@@ -20,7 +20,7 @@ def __init__(self, f, v):
20
20
self .dtype = np .dtype (ds .dtype )
21
21
self .array = pyfive .indexing .ZarrArrayStub (ds .shape , ds .chunks or ds .shape )
22
22
self .missing = get_missing_attributes (ds )
23
- ds = ds ._dataobjects
23
+ ds = ds .id
24
24
self .ds = ds
25
25
def __getitem__ (self , args ):
26
26
if self .ds .filter_pipeline is None :
@@ -30,12 +30,13 @@ def __getitem__(self, args):
30
30
if self .ds .chunks is not None :
31
31
self .ds ._get_chunk_addresses ()
32
32
33
- indexer = pyfive .OrthogonalIndexer (args , self .array )
33
+ indexer = pyfive .indexing . OrthogonalIndexer (args , self .array )
34
34
for chunk_coords , chunk_selection , out_selection in indexer :
35
- offset , size , filter_mask = self .ds .get_chunk_details (chunk_coords )
35
+ storeinfo = self .ds .get_chunk_info_from_chunk_coord (chunk_coords )
36
+ offset , size = storeinfo .byte_offset , storeinfo .size
36
37
jd = reductionist .build_request_data ('a' ,'b' ,'c' ,
37
38
offset , size , compressor , filters , self .missing , self .dtype ,
38
- self .array ._chunks ,self .ds .order ,chunk_selection )
39
+ self .array ._chunks ,self .ds ._order ,chunk_selection )
39
40
js = json .dumps (jd )
40
41
return None
41
42
0 commit comments