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

fix(get): Fix from_id cache-misses #15

Merged
merged 1 commit into from
Oct 18, 2023
Merged

fix(get): Fix from_id cache-misses #15

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions chimedb/dataset/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ def from_id(cls, state_id, load_data=True):
try:
_logger.debug(f"Loading state {state_id} from database...")
if load_data:
_state_cache[state_id] = DatasetState.get(
DatasetState.id == state_id
)
_state_cache[state_id] = DatasetState.get_by_id(state_id)
else:
_state_cache[state_id] = DatasetState.select(
DatasetState.type, DatasetState.time
).get()
except orm.DatasetState.DoesNotExist:
_state_cache[state_id] = (
DatasetState.select(DatasetState.type, DatasetState.time)
.where(DatasetState.id == state_id)
.get()
)
except DatasetState.DoesNotExist:
_logger.warning(f"Could not find state {state_id}.")
return None
return _state_cache[state_id]
Expand Down Expand Up @@ -191,8 +191,8 @@ def from_id(cls, ds_id):
)
if ds_id not in _dataset_cache:
try:
_dataset_cache[ds_id] = Dataset.get(Dataset.id == ds_id)
except orm.Dataset.DoesNotExist:
_dataset_cache[ds_id] = Dataset.get_by_id(ds_id)
except Dataset.DoesNotExist:
_logger.warning(f"Could not find dataset {ds_id}.")
return None
return _dataset_cache[ds_id]
Expand Down
14 changes: 14 additions & 0 deletions tests/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,17 @@ def tests():
# pre-fetch
dget.index()
tests()

def test_get_missing(self):
# These don't exist
assert dget.Dataset.from_id("42") is None
assert dget.DatasetState.from_id("42") is None

# But these do
ds = dget.Dataset.from_id("1337")
assert ds is not None
assert ds.id == "1337"

state = dget.DatasetState.from_id("23")
assert state is not None
assert state.id == "23"
Loading