This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new dc05b1e9477 branch-4.1: [fix](schema-change) Use actual schema change
alter version in cloud capture #62506 (#66606)
dc05b1e9477 is described below
commit dc05b1e947732744897a6e8349e9cf722b449001
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 11 09:46:15 2026 +0800
branch-4.1: [fix](schema-change) Use actual schema change alter version in
cloud capture #62506 (#66606)
Cherry-picked from #62506
Co-authored-by: Siyang Tang <[email protected]>
---
be/src/cloud/cloud_schema_change_job.cpp | 6 +-
.../test_inverted_index_sc_version1_race.groovy | 93 ++++++++++++++++++++++
2 files changed, 98 insertions(+), 1 deletion(-)
diff --git a/be/src/cloud/cloud_schema_change_job.cpp
b/be/src/cloud/cloud_schema_change_job.cpp
index 87d11264d10..9b01c4b0762 100644
--- a/be/src/cloud/cloud_schema_change_job.cpp
+++ b/be/src/cloud/cloud_schema_change_job.cpp
@@ -207,7 +207,11 @@ Status CloudSchemaChangeJob::process_alter_tablet(const
TAlterTabletReqV2& reque
}
}
- if (request.alter_version > 1) {
+ // Use the registered alter_version returned by meta-service instead of
the original FE task
+ // version. The task can be created when FE still sees version 1, but by
the time BE starts
+ // the schema change new data may already have been published and
start_tablet_job can advance
+ // alter_version. In that case we still need to capture historical rowsets
in [2, alter_version].
+ if (start_resp.alter_version() > 1) {
// [0-1] is a placeholder rowset, no need to convert
RETURN_IF_ERROR(_base_tablet->capture_rs_readers({2,
start_resp.alter_version()},
&rs_splits,
diff --git
a/regression-test/suites/cloud_p1/schema_change/compaction_optimization/test_inverted_index_sc_version1_race.groovy
b/regression-test/suites/cloud_p1/schema_change/compaction_optimization/test_inverted_index_sc_version1_race.groovy
new file mode 100644
index 00000000000..5fc02577e7c
--- /dev/null
+++
b/regression-test/suites/cloud_p1/schema_change/compaction_optimization/test_inverted_index_sc_version1_race.groovy
@@ -0,0 +1,93 @@
+// 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.apache.doris.regression.suite.ClusterOptions
+
+suite('test_inverted_index_sc_version1_race', 'nonConcurrent,docker') {
+
+ def options = new ClusterOptions()
+ options.cloudMode = true
+ options.enableDebugPoints()
+ options.beConfigs += ['enable_java_support=false']
+ options.beConfigs += ['alter_tablet_worker_count=1']
+ options.beNum = 1
+
+ docker(options) {
+ def tableName = 'test_inverted_index_sc_version1_race'
+ def scBlock = 'CloudSchemaChangeJob::process_alter_tablet.block'
+
+ def getJobState = { tbl ->
+ def result = sql """SHOW ALTER TABLE COLUMN WHERE
TableName='${tbl}' ORDER BY CreateTime DESC LIMIT 1"""
+ logger.info("getJobState: ${result}")
+ if (result == null || result.isEmpty()) {
+ return ''
+ }
+ return result[0][9]
+ }
+
+ sql "DROP TABLE IF EXISTS ${tableName}"
+ sql """
+ CREATE TABLE ${tableName} (
+ id INT NOT NULL,
+ title STRING NOT NULL
+ )
+ DUPLICATE KEY(id)
+ DISTRIBUTED BY HASH(id) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1"
+ )
+ """
+
+ GetDebugPoint().enableDebugPointForAllBEs(scBlock)
+
+ try {
+ sql """ALTER TABLE ${tableName} ADD INDEX idx_title (title) USING
INVERTED PROPERTIES(\"parser\" = \"english\")"""
+
+ int runningTries = 60
+ while (runningTries-- > 0) {
+ if (getJobState(tableName) == 'RUNNING') {
+ break
+ }
+ sleep(1000)
+ }
+ assertEquals('RUNNING', getJobState(tableName))
+
+ sql """INSERT INTO ${tableName} VALUES (1, 'alpha beta'), (2,
'beta gamma'), (3, 'gamma delta')"""
+ assertEquals(3L, (sql "SELECT count(*) FROM ${tableName}")[0][0])
+
+ } finally {
+ GetDebugPoint().disableDebugPointForAllBEs(scBlock)
+ }
+
+ int maxTries = 180
+ def finalState = ''
+ while (maxTries-- > 0) {
+ finalState = getJobState(tableName)
+ if (finalState == 'FINISHED' || finalState == 'CANCELLED') {
+ break
+ }
+ sleep(1000)
+ }
+ assertEquals('FINISHED', finalState)
+
+ def showIndexResult = sql "SHOW INDEX FROM ${tableName}"
+ assertTrue(showIndexResult.any { row -> row[2].toString() ==
'idx_title' })
+
+ def queryResult = sql "SELECT id FROM ${tableName} WHERE title MATCH
'beta' ORDER BY id"
+ assertEquals([[1], [2]], queryResult)
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
