This is an automated email from the ASF dual-hosted git repository. yuyuankang pushed a commit to branch kyy2 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 4141a66ba12b17a71a9c084ed6d1e1e204a6860c Author: Ring-k <[email protected]> AuthorDate: Mon Jul 6 19:52:18 2020 +0800 path->string --- .../org/apache/iotdb/db/qp/physical/PhysicalPlan.java | 2 ++ .../iotdb/db/qp/physical/crud/DeletePartitionPlan.java | 5 +++++ .../apache/iotdb/db/qp/physical/crud/DeletePlan.java | 9 +++++++++ .../apache/iotdb/db/qp/physical/crud/InsertRowPlan.java | 10 +++++++++- .../iotdb/db/qp/physical/crud/InsertTabletPlan.java | 17 +++++++++++++++++ .../org/apache/iotdb/db/qp/physical/crud/QueryPlan.java | 10 ++++++++++ .../apache/iotdb/db/qp/physical/crud/UpdatePlan.java | 9 +++++++++ .../iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java | 10 ++++++++++ .../org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java | 9 +++++++++ .../apache/iotdb/db/qp/physical/sys/ClearCachePlan.java | 5 +++++ .../iotdb/db/qp/physical/sys/CreateSnapshotPlan.java | 5 +++++ .../iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java | 10 ++++++++++ .../apache/iotdb/db/qp/physical/sys/DataAuthPlan.java | 5 +++++ .../db/qp/physical/sys/DeleteStorageGroupPlan.java | 9 +++++++++ .../iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java | 9 +++++++++ .../org/apache/iotdb/db/qp/physical/sys/FlushPlan.java | 10 ++++++++++ .../iotdb/db/qp/physical/sys/LoadConfigurationPlan.java | 5 +++++ .../apache/iotdb/db/qp/physical/sys/LoadDataPlan.java | 9 +++++++++ .../org/apache/iotdb/db/qp/physical/sys/MergePlan.java | 5 +++++ .../iotdb/db/qp/physical/sys/OperateFilePlan.java | 5 +++++ .../iotdb/db/qp/physical/sys/SetStorageGroupPlan.java | 9 +++++++++ .../org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java | 5 +++++ .../org/apache/iotdb/db/qp/physical/sys/ShowPlan.java | 5 +++++ .../apache/iotdb/db/qp/physical/sys/TracingPlan.java | 5 +++++ 24 files changed, 181 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java index 6b9afab..bcb5019 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java @@ -77,6 +77,8 @@ public abstract class PhysicalPlan { public abstract List<Path> getPaths(); + public abstract List<String> getPathsStrings(); + public boolean isQuery() { return isQuery; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java index c720d27..18f5966 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java @@ -41,6 +41,11 @@ public class DeletePartitionPlan extends PhysicalPlan { return null; } + @Override + public List<String> getPathsStrings() { + return null; + } + public String getStorageGroupName() { return storageGroupName; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java index 381ad5c..bd0ac7f 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java @@ -82,6 +82,15 @@ public class DeletePlan extends PhysicalPlan { return paths; } + @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : paths) { + ret.add(path.getFullPath()); + } + return ret; + } + public void setPaths(List<Path> paths) { this.paths = paths; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java index 494b29b..a29d2ac 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java @@ -196,13 +196,21 @@ public class InsertRowPlan extends InsertPlan { @Override public List<Path> getPaths() { List<Path> ret = new ArrayList<>(); - for (String m : measurements) { ret.add(new Path(deviceId, m)); } return ret; } + @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (String m : measurements) { + ret.add(new Path(deviceId, m).getFullPath()); + } + return ret; + } + public Object[] getValues() { return this.values; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java index f7b59db..6ae9cfa 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java @@ -126,6 +126,23 @@ public class InsertTabletPlan extends InsertPlan { } @Override + public List<String> getPathsStrings() { + if (paths != null) { + List<String> ret = new ArrayList<>(); + for (Path path : paths) { + ret.add(path.getFullPath()); + } + return ret; + } + List<Path> ret = new ArrayList<>(); + for (String m : measurements) { + ret.add(new Path(deviceId, m)); + } + paths = ret; + return getPathsStrings(); + } + + @Override public void serialize(DataOutputStream stream) throws IOException { int type = PhysicalPlanType.BATCHINSERT.ordinal(); stream.writeByte((byte) type); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java index 58b4c13..f39a66c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.qp.physical.crud; +import java.util.ArrayList; import org.apache.iotdb.db.qp.logical.Operator; import org.apache.iotdb.db.qp.physical.PhysicalPlan; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -52,6 +53,15 @@ public abstract class QueryPlan extends PhysicalPlan { return paths; } + @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : paths) { + ret.add(path.getFullPath()); + } + return ret; + } + public void setPaths(List<Path> paths) { this.paths = paths; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java index 418cb06..a555159 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java @@ -106,6 +106,15 @@ public class UpdatePlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + if (path != null) { + ret.add(path.getFullPath()); + } + return ret; + } + + @Override public String printQueryPlan() { StringContainer sc = new StringContainer(); String preSpace = " "; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java index 814b7cb..e86ac1d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java @@ -22,6 +22,7 @@ package org.apache.iotdb.db.qp.physical.sys; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -103,6 +104,15 @@ public class AlterTimeSeriesPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : Collections.singletonList(path)) { + ret.add(path.getFullPath()); + } + return ret; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { stream.writeByte((byte) PhysicalPlanType.ALTER_TIMESERIES.ordinal()); byte[] bytes = path.getFullPath().getBytes(); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java index 845b600..1e746af 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java @@ -255,6 +255,15 @@ public class AuthorPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + if (nodeName != null) { + ret.add(nodeName.getFullPath()); + } + return ret; + } + + @Override public boolean equals(Object o) { if (this == o) { return true; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java index e747208..3562561 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java @@ -34,4 +34,9 @@ public class ClearCachePlan extends PhysicalPlan { public List<Path> getPaths() { return new ArrayList<>(); } + + @Override + public List<String> getPathsStrings() { + return null; + } } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java index 93f8d5d..8e6c391 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java @@ -35,4 +35,9 @@ public class CreateSnapshotPlan extends PhysicalPlan { public List<Path> getPaths() { return new ArrayList<>(); } + + @Override + public List<String> getPathsStrings() { + return new ArrayList<>(); + } } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java index 5d31b22..831760d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.qp.physical.sys; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -140,6 +141,15 @@ public class CreateTimeSeriesPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : Collections.singletonList(path)) { + ret.add(path.getFullPath()); + } + return ret; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { stream.writeByte((byte) PhysicalPlanType.CREATE_TIMESERIES.ordinal()); byte[] bytes = path.getFullPath().getBytes(); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java index e6bec6f..f18fb22 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java @@ -50,6 +50,11 @@ public class DataAuthPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + return null; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { int type = this.getPlanType(super.getOperatorType()); stream.writeByte((byte) type); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java index bb33050..2ca9769 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java @@ -47,6 +47,15 @@ public class DeleteStorageGroupPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : deletePathList) { + ret.add(path.getFullPath()); + } + return ret; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { int type = PhysicalPlan.PhysicalPlanType.DELETE_STORAGE_GROUP.ordinal(); stream.writeByte((byte) type); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java index 80da6d5..16b647a 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java @@ -46,6 +46,15 @@ public class DeleteTimeSeriesPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : deletePathList) { + ret.add(path.getFullPath()); + } + return ret; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { int type = PhysicalPlanType.DELETE_TIMESERIES.ordinal(); stream.writeByte((byte) type); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java index d21c26e..b6af618 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.qp.physical.sys; +import java.util.ArrayList; import java.util.List; import org.apache.iotdb.db.qp.logical.Operator.OperatorType; import org.apache.iotdb.db.qp.physical.PhysicalPlan; @@ -42,4 +43,13 @@ public class FlushPlan extends PhysicalPlan { public List<Path> getPaths() { return storeGroups; } + + @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + for (Path path : storeGroups) { + ret.add(path.getFullPath()); + } + return ret; + } } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java index 0acadcc..2cb87c7 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java @@ -116,6 +116,11 @@ public class LoadConfigurationPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + return null; + } + + @Override public String toString() { return getOperatorType().toString(); } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java index 2c27c9f..950b924 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java @@ -48,6 +48,15 @@ public class LoadDataPlan extends PhysicalPlan { return ret; } + @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + if (measureType != null) { + ret.add(measureType); + } + return ret; + } + public String getInputFilePath() { return inputFilePath; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java index d443002..fac7479 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java @@ -38,4 +38,9 @@ public class MergePlan extends PhysicalPlan { public List<Path> getPaths() { return new ArrayList<>(); } + + @Override + public List<String> getPathsStrings() { + return new ArrayList<>(); + } } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java index 7f7ee15..2e9e57d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java @@ -54,6 +54,11 @@ public class OperateFilePlan extends PhysicalPlan { return null; } + @Override + public List<String> getPathsStrings() { + return null; + } + public File getFile() { return file; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java index 42f06ea..0ab75be 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java @@ -58,6 +58,15 @@ public class SetStorageGroupPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + List<String> ret = new ArrayList<>(); + if (path != null) { + ret.add(path.getFullPath()); + } + return ret; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { stream.write((byte) PhysicalPlanType.SET_STORAGE_GROUP.ordinal()); byte[] fullPathBytes = path.getFullPath().getBytes(); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java index 2600830..214d0b1 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java @@ -55,6 +55,11 @@ public class SetTTLPlan extends PhysicalPlan { } @Override + public List<String> getPathsStrings() { + return null; + } + + @Override public void serialize(DataOutputStream stream) throws IOException { int type = PhysicalPlanType.TTL.ordinal(); stream.writeByte((byte) type); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java index bde812a..38ba9b6 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java @@ -39,6 +39,11 @@ public class ShowPlan extends PhysicalPlan { return null; } + @Override + public List<String> getPathsStrings() { + return null; + } + public ShowContentType getShowContentType() { return showContentType; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java index 26ed373..e1c1638 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java @@ -38,6 +38,11 @@ public class TracingPlan extends PhysicalPlan { return new ArrayList<>(); } + @Override + public List<String> getPathsStrings() { + return new ArrayList<>(); + } + public boolean isTracingOn() { return isTracingOn; }
