icechunk 1.1.17__tar.gz → 1.1.18__tar.gz

{icechunk-1.1.17 → icechunk-1.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icechunk
-Version: 1.1.17
+Version: 1.1.18
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{icechunk-1.1.17 → icechunk-1.1.18}/icechunk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icechunk"
-version = "0.3.20"
+version = "0.3.21"
 description = "Transactional storage engine for Zarr designed for use on cloud object storage"
 readme = "README.md"
 repository = "https://github.com/earth-mover/icechunk"

{icechunk-1.1.17 → icechunk-1.1.18}/icechunk/src/config.rs

@@ -450,6 +450,8 @@ impl RepositoryConfig {
                 (Some(s), None) => Some(s.clone()),
                 (Some(mine), Some(theirs)) => Some(mine.merge(theirs)),
             },
+            // For virtual_chunk_containers, replace rather than extend.
+            // This is consistent with other fields: if specified, it replaces.
             virtual_chunk_containers: match (
                 &self.virtual_chunk_containers,
                 other.virtual_chunk_containers,
@@ -457,11 +459,7 @@ impl RepositoryConfig {
                 (None, None) => None,
                 (None, Some(c)) => Some(c),
                 (Some(c), None) => Some(c.clone()),
-                (Some(mine), Some(theirs)) => {
-                    let mut merged = mine.clone();
-                    merged.extend(theirs);
-                    Some(merged)
-                }
+                (Some(_), Some(theirs)) => Some(theirs),
             },
             manifest: match (&self.manifest, other.manifest) {
                 (None, None) => None,
@@ -678,4 +676,89 @@ mod tests {
             assert_eq!(config, roundtrip);
         }
     }
+
+    #[icechunk_macros::test]
+    fn test_merge_replaces_virtual_chunk_containers() {
+        // Create a config with a VCC
+        let mut config1 = RepositoryConfig::default();
+        config1.set_virtual_chunk_container(
+            VirtualChunkContainer::new(
+                "s3://bucket1/".to_string(),
+                ObjectStoreConfig::S3(S3Options {
+                    region: Some("us-east-1".to_string()),
+                    endpoint_url: None,
+                    anonymous: false,
+                    allow_http: false,
+                    force_path_style: false,
+                    network_stream_timeout_seconds: None,
+                    requester_pays: false,
+                }),
+            )
+            .unwrap(),
+        );
+
+        // Create a config with no VCCs (cleared)
+        let mut config2 = RepositoryConfig::default();
+        config2.clear_virtual_chunk_containers();
+
+        // Merge: config2 (empty VCCs) should replace config1's VCCs
+        let merged = config1.merge(config2);
+
+        // VCCs should be empty after merge
+        assert_eq!(
+            merged.virtual_chunk_containers,
+            Some(std::collections::HashMap::new()),
+            "Merging with cleared VCCs should result in empty VCCs"
+        );
+    }
+
+    #[icechunk_macros::test]
+    fn test_merge_replaces_virtual_chunk_containers_with_new_ones() {
+        // Create a config with VCC1
+        let mut config1 = RepositoryConfig::default();
+        config1.set_virtual_chunk_container(
+            VirtualChunkContainer::new(
+                "s3://bucket1/".to_string(),
+                ObjectStoreConfig::S3(S3Options {
+                    region: Some("us-east-1".to_string()),
+                    endpoint_url: None,
+                    anonymous: false,
+                    allow_http: false,
+                    force_path_style: false,
+                    network_stream_timeout_seconds: None,
+                    requester_pays: false,
+                }),
+            )
+            .unwrap(),
+        );
+
+        // Create a config with VCC2
+        let mut config2 = RepositoryConfig::default();
+        config2.set_virtual_chunk_container(
+            VirtualChunkContainer::new(
+                "s3://bucket2/".to_string(),
+                ObjectStoreConfig::S3(S3Options {
+                    region: Some("us-west-2".to_string()),
+                    endpoint_url: None,
+                    anonymous: false,
+                    allow_http: false,
+                    force_path_style: false,
+                    network_stream_timeout_seconds: None,
+                    requester_pays: false,
+                }),
+            )
+            .unwrap(),
+        );
+
+        // Merge: config2's VCCs should replace config1's VCCs
+        let merged = config1.merge(config2);
+
+        let vccs = merged.virtual_chunk_containers.unwrap();
+        assert_eq!(vccs.len(), 1, "Should have exactly one VCC after merge");
+        assert!(
+            vccs.contains_key("s3://bucket2/"),
+            "Should contain bucket2, not bucket1"
+        );
+        assert!(!vccs.contains_key("s3://bucket1/"), "Should not contain bucket1");
+    }
 }

{icechunk-1.1.17 → icechunk-1.1.18}/icechunk/src/session.rs

@@ -945,7 +945,8 @@ impl Session {
         if self.read_only() {
             return Err(SessionErrorKind::ReadOnlySession.into());
         }
-        let Session { splits: other_splits, change_set, .. } = other;
+        let Session { splits: other_splits, change_set, config: other_config, .. } =
+            other;
 
         if self.splits.iter().any(|(node, our_splits)| {
             other_splits
@@ -953,7 +954,7 @@ impl Session {
                 .is_some_and(|their_splits| !our_splits.compatible_with(their_splits))
         }) {
             let ours = self.config().manifest().splitting().clone();
-            let theirs = self.config().manifest().splitting().clone();
+            let theirs = other_config.manifest().splitting().clone();
             return Err(
                 SessionErrorKind::IncompatibleSplittingConfig { ours, theirs }.into()
             );

{icechunk-1.1.17 → icechunk-1.1.18}/icechunk-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icechunk-python"
-version = "1.1.17"
+version = "1.1.18"
 description = "Transactional storage engine for Zarr designed for use on cloud object storage"
 readme = "README.md"
 repository = "https://github.com/earth-mover/icechunk"
@@ -21,7 +21,7 @@ crate-type = ["cdylib"]
 bytes = "1.11.0"
 chrono = { version = "0.4.42" }
 futures = "0.3.31"
-icechunk = { path = "../icechunk", version = "0.3.20", features = ["logs"] }
+icechunk = { path = "../icechunk", version = "0.3.21", features = ["logs"] }
 itertools = "0.14.0"
 pyo3 = { version = "0.27.2", features = [
   "chrono",

{icechunk-1.1.17 → icechunk-1.1.18}/icechunk-python/tests/test_config.py

@@ -142,6 +142,39 @@ def test_virtual_chunk_containers() -> None:
     assert config.virtual_chunk_containers["s3://testbucket/"] == container
 
 
+def test_clear_virtual_chunk_containers_persists_through_reopen() -> None:
+    """Test that clearing VCCs is respected by reopen().
+
+    Regression test for: https://github.com/earth-mover/icechunk/issues/XXX
+    """
+    storage = icechunk.in_memory_storage()
+
+    # Create repo and add a VCC
+    repo = icechunk.Repository.create(storage=storage)
+    config = repo.config
+    store_config = icechunk.s3_store(region="us-east-1")
+    container = icechunk.VirtualChunkContainer("s3://testbucket/", store_config)
+    config.set_virtual_chunk_container(container)
+    repo = repo.reopen(config=config)
+    repo.save_config()
+
+    vccs = repo.config.virtual_chunk_containers or {}
+    assert "s3://testbucket/" in vccs
+
+    # Clear VCCs and reopen
+    config = repo.config
+    config.clear_virtual_chunk_containers()
+    assert config.virtual_chunk_containers == {}
+
+    repo = repo.reopen(config=config)
+
+    # VCCs should be cleared after reopen
+    reopened_vccs = repo.config.virtual_chunk_containers or {}
+    assert (
+        reopened_vccs == {}
+    ), f"Expected no VCCs after reopen, got: {list(reopened_vccs.keys())}"
+
+
 def test_can_change_deep_config_values() -> None:
     storage = icechunk.in_memory_storage()
     repo = icechunk.Repository.create(