Rename Address methods to DatasetLocation

python/lsst/daf/butler/core/registry.py

@@ -383,7 +383,7 @@ def disassociate(self, collection, refs, remove=True):
 
     @abstractmethod
     @transactional
-    def addAddress(self, ref, datastoreName):
+    def addDatasetLocation(self, ref, datastoreName):
         """Add datastore name locating a given dataset.
 
         Typically used by `Datastore`.
@@ -398,7 +398,7 @@ def addAddress(self, ref, datastoreName):
         raise NotImplementedError("Must be implemented by subclass")
 
     @abstractmethod
-    def getAddresses(self, ref):
+    def getDatasetLocations(self, ref):
         """Retrieve datastore locations for a given dataset.
 
         Typically used by `Datastore`.
@@ -419,7 +419,7 @@ def getAddresses(self, ref):
 
     @abstractmethod
     @transactional
-    def removeAddress(self, datastoreName, ref):
+    def removeDatasetLocation(self, datastoreName, ref):
         """Remove datastore location associated with this dataset.
 
         Typically used by `Datastore` when a dataset is removed.

python/lsst/daf/butler/datastores/inMemoryDatastore.py

@@ -315,7 +315,7 @@ def put(self, inMemoryDataset, ref):
         # We have to register this content with registry.
         # Currently this assumes we have a file so we need to use stub entries
         # TODO: Add to ephemeral part of registry
-        self.registry.addAddress(ref, self.name)
+        self.registry.addDatasetLocation(ref, self.name)
 
         # Store time we received this content, to allow us to optionally
         # expire it. Instead of storing a filename here, we include the
@@ -325,7 +325,7 @@ def put(self, inMemoryDataset, ref):
 
         # Register all components with same information
         for compRef in ref.components.values():
-            self.registry.addAddress(compRef, self.name)
+            self.registry.addDatasetLocation(compRef, self.name)
             self.addStoredItemInfo(compRef, itemInfo)
 
         if self._transaction is not None:
@@ -393,9 +393,9 @@ def remove(self, ref):
 
         # Remove rows from registries
         self.removeStoredItemInfo(ref)
-        self.registry.removeAddress(self.name, ref)
+        self.registry.removeDatasetLocation(self.name, ref)
         for compRef in ref.components.values():
-            self.registry.removeAddress(self.name, compRef)
+            self.registry.removeDatasetLocation(self.name, compRef)
             self.removeStoredItemInfo(compRef)
 
     def transfer(self, inputDatastore, ref):

python/lsst/daf/butler/datastores/posixDatastore.py

@@ -436,7 +436,7 @@ def ingest(self, path, ref, formatter=None, transfer=None):
         checksum = self.computeChecksum(fullPath)
         stat = os.stat(fullPath)
         size = stat.st_size
-        self.registry.addAddress(ref, self.name)
+        self.registry.addDatasetLocation(ref, self.name)
 
         # Associate this dataset with the formatter for later read.
         fileInfo = StoredFileInfo(formatter, path, ref.datasetType.storageClass,
@@ -448,7 +448,7 @@ def ingest(self, path, ref, formatter=None, transfer=None):
 
         # Register all components with same information
         for compRef in ref.components.values():
-            self.registry.addAddress(compRef, self.name)
+            self.registry.addDatasetLocation(compRef, self.name)
             self.addStoredFileInfo(compRef, fileInfo)
 
     def getUri(self, ref, predict=False):
@@ -533,9 +533,9 @@ def remove(self, ref):
 
         # Remove rows from registries
         self.removeStoredFileInfo(ref)
-        self.registry.removeAddress(self.name, ref)
+        self.registry.removeDatasetLocation(self.name, ref)
         for compRef in ref.components.values():
-            self.registry.removeAddress(self.name, compRef)
+            self.registry.removeDatasetLocation(self.name, compRef)
             self.removeStoredFileInfo(compRef)
 
     def transfer(self, inputDatastore, ref):

python/lsst/daf/butler/registries/sqlRegistry.py

@@ -513,7 +513,7 @@ def disassociate(self, collection, refs, remove=True):
         return []
 
     @transactional
-    def addAddress(self, ref, datastoreName):
+    def addDatasetLocation(self, ref, datastoreName):
         """Add datastore name locating a given dataset.
 
         Typically used by `Datastore`.
