Change md5 to generic checksum.

lsst · Mar 20, 2018 · 65e9eb5 · 65e9eb5
1 parent 2e63a5a
commit 65e9eb5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/config/registry/default_schema.yaml b/config/registry/default_schema.yaml
@@ -1455,10 +1455,10 @@ tables:
       nullable: false
       doc: >
         Name of the Datastore this entry corresponds to.
-    - name: md5
+    - name: checksum
       type: string
       doc: >
-        MD5 checksum of the stored dataset, if applicable.
+        Checksum (e.g. md5) of the stored dataset, if applicable.
     - name: size
       type: int
       doc: >

diff --git a/python/lsst/daf/butler/core/storageInfo.py b/python/lsst/daf/butler/core/storageInfo.py
@@ -31,19 +31,19 @@ class StorageInfo:
     ----------
     datastoreName : `str`
         Name of datastore.
-    md5 : `str`
+    checksum : `str`
         Checksum.
     size : `int`
         Size of stored object in bytes.
     """
     __eq__ = slotValuesAreEqual
-    __slots__ = ("_datastoreName", "_md5", "_size")
+    __slots__ = ("_datastoreName", "_checksum", "_size")
 
-    def __init__(self, datastoreName, md5=None, size=None):
+    def __init__(self, datastoreName, checksum=None, size=None):
         assert isinstance(datastoreName, str)
         self._datastoreName = datastoreName
-        assert md5 is None or isinstance(md5, str)
-        self._md5 = md5
+        assert checksum is None or isinstance(checksum, str)
+        self._checksum = checksum
         assert size is None or isinstance(size, int)
         self._size = size
 
@@ -54,10 +54,10 @@ def datastoreName(self):
         return self._datastoreName
 
     @property
-    def md5(self):
+    def checksum(self):
         """Checksum (`str`).
         """
-        return self._md5
+        return self._checksum
 
     @property
     def size(self):

diff --git a/python/lsst/daf/butler/registries/sqlRegistry.py b/python/lsst/daf/butler/registries/sqlRegistry.py
@@ -337,7 +337,7 @@ def addStorageInfo(self, ref, storageInfo):
         with self._engine.begin() as connection:
             connection.execute(datasetStorageTable.insert().values(dataset_id=ref.id,
                                                                    datastore_name=storageInfo.datastoreName,
-                                                                   md5=storageInfo.md5,
+                                                                   checksum=storageInfo.checksum,
                                                                    size=storageInfo.size))
 
     def updateStorageInfo(self, ref, datastoreName, storageInfo):
@@ -360,7 +360,7 @@ def updateStorageInfo(self, ref, datastoreName, storageInfo):
                 datasetStorageTable.c.dataset_id == ref.id,
                 datasetStorageTable.c.datastore_name == datastoreName)).values(
                     datastore_name=storageInfo.datastoreName,
-                    md5=storageInfo.md5,
+                    checksum=storageInfo.checksum,
                     size=storageInfo.size))
 
     def getStorageInfo(self, ref, datastoreName):
@@ -385,12 +385,12 @@ def getStorageInfo(self, ref, datastoreName):
         with self._engine.begin() as connection:
             result = connection.execute(
                 select([datasetStorageTable.c.datastore_name,
-                        datasetStorageTable.c.md5,
+                        datasetStorageTable.c.checksum,
                         datasetStorageTable.c.size]).where(
                             and_(datasetStorageTable.c.dataset_id == ref.id,
                                  datasetStorageTable.c.datastore_name == datastoreName))).fetchone()
             storageInfo = StorageInfo(datastoreName=result["datastore_name"],
-                                      md5=result["md5"],
+                                      checksum=result["checksum"],
                                       size=result["size"])
         return storageInfo
 

diff --git a/tests/test_sqlRegistry.py b/tests/test_sqlRegistry.py
@@ -108,9 +108,9 @@ def testStorageInfo(self):
         run = registry.makeRun(collection="test")
         ref = registry.addDataset(datasetType, dataId={"camera": "DummyCam"}, run=run)
         datastoreName = "dummystore"
-        md5 = "d6fb1c0c8f338044b2faaf328f91f707"
+        checksum = "d6fb1c0c8f338044b2faaf328f91f707"
         size = 512
-        storageInfo = StorageInfo(datastoreName, md5, size)
+        storageInfo = StorageInfo(datastoreName, checksum, size)
         # Test adding information about a new dataset
         registry.addStorageInfo(ref, storageInfo)
         outStorageInfo = registry.getStorageInfo(ref, datastoreName)

diff --git a/tests/test_storageInfo.py b/tests/test_storageInfo.py
@@ -36,11 +36,11 @@ def testConstructor(self):
         """Test of constructor.
         """
         datastoreName = "dummy"
-        md5 = "d6fb1c0c8f338044b2faaf328f91f707"
+        checksum = "d6fb1c0c8f338044b2faaf328f91f707"
         size = 512
-        storageInfo = StorageInfo(datastoreName, md5, size)
+        storageInfo = StorageInfo(datastoreName, checksum, size)
         self.assertEqual(storageInfo.datastoreName, datastoreName)
-        self.assertEqual(storageInfo.md5, md5)
+        self.assertEqual(storageInfo.checksum, checksum)
         self.assertEqual(storageInfo.size, size)
 
     def testEquality(self):