You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/04/01 13:27:45 UTC
[iotdb] 01/02: tmp save
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/align-id-2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6de3ac8fff25d137ce72d3713d6646bb5e25ca3f
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Fri Apr 1 21:10:43 2022 +0800
tmp save
---
.../consensus/response/DataNodesInfoDataSet.java | 8 ++--
.../iotdb/confignode/partition/PartitionTable.java | 7 ++--
.../physical/sys/RegisterDataNodePlan.java | 10 ++---
.../server/ConfigNodeRPCServerProcessor.java | 4 +-
.../iotdb/commons/partition/DataNodeLocation.java | 10 ++---
.../iotdb/commons/partition/DataPartitionInfo.java | 16 ++++----
.../commons/partition/DataPartitionQueryParam.java | 10 ++---
.../iotdb/commons/partition/DataRegionId.java | 39 -------------------
.../iotdb/commons/partition/PartitionInfo.java | 10 ++---
.../iotdb/commons/partition/RegionReplicaSet.java | 16 ++++----
...hemaPartitionInfo.java => SchemaPartition.java} | 14 +++----
.../commons/partition/SchemaRegionReplicaSet.java | 44 ----------------------
...DeviceGroupId.java => SeriesPartitionSlot.java} | 8 ++--
...TimePartitionId.java => TimePartitionSlot.java} | 2 +-
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 12 +++---
.../mpp/sql/analyze/ClusterPartitionFetcher.java | 6 +--
.../mpp/sql/analyze/FakePartitionFetcherImpl.java | 26 ++++++-------
.../db/mpp/sql/analyze/IPartitionFetcher.java | 6 +--
.../sql/analyze/StandalonePartitionFetcher.java | 6 +--
.../plan/SimpleFragmentParallelPlanner.java | 2 +-
.../db/mpp/sql/plan/DistributionPlannerTest.java | 26 ++++++-------
21 files changed, 99 insertions(+), 183 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/DataNodesInfoDataSet.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/DataNodesInfoDataSet.java
index d7a12ce..607e151 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/DataNodesInfoDataSet.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/DataNodesInfoDataSet.java
@@ -18,24 +18,24 @@
*/
package org.apache.iotdb.confignode.consensus.response;
-import org.apache.iotdb.confignode.partition.DataNodeInfo;
+import org.apache.iotdb.commons.partition.DataNodeLocation;
import org.apache.iotdb.consensus.common.DataSet;
import java.util.List;
public class DataNodesInfoDataSet implements DataSet {
- private List<DataNodeInfo> infoList;
+ private List<DataNodeLocation> infoList;
public DataNodesInfoDataSet() {
// empty constructor
}
- public void setInfoList(List<DataNodeInfo> infoList) {
+ public void setInfoList(List<DataNodeLocation> infoList) {
this.infoList = infoList;
}
- public List<DataNodeInfo> getInfoList() {
+ public List<DataNodeLocation> getInfoList() {
return this.infoList;
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/partition/PartitionTable.java b/confignode/src/main/java/org/apache/iotdb/confignode/partition/PartitionTable.java
index bc76b9f..ba8bac2 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/partition/PartitionTable.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/partition/PartitionTable.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.confignode.partition;
+import org.apache.iotdb.commons.partition.DataNodeLocation;
import org.apache.iotdb.confignode.conf.ConfigNodeConf;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.response.DataNodesInfoDataSet;
@@ -57,7 +58,7 @@ public class PartitionTable {
// TODO: Serialize and Deserialize
private int nextDataRegionGroup = 0;
// TODO: Serialize and Deserialize
- private final Map<Integer, DataNodeInfo> dataNodesMap; // Map<DataNodeID, DataNodeInfo>
+ private final Map<Integer, DataNodeLocation> dataNodesMap; // Map<DataNodeID, DataNodeInfo>
// TODO: Serialize and Deserialize
private final SchemaPartitionInfo schemaPartition;
@@ -75,13 +76,13 @@ public class PartitionTable {
public TSStatus registerDataNode(RegisterDataNodePlan plan) {
TSStatus result;
- DataNodeInfo info = plan.getInfo();
+ DataNodeLocation info = plan.getInfo();
lock.writeLock().lock();
if (dataNodesMap.containsValue(info)) {
// TODO: optimize
result = new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
- for (Map.Entry<Integer, DataNodeInfo> entry : dataNodesMap.entrySet()) {
+ for (Map.Entry<Integer, DataNodeLocation> entry : dataNodesMap.entrySet()) {
if (entry.getValue().equals(info)) {
result.setMessage(String.valueOf(entry.getKey()));
break;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/RegisterDataNodePlan.java b/confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/RegisterDataNodePlan.java
index 4d47af0..53c86d6 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/RegisterDataNodePlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/RegisterDataNodePlan.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.confignode.physical.sys;
import org.apache.iotdb.commons.partition.Endpoint;
-import org.apache.iotdb.confignode.partition.DataNodeInfo;
+import org.apache.iotdb.commons.partition.DataNodeLocation;
import org.apache.iotdb.confignode.physical.PhysicalPlan;
import org.apache.iotdb.confignode.physical.PhysicalPlanType;
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
public class RegisterDataNodePlan extends PhysicalPlan {
- private DataNodeInfo info;
+ private DataNodeLocation info;
public RegisterDataNodePlan() {
super(PhysicalPlanType.RegisterDataNode);
@@ -35,10 +35,10 @@ public class RegisterDataNodePlan extends PhysicalPlan {
public RegisterDataNodePlan(int dataNodeID, Endpoint endpoint) {
this();
- this.info = new DataNodeInfo(dataNodeID, endpoint);
+ this.info = new DataNodeLocation(dataNodeID, endpoint);
}
- public DataNodeInfo getInfo() {
+ public DataNodeLocation getInfo() {
return info;
}
@@ -60,6 +60,6 @@ public class RegisterDataNodePlan extends PhysicalPlan {
String ip = new String(byteIp, 0, ipLength);
int port = buffer.getInt();
- this.info = new DataNodeInfo(dataNodeID, new Endpoint(ip, port));
+ this.info = new DataNodeLocation(dataNodeID, new Endpoint(ip, port));
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/server/ConfigNodeRPCServerProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/server/ConfigNodeRPCServerProcessor.java
index 141e76d..75b70e9 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/server/ConfigNodeRPCServerProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/server/ConfigNodeRPCServerProcessor.java
@@ -22,7 +22,7 @@ import org.apache.iotdb.commons.partition.Endpoint;
import org.apache.iotdb.confignode.consensus.response.DataNodesInfoDataSet;
import org.apache.iotdb.confignode.consensus.response.StorageGroupSchemaDataSet;
import org.apache.iotdb.confignode.manager.ConfigManager;
-import org.apache.iotdb.confignode.partition.DataNodeInfo;
+import org.apache.iotdb.commons.partition.DataNodeLocation;
import org.apache.iotdb.confignode.partition.StorageGroupSchema;
import org.apache.iotdb.confignode.physical.sys.QueryDataNodeInfoPlan;
import org.apache.iotdb.confignode.physical.sys.QueryStorageGroupSchemaPlan;
@@ -101,7 +101,7 @@ public class ConfigNodeRPCServerProcessor implements ConfigIService.Iface {
return new HashMap<>();
} else {
Map<Integer, DataNodeMessage> result = new HashMap<>();
- for (DataNodeInfo info : ((DataNodesInfoDataSet) resp.getDataset()).getInfoList()) {
+ for (DataNodeLocation info : ((DataNodesInfoDataSet) resp.getDataset()).getInfoList()) {
result.put(
info.getDataNodeID(),
new DataNodeMessage(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/partition/DataNodeInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataNodeLocation.java
similarity index 89%
rename from confignode/src/main/java/org/apache/iotdb/confignode/partition/DataNodeInfo.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/DataNodeLocation.java
index 136fa23..06fb6f3 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/partition/DataNodeInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataNodeLocation.java
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.confignode.partition;
-
-import org.apache.iotdb.commons.partition.Endpoint;
+package org.apache.iotdb.commons.partition;
import java.util.ArrayList;
import java.util.List;
-public class DataNodeInfo {
+public class DataNodeLocation {
private int dataNodeID;
private final Endpoint endPoint;
@@ -31,7 +29,7 @@ public class DataNodeInfo {
private List<Integer> schemaRegionGroupIDs;
private List<Integer> dataRegionGroupIDs;
- public DataNodeInfo(int dataNodeID, Endpoint endPoint) {
+ public DataNodeLocation(int dataNodeID, Endpoint endPoint) {
this.dataNodeID = dataNodeID;
this.endPoint = endPoint;
}
@@ -78,7 +76,7 @@ public class DataNodeInfo {
if (o == null || getClass() != o.getClass()) {
return false;
}
- return endPoint.equals(((DataNodeInfo) o).getEndPoint());
+ return endPoint.equals(((DataNodeLocation) o).getEndPoint());
}
@Override
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
index 0e942eb..908890f 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
@@ -26,33 +26,33 @@ import java.util.stream.Collectors;
public class DataPartitionInfo {
// Map<StorageGroup, Map<DeviceGroupID, Map<TimePartitionId, List<DataRegionPlaceInfo>>>>
- private Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>>>
+ private Map<String, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>>>
dataPartitionMap;
- public Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>>>
+ public Map<String, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>>>
getDataPartitionMap() {
return dataPartitionMap;
}
public void setDataPartitionMap(
- Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>>>
+ Map<String, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>>>
dataPartitionMap) {
this.dataPartitionMap = dataPartitionMap;
}
public List<RegionReplicaSet> getDataRegionReplicaSet(
- String deviceName, List<TimePartitionId> timePartitionIdList) {
+ String deviceName, List<TimePartitionSlot> timePartitionSlotList) {
String storageGroup = getStorageGroupByDevice(deviceName);
- DeviceGroupId deviceGroupId = calculateDeviceGroupId(deviceName);
+ SeriesPartitionSlot seriesPartitionSlot = calculateDeviceGroupId(deviceName);
// TODO: (xingtanzjr) the timePartitionIdList is ignored
- return dataPartitionMap.get(storageGroup).get(deviceGroupId).values().stream()
+ return dataPartitionMap.get(storageGroup).get(seriesPartitionSlot).values().stream()
.flatMap(Collection::stream)
.collect(Collectors.toList());
}
- private DeviceGroupId calculateDeviceGroupId(String deviceName) {
+ private SeriesPartitionSlot calculateDeviceGroupId(String deviceName) {
// TODO: (xingtanzjr) implement the real algorithm for calculation of DeviceGroupId
- return new DeviceGroupId(deviceName.length());
+ return new SeriesPartitionSlot(deviceName.length());
}
private String getStorageGroupByDevice(String deviceName) {
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java
index cf17815..8d8ac29 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java
@@ -23,7 +23,7 @@ import java.util.List;
public class DataPartitionQueryParam {
private String devicePath;
- private List<TimePartitionId> timePartitionIdList;
+ private List<TimePartitionSlot> timePartitionSlotList;
public String getDevicePath() {
return devicePath;
@@ -33,11 +33,11 @@ public class DataPartitionQueryParam {
this.devicePath = devicePath;
}
- public List<TimePartitionId> getTimePartitionIdList() {
- return timePartitionIdList;
+ public List<TimePartitionSlot> getTimePartitionIdList() {
+ return timePartitionSlotList;
}
- public void setTimePartitionIdList(List<TimePartitionId> timePartitionIdList) {
- this.timePartitionIdList = timePartitionIdList;
+ public void setTimePartitionIdList(List<TimePartitionSlot> timePartitionSlotList) {
+ this.timePartitionSlotList = timePartitionSlotList;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionId.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionId.java
deleted file mode 100644
index dffdd90..0000000
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionId.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.commons.partition;
-
-public class DataRegionId {
- private int dataRegionId;
-
- public DataRegionId(int dataRegionId) {
- this.dataRegionId = dataRegionId;
- }
-
- public int getDataRegionId() {
- return dataRegionId;
- }
-
- public void setDataRegionId(int dataRegionId) {
- this.dataRegionId = dataRegionId;
- }
-
- public String toString() {
- return String.format("DataRegion-%d", dataRegionId);
- }
-}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
index 90a22a7..8f3b4b2 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.commons.partition;
public class PartitionInfo {
private DataPartitionInfo dataPartitionInfo;
- private SchemaPartitionInfo schemaPartitionInfo;
+ private SchemaPartition schemaPartition;
public DataPartitionInfo getDataPartitionInfo() {
return dataPartitionInfo;
@@ -31,11 +31,11 @@ public class PartitionInfo {
this.dataPartitionInfo = dataPartitionInfo;
}
- public SchemaPartitionInfo getSchemaPartitionInfo() {
- return schemaPartitionInfo;
+ public SchemaPartition getSchemaPartitionInfo() {
+ return schemaPartition;
}
- public void setSchemaPartitionInfo(SchemaPartitionInfo schemaPartitionInfo) {
- this.schemaPartitionInfo = schemaPartitionInfo;
+ public void setSchemaPartitionInfo(SchemaPartition schemaPartition) {
+ this.schemaPartition = schemaPartition;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java
index 7736e73..8896af3 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java
@@ -22,19 +22,19 @@ import java.util.List;
public class RegionReplicaSet {
private ConsensusGroupId Id;
- private List<Endpoint> endPointList;
+ private List<DataNodeLocation> dataNodeList;
- public RegionReplicaSet(ConsensusGroupId Id, List<Endpoint> endPointList) {
+ public RegionReplicaSet(ConsensusGroupId Id, List<DataNodeLocation> dataNodeList) {
this.Id = Id;
- this.endPointList = endPointList;
+ this.dataNodeList = dataNodeList;
}
- public List<Endpoint> getEndPointList() {
- return endPointList;
+ public List<DataNodeLocation> getDataNodeList() {
+ return dataNodeList;
}
- public void setEndPointList(List<Endpoint> endPointList) {
- this.endPointList = endPointList;
+ public void setDataNodeList(List<DataNodeLocation> dataNodeList) {
+ this.dataNodeList = dataNodeList;
}
public ConsensusGroupId getId() {
@@ -46,7 +46,7 @@ public class RegionReplicaSet {
}
public String toString() {
- return String.format("%s:%s", Id, endPointList);
+ return String.format("%s:%s", Id, dataNodeList);
}
public int hashCode() {
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartitionInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
similarity index 69%
rename from node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartitionInfo.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
index 119115c..7cd04d5 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartitionInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
@@ -20,17 +20,17 @@ package org.apache.iotdb.commons.partition;
import java.util.Map;
-public class SchemaPartitionInfo {
+public class SchemaPartition {
// Map<StorageGroup, Map<DeviceGroupID, SchemaRegionPlaceInfo>>
- private Map<String, Map<DeviceGroupId, SchemaRegionReplicaSet>> schemaPartitionInfo;
+ private Map<String, Map<SeriesPartitionSlot, RegionReplicaSet>> schemaPartition;
- public Map<String, Map<DeviceGroupId, SchemaRegionReplicaSet>> getSchemaPartitionInfo() {
- return schemaPartitionInfo;
+ public Map<String, Map<SeriesPartitionSlot, RegionReplicaSet>> getSchemaPartition() {
+ return schemaPartition;
}
- public void setSchemaPartitionInfo(
- Map<String, Map<DeviceGroupId, SchemaRegionReplicaSet>> schemaPartitionInfo) {
- this.schemaPartitionInfo = schemaPartitionInfo;
+ public void setSchemaPartition(
+ Map<String, Map<SeriesPartitionSlot, RegionReplicaSet>> schemaPartition) {
+ this.schemaPartition = schemaPartition;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionReplicaSet.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionReplicaSet.java
deleted file mode 100644
index 1bf7502..0000000
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionReplicaSet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.commons.partition;
-
-import org.apache.iotdb.service.rpc.thrift.TEndpoint;
-
-import java.util.List;
-
-public class SchemaRegionReplicaSet {
- private SchemaRegionId schemaRegionId;
- private List<TEndpoint> endPointList;
-
- public SchemaRegionId getSchemaRegionId() {
- return schemaRegionId;
- }
-
- public void setSchemaRegionId(SchemaRegionId schemaRegionId) {
- this.schemaRegionId = schemaRegionId;
- }
-
- public List<TEndpoint> getTEndpointList() {
- return endPointList;
- }
-
- public void setTEndpointList(List<TEndpoint> endPointList) {
- this.endPointList = endPointList;
- }
-}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DeviceGroupId.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SeriesPartitionSlot.java
similarity index 85%
rename from node-commons/src/main/java/org/apache/iotdb/commons/partition/DeviceGroupId.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/SeriesPartitionSlot.java
index 0a7123c..52ef9b5 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DeviceGroupId.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SeriesPartitionSlot.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb.commons.partition;
-public class DeviceGroupId {
+public class SeriesPartitionSlot {
private int deviceGroupId;
- public DeviceGroupId(int deviceGroupId) {
+ public SeriesPartitionSlot(int deviceGroupId) {
this.deviceGroupId = deviceGroupId;
}
@@ -38,7 +38,7 @@ public class DeviceGroupId {
}
public boolean equals(Object obj) {
- return obj instanceof DeviceGroupId
- && this.deviceGroupId == ((DeviceGroupId) obj).deviceGroupId;
+ return obj instanceof SeriesPartitionSlot
+ && this.deviceGroupId == ((SeriesPartitionSlot) obj).deviceGroupId;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionId.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionSlot.java
similarity index 96%
rename from node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionId.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionSlot.java
index 0acbb43..0484060 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionId.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionSlot.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.commons.partition;
-public class TimePartitionId {
+public class TimePartitionSlot {
private long startTime;
public long getStartTime() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
index 8b87244..b28e373 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.sql.analyze;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.RegionReplicaSet;
-import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
+import org.apache.iotdb.commons.partition.SchemaPartition;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.common.schematree.SchemaTree;
import org.apache.iotdb.db.mpp.sql.statement.Statement;
@@ -47,7 +47,7 @@ public class Analysis {
private DataPartitionInfo dataPartitionInfo;
- private SchemaPartitionInfo schemaPartitionInfo;
+ private SchemaPartition schemaPartition;
private SchemaTree schemaTree;
@@ -74,12 +74,12 @@ public class Analysis {
this.dataPartitionInfo = dataPartitionInfo;
}
- public SchemaPartitionInfo getSchemaPartitionInfo() {
- return schemaPartitionInfo;
+ public SchemaPartition getSchemaPartitionInfo() {
+ return schemaPartition;
}
- public void setSchemaPartitionInfo(SchemaPartitionInfo schemaPartitionInfo) {
- this.schemaPartitionInfo = schemaPartitionInfo;
+ public void setSchemaPartitionInfo(SchemaPartition schemaPartition) {
+ this.schemaPartition = schemaPartition;
}
public SchemaTree getSchemaTree() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java
index e17c38a..9c929fe 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.sql.analyze;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.PartitionInfo;
-import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
+import org.apache.iotdb.commons.partition.SchemaPartition;
import java.util.List;
@@ -38,12 +38,12 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
}
@Override
- public SchemaPartitionInfo fetchSchemaPartitionInfo(String devicePath) {
+ public SchemaPartition fetchSchemaPartitionInfo(String devicePath) {
return null;
}
@Override
- public SchemaPartitionInfo fetchSchemaPartitionInfos(List<String> devicePath) {
+ public SchemaPartition fetchSchemaPartitionInfos(List<String> devicePath) {
return null;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/FakePartitionFetcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/FakePartitionFetcherImpl.java
index c5457bb..9b912a3 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/FakePartitionFetcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/FakePartitionFetcherImpl.java
@@ -36,9 +36,9 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
String device3 = "root.sg.d333";
DataPartitionInfo dataPartitionInfo = new DataPartitionInfo();
- Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>>> dataPartitionMap =
+ Map<String, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>>> dataPartitionMap =
new HashMap<>();
- Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>> sgPartitionMap =
+ Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>> sgPartitionMap =
new HashMap<>();
List<RegionReplicaSet> d1DataRegions = new ArrayList<>();
@@ -50,16 +50,16 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
new RegionReplicaSet(
new ConsensusGroupId(GroupType.DataRegion, 2),
Arrays.asList(new Endpoint("192.0.2.1", 9000), new Endpoint("192.0.2.2", 9000))));
- Map<TimePartitionId, List<RegionReplicaSet>> d1DataRegionMap = new HashMap<>();
- d1DataRegionMap.put(new TimePartitionId(), d1DataRegions);
+ Map<TimePartitionSlot, List<RegionReplicaSet>> d1DataRegionMap = new HashMap<>();
+ d1DataRegionMap.put(new TimePartitionSlot(), d1DataRegions);
List<RegionReplicaSet> d2DataRegions = new ArrayList<>();
d2DataRegions.add(
new RegionReplicaSet(
new ConsensusGroupId(GroupType.DataRegion, 3),
Arrays.asList(new Endpoint("192.0.3.1", 9000), new Endpoint("192.0.3.2", 9000))));
- Map<TimePartitionId, List<RegionReplicaSet>> d2DataRegionMap = new HashMap<>();
- d2DataRegionMap.put(new TimePartitionId(), d2DataRegions);
+ Map<TimePartitionSlot, List<RegionReplicaSet>> d2DataRegionMap = new HashMap<>();
+ d2DataRegionMap.put(new TimePartitionSlot(), d2DataRegions);
List<RegionReplicaSet> d3DataRegions = new ArrayList<>();
d3DataRegions.add(
@@ -70,12 +70,12 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
new RegionReplicaSet(
new ConsensusGroupId(GroupType.DataRegion, 4),
Arrays.asList(new Endpoint("192.0.4.1", 9000), new Endpoint("192.0.4.2", 9000))));
- Map<TimePartitionId, List<RegionReplicaSet>> d3DataRegionMap = new HashMap<>();
- d3DataRegionMap.put(new TimePartitionId(), d3DataRegions);
+ Map<TimePartitionSlot, List<RegionReplicaSet>> d3DataRegionMap = new HashMap<>();
+ d3DataRegionMap.put(new TimePartitionSlot(), d3DataRegions);
- sgPartitionMap.put(new DeviceGroupId(device1.length()), d1DataRegionMap);
- sgPartitionMap.put(new DeviceGroupId(device2.length()), d2DataRegionMap);
- sgPartitionMap.put(new DeviceGroupId(device3.length()), d3DataRegionMap);
+ sgPartitionMap.put(new SeriesPartitionSlot(device1.length()), d1DataRegionMap);
+ sgPartitionMap.put(new SeriesPartitionSlot(device2.length()), d2DataRegionMap);
+ sgPartitionMap.put(new SeriesPartitionSlot(device3.length()), d3DataRegionMap);
dataPartitionMap.put("root.sg", sgPartitionMap);
@@ -85,12 +85,12 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
}
@Override
- public SchemaPartitionInfo fetchSchemaPartitionInfo(String devicePath) {
+ public SchemaPartition fetchSchemaPartitionInfo(String devicePath) {
return null;
}
@Override
- public SchemaPartitionInfo fetchSchemaPartitionInfos(List<String> devicePath) {
+ public SchemaPartition fetchSchemaPartitionInfos(List<String> devicePath) {
return null;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java
index 476bc16..376b4cb 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.sql.analyze;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.PartitionInfo;
-import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
+import org.apache.iotdb.commons.partition.SchemaPartition;
import java.util.List;
@@ -31,9 +31,9 @@ public interface IPartitionFetcher {
DataPartitionInfo fetchDataPartitionInfos(List<DataPartitionQueryParam> parameterList);
- SchemaPartitionInfo fetchSchemaPartitionInfo(String devicePath);
+ SchemaPartition fetchSchemaPartitionInfo(String devicePath);
- SchemaPartitionInfo fetchSchemaPartitionInfos(List<String> devicePath);
+ SchemaPartition fetchSchemaPartitionInfos(List<String> devicePath);
PartitionInfo fetchPartitionInfo(DataPartitionQueryParam parameter);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
index f2ba551..56c898f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.sql.analyze;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.PartitionInfo;
-import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
+import org.apache.iotdb.commons.partition.SchemaPartition;
import java.util.List;
@@ -45,12 +45,12 @@ public class StandalonePartitionFetcher implements IPartitionFetcher {
}
@Override
- public SchemaPartitionInfo fetchSchemaPartitionInfo(String devicePath) {
+ public SchemaPartition fetchSchemaPartitionInfo(String devicePath) {
return null;
}
@Override
- public SchemaPartitionInfo fetchSchemaPartitionInfos(List<String> devicePath) {
+ public SchemaPartition fetchSchemaPartitionInfos(List<String> devicePath) {
return null;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/SimpleFragmentParallelPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/SimpleFragmentParallelPlanner.java
index b099630..08c9897 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/SimpleFragmentParallelPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/SimpleFragmentParallelPlanner.java
@@ -87,7 +87,7 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
// TODO: (xingtanzjr) We select the first Endpoint as the default target host for current
// instance
- fragmentInstance.setHostEndpoint(dataRegion.getEndPointList().get(0));
+ fragmentInstance.setHostEndpoint(dataRegion.getDataNodeList().get(0));
instanceMap.putIfAbsent(fragment.getId(), fragmentInstance);
fragmentInstanceList.add(fragmentInstance);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/DistributionPlannerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/DistributionPlannerTest.java
index 5277b73..5bbefb5 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/DistributionPlannerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/DistributionPlannerTest.java
@@ -21,11 +21,11 @@ package org.apache.iotdb.db.mpp.sql.plan;
import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
-import org.apache.iotdb.commons.partition.DeviceGroupId;
+import org.apache.iotdb.commons.partition.SeriesPartitionSlot;
import org.apache.iotdb.commons.partition.Endpoint;
import org.apache.iotdb.commons.partition.GroupType;
import org.apache.iotdb.commons.partition.RegionReplicaSet;
-import org.apache.iotdb.commons.partition.TimePartitionId;
+import org.apache.iotdb.commons.partition.TimePartitionSlot;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
@@ -162,9 +162,9 @@ public class DistributionPlannerTest {
String device3 = "root.sg.d333";
DataPartitionInfo dataPartitionInfo = new DataPartitionInfo();
- Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>>> dataPartitionMap =
+ Map<String, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>>> dataPartitionMap =
new HashMap<>();
- Map<DeviceGroupId, Map<TimePartitionId, List<RegionReplicaSet>>> sgPartitionMap =
+ Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>> sgPartitionMap =
new HashMap<>();
List<RegionReplicaSet> d1DataRegions = new ArrayList<>();
@@ -176,16 +176,16 @@ public class DistributionPlannerTest {
new RegionReplicaSet(
new ConsensusGroupId(GroupType.DataRegion, 2),
Arrays.asList(new Endpoint("192.0.2.1", 9000), new Endpoint("192.0.2.2", 9000))));
- Map<TimePartitionId, List<RegionReplicaSet>> d1DataRegionMap = new HashMap<>();
- d1DataRegionMap.put(new TimePartitionId(), d1DataRegions);
+ Map<TimePartitionSlot, List<RegionReplicaSet>> d1DataRegionMap = new HashMap<>();
+ d1DataRegionMap.put(new TimePartitionSlot(), d1DataRegions);
List<RegionReplicaSet> d2DataRegions = new ArrayList<>();
d2DataRegions.add(
new RegionReplicaSet(
new ConsensusGroupId(GroupType.DataRegion, 3),
Arrays.asList(new Endpoint("192.0.3.1", 9000), new Endpoint("192.0.3.2", 9000))));
- Map<TimePartitionId, List<RegionReplicaSet>> d2DataRegionMap = new HashMap<>();
- d2DataRegionMap.put(new TimePartitionId(), d2DataRegions);
+ Map<TimePartitionSlot, List<RegionReplicaSet>> d2DataRegionMap = new HashMap<>();
+ d2DataRegionMap.put(new TimePartitionSlot(), d2DataRegions);
List<RegionReplicaSet> d3DataRegions = new ArrayList<>();
d3DataRegions.add(
@@ -196,12 +196,12 @@ public class DistributionPlannerTest {
new RegionReplicaSet(
new ConsensusGroupId(GroupType.DataRegion, 4),
Arrays.asList(new Endpoint("192.0.4.1", 9000), new Endpoint("192.0.4.2", 9000))));
- Map<TimePartitionId, List<RegionReplicaSet>> d3DataRegionMap = new HashMap<>();
- d3DataRegionMap.put(new TimePartitionId(), d3DataRegions);
+ Map<TimePartitionSlot, List<RegionReplicaSet>> d3DataRegionMap = new HashMap<>();
+ d3DataRegionMap.put(new TimePartitionSlot(), d3DataRegions);
- sgPartitionMap.put(new DeviceGroupId(device1.length()), d1DataRegionMap);
- sgPartitionMap.put(new DeviceGroupId(device2.length()), d2DataRegionMap);
- sgPartitionMap.put(new DeviceGroupId(device3.length()), d3DataRegionMap);
+ sgPartitionMap.put(new SeriesPartitionSlot(device1.length()), d1DataRegionMap);
+ sgPartitionMap.put(new SeriesPartitionSlot(device2.length()), d2DataRegionMap);
+ sgPartitionMap.put(new SeriesPartitionSlot(device3.length()), d3DataRegionMap);
dataPartitionMap.put("root.sg", sgPartitionMap);