This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 1c850866bb79ea9fbdab4b10a5d124bf5d82574b
Author: qiye <jianliang5...@gmail.com>
AuthorDate: Tue Jul 30 13:35:34 2024 +0800
[fix](test)Fix unstable index compaction fault injection case (#38501)
And add index_storage_format = v1 to index compaction cases
---
.../test_index_compaction_fault_injection.groovy | 7 +++++--
.../index_compaction/test_index_compaction_dup_keys.groovy | 2 +-
.../index_compaction/test_index_compaction_null.groovy | 6 ++++--
.../index_compaction/test_index_compaction_unique_keys.groovy | 3 ++-
.../test_index_compaction_with_multi_index_segments.groovy | 6 ++++--
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git
a/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
index 0ddfa064e3a..57c8132dd7a 100644
---
a/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
@@ -144,6 +144,7 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
GetDebugPoint().enableDebugPointForAllBEs("index_compaction_compact_column_throw_error")
logger.info("trigger_full_compaction_on_tablets with fault
injection: index_compaction_compact_column_throw_error")
trigger_full_compaction_on_tablets.call(tablets)
+ wait_full_compaction_done.call(tablets)
} finally {
GetDebugPoint().disableDebugPointForAllBEs("index_compaction_compact_column_throw_error")
}
@@ -187,6 +188,7 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
GetDebugPoint().enableDebugPointForAllBEs("index_compaction_compact_column_status_not_ok")
logger.info("trigger_full_compaction_on_tablets with fault
injection: index_compaction_compact_column_status_not_ok")
trigger_full_compaction_on_tablets.call(tablets)
+ wait_full_compaction_done.call(tablets)
} finally {
GetDebugPoint().disableDebugPointForAllBEs("index_compaction_compact_column_status_not_ok")
}
@@ -306,7 +308,7 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
DUPLICATE KEY(`id`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`id`) BUCKETS 1
- PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true");
+ PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true", "inverted_index_storage_format" = "V1");
"""
//TabletId,ReplicaId,BackendId,SchemaHash,Version,LstSuccessVersion,LstFailedVersion,LstFailedTime,LocalDataSize,RemoteDataSize,RowCount,State,LstConsistencyCheckTime,CheckVersion,VersionCount,PathHash,MetaUrl,CompactionStatus
@@ -336,7 +338,8 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
PROPERTIES (
"replication_num" = "1",
"disable_auto_compaction" = "true",
- "enable_unique_key_merge_on_write" = "true"
+ "enable_unique_key_merge_on_write" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
index 6817cb354e7..3e1cbc6b6e2 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
@@ -147,7 +147,7 @@ suite("test_index_compaction_dup_keys", "nonConcurrent") {
DUPLICATE KEY(`id`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`id`) BUCKETS 1
- PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true");
+ PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true", "inverted_index_storage_format" = "V1");
"""
sql """ INSERT INTO ${tableName} VALUES (1, "andy", "andy love apple",
100); """
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
index 1f7d3744eb9..2a0647ecb63 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
@@ -268,7 +268,8 @@ suite("test_index_compaction_null", "nonConcurrent") {
"replication_allocation" = "tag.location.default: 1",
"disable_auto_compaction" = "true",
"in_memory" = "false",
- "storage_format" = "V2"
+ "storage_format" = "V2",
+ "inverted_index_storage_format" = "V1"
)
"""
@@ -303,7 +304,8 @@ suite("test_index_compaction_null", "nonConcurrent") {
"disable_auto_compaction" = "true",
"enable_unique_key_merge_on_write" = "true",
"in_memory" = "false",
- "storage_format" = "V2"
+ "storage_format" = "V2",
+ "inverted_index_storage_format" = "V1"
)
"""
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
index c017fb06323..9d5f3b4cef6 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
@@ -150,7 +150,8 @@ suite("test_index_compaction_unique_keys", "nonConcurrent")
{
PROPERTIES (
"replication_num" = "1",
"disable_auto_compaction" = "true",
- "enable_unique_key_merge_on_write" = "true"
+ "enable_unique_key_merge_on_write" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
index 370b220c29c..55dfcbfb934 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
@@ -160,7 +160,8 @@ suite("test_index_compaction_with_multi_index_segments",
"nonConcurrent") {
DISTRIBUTED BY RANDOM BUCKETS 1
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
- "disable_auto_compaction" = "true"
+ "disable_auto_compaction" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
@@ -293,7 +294,8 @@ suite("test_index_compaction_with_multi_index_segments",
"nonConcurrent") {
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
"disable_auto_compaction" = "true",
- "enable_unique_key_merge_on_write" = "true"
+ "enable_unique_key_merge_on_write" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
