You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by xu...@apache.org on 2024/12/28 02:58:02 UTC
(iceberg-rust) branch main updated: fix(catalog): delete metadata file when droping table in MemoryCatalog
This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-rust.git
The following commit(s) were added to refs/heads/main by this push:
new f839b0a3 fix(catalog): delete metadata file when droping table in MemoryCatalog
f839b0a3 is described below
commit f839b0a3ce13a625df97769bf06ffeca143270be
Author: 张林伟 <le...@gmail.com>
AuthorDate: Sat Dec 28 10:57:57 2024 +0800
fix(catalog): delete metadata file when droping table in MemoryCatalog
---
Cargo.lock | 112 ++++++++++++++-------------
crates/catalog/memory/src/catalog.rs | 3 +-
crates/catalog/memory/src/namespace_state.rs | 4 +-
3 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0472a2b2..ddb0c77b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -558,7 +558,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -602,7 +602,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -829,9 +829,9 @@ dependencies = [
[[package]]
name = "aws-smithy-async"
-version = "1.2.2"
+version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aa8ff1492fd9fb99ae28e8467af0dbbb7c31512b16fabf1a0f10d7bb6ef78bb"
+checksum = "427cb637d15d63d6f9aae26358e1c9a9c09d5aa490d64b09354c8217cfef0f28"
dependencies = [
"futures-util",
"pin-project-lite",
@@ -879,9 +879,9 @@ dependencies = [
[[package]]
name = "aws-smithy-runtime"
-version = "1.7.5"
+version = "1.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "431a10d0e07e09091284ef04453dae4069283aa108d209974d67e77ae1caa658"
+checksum = "a05dd41a70fc74051758ee75b5c4db2c0ca070ed9229c3df50e9475cda1cb985"
dependencies = [
"aws-smithy-async",
"aws-smithy-http",
@@ -923,9 +923,9 @@ dependencies = [
[[package]]
name = "aws-smithy-types"
-version = "1.2.10"
+version = "1.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecbf4d5dfb169812e2b240a4350f15ad3c6b03a54074e5712818801615f2dc5"
+checksum = "38ddc9bd6c28aeb303477170ddd183760a956a03e083b3902a990238a7e3792d"
dependencies = [
"base64-simd",
"bytes",
@@ -1144,7 +1144,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -1263,9 +1263,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.5"
+version = "1.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
dependencies = [
"jobserver",
"libc",
@@ -1574,7 +1574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
dependencies = [
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -1598,7 +1598,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -1609,7 +1609,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -2087,7 +2087,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -2097,7 +2097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [
"derive_builder_core",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -2132,7 +2132,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -2392,7 +2392,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -3171,7 +3171,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -3693,7 +3693,7 @@ checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -3857,7 +3857,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -4113,7 +4113,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -4215,7 +4215,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -4386,7 +4386,7 @@ checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -4573,7 +4573,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -4658,9 +4658,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.12.9"
+version = "0.12.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "3d3536321cfc54baa8cf3e273d5e1f63f889067829c4b410fcdbac8ca7b80994"
dependencies = [
"base64 0.22.1",
"bytes",
@@ -4690,6 +4690,7 @@ dependencies = [
"tokio",
"tokio-rustls 0.26.1",
"tokio-util",
+ "tower",
"tower-service",
"url",
"wasm-bindgen",
@@ -4770,7 +4771,7 @@ checksum = "beb382a4d9f53bd5c0be86b10d8179c3f8a14c30bf774ff77096ed6581e35981"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -4952,9 +4953,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
[[package]]
name = "ryu"
@@ -5083,7 +5084,7 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5106,7 +5107,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5148,7 +5149,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5274,7 +5275,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5385,7 +5386,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5453,7 +5454,7 @@ dependencies = [
"quote",
"sqlx-core",
"sqlx-macros-core",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5474,7 +5475,7 @@ dependencies = [
"sha2",
"sqlx-core",
"sqlx-sqlite",
- "syn 2.0.91",
+ "syn 2.0.92",
"tempfile",
"tokio",
"url",
@@ -5630,7 +5631,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5652,9 +5653,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.91"
+version = "2.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
+checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126"
dependencies = [
"proc-macro2",
"quote",
@@ -5678,7 +5679,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5754,7 +5755,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5765,7 +5766,7 @@ checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5870,7 +5871,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -5940,6 +5941,11 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
"tower-layer",
"tower-service",
]
@@ -5976,7 +5982,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -6042,7 +6048,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -6053,7 +6059,7 @@ checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -6346,7 +6352,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
"wasm-bindgen-shared",
]
@@ -6381,7 +6387,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -6733,7 +6739,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
"synstructure",
]
@@ -6755,7 +6761,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
@@ -6775,7 +6781,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
"synstructure",
]
@@ -6804,7 +6810,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.91",
+ "syn 2.0.92",
]
[[package]]
diff --git a/crates/catalog/memory/src/catalog.rs b/crates/catalog/memory/src/catalog.rs
index c5a98391..99563011 100644
--- a/crates/catalog/memory/src/catalog.rs
+++ b/crates/catalog/memory/src/catalog.rs
@@ -240,7 +240,8 @@ impl Catalog for MemoryCatalog {
async fn drop_table(&self, table_ident: &TableIdent) -> Result<()> {
let mut root_namespace_state = self.root_namespace_state.lock().await;
- root_namespace_state.remove_existing_table(table_ident)
+ let metadata_location = root_namespace_state.remove_existing_table(table_ident)?;
+ self.file_io.delete(&metadata_location).await
}
/// Check if a table exists in the catalog.
diff --git a/crates/catalog/memory/src/namespace_state.rs b/crates/catalog/memory/src/namespace_state.rs
index a6531956..653487f3 100644
--- a/crates/catalog/memory/src/namespace_state.rs
+++ b/crates/catalog/memory/src/namespace_state.rs
@@ -284,7 +284,7 @@ impl NamespaceState {
}
// Removes the given table or returns an error if doesn't exist
- pub(crate) fn remove_existing_table(&mut self, table_ident: &TableIdent) -> Result<()> {
+ pub(crate) fn remove_existing_table(&mut self, table_ident: &TableIdent) -> Result<String> {
let namespace = self.get_mut_namespace(table_ident.namespace())?;
match namespace
@@ -292,7 +292,7 @@ impl NamespaceState {
.remove(table_ident.name())
{
None => no_such_table_err(table_ident),
- Some(_) => Ok(()),
+ Some(metadata_location) => Ok(metadata_location),
}
}
}