[incubator-iotdb] branch optimize_path_v2 updated: optimize code style

[geniuspig]

This is an automated email from the ASF dual-hosted git repository.

geniuspig pushed a commit to branch optimize_path_v2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/optimize_path_v2 by this push:
     new 72032a2  optimize code style
     new 25d81ab  Merge pull request #1641 from Alima777/optimize_path_v2
72032a2 is described below

commit 72032a2398640738d35e74d7c6a1b08e46be7041
Author: Xiangwei Wei <526213...@qq.com>
AuthorDate: Fri Aug 21 17:38:21 2020 +0800

    optimize code style
---
 .../org/apache/iotdb/db/metadata/PartialPath.java   | 21 +++++++++++----------
 .../org/apache/iotdb/tsfile/read/common/Path.java   | 10 ++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/PartialPath.java 
b/server/src/main/java/org/apache/iotdb/db/metadata/PartialPath.java
index ff8d524..622c040 100755
--- a/server/src/main/java/org/apache/iotdb/db/metadata/PartialPath.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/PartialPath.java
@@ -48,6 +48,7 @@ public class PartialPath extends Path implements 
Comparable<Path> {
 
   /**
    * it will return a new partial path
+   *
    * @param partialPath the path you want to concat
    * @return new partial path
    */
@@ -60,6 +61,7 @@ public class PartialPath extends Path implements 
Comparable<Path> {
 
   /**
    * It will change nodes in this partial path
+   *
    * @param otherNodes nodes
    */
   void concatPath(String[] otherNodes) {
@@ -85,8 +87,7 @@ public class PartialPath extends Path implements 
Comparable<Path> {
     } else {
       StringBuilder s = new StringBuilder(nodes[0]);
       for (int i = 1; i < nodes.length; i++) {
-        s.append(TsFileConstant.PATH_SEPARATOR);
-        s.append(nodes[i]);
+        s.append(TsFileConstant.PATH_SEPARATOR).append(nodes[i]);
       }
       fullPath = s.toString();
       return fullPath;
@@ -95,19 +96,19 @@ public class PartialPath extends Path implements 
Comparable<Path> {
 
   @Override
   public boolean equals(Object obj) {
-    if(!(obj instanceof PartialPath)) {
+    if (!(obj instanceof PartialPath)) {
       return false;
     }
     String[] otherNodes = ((PartialPath) obj).getNodes();
-    if( this.nodes.length != otherNodes.length) {
+    if (this.nodes.length != otherNodes.length) {
       return false;
     } else {
-      for(int i = 0; i < this.nodes.length; i++) {
-        if(!nodes[i].equals(otherNodes[i])) {
+      for (int i = 0; i < this.nodes.length; i++) {
+        if (!nodes[i].equals(otherNodes[i])) {
           return false;
         }
       }
-     }
+    }
     return true;
   }
 
@@ -131,7 +132,7 @@ public class PartialPath extends Path implements 
Comparable<Path> {
     if (device != null) {
       return device;
     } else {
-      if(nodes.length == 1) {
+      if (nodes.length == 1) {
         return "";
       }
       StringBuilder s = new StringBuilder(nodes[0]);
@@ -164,8 +165,8 @@ public class PartialPath extends Path implements 
Comparable<Path> {
   }
 
   public boolean startsWith(String[] otherNodes) {
-    for(int i = 0; i < otherNodes.length; i++) {
-      if(!nodes[i].equals(otherNodes[i])) {
+    for (int i = 0; i < otherNodes.length; i++) {
+      if (!nodes[i].equals(otherNodes[i])) {
         return false;
       }
     }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java
index cd9163f..7ee9ef2 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java
@@ -44,12 +44,7 @@ public class Path implements Serializable, Comparable<Path> {
    */
   @SuppressWarnings("the path that wouldn't be split")
   public Path(String pathSc) {
-    if (pathSc == null) {
-      throw new IllegalArgumentException(ILLEGAL_PATH_ARGUMENT);
-    }
-    fullPath = pathSc;
-    device = "";
-    measurement = pathSc;
+    this(pathSc, false);
   }
 
   /**
@@ -57,6 +52,9 @@ public class Path implements Serializable, Comparable<Path> {
    * @param needSplit whether need to be split to device and measurement, 
doesn't support escape character yet.
    */
   public Path(String pathSc, boolean needSplit) {
+    if (pathSc == null) {
+      throw new IllegalArgumentException(ILLEGAL_PATH_ARGUMENT);
+    }
     if(!needSplit) {
       fullPath = pathSc;
       device = "";