diff --git a/fe/src/main/java/org/apache/doris/load/loadv2/LoadJob.java b/fe/src/main/java/org/apache/doris/load/loadv2/LoadJob.java index 660649ab17eb2e..b70019a316ca42 100644 --- a/fe/src/main/java/org/apache/doris/load/loadv2/LoadJob.java +++ b/fe/src/main/java/org/apache/doris/load/loadv2/LoadJob.java @@ -244,7 +244,7 @@ public void isJobTypeRead(boolean jobTypeRead) { public void beginTxn() throws LabelAlreadyUsedException, BeginTransactionException, AnalysisException { transactionId = Catalog.getCurrentGlobalTransactionMgr() .beginTransaction(dbId, label, -1, "FE: " + FrontendOptions.getLocalHostAddress(), - TransactionState.LoadJobSourceType.LOAD_JOB, id, + TransactionState.LoadJobSourceType.BATCH_LOAD_JOB, id, timeoutSecond - 1); } diff --git a/fe/src/main/java/org/apache/doris/load/loadv2/LoadJobFinalOperation.java b/fe/src/main/java/org/apache/doris/load/loadv2/LoadJobFinalOperation.java index e2a0f8115b882b..28be04cabce0a6 100644 --- a/fe/src/main/java/org/apache/doris/load/loadv2/LoadJobFinalOperation.java +++ b/fe/src/main/java/org/apache/doris/load/loadv2/LoadJobFinalOperation.java @@ -46,12 +46,12 @@ public class LoadJobFinalOperation extends TxnCommitAttachment implements Writab private FailMsg failMsg; public LoadJobFinalOperation() { - super(TransactionState.LoadJobSourceType.LOAD_JOB); + super(TransactionState.LoadJobSourceType.BATCH_LOAD_JOB); } public LoadJobFinalOperation(long id, EtlStatus loadingStatus, int progress, long loadStartTimestamp, long finishTimestamp, JobState jobState, FailMsg failMsg) { - super(TransactionState.LoadJobSourceType.LOAD_JOB); + super(TransactionState.LoadJobSourceType.BATCH_LOAD_JOB); this.id = id; this.loadingStatus = loadingStatus; this.progress = progress; diff --git a/fe/src/main/java/org/apache/doris/transaction/TransactionState.java b/fe/src/main/java/org/apache/doris/transaction/TransactionState.java index f3cfb410432050..7fef992c30d36d 100644 --- a/fe/src/main/java/org/apache/doris/transaction/TransactionState.java +++ b/fe/src/main/java/org/apache/doris/transaction/TransactionState.java @@ -46,7 +46,7 @@ public enum LoadJobSourceType { BACKEND_STREAMING(2), // streaming load use this type INSERT_STREAMING(3), // insert stmt (streaming type) use this type ROUTINE_LOAD_TASK(4), // routine load task use this type - LOAD_JOB(5); // load job v2 for broker load + BATCH_LOAD_JOB(5); // load job v2 for broker load private final int flag; @@ -69,7 +69,7 @@ public static LoadJobSourceType valueOf(int flag) { case 4: return ROUTINE_LOAD_TASK; case 5: - return LOAD_JOB; + return BATCH_LOAD_JOB; default: return null; } diff --git a/fe/src/main/java/org/apache/doris/transaction/TxnCommitAttachment.java b/fe/src/main/java/org/apache/doris/transaction/TxnCommitAttachment.java index 1acff50cdca132..240d1c056bb78a 100644 --- a/fe/src/main/java/org/apache/doris/transaction/TxnCommitAttachment.java +++ b/fe/src/main/java/org/apache/doris/transaction/TxnCommitAttachment.java @@ -72,7 +72,7 @@ public static TxnCommitAttachment read(DataInput in) throws IOException { LoadJobSourceType type = LoadJobSourceType.valueOf(Text.readString(in)); if (type == LoadJobSourceType.ROUTINE_LOAD_TASK) { attachment = new RLTaskTxnCommitAttachment(); - } else if (type == LoadJobSourceType.LOAD_JOB) { + } else if (type == LoadJobSourceType.BATCH_LOAD_JOB) { attachment = new LoadJobFinalOperation(); } else { throw new IOException("Unknown load job source type: " + type.name());