Skip to content

Commit 7917255

Browse files
branch-4.0: [fix](insert) fix insert job duplicate registration #57572 (#57663)
Cherry-picked from #57572 Co-authored-by: hui lai <laihui@selectdb.com>
1 parent b0c7cfa commit 7917255

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ public void recordFinishedLoadJob(String label, long transactionId, String dbNam
229229
default:
230230
return;
231231
}
232+
addLoadJob(loadJob);
232233
}
233-
addLoadJob(loadJob);
234234
// persistent
235235
Env.getCurrentEnv().getEditLog().logCreateLoadJob(loadJob);
236236
}

regression-test/suites/ddl_p0/test_ctas.groovy

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,6 @@ suite("test_ctas") {
104104
result([[null]])
105105
}
106106

107-
res = sql """show load from ${dbname}"""
108-
if (isGroupCommitMode()) {
109-
assertTrue(res.size() > 4)
110-
} else {
111-
assertTrue(res.size() > 6)
112-
}
113-
114107
sql """
115108
create table if not exists test_tbl_81748325
116109
(

regression-test/suites/load_p0/insert/test_insert_statistic.groovy

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ suite("test_insert_statistic", "p0") {
4242
sql """
4343
INSERT INTO ${insert_tbl}_1 values(1, 1, 1, 1)
4444
"""
45+
sql """
46+
INSERT INTO ${insert_tbl}_1 values(1, 1, 1, 1)
47+
"""
4548
def result = sql "SHOW LOAD FROM ${dbName}"
4649
log.info("result size: " + result.size())
4750
assertEquals(result.size(), 0)
@@ -78,7 +81,9 @@ suite("test_insert_statistic", "p0") {
7881
result = sql "SHOW LOAD FROM ${dbName}"
7982
logger.info("JobDetails: " + result[0][14])
8083
def json = parseJson(result[0][14])
81-
assertEquals(json.ScannedRows, 2)
84+
assertEquals(json.ScannedRows, 3)
85+
assertEquals(json.FileNumber, 0)
86+
assertEquals(json.FileSize, 0)
8287
assertTrue(json.LoadBytes > 0)
8388

8489
// insert into s3 tvf
@@ -116,5 +121,8 @@ suite("test_insert_statistic", "p0") {
116121
logger.info("JobDetails: " + result[1][14])
117122
json = parseJson(result[1][14])
118123
assertEquals(json.ScannedRows, 2)
124+
assertEquals(json.FileNumber, 1)
125+
assertEquals(json.FileSize, 86)
126+
assertEquals(result.size(), 2)
119127
assertTrue(json.LoadBytes > 0)
120128
}

0 commit comments

Comments
 (0)