Deprecated row_avg_depth_threshold

Author: zhyass

src/query/service/src/interpreters/common/table_option_validation.rs

@@ -152,6 +152,7 @@ pub static UNSET_TABLE_OPTIONS_WHITE_LIST: LazyLock<HashSet<&'static str>> = Laz
     r.insert(FUSE_OPT_KEY_ROW_PER_BLOCK);
     r.insert(FUSE_OPT_KEY_BLOCK_IN_MEM_SIZE_THRESHOLD);
     r.insert(FUSE_OPT_KEY_FILE_SIZE);
+    // Deprecated: no longer affects recluster, but old tables can still unset it.
     r.insert(FUSE_OPT_KEY_ROW_AVG_DEPTH_THRESHOLD);
     r.insert(FUSE_OPT_KEY_RECLUSTER_DEPTH);
     r.insert(FUSE_OPT_KEY_FILE_SIZE);

src/query/storages/fuse/src/constants.rs

@@ -16,7 +16,6 @@ pub const FUSE_OPT_KEY_BLOCK_IN_MEM_SIZE_THRESHOLD: &str = "block_size_threshold
 pub const FUSE_OPT_KEY_BLOCK_PER_SEGMENT: &str = "block_per_segment";
 pub const FUSE_OPT_KEY_ROW_PER_BLOCK: &str = "row_per_block";
 pub const FUSE_OPT_KEY_ROW_PER_PAGE: &str = "row_per_page";
-pub const FUSE_OPT_KEY_ROW_AVG_DEPTH_THRESHOLD: &str = "row_avg_depth_threshold";
 pub const FUSE_OPT_KEY_RECLUSTER_DEPTH: &str = "recluster_depth";
 pub const FUSE_OPT_KEY_FILE_SIZE: &str = "file_size";
 pub const FUSE_OPT_KEY_DATA_RETENTION_PERIOD_IN_HOURS: &str = "data_retention_period_in_hours";
@@ -31,6 +30,8 @@ pub const FUSE_OPT_KEY_ATTACH_COLUMN_IDS: &str = "attach_column_ids";
 pub const FUSE_OPT_KEY_ENABLE_PARQUET_DICTIONARY: &str = "enable_parquet_dictionary";
 pub const FUSE_OPT_KEY_DATA_PAGE_ROWS: &str = "data_page_rows";
 pub const FUSE_OPT_KEY_DATA_PAGE_BYTES: &str = "data_page_bytes";
+/// Deprecated: kept only so old tables can unset this legacy option.
+pub const FUSE_OPT_KEY_ROW_AVG_DEPTH_THRESHOLD: &str = "row_avg_depth_threshold";
 
 pub const FUSE_TBL_BLOCK_PREFIX: &str = "_b";
 pub const FUSE_TBL_BLOCK_INDEX_PREFIX: &str = "_i";
@@ -52,7 +53,6 @@ pub const LEGACY_FUSE_TBL_REF_PREFIX: &str = "_ref";
 pub const DEFAULT_ROW_PER_PAGE: usize = 8192;
 pub const DEFAULT_ROW_PER_INDEX: usize = 100000;
 
-pub const DEFAULT_AVG_DEPTH_THRESHOLD: f64 = 0.001;
 pub const MIN_RECLUSTER_DEPTH: u64 = 1;
 pub const MAX_RECLUSTER_DEPTH: u64 = 32;
 pub const DEFAULT_RECLUSTER_DEPTH: u64 = 16;

src/query/storages/fuse/src/operations/mutation/mutator/recluster_mutator.rs

@@ -53,10 +53,8 @@ use log::info;
 use log::warn;
 use opendal::Operator;
 
-use crate::DEFAULT_AVG_DEPTH_THRESHOLD;
 use crate::DEFAULT_RECLUSTER_DEPTH;
 use crate::FUSE_OPT_KEY_RECLUSTER_DEPTH;
-use crate::FUSE_OPT_KEY_ROW_AVG_DEPTH_THRESHOLD;
 use crate::FuseTable;
 use crate::MAX_RECLUSTER_DEPTH;
 use crate::MIN_RECLUSTER_DEPTH;
@@ -172,7 +170,11 @@ impl ReclusterMutator {
         let cluster_key_id = table.cluster_key_id().unwrap();
         let block_thresholds = table.get_block_thresholds();
 
-        let depth_threshold = Self::recluster_depth_threshold(table, snapshot.summary.block_count);
+        let depth_threshold = if snapshot.summary.block_count <= SMALL_TABLE_RECLUSTER_BLOCK_COUNT {
+            MIN_RECLUSTER_DEPTH as f64
+        } else {
+            table.get_option(FUSE_OPT_KEY_RECLUSTER_DEPTH, DEFAULT_RECLUSTER_DEPTH) as f64
+        };
 
         let settings = ctx.get_settings();
         let memory_threshold = Self::recluster_memory_threshold(ctx.as_ref())?;
@@ -477,28 +479,6 @@ impl ReclusterMutator {
         Ok((selected_blocks_idx.len() as u64, parts))
     }
 
-    fn recluster_depth_threshold(table: &FuseTable, block_count: u64) -> f64 {
-        let options = table.table_info.options();
-        if options.contains_key(FUSE_OPT_KEY_RECLUSTER_DEPTH) {
-            return table.get_option(FUSE_OPT_KEY_RECLUSTER_DEPTH, DEFAULT_RECLUSTER_DEPTH) as f64;
-        }
-
-        if options.contains_key(FUSE_OPT_KEY_ROW_AVG_DEPTH_THRESHOLD) {
-            let avg_depth_threshold = table.get_option(
-                FUSE_OPT_KEY_ROW_AVG_DEPTH_THRESHOLD,
-                DEFAULT_AVG_DEPTH_THRESHOLD,
-            );
-            return (block_count as f64 * avg_depth_threshold)
-                .clamp(MIN_RECLUSTER_DEPTH as f64, MAX_RECLUSTER_DEPTH as f64);
-        }
-
-        if block_count <= SMALL_TABLE_RECLUSTER_BLOCK_COUNT {
-            MIN_RECLUSTER_DEPTH as f64
-        } else {
-            DEFAULT_RECLUSTER_DEPTH as f64
-        }
-    }
-
     fn recluster_memory_threshold(ctx: &dyn TableContext) -> Result<usize> {
         let settings = ctx.get_settings();
         let recluster_block_size = settings.get_recluster_block_size()? as usize;