This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a change to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from b99c266 init test client with category
add 109e8c0 [IOTDB-1428] Ask query threads to quit if query is timeout
(#4071)
add f79a31b [IOTDB-1793] Support insert Tablet with null value in python
client (#4080)
add a85decf [DOCUMENTATION] Add little note to clarify result of last
point query (#4082)
add bb8c7fa fix inline code format in Measurement-Template.md (#4088)
add 726f259 [IOTDB-1797][IOTDB-1799] Compatibility of Apache IoTDB with
InfluxDB - Intergration Framework (#4081)
add fd301c3 [DOCUMENTATION] fix bold syntax error (#4092)
add 8bd13e5 CI failed because of setStorageGroup in selectIntoIT (#4086)
add 25a8e98 [IOTDB-1742] Fix test bug caused by restart error of virtual
storage groups (#4083)
add 96ee5a8 [IOTDB-1372]Enhance management of TsFileResource (#4003)
add 2cb9336 fix ci (#4094)
add c179fb9 [IOTDB-1758] sync-tool, empty uuid file cause tool can not
auto-recovery (#4054)
add ed159df [IOTDB-1798] Compatibility of Apache IoTDB with InfluxDB -
`flush` / `ping` / `version` (#4091)
add c1e43e2 [IOTDB-1778] Support nullable fields in insertTablet
(cluster) (#4093)
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)
add 40397fd init dummyIndex after restart cluster (#3939)
add d1beffc [IOTDB-1818] Activate dependabot on rel/0.12 (#4105)
add bc4f548 Bump org.slf4j.version from 1.7.30 to 1.7.32 (#4100)
add edbb361 Bump maven-compiler-plugin from 3.3 to 3.8.1 (#4101)
add 326f43e Merge branch 'master' into cluster-
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 2 +-
.github/dependabot.yml | 43 +++
.github/workflows/influxdb-protocol.yml | 64 ++++
.github/workflows/main-unix.yml | 3 +-
.github/workflows/main-win.yml | 31 +-
.github/workflows/sonar-coveralls.yml | 2 +-
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 12 +-
client-py/SessionExample.py | 13 +
client-py/SessionTest.py | 63 +++-
client-py/iotdb/Session.py | 2 +-
.../cleanup.sh => client-py/iotdb/utils/BitMap.py | 16 +-
client-py/iotdb/utils/Tablet.py | 87 ++++-
.../iotdb/cluster/log/StableEntryManager.java | 6 +
.../cluster/log/manage/CommittedEntryManager.java | 12 +
.../iotdb/cluster/log/manage/RaftLogManager.java | 6 +-
.../serializable/SyncLogDequeSerializer.java | 25 ++
.../iotdb/cluster/log/snapshot/FileSnapshot.java | 13 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 16 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 6 +-
.../iotdb/cluster/query/RemoteQueryContext.java | 5 +-
.../cluster/query/filter/SlotTsFileFilter.java | 5 +-
.../iotdb/cluster/server/ClusterTSServiceImpl.java | 6 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 5 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 2 +-
docs/UserGuide/Data-Concept/Data-Type.md | 12 +-
docs/UserGuide/Data-Concept/Encoding.md | 4 +-
.../UserGuide/Data-Concept/Measurement-Template.md | 2 +-
.../DML-Data-Manipulation-Language.md | 22 +-
.../IoTDB-SQL-Language/Maintenance-Command.md | 4 +-
.../System-Tools/Monitor-and-Log-Tools.md | 6 +-
.../zh/UserGuide/API/InfluxDB-Protocol.md | 22 +-
docs/zh/UserGuide/Advanced-Features/Triggers.md | 2 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 8 +-
docs/zh/UserGuide/Data-Concept/Data-Type.md | 14 +-
docs/zh/UserGuide/Data-Concept/Encoding.md | 4 +-
.../UserGuide/Data-Concept/Measurement-Template.md | 2 +-
.../DML-Data-Manipulation-Language.md | 16 +-
.../IoTDB-SQL-Language/Maintenance-Command.md | 3 +-
.../System-Tools/Monitor-and-Log-Tools.md | 4 +-
example/trigger/pom.xml | 2 +-
example/udf/pom.xml | 2 +-
hive-connector/pom.xml | 2 +-
{antlr => influxdb-protocol}/pom.xml | 61 ++-
.../org/apache/iotdb/influxdb/IoTDBInfluxDB.java | 411 +++++++++++++++++++++
.../iotdb/influxdb/IoTDBInfluxDBFactory.java | 69 ++++
.../apache/iotdb/influxdb/IoTDBInfluxDBUtils.java | 21 +-
.../iotdb/influxdb/example/InfluxDBExample.java | 102 +++++
.../influxdb/integration/IoTDBInfluxDBIT.java | 125 +++++++
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 12 +-
jenkins.pom | 2 +-
pom.xml | 60 ++-
server/pom.xml | 3 +-
.../resources/conf/iotdb-engine.properties | 5 +-
.../mLogParser.bat => tsfileToolSet/settle.bat} | 6 +-
.../mLogParser.sh => tsfileToolSet/settle.sh} | 6 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 20 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 90 +++--
.../apache/iotdb/db/engine/cache/ChunkCache.java | 4 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 15 +-
.../compaction/CompactionMergeTaskPoolManager.java | 2 +-
.../level/LevelCompactionTsFileManagement.java | 15 +
.../no/NoCompactionTsFileManagement.java | 8 +
.../apache/iotdb/db/engine/settle/SettleLog.java | 116 ++++++
.../apache/iotdb/db/engine/settle/SettleTask.java | 108 ++++++
.../engine/storagegroup/StorageGroupProcessor.java | 340 +++++++++++------
.../db/engine/storagegroup/TsFileResource.java | 49 ++-
.../storagegroup/timeindex/DeviceTimeIndex.java | 70 +++-
.../storagegroup/timeindex/FileTimeIndex.java | 24 +-
.../engine/storagegroup/timeindex/ITimeIndex.java | 24 ++
.../virtualSg/HashVirtualPartitioner.java | 6 -
.../virtualSg/VirtualStorageGroupManager.java | 22 ++
.../query/QueryTimeoutRuntimeException.java | 4 +-
.../org/apache/iotdb/db/metadata/MManager.java | 2 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 27 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 62 +++-
.../org/apache/iotdb/db/qp/logical/Operator.java | 4 +-
...ePartitionOperator.java => SettleOperator.java} | 45 ++-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 8 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 10 +-
.../sys/{ClearCachePlan.java => SettlePlan.java} | 44 ++-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 19 +
.../iotdb/db/query/context/QueryContext.java | 70 +++-
.../iotdb/db/query/control/FileReaderManager.java | 2 -
.../db/query/control/QueryResourceManager.java | 2 +-
.../iotdb/db/query/control/QueryTimeManager.java | 142 +++----
.../dataset/RawQueryDataSetWithoutValueFilter.java | 9 +-
.../query/dataset/groupby/GroupByTimeDataSet.java | 4 +-
.../db/query/executor/AggregationExecutor.java | 4 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 12 +-
.../iotdb/db/rescon/TsFileResourceManager.java | 121 ++++++
.../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 ++++++++++
.../org/apache/iotdb/db/service/TSServiceImpl.java | 31 +-
.../receiver/recover/SyncReceiverLogAnalyzer.java | 2 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 2 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 34 +-
.../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} | 193 +++++-----
.../db/engine/compaction/CompactionChunkTest.java | 45 ++-
.../compaction/LevelCompactionCacheTest.java | 7 +-
.../engine/compaction/LevelCompactionLogTest.java | 7 +-
.../compaction/LevelCompactionMergeTest.java | 29 +-
.../engine/compaction/LevelCompactionModsTest.java | 7 +-
.../compaction/LevelCompactionMoreDataTest.java | 69 ++--
.../compaction/LevelCompactionRecoverTest.java | 171 +++++----
.../compaction/LevelCompactionSelectorTest.java | 7 +-
.../db/engine/compaction/LevelCompactionTest.java | 98 ++---
.../LevelCompactionTsFileManagementTest.java | 140 +++----
.../NoCompactionTsFileManagementTest.java | 140 +++----
.../iotdb/db/engine/merge/MergeOverLapTest.java | 48 +--
.../iotdb/db/engine/merge/MergeTaskTest.java | 34 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 49 +--
.../storagegroup/StorageGroupProcessorTest.java | 3 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 3 -
.../engine/storagegroup/TsFileProcessorTest.java | 15 +-
.../iotdb/db/integration/IoTDBCompleteIT.java | 9 +-
.../db/integration/IoTDBContinuousQueryIT.java | 4 -
.../iotdb/db/integration/IoTDBFilePathUtilsIT.java | 8 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 12 +-
.../integration/IoTDBManageTsFileResourceIT.java | 291 +++++++++++++++
.../iotdb/db/integration/IoTDBQueryTimeoutIT.java | 4 +-
.../iotdb/db/integration/IoTDBSelectIntoIT.java | 2 -
.../db/integration/IoTDBSequenceDataQueryIT.java | 20 -
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 23 --
.../{IoTDBResultSetIT.java => IoTDBSettleIT.java} | 80 ++--
.../iotdb/db/metadata/MManagerBasicTest.java | 21 +-
.../reader/series/SeriesAggregateReaderTest.java | 9 +-
.../reader/series/SeriesReaderByTimestampTest.java | 9 +-
.../db/query/reader/series/SeriesReaderTest.java | 8 +-
.../query/reader/series/SeriesReaderTestUtil.java | 45 +--
.../iotdb/db/rescon/ResourceManagerTest.java | 401 ++++++++++++++++++++
.../db/sync/receiver/load/FileLoaderTest.java | 9 +-
.../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 | 9 +
.../iotdb/db/utils/TsFileRewriteToolTest.java | 72 +++-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 10 +-
.../java/org/apache/iotdb/session/Session.java | 14 +-
site/src/main/.vuepress/config.js | 3 +-
.../test/java/org/apache/iotdb/db/sql/Cases.java | 52 +++
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 17 +-
.../read/controller/CachedChunkLoaderImpl.java | 3 +-
.../java/org/apache/iotdb/tsfile/utils/BitMap.java | 37 +-
.../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 ++--
zeppelin-interpreter/pom.xml | 2 +-
175 files changed, 5230 insertions(+), 1592 deletions(-)
create mode 100644 .github/dependabot.yml
create mode 100644 .github/workflows/influxdb-protocol.yml
copy test/e2e/cases/cli/cleanup.sh => client-py/iotdb/utils/BitMap.py (69%)
mode change 100755 => 100644
copy server/file-changelists/TsFileMods-changelist.md =>
docs/zh/UserGuide/API/InfluxDB-Protocol.md (70%)
copy {antlr => influxdb-protocol}/pom.xml (55%)
create mode 100644
influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/IoTDBInfluxDB.java
create mode 100644
influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/IoTDBInfluxDBFactory.java
copy cluster/src/main/java/org/apache/iotdb/cluster/log/LogApplier.java =>
influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/IoTDBInfluxDBUtils.java
(62%)
create mode 100644
influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/example/InfluxDBExample.java
create mode 100644
influxdb-protocol/src/test/java/org/apache/iotdb/influxdb/integration/IoTDBInfluxDBIT.java
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/{DeletePartitionOperator.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/rescon/TsFileResourceManager.java
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} (59%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBManageTsFileResourceIT.java
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/rescon/ResourceManagerTest.java
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%)
