This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 66b54723734 [fix](regression) fix txn_insert case (#36892)
66b54723734 is described below
commit 66b547237342eb3beb656a916632324280bd9d81
Author: meiyi <myime...@gmail.com>
AuthorDate: Tue Jul 2 09:22:37 2024 +0800
[fix](regression) fix txn_insert case (#36892)
## Proposed changes
The delete predicate on mow table is implementated in insert, so in txn
insert, it is an insert rather than delete operation, the commit order
is changed, so the result is changed.
---
regression-test/data/insert_p0/txn_insert.out | 2 --
regression-test/suites/insert_p0/txn_insert.groovy | 2 +-
.../txn_insert_concurrent_insert_duplicate.groovy | 13 +++++++------
.../insert_p2/txn_insert_concurrent_insert_ud.groovy | 15 +++++++++------
.../insert_p2/txn_insert_concurrent_insert_unique.groovy | 15 +++++++++------
.../insert_p2/txn_insert_concurrent_insert_update.groovy | 15 +++++++++------
.../suites/insert_p2/txn_insert_with_schema_change.groovy | 1 +
7 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/regression-test/data/insert_p0/txn_insert.out
b/regression-test/data/insert_p0/txn_insert.out
index 257bdcc0311..c1278f7fe2e 100644
--- a/regression-test/data/insert_p0/txn_insert.out
+++ b/regression-test/data/insert_p0/txn_insert.out
@@ -1211,14 +1211,12 @@
5 1 15
-- !select_cu2 --
-1 2 121
2 2 122
3 \N 30
4 4 14
5 \N 15
-- !select_cu3 --
-1 2 111
2 2 112
3 \N 130
4 4 14
diff --git a/regression-test/suites/insert_p0/txn_insert.groovy
b/regression-test/suites/insert_p0/txn_insert.groovy
index 66b7be4e659..c403f4c132c 100644
--- a/regression-test/suites/insert_p0/txn_insert.groovy
+++ b/regression-test/suites/insert_p0/txn_insert.groovy
@@ -739,10 +739,10 @@ suite("txn_insert") {
sql """ delete from ${unique_table}_2 where id <= 1; """
sql """ commit """
- sql """ delete from ${unique_table}_3 where id <= 1; """
sql """ insert into ${unique_table}_3(id, score) select id,
score from ${unique_table}_0; """
sql """ insert into ${unique_table}_3(id, score) select id,
score from ${unique_table}_1; """
sql """ update ${unique_table}_3 set score = score + 100 where
id in (select id from ${unique_table}_0); """
+ sql """ delete from ${unique_table}_3 where id <= 1; """
} catch (Throwable e) {
logger.warn("column update failed", e)
assertTrue(false)
diff --git
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_duplicate.groovy
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_duplicate.groovy
index 493b85064a5..048a07fb817 100644
---
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_duplicate.groovy
+++
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_duplicate.groovy
@@ -148,14 +148,13 @@ suite("txn_insert_concurrent_insert_duplicate") {
CompletableFuture.allOf(futuresArray).get(30, TimeUnit.MINUTES)
sql """ sync """
- logger.info("errors: " + errors)
+ logger.info("error num: " + errors.size() + ", errors: " + errors)
def result = sql """ select count() from ${tableName}_0 """
- logger.info("result: ${result}, expected: ${6001215 * threadNum}")
- assertTrue(result[0][0] >= 6001215 * threadNum)
- result = sql """ select count() from ${tableName}_1 """
- logger.info("result: ${result}")
- assertEquals(2999666 * threadNum, result[0][0])
+ logger.info("${tableName}_0 row count: ${result}, expected: ${6001215 *
threadNum}")
+
+ def result2 = sql """ select count() from ${tableName}_1 """
+ logger.info("${tableName}_1 row count: ${result2}, expected: ${2999666 *
threadNum}")
def tables = sql """ show tables from $dbName """
logger.info("tables: $tables")
@@ -166,5 +165,7 @@ suite("txn_insert_concurrent_insert_duplicate") {
}
}
+ assertTrue(result[0][0] >= 6001215 * threadNum)
+ assertEquals(2999666 * threadNum, result2[0][0])
assertEquals(0, errors.size())
}
diff --git
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy
index 555f4b3511a..787c556dc3d 100644
--- a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy
+++ b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_ud.groovy
@@ -161,14 +161,15 @@ suite("txn_insert_concurrent_insert_ud") {
CompletableFuture.allOf(futuresArray).get(30, TimeUnit.MINUTES)
sql """ sync """
- logger.info("errors: " + errors)
+ logger.info("error num: " + errors.size() + ", errors: " + errors)
+ def t0_row_count = 2000495 // 5000226 or 6001215
def result = sql """ select count() from ${tableName}_0 """
- logger.info("result: ${result}")
- assertEquals(6001215, result[0][0])
- result = sql """ select count() from ${tableName}_1 """
- logger.info("result: ${result}")
- assertEquals(2999666, result[0][0])
+ logger.info("${tableName}_0 row count: ${result}, expected >=
${t0_row_count}")
+
+ def t1_row_count = 2999666
+ def result2 = sql """ select count() from ${tableName}_1 """
+ logger.info("${tableName}_1 row count: ${result2}, expected:
${t1_row_count}")
def tables = sql """ show tables from $dbName """
logger.info("tables: $tables")
@@ -179,5 +180,7 @@ suite("txn_insert_concurrent_insert_ud") {
}
}
+ assertTrue(result[0][0] >= t0_row_count)
+ assertEquals(t1_row_count, result2[0][0])
assertEquals(0, errors.size())
}
diff --git
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_unique.groovy
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_unique.groovy
index 6ff6bec5104..74db454a6f3 100644
---
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_unique.groovy
+++
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_unique.groovy
@@ -148,14 +148,15 @@ suite("txn_insert_concurrent_insert_unique") {
CompletableFuture.allOf(futuresArray).get(30, TimeUnit.MINUTES)
sql """ sync """
- logger.info("errors: " + errors)
+ logger.info("error num: " + errors.size() + ", errors: " + errors)
+ def t0_row_count = 6001215
def result = sql """ select count() from ${tableName}_0 """
- logger.info("result: ${result}")
- assertEquals(6001215, result[0][0])
- result = sql """ select count() from ${tableName}_1 """
- logger.info("result: ${result}")
- assertEquals(2999666, result[0][0])
+ logger.info("${tableName}_0 row count: ${result}, expected:
${t0_row_count}")
+
+ def t1_row_count = 2999666
+ def result2 = sql """ select count() from ${tableName}_1 """
+ logger.info("${tableName}_1 row count: ${result2}, expected:
${t1_row_count}")
def tables = sql """ show tables from $dbName """
logger.info("tables: $tables")
@@ -166,5 +167,7 @@ suite("txn_insert_concurrent_insert_unique") {
}
}
+ assertEquals(t0_row_count, result[0][0])
+ assertEquals(t1_row_count, result2[0][0])
assertEquals(0, errors.size())
}
diff --git
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy
index e5c56febc6c..2eb5c4b30ef 100644
---
a/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy
+++
b/regression-test/suites/insert_p2/txn_insert_concurrent_insert_update.groovy
@@ -173,14 +173,15 @@ suite("txn_insert_concurrent_insert_update") {
CompletableFuture.allOf(futuresArray).get(30, TimeUnit.MINUTES)
sql """ sync """
- logger.info("errors: " + errors)
+ logger.info("error num: " + errors.size() + ", errors: " + errors)
+ def t0_row_count = 2000495 // 5000226 or 6001215
def result = sql """ select count() from ${tableName}_0 """
- logger.info("result: ${result}")
- assertEquals(2000495, result[0][0])
- result = sql """ select count() from ${tableName}_1 """
- logger.info("result: ${result}")
- assertEquals(6001215, result[0][0])
+ logger.info("${tableName}_0 row count: ${result}, expected >=
${t0_row_count}")
+
+ def t1_row_count = 6001215
+ def result2 = sql """ select count() from ${tableName}_1 """
+ logger.info("${tableName}_1 row count: ${result2}, expected:
${t1_row_count}")
def tables = sql """ show tables from $dbName """
logger.info("tables: $tables")
@@ -191,5 +192,7 @@ suite("txn_insert_concurrent_insert_update") {
}
}
+ assertTrue(result[0][0] >= t0_row_count)
+ assertEquals(t1_row_count, result2[0][0])
assertEquals(0, errors.size())
}
diff --git
a/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
b/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
index d7614363960..1f45955e81d 100644
--- a/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
+++ b/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
@@ -129,6 +129,7 @@ suite("txn_insert_with_schema_change") {
statement.execute(sqls[1])
logger.info("execute sql: commit")
statement.execute("commit")
+ statement.execute("sync")
} catch (Throwable e) {
logger.error("txn insert failed", e)
errors.add("txn insert failed " + e.getMessage())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
