This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch tsfile_doc
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/tsfile_doc by this push:
new 9c17f3a Add config manual and change name
9c17f3a is described below
commit 9c17f3a823b00c093b2ac2389a0ffda766a28fdf
Author: samperson1997 <[email protected]>
AuthorDate: Sun May 10 17:34:14 2020 +0800
Add config manual and change name
---
docs/SystemDesign/1-TsFile/2-Format.md | 10 +++++-----
docs/UserGuide/3-Server/4-Config Manual.md | 9 +++++++++
docs/zh/SystemDesign/1-TsFile/2-Format.md | 10 +++++-----
docs/zh/UserGuide/3-Server/4-Config Manual.md | 9 +++++++++
.../org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java | 2 +-
.../iotdb/flink/util/TSFileConfigUtilCompletenessTest.java | 2 +-
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
.../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +++---
.../org/apache/iotdb/tsfile/common/conf/TSFileConfig.java | 12 ++++++------
.../apache/iotdb/tsfile/common/conf/TSFileDescriptor.java | 4 ++--
.../iotdb/tsfile/file/metadata/MetadataIndexConstructor.java | 8 ++++----
.../apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java | 6 +++---
.../org/apache/iotdb/tsfile/read/TsFileSequenceReader.java | 4 ++--
.../java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java | 4 ++--
14 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/docs/SystemDesign/1-TsFile/2-Format.md
b/docs/SystemDesign/1-TsFile/2-Format.md
index 1d41f1b..70c6e2a 100644
--- a/docs/SystemDesign/1-TsFile/2-Format.md
+++ b/docs/SystemDesign/1-TsFile/2-Format.md
@@ -244,23 +244,23 @@ All MetadataIndexNode forms a **metadata index tree**,
which consists of no more
To describe the structure of metadata index tree more clearly, we will give
four examples here in details.
-The degree of the metadata index tree (that is, the max number of each node's
children) could be configured by users, and is 1024 by default. In the examples
below, we assume `max_degree_of_index_node = 10` in the following examples.
+The degree of the metadata index tree (that is, the max number of each node's
children) could be configured by users, and is 1024 by default. In the examples
below, we assume `degree_of_index_node = 10` in the following examples.
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466597-94f81700-9205-11ea-9476-c3d083872232.png";>
-5 devices with 5 measurements each: Since the numbers of devices and
measurements are both no more than `max_degree_of_index_node`, the tree has
only one MetadataIndexNode instead of more levels. The five MetadataIndex
entries in MetadataIndexNode point to related `TimeseriesMetadata`.
+5 devices with 5 measurements each: Since the numbers of devices and
measurements are both no more than `degree_of_index_node`, the tree has only
one MetadataIndexNode instead of more levels. The five MetadataIndex entries in
MetadataIndexNode point to related `TimeseriesMetadata`.
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466606-99bccb00-9205-11ea-8ba4-d2ed07529f58.png";>
-1 device with 150 measurements: The number of measurements exceeds
`max_degree_of_index_node`, so the measurement index level of the tree is
formed. In this level, each MetadataIndexNode is composed of no more than 10
MetadataIndex entries. Since all the entries point to `TimeseriesMetadata`,
their entry type is `LEAF_MEASUREMENT`. The root node of index tree points to
the leaf nodes of measurement index level, so its entry type is
`INTERNAL_MEASUREMENT`.
+1 device with 150 measurements: The number of measurements exceeds
`degree_of_index_node`, so the measurement index level of the tree is formed.
In this level, each MetadataIndexNode is composed of no more than 10
MetadataIndex entries. Since all the entries point to `TimeseriesMetadata`,
their entry type is `LEAF_MEASUREMENT`. The root node of index tree points to
the leaf nodes of measurement index level, so its entry type is
`INTERNAL_MEASUREMENT`.
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466613-9b868e80-9205-11ea-860a-4bf224d04359.png";>
-150 device with 1 measurement each: The number of devices exceeds
`max_degree_of_index_node`, so the device index level of the tree is formed. In
this level, each MetadataIndexNode is composed of no more than 10 MetadataIndex
entries. Since all the entries point to `TimeseriesMetadata`, their entry type
is `LEAF_MEASUREMENT`. Other nodes and root node of index tree are not leaf
node of index level, so their entry type is `INTERNAL_DEVICE`.
+150 device with 1 measurement each: The number of devices exceeds
`degree_of_index_node`, so the device index level of the tree is formed. In
this level, each MetadataIndexNode is composed of no more than 10 MetadataIndex
entries. Since all the entries point to `TimeseriesMetadata`, their entry type
is `LEAF_MEASUREMENT`. Other nodes and root node of index tree are not leaf
node of index level, so their entry type is `INTERNAL_DEVICE`.
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466616-9e817f00-9205-11ea-9dc1-aec392eb5225.png";>
-150 device with 150 measurements each: The numbers of devices and measurements
both exceed `max_degree_of_index_node`, so the device index level and
measurement index level are both formed. In these two levels, each
MetadataIndexNode is composed of no more than 10 MetadataIndex entries. As is
described before, from the root node to the leaf nodes of device index level,
the entries types are `INTERNAL_DEVICE` and `LEAF_DEVICE`; each leaf node of
device index level can be seen as the root [...]
+150 device with 150 measurements each: The numbers of devices and measurements
both exceed `degree_of_index_node`, so the device index level and measurement
index level are both formed. In these two levels, each MetadataIndexNode is
composed of no more than 10 MetadataIndex entries. As is described before, from
the root node to the leaf nodes of device index level, the entries types are
`INTERNAL_DEVICE` and `LEAF_DEVICE`; each leaf node of device index level can
be seen as the root node [...]
The MetadataIndex is designed as tree structure so that not all the
`TimeseriesMetadata` need to be read when the number of devices or measurements
is too large. Only reading specific MetadataIndex nodes according to
requirement and reducing I/O could speed up the query. More reading process of
TsFile in details will be described in the last section of this chapter.
diff --git a/docs/UserGuide/3-Server/4-Config Manual.md
b/docs/UserGuide/3-Server/4-Config Manual.md
index 8717d0f..782a5f7 100644
--- a/docs/UserGuide/3-Server/4-Config Manual.md
+++ b/docs/UserGuide/3-Server/4-Config Manual.md
@@ -141,6 +141,15 @@ The permission definitions are in
${IOTDB\_CONF}/conf/jmx.access.
|Default| 1048576 |
|Effective|Trigger|
+* degree\_of\_index\_node
+
+|Name| degree\_of\_index\_node |
+|:---:|:---|
+|Description|The degree of the metadata index tree (that is, the max number of
each node's children)|
+|Type|Int32|
+|Default| 1024 |
+|Effective|Trigger|
+
* max\_string\_length
|Name| max\_string\_length |
diff --git a/docs/zh/SystemDesign/1-TsFile/2-Format.md
b/docs/zh/SystemDesign/1-TsFile/2-Format.md
index 30f4fc1..19b693c 100644
--- a/docs/zh/SystemDesign/1-TsFile/2-Format.md
+++ b/docs/zh/SystemDesign/1-TsFile/2-Format.md
@@ -222,23 +222,23 @@ PageHeader 结构
为了更清楚的说明元数据索引树的结构，这里我们使用四个例子来加以详细说明。
-元数据索引树的度（即每个节点的最大子节点个数）是可以由用户进行配置的，配置项为`max_degree_of_index_node`，其默认值为1024。在以下例子中，为了简化，我们假定
`max_degree_of_index_node = 10`。
+元数据索引树的度（即每个节点的最大子节点个数）是可以由用户进行配置的，配置项为`degree_of_index_node`，其默认值为1024。在以下例子中，为了简化，我们假定
`degree_of_index_node = 10`。
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466597-94f81700-9205-11ea-9476-c3d083872232.png";>
-在5个设备，每个设备有5个传感器的情况下，由于设备数和传感器树均不超过
`max_degree_of_index_node`，因此树并没有产生多个层级，由1个 MetadataIndexNode 节点中的5个
MetadataIndexEntry 直接指向对应的 `TimeseriesMetadata`。
+在5个设备，每个设备有5个传感器的情况下，由于设备数和传感器树均不超过 `degree_of_index_node`，因此树并没有产生多个层级，由1个
MetadataIndexNode 节点中的5个 MetadataIndexEntry 直接指向对应的 `TimeseriesMetadata`。
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466606-99bccb00-9205-11ea-8ba4-d2ed07529f58.png";>
-在1个设备，设备中有150个传感器的情况下，传感器个数超过了
`max_degree_of_index_node`，形成元数据索引树的传感器索引层级。在这个层级里，每个 MetadataIndexNode 最多由10个
MetadataIndexEntry 组成，由于均直接指向 `TimeseriesMetadata`，因此其索引项类型为
`LEAF_MEASUREMENT`。而根节点指向传感器索引层级的叶子节点，其索引项类型为 `INTERNAL_MEASUREMENT`。
+在1个设备，设备中有150个传感器的情况下，传感器个数超过了
`degree_of_index_node`，形成元数据索引树的传感器索引层级。在这个层级里，每个 MetadataIndexNode 最多由10个
MetadataIndexEntry 组成，由于均直接指向 `TimeseriesMetadata`，因此其索引项类型为
`LEAF_MEASUREMENT`。而根节点指向传感器索引层级的叶子节点，其索引项类型为 `INTERNAL_MEASUREMENT`。
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466613-9b868e80-9205-11ea-860a-4bf224d04359.png";>
-在150个设备，每个设备中有1个传感器的情况下，设备个数超过了
`max_degree_of_index_node`，形成元数据索引树的设备索引层级。在这个层级里，每个 MetadataIndexNode 最多由10个
MetadataIndexEntry 组成，由于均直接指向 `TimeseriesMetadata`，因此其索引项类型为
`LEAF_MEASUREMENT`。而后续产生的中间节点和根节点不是设备索引层级的叶子节点，因此索引项类型为 `INTERNAL_DEVICE`。
+在150个设备，每个设备中有1个传感器的情况下，设备个数超过了
`degree_of_index_node`，形成元数据索引树的设备索引层级。在这个层级里，每个 MetadataIndexNode 最多由10个
MetadataIndexEntry 组成，由于均直接指向 `TimeseriesMetadata`，因此其索引项类型为
`LEAF_MEASUREMENT`。而后续产生的中间节点和根节点不是设备索引层级的叶子节点，因此索引项类型为 `INTERNAL_DEVICE`。
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/19167280/81466616-9e817f00-9205-11ea-9dc1-aec392eb5225.png";>
-在150个设备，每个设备中有150个传感器的情况下，传感器和设备个数均超过了
`max_degree_of_index_node`，形成元数据索引树的传感器层级和设备索引层级。在这两个层级里，每个 MetadataIndexNode
均最多由10个 MetadataIndexEntry 组成。如前所述，从根节点到设备索引层级的叶子节点，索引项类型分别为`INTERNAL_DEVICE` 和
`LEAF_DEVICE`，而每个设备索引层级的叶子节点都是传感器索引层级的根节点，从这里到传感器索引层级的叶子节点，索引项类型分别为`INTERNAL_MEASUREMENT`
和 `LEAF_MEASUREMENT`。
+在150个设备，每个设备中有150个传感器的情况下，传感器和设备个数均超过了
`degree_of_index_node`，形成元数据索引树的传感器层级和设备索引层级。在这两个层级里，每个 MetadataIndexNode
均最多由10个 MetadataIndexEntry 组成。如前所述，从根节点到设备索引层级的叶子节点，索引项类型分别为`INTERNAL_DEVICE` 和
`LEAF_DEVICE`，而每个设备索引层级的叶子节点都是传感器索引层级的根节点，从这里到传感器索引层级的叶子节点，索引项类型分别为`INTERNAL_MEASUREMENT`
和 `LEAF_MEASUREMENT`。
元数据索引采用树形结构进行设计的目的是在设备数或者传感器数量过大时，可以不用一次读取所有的
`TimeseriesMetadata`，只需要根据所读取的传感器定位对应的节点，从而减少 I/O，加快查询速度。有关 TsFile
的读流程将在本章最后一节加以详细说明。
diff --git a/docs/zh/UserGuide/3-Server/4-Config Manual.md
b/docs/zh/UserGuide/3-Server/4-Config Manual.md
index 7e77992..0b382a8 100644
--- a/docs/zh/UserGuide/3-Server/4-Config Manual.md
+++ b/docs/zh/UserGuide/3-Server/4-Config Manual.md
@@ -112,6 +112,15 @@
|默认值| 1048576 |
|改后生效方式|触发生效|
+* degree\_of\_index\_node
+
+|名字| degree\_of\_index\_node |
+|:---:|:---|
+|描述|元数据索引树的度（即每个节点的最大子节点个数）|
+|类型|Int32|
+|默认值| 1024 |
+|改后生效方式|触发生效|
+
* max\_string\_length
|名字| max\_string\_length |
diff --git
a/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
b/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
index d8b72f1..87232de 100644
---
a/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
+++
b/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/util/TSFileConfigUtil.java
@@ -50,7 +50,7 @@ public class TSFileConfigUtil {
globalConfig.setKerberosKeytabFilePath(config.getKerberosKeytabFilePath());
globalConfig.setKerberosPrincipal(config.getKerberosPrincipal());
globalConfig.setMaxNumberOfPointsInPage(config.getMaxNumberOfPointsInPage());
-
globalConfig.setMaxDegreeOfIndexNode(config.getMaxDegreeOfIndexNode());
+
globalConfig.setDegreeOfIndexNode(config.getDegreeOfIndexNode());
globalConfig.setMaxStringLength(config.getMaxStringLength());
globalConfig.setPageCheckSizeThreshold(config.getPageCheckSizeThreshold());
globalConfig.setPageSizeInByte(config.getPageSizeInByte());
diff --git
a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
index eb914ff..96d71ee 100644
---
a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
+++
b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TSFileConfigUtilCompletenessTest.java
@@ -56,7 +56,7 @@ public class TSFileConfigUtilCompletenessTest {
"setKerberosKeytabFilePath",
"setKerberosPrincipal",
"setMaxNumberOfPointsInPage",
- "setMaxDegreeOfIndexNode",
+ "setDegreeOfIndexNode",
"setMaxStringLength",
"setPageCheckSizeThreshold",
"setPageSizeInByte",
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index 43ad73a..7c7d5ef 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -454,8 +454,8 @@ value_encoder=PLAIN
# Data compression method, supports UNCOMPRESSED or SNAPPY. Default value is
SNAPPY
compressor=SNAPPY
-# Maximum degree of a metadataIndex node, default value is 1024
-max_degree_of_index_node=1024
+# Degree of a metadataIndex node, default value is 1024
+degree_of_index_node=1024
####################
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 4389fa8..48ddea6 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
@@ -533,9 +533,9 @@ public class IoTDBDescriptor {
TSFileDescriptor.getInstance().getConfig().setCompressor(properties
.getProperty("compressor",
TSFileDescriptor.getInstance().getConfig().getCompressor().toString()));
-
TSFileDescriptor.getInstance().getConfig().setMaxDegreeOfIndexNode(Integer.parseInt(properties
- .getProperty("max_degree_of_index_node", Integer
-
.toString(TSFileDescriptor.getInstance().getConfig().getMaxDegreeOfIndexNode()))));
+
TSFileDescriptor.getInstance().getConfig().setDegreeOfIndexNode(Integer.parseInt(properties
+ .getProperty("degree_of_index_node", Integer
+
.toString(TSFileDescriptor.getInstance().getConfig().getDegreeOfIndexNode()))));
}
public void loadHotModifiedProps() throws QueryProcessException {
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
index 8f04ad9..29a01d4 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
@@ -83,9 +83,9 @@ public class TSFileConfig implements Serializable {
*/
private int maxNumberOfPointsInPage = 1024 * 1024;
/**
- * The maximum degree of a metadataIndex node, default value is 1024
+ * The degree of a metadataIndex node, default value is 1024
*/
- private int maxDegreeOfIndexNode = 1024;
+ private int degreeOfIndexNode = 1024;
/**
* Data type for input timestamp, TsFile supports INT32 or INT64.
*/
@@ -233,12 +233,12 @@ public class TSFileConfig implements Serializable {
this.maxNumberOfPointsInPage = maxNumberOfPointsInPage;
}
- public int getMaxDegreeOfIndexNode() {
- return maxDegreeOfIndexNode;
+ public int getDegreeOfIndexNode() {
+ return degreeOfIndexNode;
}
- public void setMaxDegreeOfIndexNode(int maxDegreeOfIndexNode) {
- this.maxDegreeOfIndexNode = maxDegreeOfIndexNode;
+ public void setDegreeOfIndexNode(int degreeOfIndexNode) {
+ this.degreeOfIndexNode = degreeOfIndexNode;
}
public String getTimeSeriesDataType() {
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
index dd79cec..ceb55a4 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
@@ -120,8 +120,8 @@ public class TSFileDescriptor {
}
conf.setMaxNumberOfPointsInPage(Integer.parseInt(
properties.getProperty("max_number_of_points_in_page",
Integer.toString(conf.getMaxNumberOfPointsInPage()))));
- conf.setMaxDegreeOfIndexNode(Integer.parseInt(
- properties.getProperty("max_degree_of_index_node",
Integer.toString(conf.getMaxDegreeOfIndexNode()))));
+ conf.setDegreeOfIndexNode(Integer.parseInt(
+ properties.getProperty("degree_of_index_node",
Integer.toString(conf.getDegreeOfIndexNode()))));
conf.setTimeSeriesDataType(properties.getProperty("time_series_data_type",
conf.getTimeSeriesDataType()));
conf.setMaxStringLength(
Integer.parseInt(properties.getProperty("max_string_length",
Integer.toString(conf.getMaxStringLength()))));
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
index 3d72972..30e331d 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
@@ -32,8 +32,8 @@ import org.apache.iotdb.tsfile.write.writer.TsFileOutput;
public class MetadataIndexConstructor {
- private static final int MAX_DEGREE_OF_INDEX_NODE =
TSFileDescriptor.getInstance().getConfig()
- .getMaxDegreeOfIndexNode();
+ private static final int DEGREE_OF_INDEX_NODE =
TSFileDescriptor.getInstance().getConfig()
+ .getDegreeOfIndexNode();
private MetadataIndexConstructor() {
throw new IllegalStateException("Utility class");
@@ -60,7 +60,7 @@ public class MetadataIndexConstructor {
for (int i = 0; i < entry.getValue().size(); i++) {
timeseriesMetadata = entry.getValue().get(i);
// when constructing from leaf node, every "degree number of nodes"
are related to an entry
- if (i % MAX_DEGREE_OF_INDEX_NODE == 0) {
+ if (i % DEGREE_OF_INDEX_NODE == 0) {
if (currentIndexNode.isFull()) {
addCurrentIndexNodeToQueue(currentIndexNode,
measurementMetadataIndexQueue,
out);
@@ -77,7 +77,7 @@ public class MetadataIndexConstructor {
}
// if not exceed the max child nodes num, ignore the device index and
directly point to the measurement
- if (deviceMetadataIndexMap.size() <= MAX_DEGREE_OF_INDEX_NODE) {
+ if (deviceMetadataIndexMap.size() <= DEGREE_OF_INDEX_NODE) {
MetadataIndexNode metadataIndexNode = new MetadataIndexNode();
for (Map.Entry<String, MetadataIndexNode> entry :
deviceMetadataIndexMap.entrySet()) {
metadataIndexNode.addEntry(new MetadataIndexEntry(entry.getKey(),
out.getPosition(),
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java
index 28fe5df..425632c 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java
@@ -30,8 +30,8 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
public class MetadataIndexNode {
- private static final int MAX_DEGREE_OF_INDEX_NODE =
TSFileDescriptor.getInstance().getConfig()
- .getMaxDegreeOfIndexNode();
+ private static final int DEGREE_OF_INDEX_NODE =
TSFileDescriptor.getInstance().getConfig()
+ .getDegreeOfIndexNode();
private List<MetadataIndexEntry> children;
private long endOffset;
@@ -62,7 +62,7 @@ public class MetadataIndexNode {
}
boolean isFull() {
- return children.size() == MAX_DEGREE_OF_INDEX_NODE;
+ return children.size() == DEGREE_OF_INDEX_NODE;
}
MetadataIndexEntry peek() {
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
index 0e23dc2..50c011b 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
@@ -336,8 +336,8 @@ public class TsFileSequenceReader implements AutoCloseable {
Pair<MetadataIndexEntry, Long> metadataIndexPair = getMetadataAndEndOffset(
deviceMetadataIndexNode, device,
MetadataIndexNodeType.INTERNAL_DEVICE);
List<TimeseriesMetadata> resultTimeseriesMetadataList = new ArrayList<>();
- int maxDegreeOfIndexNode = config.getMaxDegreeOfIndexNode();
- if (measurements.size() > maxDegreeOfIndexNode /
Math.log(maxDegreeOfIndexNode)) {
+ int degreeOfIndexNode = config.getDegreeOfIndexNode();
+ if (measurements.size() > degreeOfIndexNode / Math.log(degreeOfIndexNode))
{
traverseAndReadTimeseriesMetadataInOneDevice(resultTimeseriesMetadataList,
metadataIndexPair,
measurements);
return resultTimeseriesMetadataList;
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java
index e9f7a5f..5f9a271 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java
@@ -51,7 +51,7 @@ public class ReaderTest {
@Before
public void before() throws IOException {
TSFileDescriptor.getInstance().getConfig().setTimeEncoder("TS_2DIFF");
- TSFileDescriptor.getInstance().getConfig().setMaxDegreeOfIndexNode(3);
+ TSFileDescriptor.getInstance().getConfig().setDegreeOfIndexNode(3);
TsFileGeneratorForTest.generateFile(rowCount, 10 * 1024 * 1024, 10000);
fileReader = new TsFileSequenceReader(FILE_PATH);
metadataQuerierByFile = new MetadataQuerierByFileImpl(fileReader);
@@ -60,7 +60,7 @@ public class ReaderTest {
@After
public void after() throws IOException {
fileReader.close();
- TSFileDescriptor.getInstance().getConfig().setMaxDegreeOfIndexNode(1024);
+ TSFileDescriptor.getInstance().getConfig().setDegreeOfIndexNode(1024);
TsFileGeneratorForTest.after();
}
![https://user-images.githubusercontent.com/19167280/81466597-94f81700-9205-11ea-9476-c3d083872232.png"](https://user-images.githubusercontent.com/19167280/81466597-94f81700-9205-11ea-9476-c3d083872232.png"){kind=link}
![https://user-images.githubusercontent.com/19167280/81466606-99bccb00-9205-11ea-8ba4-d2ed07529f58.png"](https://user-images.githubusercontent.com/19167280/81466606-99bccb00-9205-11ea-8ba4-d2ed07529f58.png"){kind=link}
![https://user-images.githubusercontent.com/19167280/81466613-9b868e80-9205-11ea-860a-4bf224d04359.png"](https://user-images.githubusercontent.com/19167280/81466613-9b868e80-9205-11ea-860a-4bf224d04359.png"){kind=link}
![https://user-images.githubusercontent.com/19167280/81466616-9e817f00-9205-11ea-9dc1-aec392eb5225.png"](https://user-images.githubusercontent.com/19167280/81466616-9e817f00-9205-11ea-9dc1-aec392eb5225.png"){kind=link}