This is an automated email from the ASF dual-hosted git repository. geniuspig pushed a commit to branch fix_path_0.9 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f197f3506fa93aefbae253f2abf652244a71ae45 Author: zhutianci <[email protected]> AuthorDate: Mon Jun 22 12:27:58 2020 +0800 fix path --- server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java | 1 + .../org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java index 069d79e..d5d5f67 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java @@ -42,6 +42,7 @@ public class IoTDBConstant { public static final String PATH_ROOT = "root"; public static final char PATH_SEPARATOR = '.'; + public static final char DOUBLE_QUOTATION = '\"'; public static final String ADMIN_NAME = "root"; public static final String ADMIN_PW = "root"; public static final String PROFILE_SUFFIX = ".profile"; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java index c267a9f..a91bf7c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java @@ -706,7 +706,13 @@ public class QueryProcessExecutor extends AbstractQueryProcessExecutor { */ private void addPathToMTree(String deviceId, String measurementId, TSDataType dataType) throws PathException, MetadataException, StorageEngineException { - String fullPath = deviceId + IoTDBConstant.PATH_SEPARATOR + measurementId; + String fullPath; + if(measurementId.indexOf(IoTDBConstant.PATH_SEPARATOR) != -1) { + fullPath = deviceId + IoTDBConstant.PATH_SEPARATOR + + IoTDBConstant.DOUBLE_QUOTATION + measurementId + IoTDBConstant.DOUBLE_QUOTATION; + } else { + fullPath = deviceId + IoTDBConstant.PATH_SEPARATOR + measurementId; + } TSEncoding defaultEncoding = getDefaultEncoding(dataType); CompressionType defaultCompressor = CompressionType.valueOf(TSFileDescriptor.getInstance().getConfig().getCompressor());
