This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new fb20b7366e7 [fix](roup commit) remove unused code (#44015) (#44118)
fb20b7366e7 is described below
commit fb20b7366e788bf5f46dea4061fbba99825a5a18
Author: meiyi <[email protected]>
AuthorDate: Tue Nov 19 17:29:59 2024 +0800
[fix](roup commit) remove unused code (#44015) (#44118)
pick https://github.com/apache/doris/pull/44015
---
.../apache/doris/planner/GroupCommitPlanner.java | 24 +---------------------
.../java/org/apache/doris/qe/ConnectContext.java | 10 ---------
2 files changed, 1 insertion(+), 33 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/GroupCommitPlanner.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/GroupCommitPlanner.java
index 9b1044b2f7e..9fe9c2a0727 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/GroupCommitPlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/GroupCommitPlanner.java
@@ -62,7 +62,6 @@ import org.apache.thrift.TSerializer;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@@ -135,28 +134,7 @@ public class GroupCommitPlanner {
List<InternalService.PDataRow> rows)
throws DdlException, RpcException, ExecutionException,
InterruptedException {
selectBackends(ctx);
- if (backend == null || !backend.isAlive() ||
backend.isDecommissioned()) {
- List<Long> allBackendIds =
Env.getCurrentSystemInfo().getAllBackendIds(true);
- if (allBackendIds.isEmpty()) {
- throw new DdlException("No alive backend");
- }
- Collections.shuffle(allBackendIds);
- boolean find = false;
- for (Long beId : allBackendIds) {
- backend = Env.getCurrentSystemInfo().getBackend(beId);
- if (!backend.isDecommissioned()) {
- ctx.setInsertGroupCommit(this.table.getId(), backend);
- find = true;
- if (LOG.isDebugEnabled()) {
- LOG.debug("choose new be {}", backend.getId());
- }
- break;
- }
- }
- if (!find) {
- throw new DdlException("No suitable backend");
- }
- }
+
PGroupCommitInsertRequest request =
PGroupCommitInsertRequest.newBuilder()
.setExecPlanFragmentRequest(InternalService.PExecPlanFragmentRequest.newBuilder()
.setRequest(execPlanFragmentParamsBytes)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index 51316630aff..e9ef33bd146 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -58,7 +58,6 @@ import org.apache.doris.resource.Tag;
import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
import org.apache.doris.statistics.ColumnStatistic;
import org.apache.doris.statistics.Histogram;
-import org.apache.doris.system.Backend;
import org.apache.doris.task.LoadTaskInfo;
import org.apache.doris.thrift.TNetworkAddress;
import org.apache.doris.thrift.TResultSinkType;
@@ -225,7 +224,6 @@ public class ConnectContext {
private Map<String, String> resultAttachedInfo = Maps.newHashMap();
private String workloadGroupName = "";
- private Map<Long, Backend> insertGroupCommitTableToBeMap = new HashMap<>();
private boolean isGroupCommitStreamLoadSql;
private TResultSinkType resultSinkType = TResultSinkType.MYSQL_PROTOCAL;
@@ -1139,14 +1137,6 @@ public class ConnectContext {
return this.workloadGroupName;
}
- public void setInsertGroupCommit(long tableId, Backend backend) {
- insertGroupCommitTableToBeMap.put(tableId, backend);
- }
-
- public Backend getInsertGroupCommit(long tableId) {
- return insertGroupCommitTableToBeMap.get(tableId);
- }
-
public boolean isSkipAuth() {
return skipAuth;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
