This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 12e774bfd2f [fix](cloud-schema-change) Remove schema change job even
if alter version < 2 (#49062)
12e774bfd2f is described below
commit 12e774bfd2fb2d618056eaa622900cbb4678a109
Author: Siyang Tang <tangsiy...@selectdb.com>
AuthorDate: Wed Apr 9 20:13:43 2025 +0800
[fix](cloud-schema-change) Remove schema change job even if alter version <
2 (#49062)
Remove schema change job even if alter version < 2, to avoid base
compaction disablility after doing schema change on empty tables.
---
cloud/src/meta-service/meta_service_job.cpp | 5 +-
.../test_base_compaction_after_sc.groovy | 73 ++++++++++++++++++++++
2 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/cloud/src/meta-service/meta_service_job.cpp
b/cloud/src/meta-service/meta_service_job.cpp
index 383800e15c5..33134ead605 100644
--- a/cloud/src/meta-service/meta_service_job.cpp
+++ b/cloud/src/meta-service/meta_service_job.cpp
@@ -1252,9 +1252,10 @@ void process_schema_change_job(MetaServiceCode& code,
std::string& msg, std::str
msg = "invalid alter_version";
return;
}
- if (schema_change.alter_version() < 2) { // no need to update stats
- // TODO(cyx): clear schema_change
job?
+ if (schema_change.alter_version() < 2) {
+ // no need to update stats
if (!new_tablet_job_val.empty()) {
+ new_recorded_job.clear_schema_change();
auto& compactions = *new_recorded_job.mutable_compaction();
auto origin_size = compactions.size();
compactions.erase(
diff --git
a/regression-test/suites/compaction/test_base_compaction_after_sc.groovy
b/regression-test/suites/compaction/test_base_compaction_after_sc.groovy
new file mode 100644
index 00000000000..6e9a3f2c85f
--- /dev/null
+++ b/regression-test/suites/compaction/test_base_compaction_after_sc.groovy
@@ -0,0 +1,73 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import org.codehaus.groovy.runtime.IOGroovyMethods
+import org.awaitility.Awaitility
+
+suite("test_base_compaction_after_sc") {
+ def tableName = "test_base_compaction_after_sc"
+
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """
+ CREATE TABLE IF NOT EXISTS ${tableName} (
+ `k1` int NOT NULL,
+ `c1` int,
+ `c2` int,
+ `c3` int
+ ) DUPLICATE KEY(k1)
+ DISTRIBUTED BY HASH(k1) BUCKETS 1
+ PROPERTIES (
+ "disable_auto_compaction" = "true",
+ "replication_num" = "1");
+ """
+ sql """ ALTER TABLE ${tableName} MODIFY COLUMN c1 VARCHAR(44) """
+
+ def wait_for_schema_change = {
+ def try_times=1000
+ while(true){
+ def res = sql " SHOW ALTER TABLE COLUMN WHERE TableName =
'${tableName}' ORDER BY CreateTime DESC LIMIT 1 "
+ Thread.sleep(10)
+ if(res[0][9].toString() == "FINISHED"){
+ break;
+ }
+ assert(try_times>0)
+ try_times--
+ }
+ }
+ wait_for_schema_change()
+
+ def insert_data = {
+ for (i in 0..100) {
+ sql """ INSERT INTO ${tableName} VALUES(1, "2", 3, 4) """
+ sql """ DELETE FROM ${tableName} WHERE k1=1 """
+ }
+ }
+
+ insert_data()
+
+ trigger_and_wait_compaction(tableName, "cumulative")
+
+ insert_data()
+
+ trigger_and_wait_compaction(tableName, "cumulative")
+
+ insert_data()
+
+ trigger_and_wait_compaction(tableName, "cumulative")
+
+ trigger_and_wait_compaction(tableName, "base")
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
