Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-27372: Fix DeferredDatasetHandle with component from getDirectDeferred #412

Merged
merged 1 commit into from
Oct 30, 2020
Merged

DM-27372: Fix DeferredDatasetHandle with component from getDirectDeferred #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions python/lsst/daf/butler/_deferredDatasetHandle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,8 @@ def get(self, *, component: Optional[str] = None, parameters: Optional[dict] = N
else:
mergedParameters = {}

if component is not None:
return self.butler.get(self.ref.datasetType.componentTypeName(component),
self.ref.dataId, parameters=mergedParameters)
return self.butler.getDirect(self.ref, parameters=mergedParameters)
ref = self.ref.makeComponentRef(component) if component is not None else self.ref
return self.butler.getDirect(ref, parameters=mergedParameters)

@property
def dataId(self) -> DataCoordinate:
Expand Down
7 changes: 7 additions & 0 deletions tests/test_butler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,14 @@ def setUpClass(cls):
def assertGetComponents(self, butler, datasetRef, components, reference):
datasetType = datasetRef.datasetType
dataId = datasetRef.dataId
deferred = butler.getDirectDeferred(datasetRef)

for component in components:
compTypeName = datasetType.componentTypeName(component)
result = butler.get(compTypeName, dataId)
self.assertEqual(result, getattr(reference, component))
result_deferred = deferred.get(component=component)
self.assertEqual(result_deferred, result)

def tearDown(self):
if self.root is not None and os.path.exists(self.root):
Expand Down Expand Up @@ -210,6 +214,9 @@ def runPutGetTest(self, storageClass, datasetTypeName):
# Test getDeferred with a datasetRef
metricOut = butler.getDeferred(ref).get()
self.assertEqual(metric, metricOut)
# and deferred direct with ref
metricOut = butler.getDirectDeferred(ref).get()
self.assertEqual(metric, metricOut)

# Check we can get components
if storageClass.isComposite():
Expand Down