You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/02/12 01:13:13 UTC
[incubator-iotdb] branch mmanager_refactor created (now 6db2964)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch mmanager_refactor
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 6db2964 Add java doc for MNode
This branch includes the following new commits:
new 6db2964 Add java doc for MNode
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.
[incubator-iotdb] 01/01: Add java doc for MNode
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch mmanager_refactor
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 6db29645b31c4b7d8a2ac7aea4168a47ecc1c692
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Wed Feb 12 09:12:47 2020 +0800
Add java doc for MNode
---
.../java/org/apache/iotdb/db/metadata/MTree.java | 73 +---------------------
1 file changed, 3 insertions(+), 70 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 7106538..1edef6b 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -936,10 +936,11 @@ public class MTree implements Serializable {
if (node.getName().contains(TsFileConstant.PATH_SEPARATOR)) {
nodeName = "\"" + node + "\"";
} else {
- nodeName = "" + node;
+ nodeName = node.toString();
}
String nodePath = parent + nodeName;
- putAPath(paths, fileName, nodePath);
+ List<String> pathList = paths.computeIfAbsent(fileName, key -> new ArrayList<>());
+ pathList.add(nodePath);
}
return;
}
@@ -998,74 +999,6 @@ public class MTree implements Serializable {
}
}
- Map<String, String> determineStorageGroup(String path) throws IllegalPathException {
- Map<String, String> paths = new HashMap<>();
- String[] nodes = MetaUtils.getNodeNames(path, PATH_SEPARATOR);
- if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
- throw new IllegalPathException(path);
- }
-
- Deque<MNode> nodeStack = new ArrayDeque<>();
- Deque<Integer> depthStack = new ArrayDeque<>();
- if (root.hasChildren()) {
- nodeStack.push(root);
- depthStack.push(0);
- }
-
- while (!nodeStack.isEmpty()) {
- MNode mNode = nodeStack.removeFirst();
- int depth = depthStack.removeFirst();
-
- determineStorageGroup(depth + 1, nodes, mNode, paths, nodeStack, depthStack);
- }
- return paths;
- }
-
- /**
- * Try determining the storage group using the children of a mNode.
- */
- private void determineStorageGroup(int depth, String[] nodes, MNode mNode,
- Map<String, String> paths, Deque<MNode> nodeStack, Deque<Integer> depthStack) {
- String currNode = depth >= nodes.length ? nodes[nodes.length - 1] : nodes[depth];
- for (Entry<String, MNode> entry : mNode.getChildren().entrySet()) {
- if (!currNode.equals(PATH_WILDCARD) && !currNode.equals(entry.getKey())) {
- continue;
- }
- // this child is desired
- MNode child = entry.getValue();
- if (child.isStorageGroup()) {
- // we have found one storage group, record it
- String sgName = child.getFullPath();
- // concat the remaining path with the storage group name
- StringBuilder pathWithKnownSG = new StringBuilder(sgName);
- for (int i = depth + 1; i < nodes.length; i++) {
- pathWithKnownSG.append(IoTDBConstant.PATH_SEPARATOR).append(nodes[i]);
- }
- if (depth >= nodes.length - 1 && currNode.equals(PATH_WILDCARD)) {
- // the we find the sg at the last node and the last node is a wildcard (find "root
- // .group1", for "root.*"), also append the wildcard (to make "root.group1.*")
- pathWithKnownSG.append(IoTDBConstant.PATH_SEPARATOR).append(PATH_WILDCARD);
- }
- paths.put(sgName, pathWithKnownSG.toString());
- } else if (child.hasChildren()) {
- // push it back so we can traver its children later
- nodeStack.push(child);
- depthStack.push(depth);
- }
- }
- }
-
- private void putAPath(HashMap<String, List<String>> paths, String fileName,
- String nodePath) {
- if (paths.containsKey(fileName)) {
- paths.get(fileName).add(nodePath);
- } else {
- List<String> pathList = new ArrayList<>();
- pathList.add(nodePath);
- paths.put(fileName, pathList);
- }
- }
-
@Override
public String toString() {
return jsonToString(toJson());