From aaf51e9551ba98d6aff61a77a4082395df78a239 Mon Sep 17 00:00:00 2001 From: dantengsky Date: Tue, 28 May 2024 08:45:05 +0800 Subject: [PATCH] disable target build --- scripts/ci/deploy/config/databend-query-node-1.toml | 2 +- src/query/service/src/interpreters/interpreter_merge_into.rs | 4 +++- .../src/pipelines/builders/merge_into_join_optimizations.rs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/ci/deploy/config/databend-query-node-1.toml b/scripts/ci/deploy/config/databend-query-node-1.toml index 1ba43c61df10d..702bef42324b6 100644 --- a/scripts/ci/deploy/config/databend-query-node-1.toml +++ b/scripts/ci/deploy/config/databend-query-node-1.toml @@ -73,7 +73,7 @@ join_spilling_memory_ratio = 60 [log] [log.file] -level = "DEBUG" +level = "INFO" format = "text" dir = "./.databend/logs_1" prefix_filter = "" diff --git a/src/query/service/src/interpreters/interpreter_merge_into.rs b/src/query/service/src/interpreters/interpreter_merge_into.rs index df7273841cf13..71f8dfc1fa7dd 100644 --- a/src/query/service/src/interpreters/interpreter_merge_into.rs +++ b/src/query/service/src/interpreters/interpreter_merge_into.rs @@ -202,6 +202,8 @@ impl MergeIntoInterpreter { } } + log::info!("target build optimization is {}", target_build_optimization); + // check mutability let check_table = self.ctx.get_table(catalog, database, table_name).await?; check_table.check_mutable()?; @@ -227,7 +229,7 @@ impl MergeIntoInterpreter { let insert_only = matches!(merge_type, MergeIntoType::InsertOnly); - let mut row_id_idx = if !insert_only { + let mut row_id_idx = if !insert_only && !target_build_optimization { match meta_data .read() .row_id_index_by_table_index(*target_table_idx) diff --git a/src/query/service/src/pipelines/builders/merge_into_join_optimizations.rs b/src/query/service/src/pipelines/builders/merge_into_join_optimizations.rs index 7bbfcb8c455d0..ea505a0383136 100644 --- a/src/query/service/src/pipelines/builders/merge_into_join_optimizations.rs +++ b/src/query/service/src/pipelines/builders/merge_into_join_optimizations.rs @@ -25,7 +25,8 @@ impl PipelineBuilder { PhysicalPlan::TableScan(scan) => match scan.table_index { None | Some(databend_common_sql::DUMMY_TABLE_INDEX) => (false, false), Some(table_index) => match need_reserve_block_info(self.ctx.clone(), table_index) { - (true, is_distributed) => (true, is_distributed), + //(true, is_distributed) => (true, is_distributed), + (true, is_distributed) => (false, is_distributed), _ => (false, false), }, },