handle some v3 stuff

Author: Carreau

zarr/meta.py

@@ -97,6 +97,24 @@ def decode_array_metadata(s):
 
 
 def encode_array_metadata(meta):
+    dtype = meta["dtype"]
+    sdshape = ()
+    if dtype.subdtype is not None:
+        dtype, sdshape = dtype.subdtype
+    meta = dict(
+        zarr_format=ZARR_FORMAT,
+        shape=meta["shape"] + sdshape,
+        chunks=meta["chunks"],
+        dtype=encode_dtype(dtype),
+        compressor=meta["compressor"],
+        fill_value=encode_fill_value(meta["fill_value"], dtype),
+        order=meta["order"],
+        filters=meta["filters"],
+    )
+    return json_dumps(meta)
+
+
+def encode_array_metadata_v3(meta):
     dtype = meta['dtype']
     sdshape = ()
     if dtype.subdtype is not None:
@@ -105,11 +123,10 @@ def encode_array_metadata(meta):
         zarr_format=ZARR_FORMAT,
         shape=meta['shape'] + sdshape,
         chunks=meta['chunks'],
-        dtype=encode_dtype(dtype),
+        dtype=encode_dtype_v3(dtype),
         compressor=meta['compressor'],
         fill_value=encode_fill_value(meta['fill_value'], dtype),
         order=meta['order'],
-        filters=meta['filters'],
     )
     return json_dumps(meta)
 

zarr/storage.py

@@ -41,7 +41,11 @@
 from zarr.errors import (MetadataError, err_bad_compressor, err_contains_array,
                          err_contains_group, err_fspath_exists_notdir,
                          err_read_only)
-from zarr.meta import encode_array_metadata, encode_group_metadata
+from zarr.meta import (
+    encode_array_metadata,
+    encode_group_metadata,
+    encode_array_metadata_v3,
+)
 from zarr.util import (buffer_size, json_loads, nolock, normalize_chunks,
                        normalize_dtype, normalize_fill_value, normalize_order,
                        normalize_shape, normalize_storage_path)
@@ -438,7 +442,11 @@ def _init_array_metadata(store, shape, chunks=None, dtype=None, compressor='defa
                 compressor=compressor_config, fill_value=fill_value,
                 order=order, filters=filters_config)
     key = _path_to_prefix(path) + array_meta_key
-    store[key] = encode_array_metadata(meta)
+
+    if getattr(store, "_store_version", 3) == 3:
+        store[key] = encode_array_metadata_v3(meta)
+    else:
+        store[key] = encode_array_metadata(meta)
 
 
 # backwards compatibility