You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/04/28 08:59:30 UTC
[incubator-iotdb] branch fix_level_number created (now 40f6395)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch fix_level_number
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 40f6395 fix init sg level
This branch includes the following new commits:
new 40f6395 fix init sg level
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: fix init sg level
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_level_number
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 40f63951af7a4d21dd010094291d72ffd32881f6
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Apr 28 16:58:43 2020 +0800
fix init sg level
---
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
server/src/main/java/org/apache/iotdb/db/metadata/MetaUtils.java | 6 +++---
.../org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java | 6 +++---
.../src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 6 +++---
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 9b68c3f..986cec9 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -397,8 +397,8 @@ enable_auto_create_schema=true
# Storage group level when creating schema automatically is enabled
# e.g. root.sg0.d1.s2
-# we will set root.sg0 as the storage group if storage group level is 2
-default_storage_group_level=2
+# we will set root.sg0 as the storage group if storage group level is 1
+default_storage_group_level=1
# BOOLEAN encoding when creating schema automatically is enabled
default_boolean_encoding=RLE
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index c1b3350..1c42f0f 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -365,7 +365,7 @@ public class IoTDBConfig {
/**
* Storage group level when creating schema automatically is enabled
*/
- private int defaultStorageGroupLevel = 2;
+ private int defaultStorageGroupLevel = 1;
/**
* BOOLEAN encoding when creating schema automatically is enabled
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MetaUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/MetaUtils.java
index 290b742..de3e9c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MetaUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MetaUtils.java
@@ -59,18 +59,18 @@ class MetaUtils {
/**
* Get storage group name when creating schema automatically is enable
*
- * e.g., path = root.a.b.c and level = 2, return root.a
+ * e.g., path = root.a.b.c and level = 1, return root.a
*
* @param path path
* @param level level
*/
public static String getStorageGroupNameByLevel(String path, int level) throws MetadataException {
String[] nodeNames = MetaUtils.getNodeNames(path);
- if (nodeNames.length < level || !nodeNames[0].equals(IoTDBConstant.PATH_ROOT)) {
+ if (nodeNames.length <= level || !nodeNames[0].equals(IoTDBConstant.PATH_ROOT)) {
throw new IllegalPathException(path);
}
StringBuilder storageGroupName = new StringBuilder(nodeNames[0]);
- for (int i = 1; i < level; i++) {
+ for (int i = 1; i <= level; i++) {
storageGroupName.append(IoTDBConstant.PATH_SEPARATOR).append(nodeNames[i]);
}
return storageGroupName.toString();
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
index 1427340..dff350c 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
@@ -408,7 +408,7 @@ public class IoTDBLoadExternalTsfileIT {
// test wrong statement
boolean hasError = false;
try {
- statement.execute(String.format("load %s true1 2", tmpDir.getAbsolutePath()));
+ statement.execute(String.format("load %s true1 1", tmpDir.getAbsolutePath()));
} catch (Exception e) {
hasError = true;
Assert.assertEquals(
@@ -420,7 +420,7 @@ public class IoTDBLoadExternalTsfileIT {
// test not load metadata automatically, it will occur errors.
hasError = false;
try {
- statement.execute(String.format("load %s false 2", tmpDir.getAbsolutePath()));
+ statement.execute(String.format("load %s false 1", tmpDir.getAbsolutePath()));
} catch (Exception e) {
hasError = true;
}
@@ -428,7 +428,7 @@ public class IoTDBLoadExternalTsfileIT {
// test load metadata automatically, it will succeed.
tmpDir = tmpDir.getParentFile().getParentFile();
- statement.execute(String.format("load %s true 2", tmpDir.getAbsolutePath()));
+ statement.execute(String.format("load %s true 1", tmpDir.getAbsolutePath()));
resources = new ArrayList<>(
StorageEngine.getInstance().getProcessor("root.vehicle")
.getSequenceFileTreeSet());
diff --git a/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java b/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
index ac4fb6b..33f1a69 100644
--- a/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
@@ -699,21 +699,21 @@ public class PhysicalPlanTest {
Planner processor = new Planner();
OperateFilePlan plan = (OperateFilePlan) processor.parseSQLToPhysicalPlan(metadata);
assertEquals(String.format(
- "OperateFilePlan{file=%s, targetDir=null, autoCreateSchema=true, sgLevel=2, operatorType=LOAD_FILES}",
+ "OperateFilePlan{file=%s, targetDir=null, autoCreateSchema=true, sgLevel=1, operatorType=LOAD_FILES}",
filePath), plan.toString());
metadata = String.format("load %s true", filePath);
processor = new Planner();
plan = (OperateFilePlan) processor.parseSQLToPhysicalPlan(metadata);
assertEquals(String.format(
- "OperateFilePlan{file=%s, targetDir=null, autoCreateSchema=true, sgLevel=2, operatorType=LOAD_FILES}",
+ "OperateFilePlan{file=%s, targetDir=null, autoCreateSchema=true, sgLevel=1, operatorType=LOAD_FILES}",
filePath), plan.toString());
metadata = String.format("load %s false", filePath);
processor = new Planner();
plan = (OperateFilePlan) processor.parseSQLToPhysicalPlan(metadata);
assertEquals(String.format(
- "OperateFilePlan{file=%s, targetDir=null, autoCreateSchema=false, sgLevel=2, operatorType=LOAD_FILES}",
+ "OperateFilePlan{file=%s, targetDir=null, autoCreateSchema=false, sgLevel=1, operatorType=LOAD_FILES}",
filePath), plan.toString());
metadata = String.format("load %s true 3", filePath);