This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 df9d8f88cc8 [fix](case) fix some unstable p2 cases #50697 (#50702)
df9d8f88cc8 is described below
commit df9d8f88cc8f715bff02719a5b3ce1d80d4ad769
Author: Sun Chenyang <[email protected]>
AuthorDate: Fri May 9 09:23:08 2025 +0800
[fix](case) fix some unstable p2 cases #50697 (#50702)
pick from master #50697
---
.../test_single_compaction_fault_injection.out | Bin 163 -> 187 bytes
.../test_single_compaction_fault_injection.groovy | 20 ++++++++++----------
.../load.groovy | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
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 9895dbe9e11..1237b8f976b 100644
Binary files
a/regression-test/data/compaction/test_single_compaction_fault_injection.out
and
b/regression-test/data/compaction/test_single_compaction_fault_injection.out
differ
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 d0ae5355b06..5399002ba58 100644
---
a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
+++
b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
@@ -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 a9b200d3099..4018a94605a 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" =
"false", "bloom_filter_columns" = "v", "inverted_index_storage_format"= "v2");
+ properties("replication_num" = "1", "disable_auto_compaction" =
"true", "bloom_filter_columns" = "v", "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 """
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
