This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch LocalSink
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/LocalSink by this push:
new 508846a977 add DataNodeEndPoints
508846a977 is described below
commit 508846a977e0599ba4c8c9b331f99036aa92bd99
Author: Jinrui.Zhang <[email protected]>
AuthorDate: Wed Jun 8 11:19:52 2022 +0800
add DataNodeEndPoints
---
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 16 ++--------
.../db/mpp/plan/constant/DataNodeEndPoints.java | 35 ++++++++++++++++++++++
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 4 +--
3 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
index 3b91b52453..08f397aa19 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
@@ -25,13 +25,13 @@ import
org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.consensus.PartitionRegionId;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.DataNodeClientPoolFactory;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
import org.apache.iotdb.db.mpp.common.QueryId;
import org.apache.iotdb.db.mpp.common.SessionInfo;
import org.apache.iotdb.db.mpp.execution.QueryIdGenerator;
import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher;
import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher;
+import org.apache.iotdb.db.mpp.plan.constant.DataNodeEndPoints;
import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult;
import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution;
import org.apache.iotdb.db.mpp.plan.execution.QueryExecution;
@@ -61,16 +61,6 @@ public class Coordinator {
private static final String COORDINATOR_SCHEDULED_EXECUTOR_NAME =
"MPPCoordinatorScheduled";
private static final int COORDINATOR_SCHEDULED_EXECUTOR_SIZE = 1;
- public static final TEndPoint LOCAL_HOST_DATA_BLOCK_ENDPOINT =
- new TEndPoint(
- IoTDBDescriptor.getInstance().getConfig().getInternalIp(),
- IoTDBDescriptor.getInstance().getConfig().getDataBlockManagerPort());
-
- private static final TEndPoint LOCAL_HOST_INTERNAL_ENDPOINT =
- new TEndPoint(
- IoTDBDescriptor.getInstance().getConfig().getInternalIp(),
- IoTDBDescriptor.getInstance().getConfig().getInternalPort());
-
private static final IClientManager<TEndPoint,
SyncDataNodeInternalServiceClient>
INTERNAL_SERVICE_CLIENT_MANAGER =
new IClientManager.Factory<TEndPoint,
SyncDataNodeInternalServiceClient>()
@@ -133,8 +123,8 @@ public class Coordinator {
sql,
queryIdGenerator.createNextQueryId(),
session,
- LOCAL_HOST_DATA_BLOCK_ENDPOINT,
- LOCAL_HOST_INTERNAL_ENDPOINT),
+ DataNodeEndPoints.LOCAL_HOST_DATA_BLOCK_ENDPOINT,
+ DataNodeEndPoints.LOCAL_HOST_INTERNAL_ENDPOINT),
partitionFetcher,
schemaFetcher);
queryExecutionMap.put(queryId, execution);
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java
new file mode 100644
index 0000000000..595dcdec90
--- /dev/null
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.mpp.plan.constant;
+
+import org.apache.iotdb.common.rpc.thrift.TEndPoint;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
+
+public class DataNodeEndPoints {
+ public static final TEndPoint LOCAL_HOST_DATA_BLOCK_ENDPOINT =
+ new TEndPoint(
+ IoTDBDescriptor.getInstance().getConfig().getInternalIp(),
+ IoTDBDescriptor.getInstance().getConfig().getDataBlockManagerPort());
+
+ public static final TEndPoint LOCAL_HOST_INTERNAL_ENDPOINT =
+ new TEndPoint(
+ IoTDBDescriptor.getInstance().getConfig().getInternalIp(),
+ IoTDBDescriptor.getInstance().getConfig().getInternalPort());
+}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
index 5e0799b22c..bc6b8a5f8f 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
@@ -105,6 +105,7 @@ import
org.apache.iotdb.db.mpp.execution.operator.source.LastCacheScanOperator;
import
org.apache.iotdb.db.mpp.execution.operator.source.SeriesAggregationScanOperator;
import org.apache.iotdb.db.mpp.execution.operator.source.SeriesScanOperator;
import org.apache.iotdb.db.mpp.plan.analyze.TypeProvider;
+import org.apache.iotdb.db.mpp.plan.constant.DataNodeEndPoints;
import org.apache.iotdb.db.mpp.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
@@ -179,7 +180,6 @@ import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import static
org.apache.iotdb.db.mpp.execution.operator.LastQueryUtil.satisfyFilter;
-import static
org.apache.iotdb.db.mpp.plan.Coordinator.LOCAL_HOST_DATA_BLOCK_ENDPOINT;
/**
* Used to plan a fragment instance. Currently, we simply change it from
PlanNode to executable
@@ -1101,7 +1101,7 @@ public class LocalExecutionPlanner {
}
private boolean isSameNode(TEndPoint endPoint) {
- return endPoint.equals(LOCAL_HOST_DATA_BLOCK_ENDPOINT);
+ return endPoint.equals(DataNodeEndPoints.LOCAL_HOST_DATA_BLOCK_ENDPOINT);
}
@Override
