diff --git a/regression-test/data/compaction/test_single_compaction_fault_injection.out b/regression-test/data/compaction/test_single_compaction_fault_injection.out index 9895dbe9e11f0a..1237b8f976bb51 100644 --- a/regression-test/data/compaction/test_single_compaction_fault_injection.out +++ b/regression-test/data/compaction/test_single_compaction_fault_injection.out @@ -1,7 +1,10 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- +1 a 100 1 b 100 +2 a 100 2 b 100 +3 a 100 3 b 100 5 a 100 6 a 100 diff --git a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy index 839bfaa10dd154..5399002ba58b82 100644 --- a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy +++ b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy @@ -86,9 +86,9 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { String command = sb.toString() logger.info(command) - process = command.execute() - code = process.waitFor() - out = process.getText() + def process = command.execute() + def code = process.waitFor() + def out = process.getText() logger.info("Get compaction status: code=" + code + ", out=" + out) assertEquals(code, 0) def compactionStatus = parseJson(out.trim()) @@ -107,9 +107,9 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { String command = sb.toString() logger.info(command) - process = command.execute() - code = process.waitFor() - out = process.getText() + def process = command.execute() + def code = process.waitFor() + def out = process.getText() logger.info("Get tablet status: =" + code + ", out=" + out) assertEquals(code, 0) def tabletStatus = parseJson(out.trim()) @@ -131,10 +131,10 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { `name` varchar(255) NULL, `score` int(11) NULL ) ENGINE=OLAP - UNIQUE KEY(`id`) + DUPLICATE KEY(`id`) COMMENT 'OLAP' DISTRIBUTED BY HASH(`id`) BUCKETS 1 - PROPERTIES ( "replication_num" = "2", "enable_single_replica_compaction" = "true", "enable_unique_key_merge_on_write" = "false", "compaction_policy" = "time_series"); + PROPERTIES ( "replication_num" = "2", "enable_single_replica_compaction" = "true", "compaction_policy" = "time_series"); """ tablets = sql_return_maparray """ show tablets from ${tableName}; """ @@ -247,7 +247,7 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { try { GetDebugPoint().enableDebugPointForAllBEs("single_compaction_failed_get_peer"); for (String id in follower_backend_id) { - out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) + def out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) assertTrue(out.contains("compaction task is successfully triggered") || out.contains("tablet don't have peer replica")); } checkFailedCompactionResult.call() @@ -258,7 +258,7 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { try { GetDebugPoint().enableDebugPointForAllBEs("single_compaction_failed_get_peer_versions"); for (String id in follower_backend_id) { - out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) + def out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) assertTrue(out.contains("compaction task is successfully triggered") || out.contains("tablet failed get peer versions")); } checkFailedCompactionResult.call() @@ -269,7 +269,7 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { try { GetDebugPoint().enableDebugPointForAllBEs("single_compaction_failed_make_snapshot"); for (String id in follower_backend_id) { - out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) + def out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) assertTrue(out.contains("compaction task is successfully triggered") || out.contains("failed snapshot")); } checkFailedCompactionResult.call() @@ -280,7 +280,7 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { try { GetDebugPoint().enableDebugPointForAllBEs("single_compaction_failed_download_file"); for (String id in follower_backend_id) { - out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) + def out = triggerSingleCompaction(backendId_to_backendIP[id], backendId_to_backendHttpPort[id], tablet_id) assertTrue(out.contains("compaction task is successfully triggered") || out.contains("failed to download file")); } checkFailedCompactionResult.call() @@ -319,6 +319,6 @@ suite("test_single_compaction_fault_injection", "p2, nonConcurrent") { checkSucceedCompactionResult.call() qt_sql """ - select * from ${tableName} order by id + select * from ${tableName} order by id, name, score """ } \ No newline at end of file diff --git a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy index d264561756d9c1..e7252d35ad56a7 100644 --- a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy +++ b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy @@ -158,7 +158,7 @@ suite("regression_test_variant_github_events_p2", "nonConcurrent,p2"){ ) DUPLICATE KEY(`k`) DISTRIBUTED BY HASH(k) BUCKETS 4 - properties("replication_num" = "1", "disable_auto_compaction" = "true", "bloom_filter_columns" = "v", "variant_enable_flatten_nested" = "true"); + properties("replication_num" = "1", "disable_auto_compaction" = "true", "bloom_filter_columns" = "v", "variant_enable_flatten_nested" = "true", "inverted_index_storage_format"= "v2"); """ set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "1") // 2015 @@ -190,7 +190,7 @@ suite("regression_test_variant_github_events_p2", "nonConcurrent,p2"){ def tablets = sql_return_maparray """ show tablets from github_events; """ // trigger compactions for all tablets in github_events - trigger_and_wait_compaction("github_events", "cumulative") + trigger_and_wait_compaction("github_events", "full") sql """set enable_match_without_inverted_index = false""" sql """ set enable_common_expr_pushdown = true """