This is an automated email from the ASF dual-hosted git repository. dataroaring pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push: new babab64bbd2 branch-2.1: [fix](group commit) group commit failed if enable global enable_unique_key_partial_update (#48251) babab64bbd2 is described below commit babab64bbd2551d1c04698b53a8ad1253a573a44 Author: meiyi <me...@selectdb.com> AuthorDate: Tue Feb 25 22:08:50 2025 +0800 branch-2.1: [fix](group commit) group commit failed if enable global enable_unique_key_partial_update (#48251) pick https://github.com/apache/doris/pull/48120 --- be/src/runtime/group_commit_mgr.cpp | 1 + .../insert_p0/group_commit/test_group_commit_replay_wal.groovy | 4 ++-- .../insert_p0/insert_group_commit_into_unique_sync_mode.groovy | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/be/src/runtime/group_commit_mgr.cpp b/be/src/runtime/group_commit_mgr.cpp index 86030664b42..512d42e84e0 100644 --- a/be/src/runtime/group_commit_mgr.cpp +++ b/be/src/runtime/group_commit_mgr.cpp @@ -313,6 +313,7 @@ Status GroupCommitTable::_create_group_commit_load(int be_exe_version, request.__set_token("group_commit"); // this is a fake, fe not check it now request.__set_max_filter_ratio(1.0); request.__set_strictMode(false); + request.__set_partial_update(false); // this is an internal interface, use admin to pass the auth check request.__set_user("admin"); if (_exec_env->master_info()->__isset.backend_id) { diff --git a/regression-test/suites/insert_p0/group_commit/test_group_commit_replay_wal.groovy b/regression-test/suites/insert_p0/group_commit/test_group_commit_replay_wal.groovy index d753105bc79..5f4d666b11b 100644 --- a/regression-test/suites/insert_p0/group_commit/test_group_commit_replay_wal.groovy +++ b/regression-test/suites/insert_p0/group_commit/test_group_commit_replay_wal.groovy @@ -42,9 +42,9 @@ suite("test_group_commit_replay_wal", "nonConcurrent") { properties("replication_num" = "1", "group_commit_interval_ms"="2000") """ - sql """ set global enable_memtable_on_sink_node = true """ + sql """ set global enable_unique_key_partial_update = true """ onFinish { - sql """ set global enable_memtable_on_sink_node = false """ + sql """ set global enable_unique_key_partial_update = false """ } // 1. load success but commit rpc timeout diff --git a/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy b/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy index 8493429e7e5..b50403bed23 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy @@ -17,7 +17,7 @@ import com.mysql.cj.jdbc.StatementImpl -suite("insert_group_commit_into_unique_sync_mode") { +suite("insert_group_commit_into_unique_sync_mode", "nonConcurrent") { def dbName = "regression_test_insert_p0" def tableName = "insert_group_commit_into_unique_sync" def dbTableName = dbName + "." + tableName @@ -107,6 +107,7 @@ suite("insert_group_commit_into_unique_sync_mode") { } for (item in ["legacy", "nereids"]) { + sql """ set global enable_unique_key_partial_update = false """ // 1. table without sequence column try { tableName = "insert_group_commit_into_unique_s_" + "1_" + item @@ -330,6 +331,11 @@ suite("insert_group_commit_into_unique_sync_mode") { // qt_sql """ select * from ${dbTableName} order by id, name, score asc; """ }; + sql """ set global enable_unique_key_partial_update = true """ + onFinish { + sql """ set global enable_unique_key_partial_update = false """ + } + // 2. stream load streamLoad { table "${tableName}" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org