@@ -530,7 +530,7 @@ def addAddress(self, ref, datastoreName):
                       datastore_name=datastoreName)
         self._connection.execute(datasetStorageTable.insert().values(**values))
 
-    def getAddresses(self, ref):
+    def getDatasetLocations(self, ref):
         """Retrieve datastore locations for a given dataset.
 
         Typically used by `Datastore`.
@@ -555,7 +555,7 @@ def getAddresses(self, ref):
         return {r["datastore_name"] for r in result}
 
     @transactional
-    def removeAddress(self, datastoreName, ref):
+    def removeDatasetLocation(self, datastoreName, ref):
         """Remove datastore location associated with this dataset.
 
         Typically used by `Datastore` when a dataset is removed.

tests/dummyRegistry.py

@@ -32,7 +32,7 @@ def __init__(self):
         self._counter = 0
         self._entries = {}
 
-    def addAddress(self, ref, datastoreName):
+    def addDatasetLocation(self, ref, datastoreName):
         # Only set ID if ID is 0 or None
         incrementCounter = True
         if ref.id is None or ref.id == 0:
@@ -44,10 +44,10 @@ def addAddress(self, ref, datastoreName):
         if incrementCounter:
             self._counter += 1
 
-    def getAddresses(self, ref):
+    def getDatasetLocations(self, ref):
         return self._entries[ref.id].copy()
 
-    def removeAddress(self, datastoreName, ref):
+    def removeDatasetLocation(self, datastoreName, ref):
         self._entries[ref.id].remove(datastoreName)
 
     def makeDatabaseDict(self, table, types, key, value):

tests/test_sqlRegistry.py

@@ -212,26 +212,26 @@ def testDatasetAddresses(self):
         datastoreName = "dummystore"
         datastoreName2 = "dummystore2"
         # Test adding information about a new dataset
-        registry.addAddress(ref, datastoreName)
-        addresses = registry.getAddresses(ref)
+        registry.addDatasetLocation(ref, datastoreName)
+        addresses = registry.getDatasetLocations(ref)
         self.assertIn(datastoreName, addresses)
         self.assertEqual(len(addresses), 1)
-        registry.addAddress(ref, datastoreName2)
-        registry.addAddress(ref2, datastoreName2)
-        addresses = registry.getAddresses(ref)
+        registry.addDatasetLocation(ref, datastoreName2)
+        registry.addDatasetLocation(ref2, datastoreName2)
+        addresses = registry.getDatasetLocations(ref)
         self.assertEqual(len(addresses), 2)
         self.assertIn(datastoreName, addresses)
         self.assertIn(datastoreName2, addresses)
-        registry.removeAddress(datastoreName, ref)
-        addresses = registry.getAddresses(ref)
+        registry.removeDatasetLocation(datastoreName, ref)
+        addresses = registry.getDatasetLocations(ref)
         self.assertEqual(len(addresses), 1)
         self.assertNotIn(datastoreName, addresses)
         self.assertIn(datastoreName2, addresses)
-        registry.removeAddress(datastoreName2, ref)
-        addresses = registry.getAddresses(ref)
+        registry.removeDatasetLocation(datastoreName2, ref)
+        addresses = registry.getDatasetLocations(ref)
         self.assertEqual(len(addresses), 0)
         self.assertNotIn(datastoreName2, addresses)
-        addresses = registry.getAddresses(ref2)
+        addresses = registry.getDatasetLocations(ref2)
         self.assertEqual(len(addresses), 1)
         self.assertIn(datastoreName2, addresses)