Skip to content

Simplify equality checking #18

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

Merged
merged 3 commits into from
Mar 17, 2025
Merged

Simplify equality checking #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f87e4d9
Simplify equality checking
maxrjones Mar 17, 2025
d535e50
Update syntax
maxrjones Mar 17, 2025
2e727cd
Remove unnecessary check
maxrjones Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 1 addition & 55 deletions src/zarr/storage/_obstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,67 +56,13 @@ class ObjectStore(Store):
"""The underlying obstore instance."""

def __eq__(self, value: object) -> bool:
from obstore.store import (
AzureStore,
GCSStore,
HTTPStore,
LocalStore,
MemoryStore,
S3Store,
)

if not isinstance(value, ObjectStore):
return False

if not isinstance(self.store, type(value.store)):
return False
if not self.read_only == value.read_only:
return False

match value.store:
case AzureStore():
assert isinstance(self.store, AzureStore)
if (
(self.store.config != value.store.config)
or (self.store.client_options != value.store.client_options)
or (self.store.prefix != value.store.prefix)
or (self.store.retry_config != value.store.retry_config)
):
return False
case GCSStore():
assert isinstance(self.store, GCSStore)
if (
(self.store.config != value.store.config)
or (self.store.client_options != value.store.client_options)
or (self.store.prefix != value.store.prefix)
or (self.store.retry_config != value.store.retry_config)
):
return False
case S3Store():
assert isinstance(self.store, S3Store)
if (
(self.store.config != value.store.config)
or (self.store.client_options != value.store.client_options)
or (self.store.prefix != value.store.prefix)
or (self.store.retry_config != value.store.retry_config)
):
return False
case HTTPStore():
assert isinstance(self.store, HTTPStore)
if (
(self.store.url != value.store.url)
or (self.store.client_options != value.store.client_options)
or (self.store.retry_config != value.store.retry_config)
):
return False
case LocalStore():
assert isinstance(self.store, LocalStore)
if self.store.prefix != value.store.prefix:
return False
case MemoryStore():
if self.store is not value.store:
return False # Two memory stores can't be equal because we can't pickle memory stores
return True
return self.store == value.store

def __init__(self, store: _UpstreamObjectStore, *, read_only: bool = False) -> None:
import obstore as obs
Expand Down