Changeset 84550 in vbox for trunk/src/VBox/ValidationKit/testmanager/core

Timestamp:

May 26, 2020 6:50:43 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138280

Message:

TestManager: Adding new table for correlating commits and bugs (for xTracker).

File:

• trunk/src/VBox/ValidationKit/testmanager/core/vcsbugreference.py (copied) (copied from trunk/src/VBox/ValidationKit/testmanager/core/vcsrevisions.py ) (9 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/vcsbugreference.py

@@ -3 +3 @@
 
 """
-Test Manager - VcsRevisions
+Test Manager - VcsBugReferences
 """
 
@@ -37 +37 @@
 
 
-class VcsRevisionData(ModelDataBase):
+class VcsBugReferenceData(ModelDataBase):
     """
-    A version control system (VCS) revision.
+    A version control system (VCS) bug tracker reference (commit message tag).
     """
 
-    #kasIdAttr = ['sRepository',iRevision];
+    #kasIdAttr = ['sRepository','iRevision', 'sBugTracker', 'iBugNo'];
 
-    ksParam_sRepository         = 'VcsRevision_sRepository';
-    ksParam_iRevision           = 'VcsRevision_iRevision';
-    ksParam_tsCreated           = 'VcsRevision_tsCreated';
-    ksParam_sAuthor             = 'VcsRevision_sAuthor';
-    ksParam_sMessage            = 'VcsRevision_sMessage';
+    ksParam_sRepository         = 'VcsBugReference_sRepository';
+    ksParam_iRevision           = 'VcsBugReference_iRevision';
+    ksParam_sBugTracker         = 'VcsBugReference_sBugTracker';
+    ksParam_lBugNo              = 'VcsBugReference_lBugNo';
 
     kasAllowNullAttributes      = [ ];
-    kfAllowUnicode_sMessage     = True;
-    kcchMax_sMessage            = 8192;
 
     def __init__(self):
@@ -63 +60 @@
         self.sRepository        = None;
         self.iRevision          = None;
-        self.tsCreated          = None;
-        self.sAuthor            = None;
-        self.sMessage           = None;
+        self.sBugTracker        = None;
+        self.lBugNo             = None;
 
     def initFromDbRow(self, aoRow):
         """
-        Re-initializes the object from a SELECT * FROM VcsRevisions row.
+        Re-initializes the object from a SELECT * FROM VcsBugReferences row.
         Returns self.  Raises exception if aoRow is None.
         """
         if aoRow is None:
-            raise TMExceptionBase('VcsRevision not found.');
+            raise TMExceptionBase('VcsBugReference not found.');
 
-        self.sRepository         = aoRow[0];
-        self.iRevision           = aoRow[1];
-        self.tsCreated           = aoRow[2];
-        self.sAuthor             = aoRow[3];
-        self.sMessage            = aoRow[4];
+        self.sRepository        = aoRow[0];
+        self.iRevision          = aoRow[1];
+        self.sBugTracker        = aoRow[2];
+        self.lBugNo             = aoRow[3];
         return self;
 
-    def initFromDbWithRepoAndRev(self, oDb, sRepository, iRevision):
-        """
-        Initialize from the database, given the tree and revision of a row.
-        """
-        oDb.execute('SELECT * FROM VcsRevisions WHERE sRepository = %s AND iRevision = %u', (sRepository, iRevision,));
-        aoRow = oDb.fetchOne()
-        if aoRow is None:
-            raise TMExceptionBase('sRepository = %s iRevision = %u not found' % (sRepository, iRevision, ));
-        return self.initFromDbRow(aoRow);
-
-    def initFromValues(self, sRepository, iRevision, tsCreated, sAuthor, sMessage):
+    def initFromValues(self, sRepository, iRevision, sBugTracker, lBugNo):
         """
         Reinitializes form a set of values.
@@ -99 +84 @@
         self.sRepository        = sRepository;
         self.iRevision          = iRevision;
-        self.tsCreated          = tsCreated;
-        self.sAuthor            = sAuthor;
-        self.sMessage           = sMessage;
+        self.sBugTracker        = sBugTracker;
+        self.lBugNo             = lBugNo;
         return self;
 
 
-class VcsRevisionLogic(ModelLogicBase): # pylint: disable=too-few-public-methods
+class VcsBugReferenceLogic(ModelLogicBase): # pylint: disable=too-few-public-methods
     """
-    VCS revisions database logic.
+    VCS revision <-> bug tracker references database logic.
     """
 
@@ -118 +102 @@
         Fetches VCS revisions for listing.
 
-        Returns an array (list) of VcsRevisionData items, empty list if none.
+        Returns an array (list) of VcsBugReferenceData items, empty list if none.
         Raises exception on error.
         """
         _ = tsNow; _ = aiSortColumns;
-        self._oDb.execute('SELECT   *\n'
-                          'FROM     VcsRevisions\n'
-                          'ORDER BY tsCreated, sRepository, iRevision\n'
-                          'LIMIT %s OFFSET %s\n'
-                          , (cMaxRows, iStart,));
+        self._oDb.execute('''
+SELECT  *
+FROM    VcsBugReferences
+ORDER BY sRepository, iRevision, sBugTracker, lBugNo
+LIMIT %s OFFSET %s
+''', (cMaxRows, iStart,));
 
         aoRows = [];
         for _ in range(self._oDb.getRowCount()):
-            aoRows.append(VcsRevisionData().initFromDbRow(self._oDb.fetchOne()));
+            aoRows.append(VcsBugReferenceData().initFromDbRow(self._oDb.fetchOne()));
         return aoRows;
 
-    def tryFetch(self, sRepository, iRevision):
+    def exists(self, oData):
         """
-        Tries to fetch the specified tree revision record.
-        Returns VcsRevisionData instance if found, None if not found.
+        Checks if the data is already present in the DB.
+        Returns True / False.
         Raises exception on input and database errors.
         """
-        self._oDb.execute('SELECT * FROM VcsRevisions WHERE sRepository = %s AND iRevision = %s',
-                          ( sRepository, iRevision, ));
-        aaoRows = self._oDb.fetchAll();
-        if len(aaoRows) == 1:
-            return VcsRevisionData().initFromDbRow(aaoRows[0]);
-        if aaoRows:
-            raise TMExceptionBase('VcsRevisions has a primary key problem: %u duplicates' % (len(aaoRows),));
-        return None
+        self._oDb.execute('''
+SELECT  COUNT(*)
+FROM    VcsBugReferences
+WHERE   sRepository = %s
+    AND iRevision   = %s
+    AND sBugTracker = %s
+    AND lBugNo      = %s
+''', ( oData.sRepository, oData.iRevision, oData.sBugTracker, oData.lBugNo));
+        cRows = self._oDb.fetchOne()[0];
+        if cRows < 0 or cRows > 1:
+            raise TMExceptionBase('VcsBugReferences has a primary key problem: %u duplicates' % (cRows,));
+        return cRows != 0;
 
 
@@ -153 +142 @@
     #
 
-    def addVcsRevision(self, oData, fCommit = False):
+    def addVcsBugReference(self, oData, fCommit = False):
         """
         Adds (or updates) a tree revision record.
@@ -159 +148 @@
         """
 
-        # Check VcsRevisionData before do anything
+        # Check VcsBugReferenceData before do anything
         dDataErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Add);
         if dDataErrors:
