Fix tests

apache · Mar 6, 2020 · 2c4d81e · 2c4d81e
1 parent 3a36b36
commit 2c4d81e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/session/src/main/java/org/apache/iotdb/session/Config.java b/session/src/main/java/org/apache/iotdb/session/Config.java
@@ -28,11 +28,12 @@ public class Config {
   public static final int DEFAULT_FETCH_SIZE = 10000;
   public static final int DEFAULT_TIMEOUT_MS = 0;
 
-  public static final String NODE_MATCHER = "([a-zA-Z0-9_-]+)";
+  public static final String NODE_MATCHER = "[" + PATH_SEPARATOR + "]" + "([a-zA-Z0-9_]+)";
 
   // for path like: root.sg1.d1."1.2.3" or root.sg1.d1.'1.2.3', only occurs in the end of the path and only occurs once
-  public static final String NODE_WITH_QUOTATION_MARK_MATCHER = "\"|\'a-zA-Z0-9_-[.a-zA-Z0-9_-]+\"|\'";
-  public static final String PATH_MATCHER = PATH_ROOT + "([" + PATH_SEPARATOR + "]" + NODE_MATCHER
-      + ")+[" + NODE_WITH_QUOTATION_MARK_MATCHER + "]?";
+  public static final String NODE_WITH_QUOTATION_MARK_MATCHER =
+      "[" + PATH_SEPARATOR + "][\"|\']([a-zA-Z0-9_]+)(" + NODE_MATCHER + ")+[\"|\']";
+  public static final String PATH_MATCHER =
+      PATH_ROOT + "(" + NODE_MATCHER + ")+(" + NODE_WITH_QUOTATION_MARK_MATCHER + ")?";
 
 }
diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -646,10 +646,9 @@ public void executeNonQueryStatement(String sql) throws TException, IoTDBRPCExce
   }
 
   private void checkPathValidity(String path) throws IoTDBSessionException {
-    if (!Pattern.compile(PATH_MATCHER).matcher(path).find()) {
+    if (!Pattern.matches(PATH_MATCHER, path)) {
       throw new IoTDBSessionException(
           String.format("Path [%s] is invalid", path));
     }
   }
-
 }
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java
@@ -589,9 +589,8 @@ public void checkPathTest() throws IoTDBSessionException {
     checkSetSG(session, "root.\tvehicle", false);
     checkSetSG(session, "root.\nvehicle", false);
     checkSetSG(session, "root..vehicle", false);
-    checkSetSG(session, "root.1234a4", false);
-    checkSetSG(session, "root.+12345", true);
-    checkSetSG(session, "root.-12345", true);
+    checkSetSG(session, "root.1234a4", true);
+    checkSetSG(session, "root.1_2", true);
     checkSetSG(session, "root.%12345", false);
     checkSetSG(session, "root.a{12345}", false);
 
@@ -600,7 +599,8 @@ public void checkPathTest() throws IoTDBSessionException {
     checkCreateTimeseries(session, "root.vehicle.1110.s0", true);
     checkCreateTimeseries(session, "root.vehicle.d0.1220", true);
     checkCreateTimeseries(session, "root.vehicle._1234.s0", true);
-    checkCreateTimeseries(session, "root.vehicle.+1245.-1256", true);
+    checkCreateTimeseries(session, "root.vehicle.1245.\"1.2.3\"", true);
+    checkCreateTimeseries(session, "root.vehicle.1245.\'1.2.4\'", true);
     checkCreateTimeseries(session, "root.vehicle./d0.s0", false);
     checkCreateTimeseries(session, "root.vehicle.d\t0.s0", false);
     checkCreateTimeseries(session, "root.vehicle.!d\t0.s0", false);
@@ -616,18 +616,18 @@ private void checkSetSG(Session session, String sg, boolean correctStatus) {
     } catch (IoTDBSessionException e) {
       status = false;
     }
-    assertEquals(status, correctStatus);
+    assertEquals(correctStatus, status);
   }
 
-  private void checkCreateTimeseries(Session session, String timeseris, boolean correctStatus) {
+  private void checkCreateTimeseries(Session session, String timeseries, boolean correctStatus) {
     boolean status = true;
     try {
-      session.createTimeseries(timeseris, TSDataType.INT64, TSEncoding.RLE,
+      session.createTimeseries(timeseries, TSDataType.INT64, TSEncoding.RLE,
           CompressionType.SNAPPY);
     } catch (IoTDBSessionException e) {
       status = false;
     }
-    assertEquals(status, correctStatus);
+    assertEquals(correctStatus, status);
   }
 
   private void insertRowBatchTest2(String deviceId) throws IoTDBSessionException {