Skip to content

Commit 95087c5

Browse files
Merge pull request pandas-dev#141 from lyrickh/origin/allow_reading_of_none
FSF-264 Allow reading of None values from arctic
2 parents d768410 + db0de3e commit 95087c5

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# Coverage
99
htmlcov
1010
.coverage
11+
.idea
12+
.cache
1113
coverage.xml
1214
junit.xml
1315
/tmp/

arctic/store/version_store.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,10 @@ def get_info(self, symbol, as_of=None):
362362

363363

364364
def _do_read(self, symbol, version, from_version=None, **kwargs):
365+
if version.get('deleted'):
366+
raise NoDataFoundException("No data found for %s in library %s" % (symbol, self._arctic_lib.get_name()))
365367
handler = self._read_handler(version, symbol)
366368
data = handler.read(self._arctic_lib, version, symbol, from_version=from_version, **kwargs)
367-
if data is None:
368-
raise NoDataFoundException("No data found for %s in library %s" % (symbol, self._arctic_lib.get_name()))
369369
return VersionedItem(symbol=symbol, library=self._arctic_lib.get_name(), version=version['version'],
370370
metadata=version.pop('metadata', None), data=data)
371371
_do_read_retry = mongo_retry(_do_read)

tests/integration/store/test_version_store.py

+5
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,11 @@ def test_delete_bson_versions(library):
427427
assert coll.versions.count() == 0
428428

429429

430+
def test_read_none_does_not_exception(library):
431+
library.write(symbol, None)
432+
assert library.read(symbol).data is None
433+
434+
430435
def test_delete_item_has_symbol(library):
431436
library.write(symbol, ts1)
432437
library.write(symbol, ts2, prune_previous_version=False)

0 commit comments

Comments
 (0)