This is an automated email from the ASF dual-hosted git repository.

airborne 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 f6ddd818cd7 [tests](inverted index)Add and improve add/drop index 
cases (#36811) (#43463)
f6ddd818cd7 is described below

commit f6ddd818cd7f725729d2ad26aa131ae47f211512
Author: qiye <[email protected]>
AuthorDate: Fri Nov 8 09:38:54 2024 +0800

    [tests](inverted index)Add and improve add/drop index cases (#36811) 
(#43463)
    
    bp #36811
---
 .../java/org/apache/doris/alter/AlterJobV2.java    |  2 +-
 .../apache/doris/alter/SchemaChangeHandler.java    |  1 +
 .../test_index_change_on_new_column.out            |  4 ++
 .../test_index_change_on_renamed_column.out        |  2 +-
 ...st_index_change_with_cumulative_compaction.out} |  0
 ... => test_index_change_with_full_compaction.out} |  0
 ...d_index_with_direct_schema_change_fault.groovy} | 45 +++++++---------
 ...ld_index_with_light_schema_change_fault.groovy} | 40 ++++++--------
 .../{ => index_change}/test_add_drop_index.groovy  |  0
 .../test_add_drop_index_ignore_case_column.groovy  |  0
 .../test_add_drop_index_repeatly.groovy}           | 63 +++++++++-------------
 .../test_add_drop_index_with_data.groovy           |  0
 .../test_add_drop_index_with_delete_data.groovy    |  0
 .../{ => index_change}/test_build_index.groovy     |  0
 .../test_build_index_with_clone_by_docker.groovy   |  0
 .../test_index_change_on_new_column.groovy         | 14 +++--
 ...index_change_with_cumulative_compaction.groovy} |  6 +--
 ... test_index_change_with_full_compaction.groovy} | 16 +++---
 18 files changed, 86 insertions(+), 107 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java 
b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
index 3574b1e6e6b..f07be4df818 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
@@ -175,7 +175,7 @@ public abstract class AlterJobV2 implements Writable {
     }
 
     // /api/debug_point/add/{name}?value=100
