put v2_default_compressor under array

Author: brokkoli71

src/zarr/core/config.py

@@ -42,7 +42,14 @@ def reset(self) -> None:
     defaults=[
         {
             "default_zarr_version": 3,
-            "array": {"order": "C"},
+            "array": {
+                "order": "C",
+                "v2_default_compressor": {
+                    "numeric": "zstd",
+                    "string": "vlen-utf8",
+                    "bytes": "vlen-bytes",
+                },
+            },
             "async": {"concurrency": 10, "timeout": None},
             "threading": {"max_workers": None},
             "json_indent": 2,
@@ -64,11 +71,7 @@ def reset(self) -> None:
             },
             "buffer": "zarr.core.buffer.cpu.Buffer",
             "ndbuffer": "zarr.core.buffer.cpu.NDBuffer",
-            "v2_default_compressor": {
-                "numeric": "zstd",
-                "string": "vlen-utf8",
-                "bytes": "vlen-bytes",
-            },
+
         }
     ],
 )

src/zarr/core/metadata/v2.py

@@ -337,7 +337,7 @@ def _default_filters_and_compressor(
     https://numpy.org/doc/2.1/reference/generated/numpy.dtype.kind.html
     """
     dtype = np.dtype(dtype)
-    default_compressor = config.get("v2_default_compressor")
+    default_compressor = config.get("array.v2_default_compressor")
     if dtype.kind in "biufcmM":
         dtype_key = "numeric"
     elif dtype.kind in "U":

tests/test_config.py

@@ -41,7 +41,14 @@ def test_config_defaults_set() -> None:
     assert config.defaults == [
         {
             "default_zarr_version": 3,
-            "array": {"order": "C"},
+            "array": {
+                "order": "C",
+                "v2_default_compressor": {
+                    "numeric": "zstd",
+                    "string": "vlen-utf8",
+                    "bytes": "vlen-bytes",
+                },
+            },
             "async": {"concurrency": 10, "timeout": None},
             "threading": {"max_workers": None},
             "json_indent": 2,
@@ -63,11 +70,6 @@ def test_config_defaults_set() -> None:
                 "vlen-utf8": "zarr.codecs.vlen_utf8.VLenUTF8Codec",
                 "vlen-bytes": "zarr.codecs.vlen_utf8.VLenBytesCodec",
             },
-            "v2_default_compressor": {
-                "numeric": "zstd",
-                "string": "vlen-utf8",
-                "bytes": "vlen-bytes",
-            },
         }
     ]
     assert config.get("array.order") == "C"

tests/test_v2.py

@@ -84,9 +84,7 @@ def test_codec_pipeline() -> None:
 async def test_v2_encode_decode(dtype):
     with config.set(
         {
-            "v2_default_compressor": {
-                "bytes": "vlen-bytes",
-            },
+            "array.v2_default_compressor.bytes": "vlen-bytes",
         }
     ):
         store = zarr.storage.MemoryStore()
@@ -126,7 +124,7 @@ def test_v2_encode_decode_with_data(dtype_value):
     dtype, value = dtype_value
     with config.set(
         {
-            "v2_default_compressor": {
+            "array.v2_default_compressor": {
                 "string": "vlen-utf8",
                 "bytes": "vlen-bytes",
             },
@@ -215,7 +213,7 @@ def test_v2_non_contiguous(array_order: Literal["C", "F"], data_order: Literal["
 def test_default_filters_and_compressor(dtype_expected: Any) -> None:
     with config.set(
         {
-            "v2_default_compressor": {
+            "array.v2_default_compressor": {
                 "numeric": "zstd",
                 "string": "vlen-utf8",
                 "bytes": "vlen-bytes",