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/18 02:20:00 UTC
[iotdb] branch xingtanzjr/mpp_issues created (now 4fb759709b)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch xingtanzjr/mpp_issues
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 4fb759709b merge DataPartion and SchemaPartition with a parent class Partition
This branch includes the following new commits:
new 4fb759709b merge DataPartion and SchemaPartition with a parent class Partition
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: merge DataPartion and SchemaPartition with a parent class Partition
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/mpp_issues
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4fb759709ba0a6ec78da083ab0d24a0c7c88b292
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Mon Apr 18 10:19:46 2022 +0800
merge DataPartion and SchemaPartition with a parent class Partition
---
.../iotdb/commons/partition/DataPartition.java | 15 ++----------
.../{PartitionInfo.java => Partition.java} | 27 ++++++++++------------
.../iotdb/commons/partition/SchemaPartition.java | 15 ++----------
3 files changed, 16 insertions(+), 41 deletions(-)
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartition.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartition.java
index bb62f1cea4..27df43e6be 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartition.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartition.java
@@ -28,18 +28,14 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-public class DataPartition {
-
- private String seriesSlotExecutorName;
- private int seriesPartitionSlotNum;
+public class DataPartition extends Partition{
// Map<StorageGroup, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionMessage>>>>
private Map<String, Map<SeriesPartitionSlot, Map<TimePartitionSlot, List<RegionReplicaSet>>>>
dataPartitionMap;
public DataPartition(String seriesSlotExecutorName, int seriesPartitionSlotNum) {
- this.seriesSlotExecutorName = seriesSlotExecutorName;
- this.seriesPartitionSlotNum = seriesPartitionSlotNum;
+ super(seriesSlotExecutorName, seriesPartitionSlotNum);
}
public DataPartition(
@@ -104,13 +100,6 @@ public class DataPartition {
return regions.get(0);
}
- private SeriesPartitionSlot calculateDeviceGroupId(String deviceName) {
- SeriesPartitionExecutor executor =
- SeriesPartitionExecutor.getSeriesPartitionExecutor(
- seriesSlotExecutorName, seriesPartitionSlotNum);
- return executor.getSeriesPartitionSlot(deviceName);
- }
-
private String getStorageGroupByDevice(String deviceName) {
for (String storageGroup : dataPartitionMap.keySet()) {
if (deviceName.startsWith(storageGroup)) {
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/Partition.java
similarity index 56%
rename from node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/Partition.java
index 6e846ad6e3..1f3a5a4999 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/Partition.java
@@ -18,24 +18,21 @@
*/
package org.apache.iotdb.commons.partition;
-public class PartitionInfo {
+import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor;
- private DataPartition dataPartition;
- private SchemaPartition schemaPartition;
+public abstract class Partition {
+ protected String seriesSlotExecutorName;
+ protected int seriesPartitionSlotNum;
- public DataPartition getDataPartitionInfo() {
- return dataPartition;
+ public Partition(String seriesSlotExecutorName, int seriesPartitionSlotNum) {
+ this.seriesSlotExecutorName = seriesSlotExecutorName;
+ this.seriesPartitionSlotNum = seriesPartitionSlotNum;
}
- public void setDataPartitionInfo(DataPartition dataPartition) {
- this.dataPartition = dataPartition;
- }
-
- public SchemaPartition getSchemaPartitionInfo() {
- return schemaPartition;
- }
-
- public void setSchemaPartitionInfo(SchemaPartition schemaPartition) {
- this.schemaPartition = schemaPartition;
+ protected SeriesPartitionSlot calculateDeviceGroupId(String deviceName) {
+ SeriesPartitionExecutor executor =
+ SeriesPartitionExecutor.getSeriesPartitionExecutor(
+ seriesSlotExecutorName, seriesPartitionSlotNum);
+ return executor.getSeriesPartitionSlot(deviceName);
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
index f0ca88f774..7795fb9b2e 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
@@ -25,17 +25,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class SchemaPartition {
-
- private String seriesSlotExecutorName;
- private int seriesPartitionSlotNum;
+public class SchemaPartition extends Partition{
// Map<StorageGroup, Map<SeriesPartitionSlot, SchemaRegionPlaceInfo>>
private Map<String, Map<SeriesPartitionSlot, RegionReplicaSet>> schemaPartitionMap;
public SchemaPartition(String seriesSlotExecutorName, int seriesPartitionSlotNum) {
- this.seriesSlotExecutorName = seriesSlotExecutorName;
- this.seriesPartitionSlotNum = seriesPartitionSlotNum;
+ super(seriesSlotExecutorName, seriesPartitionSlotNum);
}
public SchemaPartition(
@@ -64,13 +60,6 @@ public class SchemaPartition {
return schemaPartitionMap.get(storageGroup).get(seriesPartitionSlot);
}
- private SeriesPartitionSlot calculateDeviceGroupId(String deviceName) {
- SeriesPartitionExecutor executor =
- SeriesPartitionExecutor.getSeriesPartitionExecutor(
- seriesSlotExecutorName, seriesPartitionSlotNum);
- return executor.getSeriesPartitionSlot(deviceName);
- }
-
private String getStorageGroupByDevice(String deviceName) {
for (String storageGroup : schemaPartitionMap.keySet()) {
if (deviceName.startsWith(storageGroup)) {