You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2022/03/17 07:47:11 UTC
[iotdb] 13/45: update the way of getting measurementPath
This is an automated email from the ASF dual-hosted git repository.
jianyun pushed a commit to branch rocksdb/dev
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a809ae3b4c9bd1a3260e533b9572056b74825889
Author: lisijia <li...@360.cn>
AuthorDate: Wed Mar 9 11:13:06 2022 +0800
update the way of getting measurementPath
---
.../iotdb/db/metadata/rocksdb/MRocksDBManager.java | 16 +++-------------
.../db/metadata/rocksdb/mnode/RMeasurementMNode.java | 3 +++
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java
index 47b8dbb..f8a0f41 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java
@@ -1576,9 +1576,7 @@ public class MRocksDBManager implements IMetaManager {
PartialPath pathPattern, int limit, int offset, boolean isPrefixMatch)
throws MetadataException {
// todo update offset
- Pair<List<MeasurementPath>, Integer> result =
- new Pair<>(getMatchedMeasurementPath(pathPattern.getNodes()), offset + limit);
- return result;
+ return new Pair<>(getMatchedMeasurementPath(pathPattern.getNodes()), offset + limit);
}
private List<MeasurementPath> getMatchedMeasurementPath(String[] nodes)
@@ -1586,16 +1584,8 @@ public class MRocksDBManager implements IMetaManager {
List<MeasurementPath> allResult = Collections.synchronizedList(new ArrayList<>());
BiFunction<String, byte[], Boolean> function =
(a, b) -> {
- try {
- allResult.add(
- new MeasurementPath(
- new PartialPath(a),
- (MeasurementSchema) RocksDBUtils.parseNodeValue(b, FLAG_IS_SCHEMA)));
- return true;
- } catch (IllegalPathException e) {
- logger.error(e.getMessage());
- return false;
- }
+ allResult.add(new RMeasurementMNode(a, b).getMeasurementPath());
+ return true;
};
traverseOutcomeBasins(nodes, MAX_PATH_DEPTH, function, new Character[] {NODE_TYPE_MEASUREMENT});
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/mnode/RMeasurementMNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/mnode/RMeasurementMNode.java
index 2b9f988..95ffdde 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/mnode/RMeasurementMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/mnode/RMeasurementMNode.java
@@ -73,6 +73,9 @@ public class RMeasurementMNode extends RMNode implements IMeasurementMNode {
public MeasurementPath getMeasurementPath() {
MeasurementPath result = new MeasurementPath(super.getPartialPath(), schema);
result.setUnderAlignedEntity(getParent().isAligned());
+ if (alias != null && !alias.isEmpty()) {
+ result.setMeasurementAlias(alias);
+ }
return result;
}