Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BugFix] Fix transaction of insert load job can not be aborted when job has been cancelled #48059

Merged
merged 2 commits into from
Jul 31, 2024
Merged

[BugFix] Fix transaction of insert load job can not be aborted when job has been cancelled #48059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594105d
[EMR][BugFix] Fix transaction of insert load job can not be aborted w…
caneGuy Jul 9, 2024
acb6cc9
resolve comments
caneGuy Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/com/starrocks/load/loadv2/InsertLoadJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,8 @@ public void readFields(DataInput in) throws IOException {
public void setEstimateScanRow(long rows) {
this.estimateScanRow = rows;
}

public void setTransactionId(long txnId) {
this.transactionId = txnId;
}
}
3 changes: 2 additions & 1 deletion fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public void recordFinishedOrCacnelledLoadJob(long jobId, EtlJobType jobType, Str
}
}

public long registerLoadJob(String label, String dbName, long tableId, EtlJobType jobType,
public long registerLoadJob(String label, String dbName, long tableId, long txnId, EtlJobType jobType,
long createTimestamp, long estimateScanRows,
int estimateFileNum, long estimateFileSize,
TLoadJobType type, long timeout, Coordinator coordinator)
Expand All @@ -248,6 +248,7 @@ public long registerLoadJob(String label, String dbName, long tableId, EtlJobTyp
loadJob = new InsertLoadJob(label, db.getId(), tableId, createTimestamp, type, timeout, coordinator);
loadJob.setLoadFileInfo(estimateFileNum, estimateFileSize);
loadJob.setEstimateScanRow(estimateScanRows);
loadJob.setTransactionId(txnId);
} else {
throw new LoadException("Unknown job type [" + jobType.name() + "]");
}
Expand Down
1 change: 1 addition & 0 deletions fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,6 +2049,7 @@ public void handleDMLStmt(ExecPlan execPlan, DmlStmt stmt) throws Exception {
label,
database.getFullName(),
targetTable.getId(),
transactionId,
EtlJobType.INSERT,
createTime,
estimateScanRows,
Expand Down
Loading