Changeset 61406 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2016 11:58:14 AM (9 years ago)

Author:

vboxsync

Message:

partial-db-dump.py: try get a consistent set of data...

File:

• trunk/src/VBox/ValidationKit/testmanager/db/partial-db-dump.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testmanager/db/partial-db-dump.py

@@ -170 +170 @@
         print 'First test set ID: %s' % (idFirstTestSet,);
 
+        oDb.execute('SELECT MAX(idTestSet) FROM TestSets WHERE tsCreated >= %s', (tsEffective, ));
+        idLastTestSet = 0;
+        if oDb.getRowCount() > 0:
+            idLastTestSet = oDb.fetchOne()[0];
+        print 'Last test set ID: %s' % (idLastTestSet,);
+
+        oDb.execute('SELECT MAX(idTestResult) FROM TestResults WHERE tsCreated >= %s', (tsEffective, ));
+        idLastTestResult = 0;
+        if oDb.getRowCount() > 0:
+            idLastTestResult = oDb.fetchOne()[0];
+        print 'Last test result ID: %s' % (idLastTestResult,);
+
+
         # Tables with idTestSet member.
         for sTable in [ 'TestSets', 'TestResults', 'TestResultValues' ]:
             self._doCopyTo(sTable, oZipFile, oDb,
-                           'COPY (SELECT * FROM ' + sTable + ' WHERE idTestSet >= %s) TO STDOUT WITH (FORMAT TEXT)',
-                           (idFirstTestSet,));
+                           'COPY (SELECT *\n'
+                           '      FROM   ' + sTable + '\n'
+                           '      WHERE  idTestSet    >= %s\n'
+                           '         AND idTestSet    <= %s\n'
+                           '         AND idTestResult <= %s\n'
+                           ') TO STDOUT WITH (FORMAT TEXT)'
+                           , ( idFirstTestSet, idLastTestSet, idLastTestResult,));
 
         # Tables where we have to go via TestResult.
@@ -181 +199 @@
                            'COPY (SELECT it.*\n'
                            '      FROM ' + sTable + ' it, TestResults tr\n'
-                           '      WHERE  tr.idTestSet >= %s\n'
-                           '         AND tr.tsCreated >= %s\n' # performance hack.
-                           '         AND it.idTestResult = tr.idTestResult\n'
-                           ') TO STDOUT WITH (FORMAT TEXT)',
-                           (idFirstTestSet, tsEffective,));
+                           '      WHERE  tr.idTestSet    >= %s\n'
+                           '         AND tr.idTestSet    <= %s\n'
+                           '         AND tr.idTestResult <= %s\n'
+                           '         AND tr.tsCreated    >= %s\n' # performance hack.
+                           '         AND it.idTestResult  = tr.idTestResult\n'
+                           ') TO STDOUT WITH (FORMAT TEXT)'
+                           , ( idFirstTestSet, idLastTestSet, idLastTestResult, tsEffective,));
 
         # Tables which goes exclusively by tsCreated.