You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2021/02/24 14:47:23 UTC
[GitHub] [iotdb] WilliamSong11 opened a new pull request #2732: [ISSUE-2493] show child nodes path
WilliamSong11 opened a new pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732
## Description
Hi all :
I have submitted a pr for [ISSUE-2493](https://github.com/apache/iotdb/issues/2493), please take a look.
This issue about add SQL syntax for metadata queries
The modules involved are as follows:
   1、antlr
   2、server/query planner
   3、server/metadata
The local test results are as follows:
### Content1 ...
### Content2 ...
### Content3 ...
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error
conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition,
design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design
(or naming) decision point and compare the alternatives with the designs that you've implemented
(or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere
(e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list),
link to that discussion from this PR description and explain what have changed in your final design
compared to your original proposal or the consensus version in the end of the discussion.
If something hasn't changed since the original discussion, you can omit a detailed discussion of
those aspects of the design here, perhaps apart from brief mentioning for the sake of readability
of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
<hr>
This PR has:
- [ ] been self-reviewed.
- [ ] concurrent read
- [ ] concurrent write
- [ ] concurrent read and write
- [ ] added documentation for new or modified features or behaviors.
- [ ] added Javadocs for most classes and all non-trivial methods.
- [ ] added or updated version, __license__, or notice information
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious
for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold
for code coverage.
- [ ] added integration tests.
- [ ] been tested in a test IoTDB cluster.
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items
apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items
from the checklist above are strictly necessary, but it would be very helpful if you at least
self-review the PR. -->
<hr>
##### Key changed/added classes (or packages if there are too many classes) in this PR
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] wangchao316 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
wangchao316 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r583510219
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
##########
@@ -367,6 +367,41 @@ public void showChildPaths() throws SQLException, ClassNotFoundException {
}
}
+ @Test
+ public void showChildNodes() throws SQLException, ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection =
+ DriverManager.getConnection(
+ Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement()) {
+ String[] sqls = new String[] {"show child nodes root.ln"};
+ String[] standards = new String[] {"wf01,\n"};
+ for (int n = 0; n < sqls.length; n++) {
+ String sql = sqls[n];
+ String standard = standards[n];
+ StringBuilder builder = new StringBuilder();
+ try {
+ boolean hasResultSet = statement.execute(sql);
+ if (hasResultSet) {
+ try (ResultSet resultSet = statement.getResultSet()) {
+ ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ while (resultSet.next()) {
Review comment:
+1
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] WilliamSong11 commented on pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
WilliamSong11 commented on pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#issuecomment-786529407
@HTHou @wangchao316
HI all！
I've already made these adjustments:
1、Added documentation about ‘show child nodes’, including Chinese and English
2、Add IT Test in IoTDBMetadataFetchIT.showChildNodes
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] WilliamSong11 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
WilliamSong11 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r582505883
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
##########
@@ -1017,6 +1017,18 @@ public MeasurementSchema getSeriesSchema(PartialPath device, String measurement)
return mtree.getChildNodePathInNextLevel(path);
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2] given path = root.sg.d1 return [s1,s2]
+ *
Review comment:
Thank you for this advice，I will adjust accordingly
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] HTHou commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
HTHou commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r582557140
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
+ * @return All child nodes' seriesPath(s) of given seriesPath.
+ */
+ Set<String> getChildNodeInNextLevel(PartialPath path) throws MetadataException {
+ String[] nodes = path.getNodes();
+ if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
+ throw new IllegalPathException(path.getFullPath());
+ }
+ Set<String> childNodes = new TreeSet<>();
+ findChildNodeInNextLevel(root, nodes, 1, "", childNodes, nodes.length + 1);
+ return childNodes;
+ }
+
+ /**
+ * Traverse the MTree to match all child node path in next level
+ *
+ * @param node the current traversing node
+ * @param nodes split the prefix path with '.'
+ * @param idx the current index of array nodes
+ * @param parent store the node string having traversed
+ * @param res store all matched device names
+ * @param length expected length of path
+ */
+ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
+ private void findChildNodeInNextLevel(
+ MNode node, String[] nodes, int idx, String parent, Set<String> res, int length) {
+ if (node == null) {
+ return;
+ }
+ String nodeReg = MetaUtils.getNodeRegByIdx(idx, nodes);
+ if (!nodeReg.contains(PATH_WILDCARD)) {
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ node.getChild(nodeReg),
+ nodes,
+ idx + 1,
+ parent + node.getName() + PATH_SEPARATOR,
+ res,
+ length);
+ }
+ } else {
+ if (node.getChildren().size() > 0) {
+ for (MNode child : node.getChildren().values()) {
+ if (!Pattern.matches(nodeReg.replace("*", ".*"), child.getName())) {
+ continue;
+ }
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ child, nodes, idx + 1, parent + node.getName() + PATH_SEPARATOR, res, length);
+ }
+ }
+ } else if (idx == length) {
+ String nodeName = node.getName();
+ res.add(nodeName);
+ }
Review comment:
> Is this the desired effect we want to achieve @wangchao316 @HTHou @qiaojialin
Yes, I think this is the desired result exactly.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] wangchao316 commented on pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
wangchao316 commented on pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#issuecomment-785533014
could you please add some IT test in code?, E2E...
there is same as cli-test...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] wangchao316 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
wangchao316 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r583510219
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
##########
@@ -367,6 +367,41 @@ public void showChildPaths() throws SQLException, ClassNotFoundException {
}
}
+ @Test
+ public void showChildNodes() throws SQLException, ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection =
+ DriverManager.getConnection(
+ Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement()) {
+ String[] sqls = new String[] {"show child nodes root.ln"};
+ String[] standards = new String[] {"wf01,\n"};
+ for (int n = 0; n < sqls.length; n++) {
+ String sql = sqls[n];
+ String standard = standards[n];
+ StringBuilder builder = new StringBuilder();
+ try {
+ boolean hasResultSet = statement.execute(sql);
+ if (hasResultSet) {
+ try (ResultSet resultSet = statement.getResultSet()) {
+ ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ while (resultSet.next()) {
Review comment:
+ 1
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] HTHou commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
HTHou commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r582462918
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
+ * @return All child nodes' seriesPath(s) of given seriesPath.
+ */
+ Set<String> getChildNodeInNextLevel(PartialPath path) throws MetadataException {
+ String[] nodes = path.getNodes();
+ if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
+ throw new IllegalPathException(path.getFullPath());
+ }
+ Set<String> childNodes = new TreeSet<>();
+ findChildNodeInNextLevel(root, nodes, 1, "", childNodes, nodes.length + 1);
+ return childNodes;
+ }
+
+ /**
+ * Traverse the MTree to match all child node path in next level
+ *
+ * @param node the current traversing node
+ * @param nodes split the prefix path with '.'
+ * @param idx the current index of array nodes
+ * @param parent store the node string having traversed
+ * @param res store all matched device names
+ * @param length expected length of path
+ */
+ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
+ private void findChildNodeInNextLevel(
+ MNode node, String[] nodes, int idx, String parent, Set<String> res, int length) {
+ if (node == null) {
+ return;
+ }
+ String nodeReg = MetaUtils.getNodeRegByIdx(idx, nodes);
+ if (!nodeReg.contains(PATH_WILDCARD)) {
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ node.getChild(nodeReg),
+ nodes,
+ idx + 1,
+ parent + node.getName() + PATH_SEPARATOR,
+ res,
+ length);
+ }
+ } else {
+ if (node.getChildren().size() > 0) {
+ for (MNode child : node.getChildren().values()) {
+ if (!Pattern.matches(nodeReg.replace("*", ".*"), child.getName())) {
+ continue;
+ }
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ child, nodes, idx + 1, parent + node.getName() + PATH_SEPARATOR, res, length);
+ }
+ }
+ } else if (idx == length) {
+ String nodeName = node.getName();
+ res.add(nodeName);
+ }
Review comment:
If node.getChildren().size() == 0, the recursion will return. Is there any problem?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] HTHou merged pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
HTHou merged pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] WilliamSong11 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
WilliamSong11 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r582529826
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
+ * @return All child nodes' seriesPath(s) of given seriesPath.
+ */
+ Set<String> getChildNodeInNextLevel(PartialPath path) throws MetadataException {
+ String[] nodes = path.getNodes();
+ if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
+ throw new IllegalPathException(path.getFullPath());
+ }
+ Set<String> childNodes = new TreeSet<>();
+ findChildNodeInNextLevel(root, nodes, 1, "", childNodes, nodes.length + 1);
+ return childNodes;
+ }
+
+ /**
+ * Traverse the MTree to match all child node path in next level
+ *
+ * @param node the current traversing node
+ * @param nodes split the prefix path with '.'
+ * @param idx the current index of array nodes
+ * @param parent store the node string having traversed
+ * @param res store all matched device names
+ * @param length expected length of path
+ */
+ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
+ private void findChildNodeInNextLevel(
+ MNode node, String[] nodes, int idx, String parent, Set<String> res, int length) {
+ if (node == null) {
+ return;
+ }
+ String nodeReg = MetaUtils.getNodeRegByIdx(idx, nodes);
+ if (!nodeReg.contains(PATH_WILDCARD)) {
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ node.getChild(nodeReg),
+ nodes,
+ idx + 1,
+ parent + node.getName() + PATH_SEPARATOR,
+ res,
+ length);
+ }
+ } else {
+ if (node.getChildren().size() > 0) {
+ for (MNode child : node.getChildren().values()) {
+ if (!Pattern.matches(nodeReg.replace("*", ".*"), child.getName())) {
+ continue;
+ }
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ child, nodes, idx + 1, parent + node.getName() + PATH_SEPARATOR, res, length);
+ }
+ }
+ } else if (idx == length) {
+ String nodeName = node.getName();
+ res.add(nodeName);
+ }
Review comment:
Is this the desired effect we want to achieve @wangchao316 @HTHou @qiaojialin
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] WilliamSong11 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
WilliamSong11 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r582504539
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
+ * @return All child nodes' seriesPath(s) of given seriesPath.
+ */
+ Set<String> getChildNodeInNextLevel(PartialPath path) throws MetadataException {
+ String[] nodes = path.getNodes();
+ if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
+ throw new IllegalPathException(path.getFullPath());
+ }
+ Set<String> childNodes = new TreeSet<>();
+ findChildNodeInNextLevel(root, nodes, 1, "", childNodes, nodes.length + 1);
+ return childNodes;
+ }
+
+ /**
+ * Traverse the MTree to match all child node path in next level
+ *
+ * @param node the current traversing node
+ * @param nodes split the prefix path with '.'
+ * @param idx the current index of array nodes
+ * @param parent store the node string having traversed
+ * @param res store all matched device names
+ * @param length expected length of path
+ */
+ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
+ private void findChildNodeInNextLevel(
+ MNode node, String[] nodes, int idx, String parent, Set<String> res, int length) {
+ if (node == null) {
+ return;
+ }
+ String nodeReg = MetaUtils.getNodeRegByIdx(idx, nodes);
+ if (!nodeReg.contains(PATH_WILDCARD)) {
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ node.getChild(nodeReg),
+ nodes,
+ idx + 1,
+ parent + node.getName() + PATH_SEPARATOR,
+ res,
+ length);
+ }
+ } else {
+ if (node.getChildren().size() > 0) {
+ for (MNode child : node.getChildren().values()) {
+ if (!Pattern.matches(nodeReg.replace("*", ".*"), child.getName())) {
+ continue;
+ }
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ child, nodes, idx + 1, parent + node.getName() + PATH_SEPARATOR, res, length);
+ }
+ }
+ } else if (idx == length) {
+ String nodeName = node.getName();
+ res.add(nodeName);
+ }
Review comment:
Thank you for your reply
 I've run some local tests and the results seem to be in line with expectations
  1、Local client testing
