use eixsiting utils mod

src/query/catalog/src/plan/internal_column.rs

@@ -42,8 +42,8 @@ use databend_common_expression::SEARCH_MATCHED_COLUMN_ID;
 use databend_common_expression::SEARCH_SCORE_COLUMN_ID;
 use databend_common_expression::SEGMENT_NAME_COLUMN_ID;
 use databend_common_expression::SNAPSHOT_NAME_COLUMN_ID;
+use databend_storages_common_table_meta::meta::try_extract_uuid_str_from_path;
 use databend_storages_common_table_meta::meta::NUM_BLOCK_ID_BITS;
-use databend_storages_common_table_meta::try_extract_uuid_str_from_path;
 
 // Segment and Block id Bits when generate internal column `_row_id`
 // Assumes that the max block count of a segment is 2 ^ NUM_BLOCK_ID_BITS

src/query/catalog/src/plan/stream_column.rs

@@ -39,7 +39,7 @@ use databend_common_expression::ORIGIN_BLOCK_ID_COLUMN_ID;
 use databend_common_expression::ORIGIN_BLOCK_ROW_NUM_COLUMN_ID;
 use databend_common_expression::ORIGIN_VERSION_COLUMN_ID;
 use databend_common_expression::ROW_VERSION_COLUMN_ID;
-use databend_storages_common_table_meta::try_extract_uuid_str_from_path;
+use databend_storages_common_table_meta::meta::try_extract_uuid_str_from_path;
 
 use crate::plan::PartInfo;
 use crate::plan::PartInfoPtr;

src/query/storages/common/table_meta/src/lib.rs

@@ -18,7 +18,3 @@
 pub mod meta;
 pub mod readers;
 pub mod table;
-
-mod util;
-
-pub use util::*;

src/query/storages/common/table_meta/src/meta/mod.rs

@@ -37,8 +37,11 @@ pub use statistics::*;
 // export legacy versioned table meta types locally,
 // currently, used by versioned readers only
 pub(crate) use testing::*;
+pub use utils::trim_v5_object_prefix;
+pub use utils::try_extract_uuid_str_from_path;
 pub use utils::uuid_from_date_time;
 pub use utils::TableMetaTimestamps;
+pub use utils::V5_OBJET_KEY_PREFIX;
 pub(crate) use utils::*;
 pub use versions::testify_version;
 pub use versions::SegmentInfoVersion;

src/query/storages/common/table_meta/src/meta/utils.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::ops::Add;
+use std::path::Path;
 use std::sync::Arc;
 
 use chrono::DateTime;
@@ -23,9 +24,12 @@ use chrono::Utc;
 use databend_common_base::base::uuid;
 use databend_common_base::base::uuid::NoContext;
 use databend_common_base::base::uuid::Uuid;
+use databend_common_exception::ErrorCode;
 
 use crate::meta::TableSnapshot;
 use crate::readers::snapshot_reader::TableSnapshotAccessor;
+
+pub const V5_OBJET_KEY_PREFIX: char = 'g';
 pub fn trim_timestamp_to_micro_second(ts: DateTime<Utc>) -> DateTime<Utc> {
     Utc.with_ymd_and_hms(
         ts.year(),
@@ -103,6 +107,33 @@ pub fn uuid_from_date_time(ts: DateTime<Utc>) -> Uuid {
     Uuid::new_v7(uuid_ts)
 }
 
+// Extracts the UUID part from the object key.
+// For example, given a path like:
+//   bucket/root/115/122/_b/g0191114d30fd78b89fae8e5c88327725_v2.parquet
+//   bucket/root/115/122/_b/0191114d30fd78b89fae8e5c88327725_v2.parquet
+// The function should return: 0191114d30fd78b89fae8e5c88327725
+pub fn try_extract_uuid_str_from_path(path: &str) -> databend_common_exception::Result<&str> {
+    if let Some(file_stem) = Path::new(path).file_stem() {
+        let file_name = file_stem
+            .to_str()
+            .unwrap() // path is always valid utf8 string
+            .split('_')
+            .collect::<Vec<&str>>();
+        let uuid = trim_v5_object_prefix(file_name[0]);
+        Ok(uuid)
+    } else {
+        Err(ErrorCode::StorageOther(format!(
+            "Illegal object key, no file stem found: {}",
+            path
+        )))
+    }
+}
+
+#[inline]
+pub fn trim_v5_object_prefix(key: &str) -> &str {
+    key.strip_prefix(V5_OBJET_KEY_PREFIX).unwrap_or(key)
+}
+
 #[cfg(test)]
 mod tests {
     fn assert_order_preserved(

src/query/storages/fuse/src/io/locations.rs

@@ -16,15 +16,15 @@ use std::marker::PhantomData;
 
 use databend_common_exception::Result;
 use databend_common_expression::DataBlock;
+use databend_storages_common_table_meta::meta::trim_v5_object_prefix;
 use databend_storages_common_table_meta::meta::uuid_from_date_time;
 use databend_storages_common_table_meta::meta::Location;
 use databend_storages_common_table_meta::meta::SegmentInfo;
 use databend_storages_common_table_meta::meta::SnapshotVersion;
 use databend_storages_common_table_meta::meta::TableMetaTimestamps;
 use databend_storages_common_table_meta::meta::TableSnapshotStatisticsVersion;
 use databend_storages_common_table_meta::meta::Versioned;
-use databend_storages_common_table_meta::trim_v5_object_prefix;
-use databend_storages_common_table_meta::V5_OBJET_KEY_PREFIX;
+use databend_storages_common_table_meta::meta::V5_OBJET_KEY_PREFIX;
 use uuid::Uuid;
 
 use crate::constants::FUSE_TBL_BLOCK_PREFIX;