[incubator-iotdb] branch optimize_path updated: fix insert.

[geniuspig]

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

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


The following commit(s) were added to refs/heads/optimize_path by this push:
     new 80f4d43  fix insert.
80f4d43 is described below

commit 80f4d4338008d68e09a8983832559732226d83cf
Author: zhutianci <zhutianci123...@gmail.com>
AuthorDate: Tue Jul 14 17:38:15 2020 +0800

    fix insert.
---
 .../main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java  | 2 +-
 .../apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java    | 4 ++--
 server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java | 1 -
 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java    | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java 
b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
index 36331aa..146b988 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
@@ -177,7 +177,7 @@ public class PhysicalGenerator {
               "For Insert command, cannot specified more than one seriesPath: 
" + paths);
         }
 
-        return new InsertRowPlan(paths.get(0).getNodes(), insert.getTime(),
+        return new InsertRowPlan(paths.get(0).getNodes(), 
paths.get(0).getDevice(), insert.getTime(),
             insert.getMeasurementList(), insert.getValueList());
       case MERGE:
         if (operator.getTokenIntType() == SQLConstant.TOK_FULL_MERGE) {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
 
b/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
index 7b35398..7948166 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
@@ -164,7 +164,7 @@ public class ConcatPathOptimizer implements 
ILogicalOptimizer {
       // selectPath cannot start with ROOT, which is guaranteed by TSParser
       Path selectPath = suffixPaths.get(i);
       for (Path fromPath : fromPaths) {
-        allPaths.add(Path.addNotes(selectPath, fromPath));
+        allPaths.add(Path.addNodes(selectPath, fromPath));
         extendListSafely(originAggregations, i, afterConcatAggregations);
       }
     }
@@ -225,7 +225,7 @@ public class ConcatPathOptimizer implements 
ILogicalOptimizer {
       return operator;
     }
     List<Path> concatPaths = new ArrayList<>();
-    fromPaths.forEach(fromPath -> concatPaths.add(Path.addNotes(filterPath, 
fromPath)));
+    fromPaths.forEach(fromPath -> concatPaths.add(Path.addNodes(filterPath, 
fromPath)));
     List<Path> noStarPaths = removeStarsInPathWithUnique(concatPaths);
     filterPaths.addAll(noStarPaths);
     if (noStarPaths.size() == 1) {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java 
b/server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
index 7ae70d6..febce11 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.utils;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.iotdb.tsfile.common.cache.Cache;
-import org.apache.iotdb.tsfile.exception.cache.CacheException;
 
 public abstract class RandomDeleteCache<K, V> implements Cache<K, V> {
 
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 498381c..f2d5d14 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
@@ -134,7 +134,7 @@ public class Path implements Serializable, Comparable<Path> 
{
     return new Path(sc);
   }
 
-  public static Path addNotes(Path src, Path tail) {
+  public static Path addNodes(Path src, Path tail) {
     if (tail.nodes.isEmpty()) {
       return src;
     }