-    private void stateWait(final String name) {
+    protected void stateWait(final String name) {
         long waitTimeMs = DebugPointUtil.getDebugParamOrDefault(name, 0);
         if (waitTimeMs > 0) {
             try {
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java 
b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
index 2f93cbd681a..be67d912f00 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
@@ -2751,6 +2751,7 @@ public class SchemaChangeHandler extends AlterHandler {
             throw new DdlException(e.getMessage());
         }
 
+        schemaChangeJob.stateWait("FE.LIGHT_SCHEMA_CHANGE");
         // set Job state then add job
         schemaChangeJob.setJobState(AlterJobV2.JobState.FINISHED);
         schemaChangeJob.setFinishedTimeMs(System.currentTimeMillis());
diff --git 
a/regression-test/data/inverted_index_p0/index_change/test_index_change_on_new_column.out
 
b/regression-test/data/inverted_index_p0/index_change/test_index_change_on_new_column.out
index 6fc02ad3fde..78a797ead64 100644
--- 
a/regression-test/data/inverted_index_p0/index_change/test_index_change_on_new_column.out
+++ 
b/regression-test/data/inverted_index_p0/index_change/test_index_change_on_new_column.out
@@ -4,4 +4,8 @@
 
 -- !select2 --
 1      hello world     \N
+2      hello wold      welcome to the world
+
+-- !select3 --
+2      hello wold      welcome to the world
 
diff --git 
a/regression-test/data/inverted_index_p0/index_change/test_index_change_on_renamed_column.out
 
b/regression-test/data/inverted_index_p0/index_change/test_index_change_on_renamed_column.out
index 4bf30965b8b..61ca1829d24 100644
--- 
a/regression-test/data/inverted_index_p0/index_change/test_index_change_on_renamed_column.out
+++ 
b/regression-test/data/inverted_index_p0/index_change/test_index_change_on_renamed_column.out
@@ -8,4 +8,4 @@
 2      welcome to the world
 
 -- !select3 --
-2      welcome to the world
\ No newline at end of file
+2      welcome to the world
diff --git 
a/regression-test/data/inverted_index_p0/index_change/test_index_change_with_compaction.out
 
b/regression-test/data/inverted_index_p0/index_change/test_index_change_with_cumulative_compaction.out
similarity index 100%
copy from 
regression-test/data/inverted_index_p0/index_change/test_index_change_with_compaction.out
copy to 
regression-test/data/inverted_index_p0/index_change/test_index_change_with_cumulative_compaction.out
diff --git 
a/regression-test/data/inverted_index_p0/index_change/test_index_change_with_compaction.out
 
b/regression-test/data/inverted_index_p0/index_change/test_index_change_with_full_compaction.out
similarity index 100%
rename from 
regression-test/data/inverted_index_p0/index_change/test_index_change_with_compaction.out
rename to 
regression-test/data/inverted_index_p0/index_change/test_index_change_with_full_compaction.out
diff --git 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
 
b/regression-test/suites/fault_injection_p0/test_build_index_with_direct_schema_change_fault.groovy
similarity index 66%
copy from 
regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
copy to 
regression-test/suites/fault_injection_p0/test_build_index_with_direct_schema_change_fault.groovy
index 9d30ca30c0c..fdb72f5bfd7 100644
--- 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
+++ 
b/regression-test/suites/fault_injection_p0/test_build_index_with_direct_schema_change_fault.groovy
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import org.apache.doris.regression.suite.ClusterOptions
-import org.apache.doris.regression.util.NodeType
-import org.apache.doris.regression.suite.SuiteCluster
-
-suite("test_build_index_with_clone_by_docker"){
+suite("test_build_index_with_direct_schema_change_fault_injection", 
"nonConcurrent"){
+    if (isCloudMode()) {
+        return 
+    }
+    def backends = sql_return_maparray('show backends')
     def timeout = 300000
     def delta_time = 1000
     def alter_res = "null"
@@ -49,21 +49,17 @@ suite("test_build_index_with_clone_by_docker"){
         return "wait_timeout"
     }
 
-    def options = new ClusterOptions()
-    options.enableDebugPoints()
-    options.setFeNum(1)
-    options.setBeNum(3)
-    options.cloudMode = false
-    def tbl = 'test_build_index_with_clone_by_docker'
-    docker(options) {
-        cluster.injectDebugPoints(NodeType.BE, ['EngineCloneTask.wait_clone' : 
null])
+    def tbl = 'test_build_index_with_direct_schema_change'
+    try {
+        GetDebugPoint().enableDebugPointForAllFEs("FE.ALTER_JOB_V2_RUNNING", 
[value: 10000])
+        logger.info("add debug point FE.ALTER_JOB_V2_RUNNING and sleep 10 
seconds to simulate alter job running")
         sql """ DROP TABLE IF EXISTS ${tbl} """
         sql """
             CREATE TABLE ${tbl} (
             `k1` int(11) NULL,
             `k2` int(11) NULL
             )
-            DUPLICATE KEY(`k1`, `k2`)
+            DUPLICATE KEY(`k1`)
             COMMENT 'OLAP'
             DISTRIBUTED BY HASH(`k1`) BUCKETS 1
             PROPERTIES ("replication_num" = "1")
@@ -74,21 +70,16 @@ suite("test_build_index_with_clone_by_docker"){
 
         sql """ sync """
 
-        // get tablets and set replica status to DROP
-        def tablet = sql_return_maparray("show tablets from ${tbl}")[0]
-        sql """
-            ADMIN SET REPLICA STATUS PROPERTIES("tablet_id" = 
"${tablet.TabletId}", "backend_id" = "${tablet.BackendId}", "status" = "drop");
-            """
         // create index on table 
         sql """ create index idx_k2 on ${tbl}(k2) using inverted """
+        // modify column
+        sql """ alter table ${tbl} modify column k2 bigint; """
+        // build index 
         sql """ build index idx_k2 on ${tbl} """
-        // sleep 5s to wait for the build index job report table is unstable
-        sleep(5000)
-        def show_build_index = sql_return_maparray("show build index where 
TableName = \"${tbl}\" ORDER BY JobId DESC LIMIT 1")
-        assertEquals('WAITING_TXN', show_build_index[0].State)
-        assertEquals('table is unstable', show_build_index[0].Msg)
-
-        def state = wait_for_last_build_index_on_table_finish(tbl, timeout)
-        assertEquals(state, "FINISHED")
+    } catch (Exception e) {
+        log.info(e.getMessage())
+        
assertTrue(e.getMessage().contains("Table[test_build_index_with_direct_schema_change]'s
 state(SCHEMA_CHANGE) is not NORMAL. Do not allow doing ALTER ops"))
+    } finally {
+        GetDebugPoint().disableDebugPointForAllFEs("FE.ALTER_JOB_V2_RUNNING")
     }
 }
diff --git 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
 
b/regression-test/suites/fault_injection_p0/test_build_index_with_light_schema_change_fault.groovy
similarity index 69%
copy from 
regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
copy to 
regression-test/suites/fault_injection_p0/test_build_index_with_light_schema_change_fault.groovy
index 9d30ca30c0c..4f2c6db6cd2 100644
--- 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
+++ 
b/regression-test/suites/fault_injection_p0/test_build_index_with_light_schema_change_fault.groovy
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import org.apache.doris.regression.suite.ClusterOptions
-import org.apache.doris.regression.util.NodeType
-import org.apache.doris.regression.suite.SuiteCluster
-
-suite("test_build_index_with_clone_by_docker"){
+suite("test_build_index_with_light_schema_change_fault_injection", 
"nonConcurrent"){
+    if (isCloudMode()) {
+        return 
+    }
+    def backends = sql_return_maparray('show backends')
     def timeout = 300000
     def delta_time = 1000
     def alter_res = "null"
@@ -49,21 +49,17 @@ suite("test_build_index_with_clone_by_docker"){
         return "wait_timeout"
     }
 
-    def options = new ClusterOptions()
-    options.enableDebugPoints()
-    options.setFeNum(1)
-    options.setBeNum(3)
-    options.cloudMode = false
-    def tbl = 'test_build_index_with_clone_by_docker'
-    docker(options) {
-        cluster.injectDebugPoints(NodeType.BE, ['EngineCloneTask.wait_clone' : 
null])
+    def tbl = 'test_build_index_with_light_schema_change'
+    try {
+        GetDebugPoint().enableDebugPointForAllFEs("FE.LIGHT_SCHEMA_CHANGE", 
[value: 10000])
+        logger.info("add debug point FE.LIGHT_SCHEMA_CHANGE and sleep 10 
seconds to simulate alter job running")
         sql """ DROP TABLE IF EXISTS ${tbl} """
         sql """
             CREATE TABLE ${tbl} (
             `k1` int(11) NULL,
             `k2` int(11) NULL
             )
-            DUPLICATE KEY(`k1`, `k2`)
+            DUPLICATE KEY(`k1`)
             COMMENT 'OLAP'
             DISTRIBUTED BY HASH(`k1`) BUCKETS 1
             PROPERTIES ("replication_num" = "1")
@@ -74,21 +70,15 @@ suite("test_build_index_with_clone_by_docker"){
 
         sql """ sync """
 
-        // get tablets and set replica status to DROP
-        def tablet = sql_return_maparray("show tablets from ${tbl}")[0]
-        sql """
-            ADMIN SET REPLICA STATUS PROPERTIES("tablet_id" = 
"${tablet.TabletId}", "backend_id" = "${tablet.BackendId}", "status" = "drop");
-            """
         // create index on table 
         sql """ create index idx_k2 on ${tbl}(k2) using inverted """
+        // add new column
+        sql """ alter table ${tbl} add column s bigint after k2; """
+        // build index 
         sql """ build index idx_k2 on ${tbl} """
-        // sleep 5s to wait for the build index job report table is unstable
-        sleep(5000)
-        def show_build_index = sql_return_maparray("show build index where 
TableName = \"${tbl}\" ORDER BY JobId DESC LIMIT 1")
-        assertEquals('WAITING_TXN', show_build_index[0].State)
-        assertEquals('table is unstable', show_build_index[0].Msg)
-
         def state = wait_for_last_build_index_on_table_finish(tbl, timeout)
         assertEquals(state, "FINISHED")
+    } finally {
+        GetDebugPoint().disableDebugPointForAllFEs("FE.LIGHT_SCHEMA_CHANGE")
     }
 }
diff --git 
a/regression-test/suites/inverted_index_p0/test_add_drop_index.groovy 
b/regression-test/suites/inverted_index_p0/index_change/test_add_drop_index.groovy
similarity index 100%
rename from regression-test/suites/inverted_index_p0/test_add_drop_index.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_add_drop_index.groovy
diff --git 
a/regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_ignore_case_column.groovy
similarity index 100%
rename from 
regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_ignore_case_column.groovy
diff --git 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_repeatly.groovy
similarity index 58%
copy from 
regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
copy to 
regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_repeatly.groovy
index 9d30ca30c0c..33b6fc1c922 100644
--- 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
+++ 
b/regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_repeatly.groovy
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import org.apache.doris.regression.suite.ClusterOptions
-import org.apache.doris.regression.util.NodeType
-import org.apache.doris.regression.suite.SuiteCluster
-
-suite("test_build_index_with_clone_by_docker"){
+suite("test_add_drop_index_repeatly"){
+    if (isCloudMode()) {
+        return 
+    }
+    def backends = sql_return_maparray('show backends')
     def timeout = 300000
     def delta_time = 1000
     def alter_res = "null"
@@ -49,46 +49,31 @@ suite("test_build_index_with_clone_by_docker"){
         return "wait_timeout"
     }
 
-    def options = new ClusterOptions()
-    options.enableDebugPoints()
-    options.setFeNum(1)
-    options.setBeNum(3)
-    options.cloudMode = false
-    def tbl = 'test_build_index_with_clone_by_docker'
-    docker(options) {
-        cluster.injectDebugPoints(NodeType.BE, ['EngineCloneTask.wait_clone' : 
null])
-        sql """ DROP TABLE IF EXISTS ${tbl} """
-        sql """
-            CREATE TABLE ${tbl} (
-            `k1` int(11) NULL,
-            `k2` int(11) NULL
-            )
-            DUPLICATE KEY(`k1`, `k2`)
-            COMMENT 'OLAP'
-            DISTRIBUTED BY HASH(`k1`) BUCKETS 1
-            PROPERTIES ("replication_num" = "1")
-            """
-        for (def i = 1; i <= 5; i++) {
-            sql "INSERT INTO ${tbl} VALUES (${i}, ${10 * i})"
-        }
+    def tbl = 'test_add_drop_index_repeatly'
+    sql """ DROP TABLE IF EXISTS ${tbl} """
+    sql """
+        CREATE TABLE ${tbl} (
+        `k1` int(11) NULL,
+        `k2` int(11) NULL
+        )
+        DUPLICATE KEY(`k1`)
+        COMMENT 'OLAP'
+        DISTRIBUTED BY HASH(`k1`) BUCKETS 1
+        PROPERTIES ("replication_num" = "1")
+        """
+    for (def i = 1; i <= 5; i++) {
+        sql "INSERT INTO ${tbl} VALUES (${i}, ${10 * i})"
+    }
 
-        sql """ sync """
+    sql """ sync """
 
-        // get tablets and set replica status to DROP
-        def tablet = sql_return_maparray("show tablets from ${tbl}")[0]
-        sql """
-            ADMIN SET REPLICA STATUS PROPERTIES("tablet_id" = 
"${tablet.TabletId}", "backend_id" = "${tablet.BackendId}", "status" = "drop");
-            """
+    for (def i = 1; i <= 10; i++) {
         // create index on table 
         sql """ create index idx_k2 on ${tbl}(k2) using inverted """
+        // build index 
         sql """ build index idx_k2 on ${tbl} """
-        // sleep 5s to wait for the build index job report table is unstable
-        sleep(5000)
-        def show_build_index = sql_return_maparray("show build index where 
TableName = \"${tbl}\" ORDER BY JobId DESC LIMIT 1")
-        assertEquals('WAITING_TXN', show_build_index[0].State)
-        assertEquals('table is unstable', show_build_index[0].Msg)
-
         def state = wait_for_last_build_index_on_table_finish(tbl, timeout)
         assertEquals(state, "FINISHED")
+        sql """ drop index idx_k2 on ${tbl} """
     }
 }
diff --git 
a/regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy 
b/regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_with_data.groovy
similarity index 100%
rename from 
regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_with_data.groovy
diff --git 
a/regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_with_delete_data.groovy
similarity index 100%
rename from 
regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_add_drop_index_with_delete_data.groovy
diff --git a/regression-test/suites/inverted_index_p0/test_build_index.groovy 
b/regression-test/suites/inverted_index_p0/index_change/test_build_index.groovy
similarity index 100%
rename from regression-test/suites/inverted_index_p0/test_build_index.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_build_index.groovy
diff --git 
a/regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_build_index_with_clone_by_docker.groovy
similarity index 100%
rename from 
regression-test/suites/inverted_index_p0/test_build_index_with_clone_by_docker.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_build_index_with_clone_by_docker.groovy
diff --git 
a/regression-test/suites/inverted_index_p0/index_change/test_index_change_on_new_column.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_index_change_on_new_column.groovy
index b4ca879569b..eba77b8396c 100644
--- 
a/regression-test/suites/inverted_index_p0/index_change/test_index_change_on_new_column.groovy
+++ 
b/regression-test/suites/inverted_index_p0/index_change/test_index_change_on_new_column.groovy
@@ -81,17 +81,23 @@ suite("test_index_change_on_new_column") {
     qt_select1 """ SELECT * FROM ${tableName}; """
 
     // create inverted index on new column
-    sql """ alter table ${tableName} add index idx_s1(s1) USING INVERTED """
+    sql """ alter table ${tableName} add index idx_s1(s1) USING INVERTED 
PROPERTIES('parser' = 'english')"""
     wait_for_latest_op_on_table_finish(tableName, timeout)
 
     // build inverted index on new column
-    sql """ build index idx_s1 on ${tableName} """
-    wait_for_build_index_on_partition_finish(tableName, timeout)
+    if (!isCloudMode()) {
+        sql """ INSERT INTO ${tableName} VALUES
+             (2, 'hello wold', 'welcome to the world')
+            """
+        sql """ build index idx_s1 on ${tableName} """
+        wait_for_build_index_on_partition_finish(tableName, timeout)
+    }
 
     def show_result = sql "show index from ${tableName}"
     logger.info("show index from " + tableName + " result: " + show_result)
     assertEquals(show_result.size(), 1)
     assertEquals(show_result[0][2], "idx_s1")
 
-    qt_select2 """ SELECT * FROM ${tableName}; """
+    qt_select2 """ SELECT * FROM ${tableName} order by id; """
+    qt_select3 """ SELECT * FROM ${tableName} where s1 match 'welcome'; """
 }
diff --git 
a/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_compaction.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_cumulative_compaction.groovy
similarity index 98%
copy from 
regression-test/suites/inverted_index_p0/index_change/test_index_change_with_compaction.groovy
copy to 
regression-test/suites/inverted_index_p0/index_change/test_index_change_with_cumulative_compaction.groovy
index 7dbd714294e..2743071c4b4 100644
--- 
a/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_compaction.groovy
+++ 
b/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_cumulative_compaction.groovy
@@ -17,8 +17,8 @@
 
 import org.codehaus.groovy.runtime.IOGroovyMethods
 
-suite("test_index_change_with_compaction") {
-    def tableName = "index_change_with_compaction_dup_keys"
+suite("test_index_change_with_cumulative_compaction") {
+    def tableName = "index_change_with_cumulative_compaction_dup_keys"
 
     def timeout = 60000
     def delta_time = 1000
@@ -94,7 +94,7 @@ suite("test_index_change_with_compaction") {
                 `max_dwell_time` INT DEFAULT "0" COMMENT "用户最大停留时间",
                 `min_dwell_time` INT DEFAULT "99999" COMMENT "用户最小停留时间")
             DUPLICATE KEY(`user_id`, `date`, `datev2`, `datetimev2_1`, 
`datetimev2_2`, `city`, `age`, `sex`) DISTRIBUTED BY HASH(`user_id`)
-            PROPERTIES ( "replication_num" = "1" );
+            PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" = 
"true" );
         """
 
         sql """ INSERT INTO ${tableName} VALUES
diff --git 
a/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_compaction.groovy
 
b/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_full_compaction.groovy
similarity index 96%
rename from 
regression-test/suites/inverted_index_p0/index_change/test_index_change_with_compaction.groovy
rename to 
regression-test/suites/inverted_index_p0/index_change/test_index_change_with_full_compaction.groovy
index 7dbd714294e..f8d807ffb56 100644
--- 
a/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_compaction.groovy
+++ 
b/regression-test/suites/inverted_index_p0/index_change/test_index_change_with_full_compaction.groovy
@@ -17,8 +17,8 @@
 
 import org.codehaus.groovy.runtime.IOGroovyMethods
 
-suite("test_index_change_with_compaction") {
-    def tableName = "index_change_with_compaction_dup_keys"
+suite("test_index_change_with_full_compaction") {
+    def tableName = "index_change_with_full_compaction_dup_keys"
 
     def timeout = 60000
     def delta_time = 1000
@@ -94,7 +94,7 @@ suite("test_index_change_with_compaction") {
                 `max_dwell_time` INT DEFAULT "0" COMMENT "用户最大停留时间",
                 `min_dwell_time` INT DEFAULT "99999" COMMENT "用户最小停留时间")
             DUPLICATE KEY(`user_id`, `date`, `datev2`, `datetimev2_1`, 
`datetimev2_2`, `city`, `age`, `sex`) DISTRIBUTED BY HASH(`user_id`)
-            PROPERTIES ( "replication_num" = "1" );
+            PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" = 
"true" );
         """
 
         sql """ INSERT INTO ${tableName} VALUES
@@ -153,7 +153,7 @@ suite("test_index_change_with_compaction") {
             sb.append(backendId_to_backendHttpPort.get(backend_id))
             sb.append("/api/compaction/run?tablet_id=")
             sb.append(tablet_id)
-            sb.append("&compact_type=cumulative")
+            sb.append("&compact_type=full")
 
             String command = sb.toString()
             process = command.execute()
@@ -173,9 +173,11 @@ suite("test_index_change_with_compaction") {
         }
 
         // build index
-        sql "build index idx_user_id on ${tableName}"
-        sql "build index idx_date on ${tableName}"
-        sql "build index idx_city on ${tableName}"
+        if (!isCloudMode()) {
+            sql "build index idx_user_id on ${tableName}"
+            sql "build index idx_date on ${tableName}"
+            sql "build index idx_city on ${tableName}"
+        }
 
         // wait for all compactions done
         for (def tablet in tablets) {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to