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:12 UTC
[iotdb] 14/45: change the parameter type in function
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 4fa0f53da9f02958bffdcc97e8b29cce63c97ccf
Author: lisijia <li...@360.cn>
AuthorDate: Wed Mar 9 12:19:29 2022 +0800
change the parameter type in function
---
.../iotdb/db/metadata/rocksdb/MRocksDBManager.java | 26 +++++++++-------------
.../metadata/rocksdb/mnode/RMeasurementMNode.java | 4 ++--
2 files changed, 13 insertions(+), 17 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 f8a0f41..a1f5aa9 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
@@ -959,7 +959,7 @@ public class MRocksDBManager implements IMetaManager {
public void traverseOutcomeBasins(
String[] nodes,
int maxLevel,
- BiFunction<String, byte[], Boolean> function,
+ BiFunction<byte[], byte[], Boolean> function,
Character[] nodeTypeArray)
throws IllegalPathException {
List<String[]> allNodesArray = RocksDBUtils.replaceMultiWildcardToSingle(nodes, maxLevel);
@@ -967,7 +967,7 @@ public class MRocksDBManager implements IMetaManager {
}
public void traverseByPatternPath(
- String[] nodes, BiFunction<String, byte[], Boolean> function, Character[] nodeTypeArray) {
+ String[] nodes, BiFunction<byte[], byte[], Boolean> function, Character[] nodeTypeArray) {
// String[] nodes = pathPattern.getNodes();
int startIndex = 0;
@@ -985,11 +985,7 @@ public class MRocksDBManager implements IMetaManager {
Holder<byte[]> holder = new Holder<>();
readWriteHandler.keyExist(levelPrefix.getBytes(), holder);
if (holder.getValue() != null) {
- StringBuilder stringBuilder = new StringBuilder();
- for (String node : nodes) {
- stringBuilder.append(RockDBConstants.PATH_SEPARATOR).append(node);
- }
- function.apply(stringBuilder.substring(1), holder.getValue());
+ function.apply(levelPrefix.getBytes(), holder.getValue());
}
} catch (RocksDBException e) {
logger.error(e.getMessage());
@@ -1034,9 +1030,7 @@ public class MRocksDBManager implements IMetaManager {
}
if (RocksDBUtils.suffixMatch(iterator.key(), suffixToMatch)) {
if (lastIteration) {
- function.apply(
- RocksDBUtils.getPathByInnerName(new String(iterator.key())),
- iterator.value());
+ function.apply(iterator.key(), iterator.value());
} else {
tempNodes.add(RocksDBUtils.toMetaNodes(iterator.key()));
}
@@ -1169,7 +1163,7 @@ public class MRocksDBManager implements IMetaManager {
private int getCountByNodeType(Character[] nodetype, String[] nodes) throws IllegalPathException {
AtomicInteger atomicInteger = new AtomicInteger(0);
- BiFunction<String, byte[], Boolean> function =
+ BiFunction<byte[], byte[], Boolean> function =
(a, b) -> {
atomicInteger.incrementAndGet();
return true;
@@ -1428,9 +1422,9 @@ public class MRocksDBManager implements IMetaManager {
String[] nodes, Character[] nodetype, Collection<PartialPath> collection)
throws IllegalPathException {
List<String> allResult = Collections.synchronizedList(new ArrayList<>());
- BiFunction<String, byte[], Boolean> function =
+ BiFunction<byte[], byte[], Boolean> function =
(a, b) -> {
- allResult.add(a);
+ allResult.add(RocksDBUtils.getPathByInnerName(new String(a)));
return true;
};
traverseOutcomeBasins(nodes, MAX_PATH_DEPTH, function, nodetype);
@@ -1582,9 +1576,11 @@ public class MRocksDBManager implements IMetaManager {
private List<MeasurementPath> getMatchedMeasurementPath(String[] nodes)
throws IllegalPathException {
List<MeasurementPath> allResult = Collections.synchronizedList(new ArrayList<>());
- BiFunction<String, byte[], Boolean> function =
+ BiFunction<byte[], byte[], Boolean> function =
(a, b) -> {
- allResult.add(new RMeasurementMNode(a, b).getMeasurementPath());
+ allResult.add(
+ new RMeasurementMNode(RocksDBUtils.getPathByInnerName(new String(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 95ffdde..e619d3c 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
@@ -63,7 +63,7 @@ public class RMeasurementMNode extends RMNode implements IMeasurementMNode {
@Override
public IEntityMNode getParent() {
- if (parent == null) {
+ if (super.getParent() == null) {
return null;
}
return parent.getAsEntityMNode();
@@ -72,7 +72,7 @@ public class RMeasurementMNode extends RMNode implements IMeasurementMNode {
@Override
public MeasurementPath getMeasurementPath() {
MeasurementPath result = new MeasurementPath(super.getPartialPath(), schema);
- result.setUnderAlignedEntity(getParent().isAligned());
+ // result.setUnderAlignedEntity(getParent().isAligned());
if (alias != null && !alias.isEmpty()) {
result.setMeasurementAlias(alias);
}