-            raise TMExceptionBase('Invalid data passed to addVcsRevision(): %s' % (dDataErrors,));
+            raise TMExceptionBase('Invalid data passed to addVcsBugReference(): %s' % (dDataErrors,));
 
         # Does it already exist?
-        oOldData = self.tryFetch(oData.sRepository, oData.iRevision);
-        if oOldData is None:
+        if not self.exists(oData):
             # New row.
-            self._oDb.execute('INSERT INTO VcsRevisions (sRepository, iRevision, tsCreated, sAuthor, sMessage)\n'
-                              'VALUES (%s, %s, %s, %s, %s)\n'
+            self._oDb.execute('INSERT INTO VcsBugReferences (sRepository, iRevision, sBugTracker, lBugNo)\n'
+                              'VALUES (%s, %s, %s, %s)\n'
                               , ( oData.sRepository,
                                   oData.iRevision,
-                                  oData.tsCreated,
-                                  oData.sAuthor,
-                                  oData.sMessage,
-                              ));
-        elif not oOldData.isEqual(oData):
-            # Update old row.
-            self._oDb.execute('UPDATE VcsRevisions\n'
-                              '   SET tsCreated   = %s,\n'
-                              '       sAuthor     = %s,\n'
-                              '       sMessage    = %s\n'
-                              'WHERE  sRepository = %s\n'
-                              '   AND iRevision   = %s'
-                              , ( oData.tsCreated,
-                                  oData.sAuthor,
-                                  oData.sMessage,
-                                  oData.sRepository,
-                                  oData.iRevision,
+                                  oData.sBugTracker,
+                                  oData.lBugNo,
                               ));
 
@@ -199 +172 @@
         if the repository is not known to us:
         """
-        self._oDb.execute('SELECT iRevision\n'
-                          'FROM   VcsRevisions\n'
-                          'WHERE  sRepository = %s\n'
-                          'ORDER BY iRevision DESC\n'
-                          'LIMIT 1\n'
-                          , ( sRepository, ));
+        self._oDb.execute('''
+SELECT iRevision
+FROM   VcsBugReferences
+WHERE  sRepository = %s
+ORDER BY iRevision DESC
+LIMIT 1
+''', ( sRepository, ));
         if self._oDb.getRowCount() == 0:
             return 0;
         return self._oDb.fetchOne()[0];
-
-    def fetchTimeline(self, sRepository, iRevision, cEntriesBack):
-        """
-        Fetches a VCS timeline portion for a repository.
-
-        Returns an array (list) of VcsRevisionData items, empty list if none.
-        Raises exception on error.
-        """
-        self._oDb.execute('SELECT   *\n'
-                          'FROM     VcsRevisions\n'
-                          'WHERE    sRepository = %s\n'
-                          '   AND   iRevision  >  %s\n'
-                          '   AND   iRevision  <= %s\n'
-                          'ORDER BY iRevision DESC\n'
-                          'LIMIT    %s\n'
-                          , ( sRepository, iRevision - cEntriesBack*2 + 1, iRevision, cEntriesBack));
-        aoRows = [];
-        for _ in range(self._oDb.getRowCount()):
-            aoRows.append(VcsRevisionData().initFromDbRow(self._oDb.fetchOne()));
-        return aoRows;
 
 
@@ -235 +189 @@
 
 # pylint: disable=missing-docstring
-class VcsRevisionDataTestCase(ModelDataBaseTestCase):
+class VcsBugReferenceDataTestCase(ModelDataBaseTestCase):
     def setUp(self):
-        self.aoSamples = [VcsRevisionData(),];
+        self.aoSamples = [VcsBugReferenceData(),];
 
 if __name__ == '__main__':