This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new b7472ea1355 Rename PB_Tree to PBTree (#10223)
b7472ea1355 is described below
commit b7472ea1355b1ee7f5ad85186ecc39310e8e3404
Author: Marcos_Zyk <[email protected]>
AuthorDate: Tue Jun 20 14:03:34 2023 +0800
Rename PB_Tree to PBTree (#10223)
---
.../Data-Modeling/SchemaRegion-rocksdb.md | 2 +-
.../Maintenance-Tools/SchemaFileSketch-Tool.md | 6 ++---
docs/UserGuide/Reference/Common-Config-Manual.md | 2 +-
docs/UserGuide/Reference/Status-Codes.md | 4 ++--
.../Data-Modeling/SchemaRegion-rocksdb.md | 2 +-
.../Maintenance-Tools/SchemaFileSketch-Tool.md | 8 +++----
.../zh/UserGuide/Reference/Common-Config-Manual.md | 2 +-
docs/zh/UserGuide/Reference/Status-Codes.md | 4 ++--
.../org/apache/iotdb/util/AbstractSchemaIT.java | 4 ++--
iotdb-client/client-cpp/src/main/Session.h | 4 ++--
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 ++--
.../resources/conf/iotdb-common.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +++----
.../SchemaFileLogCorruptedException.java | 2 +-
.../metadata/schemafile/SchemaFileNotExists.java | 2 +-
.../schemafile/SchemaPageOverflowException.java | 3 +--
.../apache/iotdb/db/metadata/MetadataConstant.java | 8 +++----
.../idtable/AppendOnlyDiskSchemaManager.java | 2 +-
.../metadata/metric/SchemaEngineCachedMetric.java | 2 +-
.../mtree/store/disk/schemafile/ISchemaFile.java | 4 ++--
.../mtree/store/disk/schemafile/SchemaFile.java | 28 +++++++++++-----------
.../store/disk/schemafile/SchemaFileConfig.java | 4 ++--
.../disk/schemafile/pagemgr/BTreePageManager.java | 2 +-
.../store/disk/schemafile/pagemgr/PageManager.java | 2 +-
.../rescon/CachedSchemaEngineStatistics.java | 2 +-
.../rescon/CachedSchemaRegionStatistics.java | 4 ++--
.../db/metadata/rescon/SchemaResourceManager.java | 4 ++--
.../db/metadata/schemaregion/SchemaEngine.java | 2 +-
.../db/metadata/schemaregion/SchemaEngineMode.java | 2 +-
.../schemaregion/SchemaRegionPBTreeImpl.java | 2 +-
.../protocol/influxdb/util/QueryResultUtils.java | 2 +-
.../db/tools/schema/PBTreeFileSketchTool.java | 6 ++---
.../mtree/schemafile/AliasIndexPageTest.java | 2 +-
.../mtree/schemafile/InternalPageTest.java | 2 +-
.../mtree/schemafile/SchemaFileLogTest.java | 8 +++----
.../metadata/mtree/schemafile/SchemaFileTest.java | 2 +-
.../mtree/schemafile/WrappedSegmentTest.java | 2 +-
.../schemaRegion/AbstractSchemaRegionTest.java | 6 ++---
.../schemaRegion/SchemaRegionBasicTest.java | 4 ++--
.../schemaRegion/SchemaStatisticsTest.java | 2 +-
.../iotdb/db/tools/PBTreeFileSketchTest.java | 4 ++--
.../src/test/resources/iotdb-datanode.properties | 4 ++--
43 files changed, 87 insertions(+), 88 deletions(-)
diff --git a/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
b/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
index 4caef952ed6..cb13eecdd12 100644
--- a/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
+++ b/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
@@ -44,7 +44,7 @@ Rocksdb_based. Restart the IoTDB, the system will use
`RSchemaRegion` to manage
####################
### Schema Engine Configuration
####################
-# Choose the mode of schema engine. The value could be Memory,PB_Tree and
Rocksdb_based. If the provided value doesn't match any pre-defined value,
Memory mode will be used as default.
+# Choose the mode of schema engine. The value could be Memory,PBTree and
Rocksdb_based. If the provided value doesn't match any pre-defined value,
Memory mode will be used as default.
# Datatype: string
schema_engine_mode=Rocksdb_based
diff --git a/docs/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
b/docs/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
index 74262d39ce0..0ccb77c97c9 100644
--- a/docs/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
+++ b/docs/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
@@ -23,16 +23,16 @@
Since version 1.1, IoTDB could store schema into a persistent slotted file.
-If you want to parse PB-Tree file into a human-readable way, you can use this
tool to parse the specified PB-Tree file.
+If you want to parse PBTree file into a human-readable way, you can use this
tool to parse the specified PBTree file.
The tool can sketch .pst file.
### How to use
Linux/MacOS
-> ./print-pb-tree-file.sh -f your/path/to/pb_tree.pst -o
/your/path/to/sketch.txt
+> ./print-pbtree-file.sh -f your/path/to/pbtree.pst -o /your/path/to/sketch.txt
Windows
-> ./print-pb-tree-file.bat -f your/path/to/pb_tree.pst -o
/your/path/to/sketch.txt
+> ./print-pbtree-file.bat -f your/path/to/pbtree.pst -o
/your/path/to/sketch.txt
diff --git a/docs/UserGuide/Reference/Common-Config-Manual.md
b/docs/UserGuide/Reference/Common-Config-Manual.md
index 503c33c05a9..6baeaa85f8e 100644
--- a/docs/UserGuide/Reference/Common-Config-Manual.md
+++ b/docs/UserGuide/Reference/Common-Config-Manual.md
@@ -375,7 +375,7 @@ Different configuration parameters take effect in the
following three ways:
|名字| schema\_engine\_mode
|
|:---:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Description| Schema engine mode, supporting Memory and PB_Tree modes; PB_Tree
mode support evict the timeseries schema temporarily not used in memory at
runtime, and load it into memory from disk when needed. This parameter must be
the same on all DataNodes in one cluster. |
+|Description| Schema engine mode, supporting Memory and PBTree modes; PBTree
mode support evict the timeseries schema temporarily not used in memory at
runtime, and load it into memory from disk when needed. This parameter must be
the same on all DataNodes in one cluster. |
|Type| string
|
|Default| Memory
|
|Effective| Only allowed to be modified in first start up
|
diff --git a/docs/UserGuide/Reference/Status-Codes.md
b/docs/UserGuide/Reference/Status-Codes.md
index b36e0714e67..5dffc1ed5ba 100644
--- a/docs/UserGuide/Reference/Status-Codes.md
+++ b/docs/UserGuide/Reference/Status-Codes.md
@@ -78,9 +78,9 @@ Here is a list of Status Code and related message:
| 518 | PAGE_OUT_OF_SPACE | No enough space on
schema page |
| 519 | RECORD_DUPLICATED | Record is duplicated
|
| 520 | SEGMENT_OUT_OF_SPACE | No enough space on
schema segment |
-| 521 | PB_TREE_FILE_NOT_EXISTS | PBTreeFile does not
exist |
+| 521 | PBTREE_FILE_NOT_EXISTS | PBTreeFile does not
exist |
| 522 | OVERSIZE_RECORD | Size of record
exceeds the threshold of page of PBTreeFile |
-| 523 | PB_TREE_FILE_REDO_LOG_BROKEN | PBTreeFile redo log
has broken |
+| 523 | PBTREE_FILE_REDO_LOG_BROKEN | PBTreeFile redo log
has broken |
| 524 | TEMPLATE_NOT_ACTIVATED | Schema template is
not activated |
| 526 | SCHEMA_QUOTA_EXCEEDED | Schema usage exceeds
quota limit |
| 527 | MEASUREMENT_ALREADY_EXISTS_IN_TEMPLATE | Measurement already exists
in schema template |
diff --git a/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
b/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
index a85a930ef34..ef8172cc0c3 100644
--- a/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
+++ b/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
@@ -40,7 +40,7 @@ server 的 lib 的文件夹中。
####################
### Schema Engine Configuration
####################
-# Choose the mode of schema engine. The value could be Memory,PB_Tree and
Rocksdb_based. If the provided value doesn't match any pre-defined value,
Memory mode will be used as default.
+# Choose the mode of schema engine. The value could be Memory,PBTree and
Rocksdb_based. If the provided value doesn't match any pre-defined value,
Memory mode will be used as default.
# Datatype: string
schema_engine_mode=Rocksdb_based
```
diff --git a/docs/zh/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
b/docs/zh/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
index 6dd84407add..54393200b8c 100644
--- a/docs/zh/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
+++ b/docs/zh/UserGuide/Maintenance-Tools/SchemaFileSketch-Tool.md
@@ -21,15 +21,15 @@
## PBTreeFile 解析工具
-自 1.1 版本起，IoTDB 将每个 database 下序列的元数据存储为 pb_tree.pst 文件。
+自 1.1 版本起，IoTDB 将每个 database 下序列的元数据存储为 pbtree.pst 文件。
-如果需要将该文件转为便于阅读的的格式，可以使用本工具来解析指定 pb_tree.pst 。
+如果需要将该文件转为便于阅读的的格式，可以使用本工具来解析指定 pbtree.pst 。
### 使用方式
Linux/MacOS
-> ./print-pb-tree-file.sh -f your/path/to/pb_tree.pst -o
/your/path/to/sketch.txt
+> ./print-pbtree-file.sh -f your/path/to/pbtree.pst -o /your/path/to/sketch.txt
Windows
-> ./print-pb-tree-file.bat -f your/path/to/pb_tree.pst -o
/your/path/to/sketch.txt
+> ./print-pbtree-file.bat -f your/path/to/pbtree.pst -o
/your/path/to/sketch.txt
diff --git a/docs/zh/UserGuide/Reference/Common-Config-Manual.md
b/docs/zh/UserGuide/Reference/Common-Config-Manual.md
index b942be2cd46..418c817ab94 100644
--- a/docs/zh/UserGuide/Reference/Common-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/Common-Config-Manual.md
@@ -368,7 +368,7 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|名字| schema\_engine\_mode |
|:---:|:---|
-|描述| 元数据引擎的运行模式，支持 Memory 和 PB_Tree；PB_Tree
模式下支持将内存中暂时不用的序列元数据实时置换到磁盘上，需要使用时再加载进内存；此参数在集群中所有的 DataNode 上务必保持相同。|
+|描述| 元数据引擎的运行模式，支持 Memory 和 PBTree；PBTree
模式下支持将内存中暂时不用的序列元数据实时置换到磁盘上，需要使用时再加载进内存；此参数在集群中所有的 DataNode 上务必保持相同。|
|类型| string |
|默认值| Memory |
|改后生效方式|仅允许在第一次启动服务前修改|
diff --git a/docs/zh/UserGuide/Reference/Status-Codes.md
b/docs/zh/UserGuide/Reference/Status-Codes.md
index 535817d0b9b..cc545baa323 100644
--- a/docs/zh/UserGuide/Reference/Status-Codes.md
+++ b/docs/zh/UserGuide/Reference/Status-Codes.md
@@ -79,9 +79,9 @@ try {
| 518 | PAGE_OUT_OF_SPACE | PBTreeFile 中 Page 空间不够 |
| 519 | RECORD_DUPLICATED | 记录重复 |
| 520 | SEGMENT_OUT_OF_SPACE | PBTreeFile 中 segment 空间不够 |
-| 521 | PB_TREE_FILE_NOT_EXISTS | PBTreeFile 不存在 |
+| 521 | PBTREE_FILE_NOT_EXISTS | PBTreeFile 不存在 |
| 522 | OVERSIZE_RECORD | 记录大小超过元数据文件页面大小 |
-| 523 | PB_TREE_FILE_REDO_LOG_BROKEN | PBTreeFile 的 redo 日志损坏 |
+| 523 | PBTREE_FILE_REDO_LOG_BROKEN | PBTreeFile 的 redo 日志损坏 |
| 524 | TEMPLATE_NOT_ACTIVATED | 元数据模板未激活 |
| 526 | SCHEMA_QUOTA_EXCEEDED | 集群元数据超过配额上限 |
| 527 | MEASUREMENT_ALREADY_EXISTS_IN_TEMPLATE | 元数据模板中已存在物理量 |
diff --git
a/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
index 78a588fa8ca..71fd60a584d 100644
--- a/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
@@ -36,7 +36,7 @@ import java.util.List;
/**
* This class define multiple modes for schema engine. All IT class extends
AbstractSchemaIT will be
- * run in both Memory and PB_Tree modes. In PB_Tree mode, there are three
kinds of test environment:
+ * run in both Memory and PBTree modes. In PBTree mode, there are three kinds
of test environment:
* full memory, partial memory and non memory.
*
* <p>Notice that, all IT class extends AbstractSchemaIT need to call {@link
@@ -76,7 +76,7 @@ public abstract class AbstractSchemaIT {
EnvFactory.getEnv().getConfig().getCommonConfig().setSchemaEngineMode("Memory");
break;
case PBTree:
-
EnvFactory.getEnv().getConfig().getCommonConfig().setSchemaEngineMode("PB_Tree");
+
EnvFactory.getEnv().getConfig().getCommonConfig().setSchemaEngineMode("PBTree");
allocateMemoryForSchemaRegion(4000);
break;
}
diff --git a/iotdb-client/client-cpp/src/main/Session.h
b/iotdb-client/client-cpp/src/main/Session.h
index 9fcf080cbd8..56418ebcec2 100644
--- a/iotdb-client/client-cpp/src/main/Session.h
+++ b/iotdb-client/client-cpp/src/main/Session.h
@@ -229,9 +229,9 @@ namespace TSStatusCode {
PAGE_OUT_OF_SPACE = 518,
RECORD_DUPLICATED=519,
SEGMENT_OUT_OF_SPACE = 520,
- PB_TREE_FILE_NOT_EXISTS = 521,
+ PBTREE_FILE_NOT_EXISTS = 521,
OVERSIZE_RECORD = 522,
- PB_TREE_FILE_REDO_LOG_BROKEN = 523,
+ PBTREE_FILE_REDO_LOG_BROKEN = 523,
TEMPLATE_NOT_ACTIVATED = 524,
// Storage Engine
diff --git
a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
index cb2dbd24857..40056df464c 100644
---
a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
+++
b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
@@ -72,9 +72,9 @@ public enum TSStatusCode {
PAGE_OUT_OF_SPACE(518),
RECORD_DUPLICATED(519),
SEGMENT_OUT_OF_SPACE(520),
- PB_TREE_FILE_NOT_EXISTS(521),
+ PBTREE_FILE_NOT_EXISTS(521),
OVERSIZE_RECORD(522),
- PB_TREE_FILE_REDO_LOG_BROKEN(523),
+ PBTREE_FILE_REDO_LOG_BROKEN(523),
TEMPLATE_NOT_ACTIVATED(524),
DATABASE_CONFIG_ERROR(525),
SCHEMA_QUOTA_EXCEEDED(526),
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties
b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index 613ac946d22..38a57fa0205 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -248,7 +248,7 @@ cluster_name=defaultCluster
### Schema Engine Configuration
####################
-# The schema management mode of schema engine. Currently support Memory and
PB_Tree.
+# The schema management mode of schema engine. Currently support Memory and
PBTree.
# This config of all DataNodes in one cluster must keep same.
# Datatype: string
# schema_engine_mode=Memory
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 1cc7f3c436b..367a4b9ffc6 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
@@ -842,10 +842,10 @@ public class IoTDBConfig {
/** the memory used for metadata cache when using persistent schema */
private int cachedMNodeSizeInPBTreeMode = -1;
- /** the minimum size (in bytes) of segment inside a pb-tree file page */
+ /** the minimum size (in bytes) of segment inside a pbtree file page */
private short minimumSegmentInPBTree = 0;
- /** cache size for pages in one pb-tree file */
+ /** cache size for pages in one pbtree file */
private int pageCacheSizeInPBTree = 1024;
/** maximum number of logged pages before log erased */
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 02e7a7a48bd..0abc720bf9f 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -865,23 +865,23 @@ public class IoTDBDescriptor {
conf.setCachedMNodeSizeInPBTreeMode(
Integer.parseInt(
properties.getProperty(
- "cached_mnode_size_in_pb_tree_mode",
+ "cached_mnode_size_in_pbtree_mode",
String.valueOf(conf.getCachedMNodeSizeInPBTreeMode()))));
conf.setMinimumSegmentInPBTree(
Short.parseShort(
properties.getProperty(
- "minimum_pb_tree_segment_in_bytes",
+ "minimum_pbtree_segment_in_bytes",
String.valueOf(conf.getMinimumSegmentInPBTree()))));
conf.setPageCacheSizeInPBTree(
Integer.parseInt(
properties.getProperty(
- "page_cache_in_pb_tree",
String.valueOf(conf.getPageCacheSizeInPBTree()))));
+ "page_cache_in_pbtree",
String.valueOf(conf.getPageCacheSizeInPBTree()))));
conf.setPBTreeLogSize(
Integer.parseInt(
- properties.getProperty("pb_tree_log_size",
String.valueOf(conf.getPBTreeLogSize()))));
+ properties.getProperty("pbtree_log_size",
String.valueOf(conf.getPBTreeLogSize()))));
conf.setMaxMeasurementNumOfInternalRequest(
Integer.parseInt(
diff --git
a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
index 22deb0727cf..826de03c796 100644
---
a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
+++
b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
@@ -28,7 +28,7 @@ public class SchemaFileLogCorruptedException extends
MetadataException {
public SchemaFileLogCorruptedException(String fileName, String reason) {
super(
String.format("PBTreeFileLog [%s] corrupted for [%s].", fileName,
reason),
- TSStatusCode.PB_TREE_FILE_REDO_LOG_BROKEN.getStatusCode(),
+ TSStatusCode.PBTREE_FILE_REDO_LOG_BROKEN.getStatusCode(),
true);
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileNotExists.java
b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileNotExists.java
index 04c38e68273..60fb0c48c43 100644
---
a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileNotExists.java
+++
b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileNotExists.java
@@ -28,7 +28,7 @@ public class SchemaFileNotExists extends MetadataException {
public SchemaFileNotExists(String fileName) {
super(
String.format("PBTree file [%s] not exists.", fileName),
- TSStatusCode.PB_TREE_FILE_NOT_EXISTS.getStatusCode(),
+ TSStatusCode.PBTREE_FILE_NOT_EXISTS.getStatusCode(),
true);
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaPageOverflowException.java
b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaPageOverflowException.java
index 671868ca151..c858d83d8cf 100644
---
a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaPageOverflowException.java
+++
b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaPageOverflowException.java
@@ -28,8 +28,7 @@ public class SchemaPageOverflowException extends
MetadataException {
public SchemaPageOverflowException(int pageIndex) {
super(
String.format(
- "Page [%s] in pb-tree file runs out of space or contains too many
segments.",
- pageIndex),
+ "Page [%s] in pbtree file runs out of space or contains too many
segments.", pageIndex),
TSStatusCode.PAGE_OUT_OF_SPACE.getStatusCode(),
true);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
b/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
index 36704a465a7..2aecd489b52 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
@@ -43,10 +43,10 @@ public class MetadataConstant {
public static final String TAG_LOG = "tlog.txt";
public static final String TEMPLATE_FILE = "template_log.bin";
public static final String STORAGE_GROUP_LOG = "storage_group_log.bin";
- public static final String PB_TREE_FILE_NAME = "pb_tree.pst";
- public static final String PB_TREE_LOG_FILE_NAME = "pb_tree_log.bin";
+ public static final String PBTREE_FILE_NAME = "pbtree.pst";
+ public static final String PBTREE_LOG_FILE_NAME = "pbtree_log.bin";
- public static final String PB_TREE_SNAPSHOT = "pb_tree.pst.snapshot";
+ public static final String PBTREE_SNAPSHOT = "pbtree.pst.snapshot";
public static final String TAG_LOG_SNAPSHOT = "tlog.txt.snapshot";
public static final String TAG_LOG_SNAPSHOT_TMP = "tlog.txt.snapshot.tmp";
public static final String MTREE_SNAPSHOT = "mtree.snapshot";
@@ -75,7 +75,7 @@ public class MetadataConstant {
public static final String LOGICAL_VIEW_MNODE_TYPE_NAME = "LogicalViewMNode";
public static final String SCHEMA_REGION_METRIC_NAME = "schema_region";
- public static final String SCHEMA_ENGINE_METRIC_NAME = "pb_tree";
+ public static final String SCHEMA_ENGINE_METRIC_NAME = "pbtree";
public static final String DEFAULT_SCHEMA_ENGINE_MODE = "Memory";
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
index d34bdb2dbfc..3bfccf1dae8 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
@@ -272,7 +272,7 @@ public class AppendOnlyDiskSchemaManager implements
IDiskSchemaManager {
outputStream.close();
randomAccessFile.close();
} catch (IOException e) {
- logger.error("close pb-tree file failed");
+ logger.error("close pbtree file failed");
throw e;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaEngineCachedMetric.java
b/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaEngineCachedMetric.java
index 430d561bfac..2ce507dda73 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaEngineCachedMetric.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaEngineCachedMetric.java
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
public class SchemaEngineCachedMetric implements ISchemaEngineMetric {
- // TODO: rename schema_file to pb_tree
+ // TODO: rename schema_file to pbtree
private static final String RELEASE_THRESHOLD =
"schema_file_release_threshold";
private static final String FLUSH_THRESHOLD = "schema_file_flush_threshold";
private static final String PINNED_NODE_NUM = "schema_file_pinned_num";
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
index ce33d62801f..8b167346f8a 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
@@ -36,7 +36,7 @@ public interface ISchemaFile {
ICachedMNode init() throws MetadataException;
/**
- * Modify header of pb-tree file corresponding to the database node
synchronously
+ * Modify header of pbtree file corresponding to the database node
synchronously
*
* @param sgNode node to be updated
* @return true if success
@@ -44,7 +44,7 @@ public interface ISchemaFile {
boolean updateDatabaseNode(IDatabaseMNode<ICachedMNode> sgNode) throws
IOException;
/**
- * Only database node along with its descendents could be flushed into
pb-tree file.
+ * Only database node along with its descendents could be flushed into
pbtree file.
*
* @param node
*/
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
index 1763bc925f9..9e8ec6b8365 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
@@ -59,7 +59,7 @@ public class SchemaFile implements ISchemaFile {
private static final Logger logger =
LoggerFactory.getLogger(SchemaFile.class);
- // attributes for this pb-tree file
+ // attributes for this pbtree file
private final String filePath;
private final String logPath;
private String storageGroupName;
@@ -85,8 +85,8 @@ public class SchemaFile implements ISchemaFile {
throws IOException, MetadataException {
String dirPath = getDirPath(sgName, schemaRegionId);
this.storageGroupName = sgName;
- this.filePath = dirPath + File.separator +
MetadataConstant.PB_TREE_FILE_NAME;
- this.logPath = dirPath + File.separator +
MetadataConstant.PB_TREE_LOG_FILE_NAME;
+ this.filePath = dirPath + File.separator +
MetadataConstant.PBTREE_FILE_NAME;
+ this.logPath = dirPath + File.separator +
MetadataConstant.PBTREE_LOG_FILE_NAME;
pmtFile = SystemFileFactory.INSTANCE.getFile(filePath);
if (!pmtFile.exists() && !override) {
@@ -115,11 +115,11 @@ public class SchemaFile implements ISchemaFile {
}
private SchemaFile(File file) throws IOException, MetadataException {
- // only used to sketch a pb-tree file so a file object is necessary while
+ // only used to sketch a pbtree file so a file object is necessary while
// components of log manipulations are not.
pmtFile = file;
filePath = pmtFile.getPath();
- logPath = file.getParent() + File.separator +
MetadataConstant.PB_TREE_LOG_FILE_NAME;
+ logPath = file.getParent() + File.separator +
MetadataConstant.PBTREE_LOG_FILE_NAME;
channel = new RandomAccessFile(file, "rw").getChannel();
headerContent = ByteBuffer.allocate(SchemaFileConfig.FILE_HEADER_SIZE);
@@ -138,7 +138,7 @@ public class SchemaFile implements ISchemaFile {
SystemFileFactory.INSTANCE.getFile(
getDirPath(sgName, schemaRegionId)
+ File.separator
- + MetadataConstant.PB_TREE_FILE_NAME);
+ + MetadataConstant.PBTREE_FILE_NAME);
return new SchemaFile(
sgName,
schemaRegionId,
@@ -249,7 +249,7 @@ public class SchemaFile implements ISchemaFile {
throws MetadataException, IOException {
if (parent.isMeasurement() || getNodeAddress(parent) < 0) {
throw new MetadataException(
- String.format("Node [%s] has no child in pb-tree file.",
parent.getFullPath()));
+ String.format("Node [%s] has no child in pbtree file.",
parent.getFullPath()));
}
return pageManager.getChildren(parent);
@@ -329,7 +329,7 @@ public class SchemaFile implements ISchemaFile {
* <li>b. 1 bool (1 byte): isEntityStorageGroup {@link #isEntity}
* <li>c. 1 int (4 bytes): hash code of template name {@link
#sgNodeTemplateIdWithState}
* <li>d. 1 long (8 bytes): last segment address of database {@link
#lastSGAddr}
- * <li>e. 1 int (4 bytes): version of pb-tree file {@linkplain
+ * <li>e. 1 int (4 bytes): version of pbtree file {@linkplain
* SchemaFileConfig#SCHEMA_FILE_VERSION}
* </ul>
* </ul>
@@ -338,7 +338,7 @@ public class SchemaFile implements ISchemaFile {
*/
private void initFileHeader() throws IOException, MetadataException {
if (channel.size() == 0) {
- // new pb-tree file
+ // new pbtree file
lastPageIndex = 0;
ReadWriteIOUtils.write(lastPageIndex, headerContent);
ReadWriteIOUtils.write(dataTTL, headerContent);
@@ -444,12 +444,12 @@ public class SchemaFile implements ISchemaFile {
@Override
public boolean createSnapshot(File snapshotDir) {
File schemaFileSnapshot =
- SystemFileFactory.INSTANCE.getFile(snapshotDir,
MetadataConstant.PB_TREE_SNAPSHOT);
+ SystemFileFactory.INSTANCE.getFile(snapshotDir,
MetadataConstant.PBTREE_SNAPSHOT);
try {
sync();
if (schemaFileSnapshot.exists() && !schemaFileSnapshot.delete()) {
logger.error(
- "Failed to delete old snapshot {} while creating pb-tree file
snapshot.",
+ "Failed to delete old snapshot {} while creating pbtree file
snapshot.",
schemaFileSnapshot.getName());
return false;
}
@@ -465,16 +465,16 @@ public class SchemaFile implements ISchemaFile {
public static ISchemaFile loadSnapshot(File snapshotDir, String sgName, int
schemaRegionId)
throws IOException, MetadataException {
File snapshot =
- SystemFileFactory.INSTANCE.getFile(snapshotDir,
MetadataConstant.PB_TREE_SNAPSHOT);
+ SystemFileFactory.INSTANCE.getFile(snapshotDir,
MetadataConstant.PBTREE_SNAPSHOT);
if (!snapshot.exists()) {
throw new SchemaFileNotExists(snapshot.getPath());
}
File schemaFile =
SystemFileFactory.INSTANCE.getFile(
- getDirPath(sgName, schemaRegionId),
MetadataConstant.PB_TREE_FILE_NAME);
+ getDirPath(sgName, schemaRegionId),
MetadataConstant.PBTREE_FILE_NAME);
File schemaLogFile =
SystemFileFactory.INSTANCE.getFile(
- getDirPath(sgName, schemaRegionId),
MetadataConstant.PB_TREE_LOG_FILE_NAME);
+ getDirPath(sgName, schemaRegionId),
MetadataConstant.PBTREE_LOG_FILE_NAME);
Files.deleteIfExists(schemaFile.toPath());
Files.deleteIfExists(schemaLogFile.toPath());
Files.copy(snapshot.toPath(), schemaFile.toPath());
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
index 74c49f6b61f..dc5e81ab825 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
@@ -25,7 +25,7 @@ public class SchemaFileConfig {
// region SchemaFile Configuration
- // current version of pb-tree file
+ // current version of pbtree file
public static final int SCHEMA_FILE_VERSION = 1;
// folder to store .pst files
@@ -40,7 +40,7 @@ public class SchemaFileConfig {
public static final int SCHEMA_FILE_LOG_SIZE =
IoTDBDescriptor.getInstance().getConfig().getPBTreeLogSize();
- // marks to note the state of pb-tree file log
+ // marks to note the state of pbtree file log
public static final byte SF_PREPARE_MARK = (byte) 0xfe;
public static final byte SF_COMMIT_MARK = (byte) 0xff;
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
index 985a8a6d4d8..9597edead47 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
@@ -356,7 +356,7 @@ public class BTreePageManager extends PageManager {
if (getNodeAddress(parent) < 0) {
throw new MetadataException(
String.format(
- "Node [%s] has no valid segment address in pb-tree file.",
parent.getFullPath()));
+ "Node [%s] has no valid segment address in pbtree file.",
parent.getFullPath()));
}
long actualSegAddr = getTargetSegmentAddress(getNodeAddress(parent),
childName);
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
index 8d6369d6ebb..35e5975ca0b 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
@@ -267,7 +267,7 @@ public abstract class PageManager implements IPageManager {
if (curPage.getAsSegmentedPage().read(getSegIndex(actualAddress),
entry.getKey()) == null) {
throw new MetadataException(
String.format(
- "Node[%s] has no child[%s] in pb-tree file.", node.getName(),
entry.getKey()));
+ "Node[%s] has no child[%s] in pbtree file.", node.getName(),
entry.getKey()));
}
// prepare alias comparison
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
index c2e8a4c8561..8659f48a41c 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.metadata.rescon;
import java.util.concurrent.atomic.AtomicLong;
/**
- * This class is used to record global statistics for SchemaEngine in PB_Tree
mode, which is a
+ * This class is used to record global statistics for SchemaEngine in PBTree
mode, which is a
* superset of the statistics in Memory mode
*/
public class CachedSchemaEngineStatistics extends MemSchemaEngineStatistics {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
index 2e9b1d22d52..7be61c6c618 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
@@ -23,8 +23,8 @@ import
org.apache.iotdb.db.metadata.mtree.store.disk.cache.ICacheManager;
import java.util.concurrent.atomic.AtomicLong;
/**
- * This class is used to record statistics within a SchemaRegion in PB_Tree
mode, which is a
- * superset of the statistics in Memory mode
+ * This class is used to record statistics within a SchemaRegion in PBTree
mode, which is a superset
+ * of the statistics in Memory mode
*/
public class CachedSchemaRegionStatistics extends MemSchemaRegionStatistics {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
index 28e85fd5e5d..5b379e7960b 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
@@ -31,7 +31,7 @@ public class SchemaResourceManager {
if (CommonDescriptor.getInstance()
.getConfig()
.getSchemaEngineMode()
- .equals(SchemaEngineMode.PB_Tree.toString())) {
+ .equals(SchemaEngineMode.PBTree.toString())) {
initSchemaFileModeResource(engineStatistics);
}
}
@@ -40,7 +40,7 @@ public class SchemaResourceManager {
if (CommonDescriptor.getInstance()
.getConfig()
.getSchemaEngineMode()
- .equals(SchemaEngineMode.PB_Tree.toString())) {
+ .equals(SchemaEngineMode.PBTree.toString())) {
clearSchemaFileModeResource();
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
index a28ddb2dc93..4f2023e59f5 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
@@ -212,7 +212,7 @@ public class SchemaEngine {
public void clear() {
schemaRegionLoader.clear();
- // clearSchemaResource will shut down release and flush task in PB_Tree
mode, which must be
+ // clearSchemaResource will shut down release and flush task in PBTree
mode, which must be
// down before clear schema region
SchemaResourceManager.clearSchemaResource();
if (timedForceMLogThread != null) {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngineMode.java
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngineMode.java
index fb25af53ccc..11547f967bc 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngineMode.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngineMode.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.metadata.schemaregion;
public enum SchemaEngineMode {
Memory(0),
- PB_Tree(1),
+ PBTree(1),
Rocksdb_based(2);
private final int code;
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
index 493637ae44e..b9fce764a96 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
@@ -129,7 +129,7 @@ import static
org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARA
* </ol>
*/
@SuppressWarnings("java:S1135") // ignore todos
-@SchemaRegion(mode = "PB_Tree")
+@SchemaRegion(mode = "PBTree")
public class SchemaRegionPBTreeImpl implements ISchemaRegion {
private static final Logger logger =
LoggerFactory.getLogger(SchemaRegionPBTreeImpl.class);
diff --git
a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/util/QueryResultUtils.java
b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/util/QueryResultUtils.java
index 8ab471370fc..65a3d1e1b20 100644
---
a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/util/QueryResultUtils.java
+++
b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/util/QueryResultUtils.java
@@ -229,7 +229,7 @@ public class QueryResultUtils {
/**
* Convert align by device query result of NewIoTDB to the query result of
influxdb,used for
- * Memory and PB_Tree schema region
+ * Memory and PBTree schema region
*
* @param tsExecuteStatementResp NewIoTDB execute statement resp to be
converted
* @return query results in influxdb format
diff --git
a/server/src/main/java/org/apache/iotdb/db/tools/schema/PBTreeFileSketchTool.java
b/server/src/main/java/org/apache/iotdb/db/tools/schema/PBTreeFileSketchTool.java
index a5fe4e50992..51223dc7c8b 100644
---
a/server/src/main/java/org/apache/iotdb/db/tools/schema/PBTreeFileSketchTool.java
+++
b/server/src/main/java/org/apache/iotdb/db/tools/schema/PBTreeFileSketchTool.java
@@ -44,10 +44,10 @@ import java.io.PrintWriter;
public class PBTreeFileSketchTool {
private static final Logger logger =
LoggerFactory.getLogger(PBTreeFileSketchTool.class);
- private static final String SFST_CLI_PREFIX = "print-pb-tree-file";
+ private static final String SFST_CLI_PREFIX = "print-pbtree-file";
private static final String FILE_ARGS = "f";
- private static final String FILE_NAME = "pb-tree file";
+ private static final String FILE_NAME = "pbtree file";
private static final String OUT_ARGS = "o";
private static final String OUT_NAME = "output txt file";
@@ -72,7 +72,7 @@ public class PBTreeFileSketchTool {
.required()
.argName(FILE_NAME)
.hasArg()
- .desc("Need to specify a pb-tree file to sketch (required)")
+ .desc("Need to specify a pbtree file to sketch (required)")
.build();
options.addOption(opFile);
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
index 5a1f992c026..cc25b8fb9dc 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
@@ -38,7 +38,7 @@ public class AliasIndexPageTest {
public void setUp() {
CommonDescriptor.getInstance()
.getConfig()
- .setSchemaEngineMode(SchemaEngineMode.PB_Tree.toString());
+ .setSchemaEngineMode(SchemaEngineMode.PBTree.toString());
EnvironmentUtils.envSetUp();
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
index 5f145b6f3fa..657e86249be 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
@@ -38,7 +38,7 @@ public class InternalPageTest {
public void setUp() {
CommonDescriptor.getInstance()
.getConfig()
- .setSchemaEngineMode(SchemaEngineMode.PB_Tree.toString());
+ .setSchemaEngineMode(SchemaEngineMode.PBTree.toString());
EnvironmentUtils.envSetUp();
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
index bc822554012..ea96e0780c5 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
@@ -58,7 +58,7 @@ public class SchemaFileLogTest {
public void setUp() {
CommonDescriptor.getInstance()
.getConfig()
- .setSchemaEngineMode(SchemaEngineMode.PB_Tree.toString());
+ .setSchemaEngineMode(SchemaEngineMode.PBTree.toString());
EnvironmentUtils.envSetUp();
}
@@ -130,7 +130,7 @@ public class SchemaFileLogTest {
sf.close();
}
- // modify log file to restore pb-tree file
+ // modify log file to restore pbtree file
FileOutputStream outputStream = null;
FileChannel channel;
try {
@@ -142,7 +142,7 @@ public class SchemaFileLogTest {
"schema",
"root.test.vRoot1",
"0",
- MetadataConstant.PB_TREE_LOG_FILE_NAME
+ MetadataConstant.PBTREE_LOG_FILE_NAME
};
File logFile = new File(String.join(File.separator, logFilePath));
outputStream = new FileOutputStream(logFile, true);
@@ -152,7 +152,7 @@ public class SchemaFileLogTest {
outputStream.close();
}
- // verify that pb-tree file has been repaired
+ // verify that pbtree file has been repaired
sf = (SchemaFile) SchemaFile.loadSchemaFile("root.test.vRoot1",
TEST_SCHEMA_REGION_ID);
res = sf.getChildren(lastNode);
int cnt2 = 0;
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
index 38786528b8c..3e05306f12e 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
@@ -68,7 +68,7 @@ public class SchemaFileTest {
public void setUp() {
CommonDescriptor.getInstance()
.getConfig()
- .setSchemaEngineMode(SchemaEngineMode.PB_Tree.toString());
+ .setSchemaEngineMode(SchemaEngineMode.PBTree.toString());
EnvironmentUtils.envSetUp();
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
index be5c5ef15bd..f404428fe19 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
@@ -48,7 +48,7 @@ public class WrappedSegmentTest {
public void setUp() {
CommonDescriptor.getInstance()
.getConfig()
- .setSchemaEngineMode(SchemaEngineMode.PB_Tree.toString());
+ .setSchemaEngineMode(SchemaEngineMode.PBTree.toString());
EnvironmentUtils.envSetUp();
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
index 451277f8335..c8315dc6b8d 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
@@ -53,9 +53,9 @@ public abstract class AbstractSchemaRegionTest {
public static List<SchemaRegionTestParams> getTestModes() {
return Arrays.asList(
new SchemaRegionTestParams("MemoryMode", "Memory", -1, true),
- new SchemaRegionTestParams("PBTree-FullMemory", "PB_Tree", 10000,
true),
- new SchemaRegionTestParams("PBTree-PartialMemory", "PB_Tree", 3, true),
- new SchemaRegionTestParams("PBTree-NonMemory", "PB_Tree", 0, true));
+ new SchemaRegionTestParams("PBTree-FullMemory", "PBTree", 10000, true),
+ new SchemaRegionTestParams("PBTree-PartialMemory", "PBTree", 3, true),
+ new SchemaRegionTestParams("PBTree-NonMemory", "PBTree", 0, true));
}
public AbstractSchemaRegionTest(SchemaRegionTestParams testParams) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
index 1a0503f3553..3ac448ae097 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
@@ -61,8 +61,8 @@ import static
org.apache.iotdb.db.metadata.schemaRegion.SchemaRegionTestUtil.get
/**
* This class define test cases for {@link ISchemaRegion}. All test cases will
be run in both Memory
- * and PB_Tree modes. In PB_Tree mode, there are three kinds of test
environment: full memory,
- * partial memory and non memory.
+ * and PBTree modes. In PBTree mode, there are three kinds of test
environment: full memory, partial
+ * memory and non memory.
*/
public class SchemaRegionBasicTest extends AbstractSchemaRegionTest {
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaStatisticsTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaStatisticsTest.java
index 83b533d101b..38e3de3f680 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaStatisticsTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaStatisticsTest.java
@@ -232,7 +232,7 @@ public class SchemaStatisticsTest extends
AbstractSchemaRegionTest {
@Test
public void testSchemaFileNodeStatistics() throws Exception {
- if (testParams.getSchemaEngineMode().equals("PB_Tree")) {
+ if (testParams.getSchemaEngineMode().equals("PBTree")) {
ISchemaRegion schemaRegion1 = getSchemaRegion("root.sg1", 0);
ISchemaRegion schemaRegion2 = getSchemaRegion("root.sg2", 1);
CachedSchemaEngineStatistics engineStatistics =
diff --git
a/server/src/test/java/org/apache/iotdb/db/tools/PBTreeFileSketchTest.java
b/server/src/test/java/org/apache/iotdb/db/tools/PBTreeFileSketchTest.java
index e5fd2cd1e56..c54a52b9e01 100644
--- a/server/src/test/java/org/apache/iotdb/db/tools/PBTreeFileSketchTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/tools/PBTreeFileSketchTest.java
@@ -57,7 +57,7 @@ public class PBTreeFileSketchTest {
public void setUp() {
CommonDescriptor.getInstance()
.getConfig()
- .setSchemaEngineMode(SchemaEngineMode.PB_Tree.toString());
+ .setSchemaEngineMode(SchemaEngineMode.PBTree.toString());
EnvironmentUtils.envSetUp();
}
@@ -103,7 +103,7 @@ public class PBTreeFileSketchTest {
+ File.separator
+ "0"
+ File.separator
- + MetadataConstant.PB_TREE_FILE_NAME);
+ + MetadataConstant.PBTREE_FILE_NAME);
File sketchFile = new File("sketch_schemafile.txt");
PBTreeFileSketchTool.sketchFile(file.getAbsolutePath(),
sketchFile.getAbsolutePath());
diff --git a/server/src/test/resources/iotdb-datanode.properties
b/server/src/test/resources/iotdb-datanode.properties
index 990090b52cc..7d730ba7d61 100644
--- a/server/src/test/resources/iotdb-datanode.properties
+++ b/server/src/test/resources/iotdb-datanode.properties
@@ -22,7 +22,7 @@ dn_data_dirs=target/data
dn_wal_dirs=target/wal
index_root_dir=target/index
dn_tracing_dir=target/data/tracing
-minimum_pb_tree_segment_in_bytes=0
-page_cache_in_pb_tree=10
+minimum_pbtree_segment_in_bytes=0
+page_cache_in_pbtree=10
dn_internal_address=0.0.0.0
dn_sync_dir=target/sync
