Skip to content

Change source type to BATCH_LOAD_JOB #1182

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

Merged
morningman merged 1 commit into from
May 22, 2019
Merged

Change source type to BATCH_LOAD_JOB #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion fe/src/main/java/org/apache/doris/load/loadv2/LoadJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions fe/src/main/java/org/apache/doris/load/loadv2/LoadJobFinalOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions fe/src/main/java/org/apache/doris/transaction/TransactionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion fe/src/main/java/org/apache/doris/transaction/TxnCommitAttachment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down