You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/10/11 08:57:53 UTC
[iotdb] branch iotdb-1818 updated (e069714 -> 66ffd88)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch iotdb-1818
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from e069714 [IOTDB-1818] Activate dependabot on rel/0.12
add 2e926ab [DOCUMENTATION] fix bold syntax error (#4096)
add 5ab9e4a [IOTDB-1818] Activate dependabot on IoTDB codebase (#4097)
add 855db65 [IOTDB-1635] settle TsFiles and mods (#4024)
add a6fc68e [IOTDB-1726] Wrong hashCode() and equals() method in ChunkMetadata (#4084)
add 3da5c6d [IOTDB-1792] Remove tomcat-embed dependency and make all transitive dependencies versions consistent (#4077)
add 07f3912 check whether bitmap is null before spliting (#4102)
new 66ffd88 [IOTDB-1818] Activate dependabot on rel/0.12
The 1 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:
.asf.yaml | 2 +-
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 12 +-
.../iotdb/cluster/log/snapshot/FileSnapshot.java | 13 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 7 +-
.../cluster/query/filter/SlotTsFileFilter.java | 5 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 2 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 8 +-
hive-connector/pom.xml | 2 +-
jenkins.pom | 2 +-
pom.xml | 56 +++-
server/pom.xml | 3 +-
.../mLogParser.bat => tsfileToolSet/settle.bat} | 6 +-
.../mLogParser.sh => tsfileToolSet/settle.sh} | 6 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 7 +
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 27 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 4 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 15 +-
.../compaction/CompactionMergeTaskPoolManager.java | 2 +-
.../apache/iotdb/db/engine/settle/SettleLog.java | 116 +++++++
.../apache/iotdb/db/engine/settle/SettleTask.java | 108 +++++++
.../engine/storagegroup/StorageGroupProcessor.java | 215 ++++++++----
.../db/engine/storagegroup/TsFileResource.java | 13 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 2 +-
.../storagegroup/timeindex/FileTimeIndex.java | 2 +-
.../virtualSg/VirtualStorageGroupManager.java | 22 ++
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 45 +++
.../org/apache/iotdb/db/qp/logical/Operator.java | 4 +-
...{DropIndexOperator.java => SettleOperator.java} | 48 +--
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 8 +-
.../sys/{ClearCachePlan.java => SettlePlan.java} | 44 ++-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 19 ++
.../iotdb/db/query/control/FileReaderManager.java | 2 -
.../query/dataset/groupby/GroupByTimeDataSet.java | 4 +-
.../db/query/executor/AggregationExecutor.java | 4 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 +
.../org/apache/iotdb/db/service/ServiceType.java | 1 +
.../org/apache/iotdb/db/service/SettleService.java | 190 +++++++++++
.../receiver/recover/SyncReceiverLogAnalyzer.java | 2 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 2 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 117 ++++---
.../db/tools/settle/TsFileAndModSettleTool.java | 360 +++++++++++++++++++++
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 73 ++---
.../{FilePathUtils.java => AggregateUtils.java} | 94 +-----
.../db/conf/adapter/CompressionRatioTest.java | 2 +-
.../org/apache/iotdb/db/constant/TestConstant.java | 30 ++
.../MergeTest.java => cache/ChunkCacheTest.java} | 196 +++++------
.../db/engine/compaction/CompactionChunkTest.java | 45 +--
.../compaction/LevelCompactionCacheTest.java | 7 +-
.../engine/compaction/LevelCompactionLogTest.java | 7 +-
.../compaction/LevelCompactionMergeTest.java | 7 +-
.../engine/compaction/LevelCompactionModsTest.java | 7 +-
.../compaction/LevelCompactionMoreDataTest.java | 64 ++--
.../compaction/LevelCompactionRecoverTest.java | 121 +++----
.../compaction/LevelCompactionSelectorTest.java | 7 +-
.../db/engine/compaction/LevelCompactionTest.java | 95 +++---
.../LevelCompactionTsFileManagementTest.java | 140 ++++----
.../NoCompactionTsFileManagementTest.java | 140 ++++----
.../iotdb/db/engine/merge/MergeOverLapTest.java | 43 +--
.../iotdb/db/engine/merge/MergeTaskTest.java | 7 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 46 +--
.../engine/storagegroup/TsFileProcessorTest.java | 15 +-
.../iotdb/db/integration/IoTDBFilePathUtilsIT.java | 8 +-
.../{IoTDBResultSetIT.java => IoTDBSettleIT.java} | 80 ++---
.../query/reader/series/SeriesReaderTestUtil.java | 45 +--
.../db/sync/sender/manage/SyncFileManagerTest.java | 2 +-
.../sender/recover/SyncSenderLogAnalyzerTest.java | 2 +-
.../db/sync/sender/transfer/SyncClientTest.java | 2 +-
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 238 ++++++++++++++
.../apache/iotdb/db/utils/EnvironmentUtils.java | 1 +
.../iotdb/db/utils/TsFileRewriteToolTest.java | 72 +++--
.../db/writelog/recover/SeqTsFileRecoverTest.java | 10 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 17 +-
.../read/controller/CachedChunkLoaderImpl.java | 3 +-
.../apache/iotdb/tsfile/utils/FilePathUtils.java | 126 ++++++++
.../apache/iotdb/tsfile/constant/TestConstant.java | 4 +
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 7 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 3 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 3 +-
.../read/query/timegenerator/ReadWriteTest.java | 8 +-
.../timegenerator/TimeGeneratorReadEmptyTest.java | 7 +-
.../timegenerator/TimeGeneratorReadWriteTest.java | 7 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 21 +-
.../apache/iotdb/tsfile/utils/FileGenerator.java | 36 ++-
.../iotdb/tsfile}/utils/FilePathUtilsTest.java | 36 +--
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 39 ++-
.../tsfile/write/DefaultSchemaTemplateTest.java | 6 +-
...SameMeasurementsWithDifferentDataTypesTest.java | 7 +-
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 7 +-
.../iotdb/tsfile/write/TsFileWriterTest.java | 17 +-
.../write/writer/ForceAppendTsFileWriterTest.java | 8 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 79 ++---
96 files changed, 2530 insertions(+), 1037 deletions(-)
copy server/src/assembly/resources/tools/{mlog/mLogParser.bat => tsfileToolSet/settle.bat} (95%)
copy server/src/assembly/resources/tools/{mlog/mLogParser.sh => tsfileToolSet/settle.sh} (92%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/settle/SettleLog.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/settle/SettleTask.java
copy server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{DropIndexOperator.java => SettleOperator.java} (62%)
copy server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{ClearCachePlan.java => SettlePlan.java} (62%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/SettleService.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
rename server/src/main/java/org/apache/iotdb/db/utils/{FilePathUtils.java => AggregateUtils.java} (66%)
copy server/src/test/java/org/apache/iotdb/db/engine/{merge/MergeTest.java => cache/ChunkCacheTest.java} (58%)
copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBResultSetIT.java => IoTDBSettleIT.java} (50%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java
rename {server/src/test/java/org/apache/iotdb/db => tsfile/src/test/java/org/apache/iotdb/tsfile}/utils/FilePathUtilsTest.java (72%)
[iotdb] 01/01: [IOTDB-1818] Activate dependabot on rel/0.12
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-1818
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 66ffd88f2e09edb66263ac136cab1061faa1b116
Merge: e069714 07f3912
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Mon Oct 11 16:57:14 2021 +0800
[IOTDB-1818] Activate dependabot on rel/0.12
.asf.yaml | 2 +-
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 12 +-
.../iotdb/cluster/log/snapshot/FileSnapshot.java | 13 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 7 +-
.../cluster/query/filter/SlotTsFileFilter.java | 5 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 2 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 8 +-
hive-connector/pom.xml | 2 +-
jenkins.pom | 2 +-
pom.xml | 56 +++-
server/pom.xml | 3 +-
.../resources/tools/tsfileToolSet/settle.bat | 62 ++++
.../resources/tools/tsfileToolSet/settle.sh | 43 ++-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 7 +
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 27 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 4 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 15 +-
.../compaction/CompactionMergeTaskPoolManager.java | 2 +-
.../apache/iotdb/db/engine/settle/SettleLog.java | 116 +++++++
.../apache/iotdb/db/engine/settle/SettleTask.java | 108 +++++++
.../engine/storagegroup/StorageGroupProcessor.java | 215 ++++++++----
.../db/engine/storagegroup/TsFileResource.java | 13 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 2 +-
.../storagegroup/timeindex/FileTimeIndex.java | 2 +-
.../virtualSg/VirtualStorageGroupManager.java | 22 ++
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 45 +++
.../org/apache/iotdb/db/qp/logical/Operator.java | 4 +-
.../iotdb/db/qp/logical/sys/SettleOperator.java | 71 ++++
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 8 +-
.../iotdb/db/qp/physical/sys/SettlePlan.java | 65 ++++
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 19 ++
.../iotdb/db/query/control/FileReaderManager.java | 2 -
.../query/dataset/groupby/GroupByTimeDataSet.java | 4 +-
.../db/query/executor/AggregationExecutor.java | 4 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 +
.../org/apache/iotdb/db/service/ServiceType.java | 1 +
.../org/apache/iotdb/db/service/SettleService.java | 190 +++++++++++
.../receiver/recover/SyncReceiverLogAnalyzer.java | 2 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 2 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 117 ++++---
.../db/tools/settle/TsFileAndModSettleTool.java | 360 +++++++++++++++++++++
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 73 ++---
.../{FilePathUtils.java => AggregateUtils.java} | 94 +-----
.../db/conf/adapter/CompressionRatioTest.java | 2 +-
.../org/apache/iotdb/db/constant/TestConstant.java | 30 ++
.../MergeTest.java => cache/ChunkCacheTest.java} | 196 +++++------
.../db/engine/compaction/CompactionChunkTest.java | 45 +--
.../compaction/LevelCompactionCacheTest.java | 7 +-
.../engine/compaction/LevelCompactionLogTest.java | 7 +-
.../compaction/LevelCompactionMergeTest.java | 7 +-
.../engine/compaction/LevelCompactionModsTest.java | 7 +-
.../compaction/LevelCompactionMoreDataTest.java | 64 ++--
.../compaction/LevelCompactionRecoverTest.java | 121 +++----
.../compaction/LevelCompactionSelectorTest.java | 7 +-
.../db/engine/compaction/LevelCompactionTest.java | 95 +++---
.../LevelCompactionTsFileManagementTest.java | 140 ++++----
.../NoCompactionTsFileManagementTest.java | 140 ++++----
.../iotdb/db/engine/merge/MergeOverLapTest.java | 43 +--
.../iotdb/db/engine/merge/MergeTaskTest.java | 7 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 46 +--
.../engine/storagegroup/TsFileProcessorTest.java | 15 +-
.../iotdb/db/integration/IoTDBFilePathUtilsIT.java | 8 +-
.../apache/iotdb/db/integration/IoTDBSettleIT.java | 94 ++++++
.../query/reader/series/SeriesReaderTestUtil.java | 45 +--
.../db/sync/sender/manage/SyncFileManagerTest.java | 2 +-
.../sender/recover/SyncSenderLogAnalyzerTest.java | 2 +-
.../db/sync/sender/transfer/SyncClientTest.java | 2 +-
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 238 ++++++++++++++
.../apache/iotdb/db/utils/EnvironmentUtils.java | 1 +
.../iotdb/db/utils/TsFileRewriteToolTest.java | 72 +++--
.../db/writelog/recover/SeqTsFileRecoverTest.java | 10 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 17 +-
.../read/controller/CachedChunkLoaderImpl.java | 3 +-
.../apache/iotdb/tsfile/utils/FilePathUtils.java | 126 ++++++++
.../apache/iotdb/tsfile/constant/TestConstant.java | 4 +
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 7 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 3 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 3 +-
.../read/query/timegenerator/ReadWriteTest.java | 8 +-
.../timegenerator/TimeGeneratorReadEmptyTest.java | 7 +-
.../timegenerator/TimeGeneratorReadWriteTest.java | 7 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 21 +-
.../apache/iotdb/tsfile/utils/FileGenerator.java | 36 ++-
.../iotdb/tsfile}/utils/FilePathUtilsTest.java | 36 +--
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 39 ++-
.../tsfile/write/DefaultSchemaTemplateTest.java | 6 +-
...SameMeasurementsWithDifferentDataTypesTest.java | 7 +-
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 7 +-
.../iotdb/tsfile/write/TsFileWriterTest.java | 17 +-
.../write/writer/ForceAppendTsFileWriterTest.java | 8 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 79 ++---
96 files changed, 2767 insertions(+), 951 deletions(-)