You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/02/01 09:54:14 UTC
[iotdb] 01/01: Finish
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch Show-Region-creation-time-when-execute-show-regions
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ef149729417287b3006a709dd9cdfed73414d37b
Author: YongzaoDan <53...@qq.com>
AuthorDate: Wed Feb 1 17:54:01 2023 +0800
Finish
---
.../manager/partition/PartitionManager.java | 2 +-
.../persistence/partition/PartitionInfo.java | 2 +-
.../confignode/persistence/partition/RegionGroup.java | 19 +++++++++++++------
.../partition/StorageGroupPartitionTable.java | 9 ++++++++-
.../db/mpp/common/header/ColumnHeaderConstant.java | 3 ++-
.../execution/config/metadata/ShowRegionTask.java | 5 ++---
thrift-confignode/src/main/thrift/confignode.thrift | 1 +
7 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
index fafb478be7..ff7290329b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
@@ -664,9 +664,9 @@ public class PartitionManager {
// Get static result
RegionInfoListResp regionInfoListResp =
(RegionInfoListResp) getConsensusManager().read(req).getDataset();
- Map<TConsensusGroupId, Integer> allLeadership = getLoadManager().getLatestRegionLeaderMap();
// Get cached result
+ Map<TConsensusGroupId, Integer> allLeadership = getLoadManager().getLatestRegionLeaderMap();
regionInfoListResp
.getRegionInfoList()
.forEach(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
index b8015707cb..d0c7f6a2cf 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
@@ -443,7 +443,7 @@ public class PartitionInfo implements SnapshotProcessor {
return schemaNodeManagementResp;
}
- /** Get region information */
+ /** Get Region information */
public DataSet getRegionInfoList(GetRegionInfoListPlan regionsInfoPlan) {
RegionInfoListResp regionResp = new RegionInfoListResp();
List<TRegionInfo> regionInfoList = new Vector<>();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/RegionGroup.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/RegionGroup.java
index c844411911..d1fa77a729 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/RegionGroup.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/RegionGroup.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.persistence.partition;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
-import org.apache.iotdb.confignode.manager.partition.heartbeat.RegionGroupStatistics;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.thrift.TException;
@@ -37,6 +36,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class RegionGroup {
+ private String createTime;
private final TRegionReplicaSet replicaSet;
// Map<TSeriesPartitionSlot, TTimePartitionSlot Count>
@@ -48,20 +48,24 @@ public class RegionGroup {
private final AtomicLong totalTimeSlotCount;
- private volatile RegionGroupStatistics statistics;
-
public RegionGroup() {
+ this.createTime = "0-0-0 0:0:0";
this.replicaSet = new TRegionReplicaSet();
this.slotCountMap = new ConcurrentHashMap<>();
this.totalTimeSlotCount = new AtomicLong();
}
- public RegionGroup(TRegionReplicaSet replicaSet) {
+ public RegionGroup(String createTime, TRegionReplicaSet replicaSet) {
+ this.createTime = createTime;
this.replicaSet = replicaSet;
this.slotCountMap = new ConcurrentHashMap<>();
this.totalTimeSlotCount = new AtomicLong(0);
}
+ public String getCreateTime() {
+ return createTime;
+ }
+
public TConsensusGroupId getId() {
return replicaSet.getRegionId();
}
@@ -91,6 +95,7 @@ public class RegionGroup {
public void serialize(OutputStream outputStream, TProtocol protocol)
throws IOException, TException {
+ ReadWriteIOUtils.write(createTime, outputStream);
replicaSet.write(protocol);
ReadWriteIOUtils.write(slotCountMap.size(), outputStream);
@@ -104,6 +109,7 @@ public class RegionGroup {
public void deserialize(InputStream inputStream, TProtocol protocol)
throws IOException, TException {
+ this.createTime = ReadWriteIOUtils.readString(inputStream);
replicaSet.read(protocol);
int size = ReadWriteIOUtils.readInt(inputStream);
@@ -130,12 +136,13 @@ public class RegionGroup {
return false;
}
}
- return replicaSet.equals(that.replicaSet)
+ return createTime.equals(that.createTime)
+ && replicaSet.equals(that.replicaSet)
&& totalTimeSlotCount.get() == that.totalTimeSlotCount.get();
}
@Override
public int hashCode() {
- return Objects.hash(replicaSet, slotCountMap, totalTimeSlotCount);
+ return Objects.hash(createTime, replicaSet, slotCountMap, totalTimeSlotCount);
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java
index 1f341b0005..bc82635961 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java
@@ -41,8 +41,10 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -92,8 +94,12 @@ public class StorageGroupPartitionTable {
* @param replicaSets List<TRegionReplicaSet>
*/
public void createRegionGroups(List<TRegionReplicaSet> replicaSets) {
+ String currentTime =
+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+ .format(new Date(Long.parseLong(String.valueOf(System.currentTimeMillis()))));
replicaSets.forEach(
- replicaSet -> regionGroupMap.put(replicaSet.getRegionId(), new RegionGroup(replicaSet)));
+ replicaSet ->
+ regionGroupMap.put(replicaSet.getRegionId(), new RegionGroup(currentTime, replicaSet)));
}
/**
@@ -347,6 +353,7 @@ public class StorageGroupPartitionTable {
regionInfo.setDataNodeId(dataNodeLocation.getDataNodeId());
regionInfo.setClientRpcIp(dataNodeLocation.getClientRpcEndPoint().getIp());
regionInfo.setClientRpcPort(dataNodeLocation.getClientRpcEndPoint().getPort());
+ regionInfo.setCreateTime(regionGroup.getCreateTime());
regionInfoList.add(regionInfo);
});
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
index ebddd19f06..589d6c1d57 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
@@ -249,7 +249,8 @@ public class ColumnHeaderConstant {
new ColumnHeader(DATA_NODE_ID, TSDataType.INT32),
new ColumnHeader(RPC_ADDRESS, TSDataType.TEXT),
new ColumnHeader(RPC_PORT, TSDataType.INT32),
- new ColumnHeader(ROLE, TSDataType.TEXT));
+ new ColumnHeader(ROLE, TSDataType.TEXT),
+ new ColumnHeader(CREATE_TIME, TSDataType.TEXT));
public static final List<ColumnHeader> showDataNodesColumnHeaders =
ImmutableList.of(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowRegionTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowRegionTask.java
index 0847ba9759..944d3cea41 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowRegionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowRegionTask.java
@@ -43,9 +43,7 @@ import java.util.stream.Collectors;
public class ShowRegionTask implements IConfigTask {
- private ShowRegionStatement showRegionStatement;
-
- public ShowRegionTask() {}
+ private final ShowRegionStatement showRegionStatement;
public ShowRegionTask(ShowRegionStatement showRegionStatement) {
this.showRegionStatement = showRegionStatement;
@@ -90,6 +88,7 @@ public class ShowRegionTask implements IConfigTask {
builder.getColumnBuilder(7).writeBinary(Binary.valueOf(regionInfo.getClientRpcIp()));
builder.getColumnBuilder(8).writeInt(regionInfo.getClientRpcPort());
builder.getColumnBuilder(9).writeBinary(Binary.valueOf(regionInfo.getRoleType()));
+ builder.getColumnBuilder(10).writeBinary(Binary.valueOf(regionInfo.getCreateTime()));
builder.declarePosition();
}
}
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift b/thrift-confignode/src/main/thrift/confignode.thrift
index b8dd2ee758..458beda7e1 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -518,6 +518,7 @@ struct TRegionInfo {
7: required i64 timeSlots
8: optional string status
9: optional string roleType
+ 10: optional string createTime
}
struct TShowRegionResp {