This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 1d5d893 Move MetadataIndexNodeType from entry to node
1d5d893 is described below
commit 1d5d89303e70046c2bcd201e7ffdeca42fb89747
Author: samperson1997 <[email protected]>
AuthorDate: Wed May 13 14:11:07 2020 +0800
Move MetadataIndexNodeType from entry to node
---
.../file/metadata/MetadataIndexConstructor.java | 31 +++++++-------
.../tsfile/file/metadata/MetadataIndexEntry.java | 32 +++------------
.../tsfile/file/metadata/MetadataIndexNode.java | 21 ++++++++--
.../iotdb/tsfile/read/TsFileSequenceReader.java | 48 +++++++++++-----------
.../file/metadata/MetadataIndexNodeTest.java | 14 +++----
.../tsfile/file/metadata/utils/TestHelper.java | 5 +--
6 files changed, 72 insertions(+), 79 deletions(-)
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..82467e9 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
@@ -56,18 +56,18 @@ public class MetadataIndexConstructor {
}
Queue<MetadataIndexNode> measurementMetadataIndexQueue = new
ArrayDeque<>();
TimeseriesMetadata timeseriesMetadata;
- MetadataIndexNode currentIndexNode = new MetadataIndexNode();
+ MetadataIndexNode currentIndexNode = new MetadataIndexNode(
+ MetadataIndexNodeType.LEAF_MEASUREMENT);
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 (currentIndexNode.isFull()) {
- addCurrentIndexNodeToQueue(currentIndexNode,
measurementMetadataIndexQueue,
- out);
- currentIndexNode = new MetadataIndexNode();
+ addCurrentIndexNodeToQueue(currentIndexNode,
measurementMetadataIndexQueue, out);
+ currentIndexNode = new
MetadataIndexNode(MetadataIndexNodeType.LEAF_MEASUREMENT);
}
currentIndexNode.addEntry(new
MetadataIndexEntry(timeseriesMetadata.getMeasurementId(),
- out.getPosition(), MetadataIndexNodeType.LEAF_MEASUREMENT));
+ out.getPosition()));
}
timeseriesMetadata.serializeTo(out.wrapAsStream());
}
@@ -78,10 +78,10 @@ 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) {
- MetadataIndexNode metadataIndexNode = new MetadataIndexNode();
+ MetadataIndexNode metadataIndexNode = new MetadataIndexNode(
+ MetadataIndexNodeType.INTERNAL_MEASUREMENT);
for (Map.Entry<String, MetadataIndexNode> entry :
deviceMetadataIndexMap.entrySet()) {
- metadataIndexNode.addEntry(new MetadataIndexEntry(entry.getKey(),
out.getPosition(),
- MetadataIndexNodeType.INTERNAL_MEASUREMENT));
+ metadataIndexNode.addEntry(new MetadataIndexEntry(entry.getKey(),
out.getPosition()));
entry.getValue().serializeTo(out.wrapAsStream());
}
metadataIndexNode.setEndOffset(out.getPosition());
@@ -90,17 +90,16 @@ public class MetadataIndexConstructor {
// else, build level index for devices
Queue<MetadataIndexNode> deviceMetadaIndexQueue = new ArrayDeque<>();
- MetadataIndexNode currentIndexNode = new MetadataIndexNode();
+ MetadataIndexNode currentIndexNode = new
MetadataIndexNode(MetadataIndexNodeType.LEAF_DEVICE);
MetadataIndexNode deviceMetadataIndexNode;
for (Map.Entry<String, MetadataIndexNode> entry :
deviceMetadataIndexMap.entrySet()) {
// when constructing from internal node, each node is related to an entry
if (currentIndexNode.isFull()) {
addCurrentIndexNodeToQueue(currentIndexNode, deviceMetadaIndexQueue,
out);
- currentIndexNode = new MetadataIndexNode();
+ currentIndexNode = new
MetadataIndexNode(MetadataIndexNodeType.LEAF_DEVICE);
}
- currentIndexNode.addEntry(new MetadataIndexEntry(entry.getKey(),
- out.getPosition(), MetadataIndexNodeType.LEAF_DEVICE));
+ currentIndexNode.addEntry(new MetadataIndexEntry(entry.getKey(),
out.getPosition()));
entry.getValue().serializeTo(out.wrapAsStream());
}
addCurrentIndexNodeToQueue(currentIndexNode, deviceMetadaIndexQueue, out);
@@ -123,21 +122,21 @@ public class MetadataIndexConstructor {
TsFileOutput out, MetadataIndexNodeType type) throws IOException {
int queueSize = metadataIndexNodeQueue.size();
MetadataIndexNode metadataIndexNode;
- MetadataIndexNode currentIndexNode = new MetadataIndexNode();
+ MetadataIndexNode currentIndexNode = new MetadataIndexNode(type);
while (queueSize != 1) {
for (int i = 0; i < queueSize; i++) {
metadataIndexNode = metadataIndexNodeQueue.poll();
// when constructing from internal node, each node is related to an
entry
if (currentIndexNode.isFull()) {
addCurrentIndexNodeToQueue(currentIndexNode, metadataIndexNodeQueue,
out);
- currentIndexNode = new MetadataIndexNode();
+ currentIndexNode = new MetadataIndexNode(type);
}
currentIndexNode.addEntry(new
MetadataIndexEntry(metadataIndexNode.peek().getName(),
- out.getPosition(), type));
+ out.getPosition()));
metadataIndexNode.serializeTo(out.wrapAsStream());
}
addCurrentIndexNodeToQueue(currentIndexNode, metadataIndexNodeQueue,
out);
- currentIndexNode = new MetadataIndexNode();
+ currentIndexNode = new MetadataIndexNode(type);
queueSize = metadataIndexNodeQueue.size();
}
return metadataIndexNodeQueue.poll();
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java
index 6d53878..5325992 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java
@@ -22,7 +22,6 @@ package org.apache.iotdb.tsfile.file.metadata;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
public class MetadataIndexEntry {
@@ -30,18 +29,9 @@ public class MetadataIndexEntry {
private String name;
private long offset;
- /**
- * type of the child node at offset
- */
- private MetadataIndexNodeType childNodeType;
-
- public MetadataIndexEntry() {
- }
-
- public MetadataIndexEntry(String name, long offset, MetadataIndexNodeType
childNodeType) {
+ public MetadataIndexEntry(String name, long offset) {
this.name = name;
this.offset = offset;
- this.childNodeType = childNodeType;
}
public String getName() {
@@ -52,10 +42,6 @@ public class MetadataIndexEntry {
return offset;
}
- public MetadataIndexNodeType getChildNodeType() {
- return childNodeType;
- }
-
public void setName(String name) {
this.name = name;
}
@@ -64,28 +50,20 @@ public class MetadataIndexEntry {
this.offset = offset;
}
- public void setChildNodeType(MetadataIndexNodeType childNodeType) {
- this.childNodeType = childNodeType;
- }
-
public String toString() {
- return "<" + name + "," + offset + "," + childNodeType + ">";
+ return "<" + name + "," + offset + ">";
}
public int serializeTo(OutputStream outputStream) throws IOException {
int byteLen = 0;
byteLen += ReadWriteIOUtils.write(name, outputStream);
byteLen += ReadWriteIOUtils.write(offset, outputStream);
- byteLen += ReadWriteIOUtils.write(childNodeType.serialize(), outputStream);
return byteLen;
}
public static MetadataIndexEntry deserializeFrom(ByteBuffer buffer) {
- MetadataIndexEntry metadataIndex = new MetadataIndexEntry();
- metadataIndex.setName(ReadWriteIOUtils.readString(buffer));
- metadataIndex.setOffset(ReadWriteIOUtils.readLong(buffer));
- metadataIndex
-
.setChildNodeType(MetadataIndexNodeType.deserialize(ReadWriteIOUtils.readByte(buffer)));
- return metadataIndex;
+ String name = ReadWriteIOUtils.readString(buffer);
+ long offset = ReadWriteIOUtils.readLong(buffer);
+ return new MetadataIndexEntry(name, offset);
}
}
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..603aeda 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
@@ -25,6 +25,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
+import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
@@ -35,14 +36,22 @@ public class MetadataIndexNode {
private List<MetadataIndexEntry> children;
private long endOffset;
- public MetadataIndexNode() {
+ /**
+ * type of the child node at offset
+ */
+ private MetadataIndexNodeType nodeType;
+
+ public MetadataIndexNode(MetadataIndexNodeType nodeType) {
children = new ArrayList<>();
endOffset = -1L;
+ this.nodeType = nodeType;
}
- public MetadataIndexNode(List<MetadataIndexEntry> children, long endOffset) {
+ public MetadataIndexNode(List<MetadataIndexEntry> children, long endOffset,
+ MetadataIndexNodeType nodeType) {
this.children = children;
this.endOffset = endOffset;
+ this.nodeType = nodeType;
}
public List<MetadataIndexEntry> getChildren() {
@@ -57,6 +66,10 @@ public class MetadataIndexNode {
this.endOffset = endOffset;
}
+ public MetadataIndexNodeType getNodeType() {
+ return nodeType;
+ }
+
public void addEntry(MetadataIndexEntry metadataIndexEntry) {
this.children.add(metadataIndexEntry);
}
@@ -79,6 +92,7 @@ public class MetadataIndexNode {
byteLen += metadataIndexEntry.serializeTo(outputStream);
}
byteLen += ReadWriteIOUtils.write(endOffset, outputStream);
+ byteLen += ReadWriteIOUtils.write(nodeType.serialize(), outputStream);
return byteLen;
}
@@ -89,7 +103,8 @@ public class MetadataIndexNode {
children.add(MetadataIndexEntry.deserializeFrom(buffer));
}
long offset = ReadWriteIOUtils.readLong(buffer);
- return new MetadataIndexNode(children, offset);
+ MetadataIndexNodeType nodeType =
MetadataIndexNodeType.deserialize(ReadWriteIOUtils.readByte(buffer));
+ return new MetadataIndexNode(children, offset, nodeType);
}
public Pair<MetadataIndexEntry, Long> getChildIndexEntry(String key) {
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..f924d83 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
@@ -312,9 +312,9 @@ public class TsFileSequenceReader implements AutoCloseable {
Pair<MetadataIndexEntry, Long> metadataIndexPair = getMetadataAndEndOffset(
deviceMetadataIndexNode, path.getDevice(),
MetadataIndexNodeType.INTERNAL_DEVICE);
ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(),
metadataIndexPair.right);
- while (!metadataIndexPair.left.getChildNodeType()
- .equals(MetadataIndexNodeType.LEAF_MEASUREMENT)) {
- MetadataIndexNode metadataIndexNode =
MetadataIndexNode.deserializeFrom(buffer);
+ MetadataIndexNode metadataIndexNode = deviceMetadataIndexNode;
+ if
(!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT))
{
+ metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
metadataIndexPair = getMetadataAndEndOffset(metadataIndexNode,
path.getMeasurement(), MetadataIndexNodeType.INTERNAL_MEASUREMENT);
}
@@ -338,17 +338,17 @@ public class TsFileSequenceReader implements
AutoCloseable {
List<TimeseriesMetadata> resultTimeseriesMetadataList = new ArrayList<>();
int maxDegreeOfIndexNode = config.getMaxDegreeOfIndexNode();
if (measurements.size() > maxDegreeOfIndexNode /
Math.log(maxDegreeOfIndexNode)) {
-
traverseAndReadTimeseriesMetadataInOneDevice(resultTimeseriesMetadataList,
metadataIndexPair,
- measurements);
+
traverseAndReadTimeseriesMetadataInOneDevice(resultTimeseriesMetadataList,
+ MetadataIndexNodeType.INTERNAL_MEASUREMENT, metadataIndexPair,
measurements);
return resultTimeseriesMetadataList;
}
for (String measurement : measurements) {
ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(),
metadataIndexPair.right);
Pair<MetadataIndexEntry, Long> measurementMetadataIndexPair =
metadataIndexPair;
List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
- while (!measurementMetadataIndexPair.left.getChildNodeType()
- .equals(MetadataIndexNodeType.LEAF_MEASUREMENT)) {
- MetadataIndexNode metadataIndexNode =
MetadataIndexNode.deserializeFrom(buffer);
+ MetadataIndexNode metadataIndexNode = deviceMetadataIndexNode;
+ if
(!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT))
{
+ metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
measurementMetadataIndexPair =
getMetadataAndEndOffset(metadataIndexNode,
measurement, MetadataIndexNodeType.INTERNAL_MEASUREMENT);
}
@@ -367,11 +367,11 @@ public class TsFileSequenceReader implements
AutoCloseable {
}
private void traverseAndReadTimeseriesMetadataInOneDevice(
- List<TimeseriesMetadata> timeseriesMetadataList,
+ List<TimeseriesMetadata> timeseriesMetadataList, MetadataIndexNodeType
type,
Pair<MetadataIndexEntry, Long> metadataIndexPair, Set<String>
measurements)
throws IOException {
ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(),
metadataIndexPair.right);
- switch (metadataIndexPair.left.getChildNodeType()) {
+ switch (type) {
case LEAF_DEVICE:
case INTERNAL_MEASUREMENT:
MetadataIndexNode metadataIndexNode =
MetadataIndexNode.deserializeFrom(buffer);
@@ -382,6 +382,7 @@ public class TsFileSequenceReader implements AutoCloseable {
endOffset = metadataIndexNode.getChildren().get(i + 1).getOffset();
}
traverseAndReadTimeseriesMetadataInOneDevice(timeseriesMetadataList,
+ metadataIndexNode.getNodeType(),
new Pair<>(metadataIndexNode.getChildren().get(i), endOffset),
measurements);
}
break;
@@ -432,7 +433,7 @@ public class TsFileSequenceReader implements AutoCloseable {
int metadataIndexListSize = metadataIndexNode.getChildren().size();
for (int i = 0; i < metadataIndexListSize; i++) {
MetadataIndexEntry metadataIndex =
metadataIndexNode.getChildren().get(i);
- switch (metadataIndex.getChildNodeType()) {
+ switch (metadataIndexNode.getNodeType()) {
case LEAF_MEASUREMENT:
case INTERNAL_MEASUREMENT:
for (MetadataIndexEntry index : metadataIndexNode.getChildren()) {
@@ -519,8 +520,9 @@ public class TsFileSequenceReader implements AutoCloseable {
* @param timeseriesMetadataMap map: deviceId -> timeseriesMetadata list
*/
private void generateMetadataIndex(MetadataIndexEntry metadataIndex,
ByteBuffer buffer,
- String deviceId, Map<String, List<TimeseriesMetadata>>
timeseriesMetadataMap) throws IOException {
- switch (metadataIndex.getChildNodeType()) {
+ String deviceId, MetadataIndexNodeType type,
+ Map<String, List<TimeseriesMetadata>> timeseriesMetadataMap) throws
IOException {
+ switch (type) {
case INTERNAL_DEVICE:
case LEAF_DEVICE:
case INTERNAL_MEASUREMENT:
@@ -535,7 +537,7 @@ public class TsFileSequenceReader implements AutoCloseable {
ByteBuffer nextBuffer =
readData(metadataIndexNode.getChildren().get(i).getOffset(),
endOffset);
generateMetadataIndex(metadataIndexNode.getChildren().get(i),
nextBuffer, deviceId,
- timeseriesMetadataMap);
+ metadataIndexNode.getNodeType(), timeseriesMetadataMap);
}
break;
case LEAF_MEASUREMENT:
@@ -543,10 +545,8 @@ public class TsFileSequenceReader implements AutoCloseable
{
while (buffer.hasRemaining()) {
timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
}
- if (timeseriesMetadataMap.containsKey(deviceId)) {
- timeseriesMetadataList.addAll(timeseriesMetadataMap.get(deviceId));
- }
- timeseriesMetadataMap.put(deviceId, timeseriesMetadataList);
+ timeseriesMetadataMap.computeIfAbsent(deviceId, k -> new ArrayList<>())
+ .addAll(timeseriesMetadataList);
break;
}
}
@@ -556,8 +556,8 @@ public class TsFileSequenceReader implements AutoCloseable {
readFileMetadata();
}
Map<String, List<TimeseriesMetadata>> timeseriesMetadataMap = new
HashMap<>();
- List<MetadataIndexEntry> metadataIndexEntryList =
tsFileMetaData.getMetadataIndex()
- .getChildren();
+ MetadataIndexNode metadataIndexNode = tsFileMetaData.getMetadataIndex();
+ List<MetadataIndexEntry> metadataIndexEntryList =
metadataIndexNode.getChildren();
for (int i = 0; i < metadataIndexEntryList.size(); i++) {
MetadataIndexEntry metadataIndexEntry = metadataIndexEntryList.get(i);
long endOffset = tsFileMetaData.getMetadataIndex().getEndOffset();
@@ -565,7 +565,8 @@ public class TsFileSequenceReader implements AutoCloseable {
endOffset = metadataIndexEntryList.get(i + 1).getOffset();
}
ByteBuffer buffer = readData(metadataIndexEntry.getOffset(), endOffset);
- generateMetadataIndex(metadataIndexEntry, buffer, null,
timeseriesMetadataMap);
+ generateMetadataIndex(metadataIndexEntry, buffer, null,
+ metadataIndexNode.getNodeType(), timeseriesMetadataMap);
}
return timeseriesMetadataMap;
}
@@ -576,7 +577,8 @@ public class TsFileSequenceReader implements AutoCloseable {
metadataIndexNode, device, MetadataIndexNodeType.INTERNAL_DEVICE);
ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(),
metadataIndexPair.right);
Map<String, List<TimeseriesMetadata>> timeseriesMetadataMap = new
TreeMap<>();
- generateMetadataIndex(metadataIndexPair.left, buffer, device,
timeseriesMetadataMap);
+ generateMetadataIndex(metadataIndexPair.left, buffer, device,
+ MetadataIndexNodeType.INTERNAL_MEASUREMENT, timeseriesMetadataMap);
List<TimeseriesMetadata> deviceTimeseriesMetadata = new ArrayList<>();
for (List<TimeseriesMetadata> timeseriesMetadataList :
timeseriesMetadataMap.values()) {
deviceTimeseriesMetadata.addAll(timeseriesMetadataList);
@@ -599,7 +601,7 @@ public class TsFileSequenceReader implements AutoCloseable {
private Pair<MetadataIndexEntry, Long>
getMetadataAndEndOffset(MetadataIndexNode metadataIndex,
String name, MetadataIndexNodeType type) throws IOException {
Pair<MetadataIndexEntry, Long> childIndexEntry =
metadataIndex.getChildIndexEntry(name);
- if (!childIndexEntry.left.getChildNodeType().equals(type)) {
+ if (!metadataIndex.getNodeType().equals(type)) {
return childIndexEntry;
}
ByteBuffer buffer = readData(childIndexEntry.left.getOffset(),
childIndexEntry.right);
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java
index 33b7459..eb1ef3a 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java
@@ -30,14 +30,14 @@ public class MetadataIndexNodeTest {
@Test
public void testBinarySearchInChildren() {
List<MetadataIndexEntry> list = new ArrayList<>();
- MetadataIndexNodeType type = MetadataIndexNodeType.LEAF_MEASUREMENT;
- list.add(new MetadataIndexEntry("s0", -1L, type));
- list.add(new MetadataIndexEntry("s5", -1L, type));
- list.add(new MetadataIndexEntry("s10", -1L, type));
- list.add(new MetadataIndexEntry("s15", -1L, type));
- list.add(new MetadataIndexEntry("s20", -1L, type));
+ list.add(new MetadataIndexEntry("s0", -1L));
+ list.add(new MetadataIndexEntry("s5", -1L));
+ list.add(new MetadataIndexEntry("s10", -1L));
+ list.add(new MetadataIndexEntry("s15", -1L));
+ list.add(new MetadataIndexEntry("s20", -1L));
- MetadataIndexNode metadataIndexNode = new MetadataIndexNode(list, -1L);
+ MetadataIndexNode metadataIndexNode = new MetadataIndexNode(list, -1L,
+ MetadataIndexNodeType.LEAF_MEASUREMENT);
Assert.assertEquals(0, metadataIndexNode.binarySearchInChildren("s0"));
Assert.assertEquals(2, metadataIndexNode.binarySearchInChildren("s10"));
Assert.assertEquals(2, metadataIndexNode.binarySearchInChildren("s13"));
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
index 6611717..89c414d 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
@@ -43,10 +43,9 @@ public class TestHelper {
}
private static MetadataIndexNode generateMetaDataIndex() {
- MetadataIndexNode metaDataIndex = new MetadataIndexNode();
+ MetadataIndexNode metaDataIndex = new
MetadataIndexNode(MetadataIndexNodeType.LEAF_MEASUREMENT);
for (int i = 0; i < 5; i++) {
- metaDataIndex.addEntry(new MetadataIndexEntry("d" + i, (long) i * 5,
- MetadataIndexNodeType.LEAF_MEASUREMENT));
+ metaDataIndex.addEntry(new MetadataIndexEntry("d" + i, (long) i * 5));
}
return metaDataIndex;
}
