This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch NewTsFile
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from a7a1486 Merge branch 'master' of https://github.com/apache/iotdb into
NewTsFile
add 9d0de83 compatible with v2 tsfile
add 883a0e4 fix format
add 7e232be Merge branch 'NewTsFile' of https://github.com/apache/iotdb
into UpgradeToolV3
add aea74ff code smell
add a9e9c44 fix code smell
add 8430e46 remove some code
add f9f37e8 refact upgrade tool
add b08e80f fix a code smell
add a5f97ba fix upgrade resource
add 51dfc6e merge NewTsFile
add 7220ae1 Merge branch 'NewTsFile' of https://github.com/apache/iotdb
into UpgradeToolV3
add b2e29c2 remove old file
add 169843d Merge branch 'NewTsFile' of https://github.com/apache/iotdb
into UpgradeToolV3
add 06dc16e upgrade tool works
add ae1f198 small fix
add c0a5d5b remove unused offline upgrade shell script
add ee5a32f merge
add ab67227 Merge pull request #2194 from apache/UpgradeToolV3
No new revisions were added by this update.
Summary of changes:
.../resources/tools/upgrade/config.properties | 27 -
.../resources/tools/upgrade/offline-upgrade.bat | 67 --
.../resources/tools/upgrade/offline-upgrade.sh | 47 -
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 101 ++-
.../engine/storagegroup/StorageGroupProcessor.java | 100 +--
.../db/engine/storagegroup/TsFileResource.java | 38 +-
.../iotdb/db/engine/upgrade/UpgradeTask.java | 313 +++----
.../iotdb/db/query/control/FileReaderManager.java | 11 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 244 ++---
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 996 ++++++++-------------
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 3 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 2 +-
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 4 +
.../file/metadata/statistics/BinaryStatistics.java | 4 +-
.../metadata/statistics/BooleanStatistics.java | 4 +-
.../file/metadata/statistics/DoubleStatistics.java | 4 +-
.../file/metadata/statistics/FloatStatistics.java | 4 +-
.../metadata/statistics/IntegerStatistics.java | 4 +-
.../file/metadata/statistics/LongStatistics.java | 4 +-
.../file/metadata/statistics/Statistics.java | 4 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 12 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 2 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 9 +
.../tsfile/read/reader/chunk/ChunkReader.java | 64 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 14 +-
.../file/footer/ChunkGroupFooterV2.java} | 85 +-
.../iotdb/tsfile/v2/file/header/ChunkHeaderV2.java | 108 +++
.../iotdb/tsfile/v2/file/header/PageHeaderV2.java | 51 ++
.../tsfile/v2/file/metadata/ChunkMetadataV2.java | 52 ++
.../v2/file/metadata/MetadataIndexEntryV2.java | 33 +-
.../v2/file/metadata/MetadataIndexNodeV2.java | 47 +
.../v2/file/metadata/TimeseriesMetadataV2.java | 42 +
.../tsfile/v2/file/metadata/TsFileMetadataV2.java | 78 ++
.../v2/file/metadata/statistics/StatisticsV2.java | 104 +++
.../tsfile/v2/read/TsFileSequenceReaderForV2.java | 669 ++++++++++++++
.../tsfile/v2/read/reader/page/PageReaderV2.java | 85 ++
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 17 +-
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 6 -
39 files changed, 2199 insertions(+), 1262 deletions(-)
delete mode 100644
server/src/assembly/resources/tools/upgrade/config.properties
delete mode 100644
server/src/assembly/resources/tools/upgrade/offline-upgrade.bat
delete mode 100755
server/src/assembly/resources/tools/upgrade/offline-upgrade.sh
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/{file/header/ChunkGroupHeader.java
=> v2/file/footer/ChunkGroupFooterV2.java} (52%)
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/header/ChunkHeaderV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/header/PageHeaderV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/ChunkMetadataV2.java
copy grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java
=>
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/MetadataIndexEntryV2.java
(62%)
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/MetadataIndexNodeV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/TimeseriesMetadataV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/TsFileMetadataV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/statistics/StatisticsV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/read/TsFileSequenceReaderForV2.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v2/read/reader/page/PageReaderV2.java
