Removing warnings and doc notes about sync vs. transactions.

lsst · Oct 9, 2020 · 8578324 · 8578324
1 parent 2b4b688
commit 8578324
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/python/lsst/daf/butler/registry/_registry.py b/python/lsst/daf/butler/registry/_registry.py
@@ -1059,11 +1059,6 @@ def syncDimensionData(self, element: Union[DimensionElement, str],
         ConflictingDefinitionError
             Raised if the record exists in the database (according to primary
             key lookup) but is inconsistent with the given one.
-
-        Notes
-        -----
-        This method cannot be called within transactions, as it needs to be
-        able to perform its own transaction to be concurrent.
         """
         if conform:
             if isinstance(element, str):

diff --git a/python/lsst/daf/butler/registry/dimensions/spatial.py b/python/lsst/daf/butler/registry/dimensions/spatial.py
@@ -158,24 +158,9 @@ def insert(self, *records: DimensionRecord) -> None:
 
     def sync(self, record: DimensionRecord) -> bool:
         # Docstring inherited from DimensionRecordStorage.sync.
-        inserted = super().sync(record)
-        if inserted:
-            try:
+        with self._db.transaction():
+            inserted = super().sync(record)
+            if inserted:
                 commonSkyPixRows = self._computeCommonSkyPixRows(record)
                 self._db.insert(self._commonSkyPixOverlapTable, *commonSkyPixRows)
-            except Exception as err:
-                # EEK.  We've just failed to insert the overlap table rows
-                # after succesfully inserting the main dimension element table
-                # row, which means the database is now in a slightly
-                # inconsistent state.
-                # Note that we can't use transactions to solve this, because
-                # Database.sync needs to begin and commit its own transation;
-                # see also DM-24355.
-                raise RuntimeError(
-                    f"Failed to add overlap records for {self.element} after "
-                    f"successfully inserting the main row.  This means the "
-                    f"database is in an inconsistent state; please manually "
-                    f"remove the row corresponding to data ID "
-                    f"{record.dataId.byName()}."
-                ) from err
         return inserted
diff --git a/python/lsst/daf/butler/registry/interfaces/_dimensions.py b/python/lsst/daf/butler/registry/interfaces/_dimensions.py
@@ -240,11 +240,6 @@ def sync(self, record: DimensionRecord) -> bool:
         sqlalchemy.exc.IntegrityError
             Raised if one or more records violate database integrity
             constraints.
-
-        Notes
-        -----
-        This method cannot be called within transactions, as it needs to be
-        able to perform its own transaction to be concurrent.
         """
         raise NotImplementedError()