IoTDB> SET STORAGE GROUP TO root.gsxgt
SET STORAGE GROUP TO root.gsxgt
Msg: The statement is executed successfully.
IoTDB> show child nodes root.gsxgt
show child nodes root.gsxgt
+-----------+
|child nodes|
+-----------+
+-----------+
Empty set.
It costs 0.005s
IoTDB> CREATE TIMESERIES root.gsxgt.d1 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN
CREATE TIMESERIES root.gsxgt.d1 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN
Msg: The statement is executed successfully.
IoTDB> show child nodes root.gsxgt
show child nodes root.gsxgt
+-----------+
|child nodes|
+-----------+
| d1|
+-----------+
Total line number = 1
It costs 0.009s
IoTDB> show child nodes root.gsxgt.d1
show child nodes root.gsxgt.d1
+-----------+
|child nodes|
+-----------+
+-----------+
Empty set.
It costs 0.004s
IoTDB> CREATE TIMESERIES root.gsxgt.d1.s1 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN
CREATE TIMESERIES root.gsxgt.d1.s1 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN
Msg: The statement is executed successfully.
IoTDB> show child nodes root.gsxgt.d1
show child nodes root.gsxgt.d1
+-----------+
|child nodes|
+-----------+
| s1|
+-----------+
Total line number = 1
It costs 0.005s
  2、org.apache.iotdb.db.metadata.MTreeTest --> Add Child Node as an empty scene
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] WilliamSong11 edited a comment on pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
WilliamSong11 edited a comment on pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#issuecomment-786529407
@HTHou @wangchao316
HI all！
I've already made these adjustments:
1、Added documentation about ‘show child nodes’, including Chinese and English
2、Added IT Test in IoTDBMetadataFetchIT.showChildNodes
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] wangchao316 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
wangchao316 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r583509539
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
+ * @return All child nodes' seriesPath(s) of given seriesPath.
+ */
+ Set<String> getChildNodeInNextLevel(PartialPath path) throws MetadataException {
+ String[] nodes = path.getNodes();
+ if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
+ throw new IllegalPathException(path.getFullPath());
+ }
+ Set<String> childNodes = new TreeSet<>();
+ findChildNodeInNextLevel(root, nodes, 1, "", childNodes, nodes.length + 1);
+ return childNodes;
+ }
+
+ /**
+ * Traverse the MTree to match all child node path in next level
+ *
+ * @param node the current traversing node
+ * @param nodes split the prefix path with '.'
+ * @param idx the current index of array nodes
+ * @param parent store the node string having traversed
+ * @param res store all matched device names
+ * @param length expected length of path
+ */
+ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
+ private void findChildNodeInNextLevel(
+ MNode node, String[] nodes, int idx, String parent, Set<String> res, int length) {
+ if (node == null) {
+ return;
+ }
+ String nodeReg = MetaUtils.getNodeRegByIdx(idx, nodes);
+ if (!nodeReg.contains(PATH_WILDCARD)) {
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ node.getChild(nodeReg),
+ nodes,
+ idx + 1,
+ parent + node.getName() + PATH_SEPARATOR,
+ res,
+ length);
+ }
+ } else {
+ if (node.getChildren().size() > 0) {
+ for (MNode child : node.getChildren().values()) {
+ if (!Pattern.matches(nodeReg.replace("*", ".*"), child.getName())) {
+ continue;
+ }
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ child, nodes, idx + 1, parent + node.getName() + PATH_SEPARATOR, res, length);
+ }
+ }
+ } else if (idx == length) {
+ String nodeName = node.getName();
+ res.add(nodeName);
+ }
Review comment:
> @HTHou @wangchao316
> HI all！
> I've already made these adjustments:
> 1、Added documentation about ‘show child nodes’, including Chinese and English
> 2、Added IT Test in IoTDBMetadataFetchIT.showChildNodes
good
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] wangchao316 commented on a change in pull request #2732: [ISSUE-2493] show child nodes path
Posted by GitBox <gi...@apache.org>.
wangchao316 commented on a change in pull request #2732:
URL: https://github.com/apache/iotdb/pull/2732#discussion_r582445936
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
Review comment:
Same as above
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
##########
@@ -1017,6 +1017,18 @@ public MeasurementSchema getSeriesSchema(PartialPath device, String measurement)
return mtree.getChildNodePathInNextLevel(path);
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2] given path = root.sg.d1 return [s1,s2]
+ *
Review comment:
this add paremater comment..
so @parameter path ....
##########
File path: server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
##########
@@ -1170,6 +1170,76 @@ private void findChildNodePathInNextLevel(
}
}
+ /**
+ * Get child node in the next level of the given path.
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1,
+ * return [d1, d2]
+ *
+ * <p>e.g., MTree has [root.sg1.d1.s1, root.sg1.d1.s2, root.sg1.d2.s1] given path = root.sg1.d1
+ * return [s1, s2]
+ *
+ * @return All child nodes' seriesPath(s) of given seriesPath.
+ */
+ Set<String> getChildNodeInNextLevel(PartialPath path) throws MetadataException {
+ String[] nodes = path.getNodes();
+ if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
+ throw new IllegalPathException(path.getFullPath());
+ }
+ Set<String> childNodes = new TreeSet<>();
+ findChildNodeInNextLevel(root, nodes, 1, "", childNodes, nodes.length + 1);
+ return childNodes;
+ }
+
+ /**
+ * Traverse the MTree to match all child node path in next level
+ *
+ * @param node the current traversing node
+ * @param nodes split the prefix path with '.'
+ * @param idx the current index of array nodes
+ * @param parent store the node string having traversed
+ * @param res store all matched device names
+ * @param length expected length of path
+ */
+ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
+ private void findChildNodeInNextLevel(
+ MNode node, String[] nodes, int idx, String parent, Set<String> res, int length) {
+ if (node == null) {
+ return;
+ }
+ String nodeReg = MetaUtils.getNodeRegByIdx(idx, nodes);
+ if (!nodeReg.contains(PATH_WILDCARD)) {
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ node.getChild(nodeReg),
+ nodes,
+ idx + 1,
+ parent + node.getName() + PATH_SEPARATOR,
+ res,
+ length);
+ }
+ } else {
+ if (node.getChildren().size() > 0) {
+ for (MNode child : node.getChildren().values()) {
+ if (!Pattern.matches(nodeReg.replace("*", ".*"), child.getName())) {
+ continue;
+ }
+ if (idx == length) {
+ res.add(node.getName());
+ } else {
+ findChildNodeInNextLevel(
+ child, nodes, idx + 1, parent + node.getName() + PATH_SEPARATOR, res, length);
+ }
+ }
+ } else if (idx == length) {
+ String nodeName = node.getName();
+ res.add(nodeName);
+ }
Review comment:
if node.getChildren().size() == 0 , will....
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org