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/12/05 06:22:23 UTC
[iotdb] branch UpgradeToolV3 updated (9d0de83 -> 7e232be)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch UpgradeToolV3
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 9d0de83 compatible with v2 tsfile
new 883a0e4 fix format
add 0e25b57 add merge IT for new tsfile format
new 7e232be Merge branch 'NewTsFile' of https://github.com/apache/iotdb into UpgradeToolV3
The 2 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.
Summary of changes:
.../level/LevelCompactionTsFileManagement.java | 9 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 1018 ++++++++++++++++++++
.../file/metadata/statistics/BinaryStatistics.java | 6 +-
.../metadata/statistics/BooleanStatistics.java | 6 +-
.../file/metadata/statistics/DoubleStatistics.java | 6 +-
.../file/metadata/statistics/FloatStatistics.java | 6 +-
.../metadata/statistics/IntegerStatistics.java | 6 +-
.../file/metadata/statistics/LongStatistics.java | 6 +-
.../iotdb/tsfile/v2/file/header/ChunkHeaderV2.java | 7 +-
9 files changed, 1041 insertions(+), 29 deletions(-)
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
[iotdb] 01/02: fix format
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch UpgradeToolV3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 883a0e45b453a88cf104bebcf7c546c2e774ee2c
Author: HTHou <hh...@outlook.com>
AuthorDate: Sat Dec 5 14:19:56 2020 +0800
fix format
---
.../iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java | 6 ++----
.../iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java | 6 ++----
.../iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java | 6 ++----
.../iotdb/tsfile/file/metadata/statistics/FloatStatistics.java | 6 ++----
.../iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java | 6 ++----
.../iotdb/tsfile/file/metadata/statistics/LongStatistics.java | 6 ++----
.../java/org/apache/iotdb/tsfile/v2/file/header/ChunkHeaderV2.java | 7 ++++---
7 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
index a632da4..e2567f7 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
@@ -202,15 +202,13 @@ public class BinaryStatistics extends Statistics<Binary> {
}
@Override
- public
- void deserialize(InputStream inputStream) throws IOException {
+ public void deserialize(InputStream inputStream) throws IOException {
this.firstValue = ReadWriteIOUtils.readBinary(inputStream);
this.lastValue = ReadWriteIOUtils.readBinary(inputStream);
}
@Override
- public
- void deserialize(ByteBuffer byteBuffer) {
+ public void deserialize(ByteBuffer byteBuffer) {
this.firstValue = ReadWriteIOUtils.readBinary(byteBuffer);
this.lastValue = ReadWriteIOUtils.readBinary(byteBuffer);
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
index 388292a..c46bffa 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
@@ -205,16 +205,14 @@ public class BooleanStatistics extends Statistics<Boolean> {
}
@Override
- public
- void deserialize(InputStream inputStream) throws IOException {
+ public void deserialize(InputStream inputStream) throws IOException {
this.firstValue = ReadWriteIOUtils.readBool(inputStream);
this.lastValue = ReadWriteIOUtils.readBool(inputStream);
this.sumValue = ReadWriteIOUtils.readLong(inputStream);
}
@Override
- public
- void deserialize(ByteBuffer byteBuffer) {
+ public void deserialize(ByteBuffer byteBuffer) {
this.firstValue = ReadWriteIOUtils.readBool(byteBuffer);
this.lastValue = ReadWriteIOUtils.readBool(byteBuffer);
this.sumValue = ReadWriteIOUtils.readLong(byteBuffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
index 3ea8ef6..1168623 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
@@ -227,8 +227,7 @@ public class DoubleStatistics extends Statistics<Double> {
}
@Override
- public
- void deserialize(InputStream inputStream) throws IOException {
+ public void deserialize(InputStream inputStream) throws IOException {
this.minValue = ReadWriteIOUtils.readDouble(inputStream);
this.maxValue = ReadWriteIOUtils.readDouble(inputStream);
this.firstValue = ReadWriteIOUtils.readDouble(inputStream);
@@ -237,8 +236,7 @@ public class DoubleStatistics extends Statistics<Double> {
}
@Override
- public
- void deserialize(ByteBuffer byteBuffer) {
+ public void deserialize(ByteBuffer byteBuffer) {
this.minValue = ReadWriteIOUtils.readDouble(byteBuffer);
this.maxValue = ReadWriteIOUtils.readDouble(byteBuffer);
this.firstValue = ReadWriteIOUtils.readDouble(byteBuffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
index 848bc7d..9bf7381 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
@@ -222,8 +222,7 @@ public class FloatStatistics extends Statistics<Float> {
}
@Override
- public
- void deserialize(InputStream inputStream) throws IOException {
+ public void deserialize(InputStream inputStream) throws IOException {
this.minValue = ReadWriteIOUtils.readFloat(inputStream);
this.maxValue = ReadWriteIOUtils.readFloat(inputStream);
this.firstValue = ReadWriteIOUtils.readFloat(inputStream);
@@ -232,8 +231,7 @@ public class FloatStatistics extends Statistics<Float> {
}
@Override
- public
- void deserialize(ByteBuffer byteBuffer) {
+ public void deserialize(ByteBuffer byteBuffer) {
this.minValue = ReadWriteIOUtils.readFloat(byteBuffer);
this.maxValue = ReadWriteIOUtils.readFloat(byteBuffer);
this.firstValue = ReadWriteIOUtils.readFloat(byteBuffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
index 38263ad..6df16a8 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
@@ -223,8 +223,7 @@ public class IntegerStatistics extends Statistics<Integer> {
}
@Override
- public
- void deserialize(InputStream inputStream) throws IOException {
+ public void deserialize(InputStream inputStream) throws IOException {
this.minValue = ReadWriteIOUtils.readInt(inputStream);
this.maxValue = ReadWriteIOUtils.readInt(inputStream);
this.firstValue = ReadWriteIOUtils.readInt(inputStream);
@@ -233,8 +232,7 @@ public class IntegerStatistics extends Statistics<Integer> {
}
@Override
- public
- void deserialize(ByteBuffer byteBuffer) {
+ public void deserialize(ByteBuffer byteBuffer) {
this.minValue = ReadWriteIOUtils.readInt(byteBuffer);
this.maxValue = ReadWriteIOUtils.readInt(byteBuffer);
this.firstValue = ReadWriteIOUtils.readInt(byteBuffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
index e86087b..7d35666 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
@@ -231,8 +231,7 @@ public class LongStatistics extends Statistics<Long> {
}
@Override
- public
- void deserialize(InputStream inputStream) throws IOException {
+ public void deserialize(InputStream inputStream) throws IOException {
this.minValue = ReadWriteIOUtils.readLong(inputStream);
this.maxValue = ReadWriteIOUtils.readLong(inputStream);
this.firstValue = ReadWriteIOUtils.readLong(inputStream);
@@ -241,8 +240,7 @@ public class LongStatistics extends Statistics<Long> {
}
@Override
- public
- void deserialize(ByteBuffer byteBuffer) {
+ public void deserialize(ByteBuffer byteBuffer) {
this.minValue = ReadWriteIOUtils.readLong(byteBuffer);
this.maxValue = ReadWriteIOUtils.readLong(byteBuffer);
this.firstValue = ReadWriteIOUtils.readLong(byteBuffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/header/ChunkHeaderV2.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/header/ChunkHeaderV2.java
index 7574d31..3a5376e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/header/ChunkHeaderV2.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/header/ChunkHeaderV2.java
@@ -87,11 +87,12 @@ public class ChunkHeaderV2 {
String measurementID = ReadWriteIOUtils.readStringWithLength(buffer, size);
int dataSize = ReadWriteIOUtils.readInt(buffer);
TSDataType dataType = TSDataTypeV2.deserialize(ReadWriteIOUtils.readShort(buffer));
- int numOfPages = ReadWriteIOUtils.readInt(buffer);
+ // numOfPages
+ ReadWriteIOUtils.readInt(buffer);
CompressionType type = CompressionTypeV2.deserialize(ReadWriteIOUtils.readShort(buffer));
TSEncoding encoding = TSEncodingV2.deserialize(ReadWriteIOUtils.readShort(buffer));
- return new ChunkHeader(numOfPages <= 1 ? MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER : MetaMarker.CHUNK_HEADER,
- measurementID, dataSize, chunkHeaderSize, dataType, type, encoding);
+ return new ChunkHeader(MetaMarker.CHUNK_HEADER, measurementID, dataSize, chunkHeaderSize,
+ dataType, type, encoding);
}
public static int getSerializedSize(String measurementID) {
[iotdb] 02/02: Merge branch 'NewTsFile' of
https://github.com/apache/iotdb into UpgradeToolV3
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch UpgradeToolV3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7e232be48075055a9cb707637336bf0a342f18b8
Merge: 883a0e4 0e25b57
Author: HTHou <hh...@outlook.com>
AuthorDate: Sat Dec 5 14:21:48 2020 +0800
Merge branch 'NewTsFile' of https://github.com/apache/iotdb into UpgradeToolV3
.../level/LevelCompactionTsFileManagement.java | 9 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 1018 ++++++++++++++++++++
2 files changed, 1025 insertions(+), 2 deletions(-)