This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 107f83a add tsfilemanage-merge (#1597)
add 11962e5 [merge]Fix partition and sonar (#1654)
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 37 +---
.../DDL Data Definition Language.md | 9 +
.../DDL Data Definition Language.md | 9 +
.../zh/UserGuide/Operation Manual/SQL Reference.md | 2 +-
.../org/apache/iotdb/DataMigrationExample.java | 185 ++++++++++++++++
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 6 +-
.../resources/conf/iotdb-engine.properties | 4 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 38 ++--
.../org/apache/iotdb/db/engine/StorageEngine.java | 13 ++
.../iotdb/db/engine/memtable/AbstractMemTable.java | 5 +
.../engine/storagegroup/StorageGroupProcessor.java | 16 +-
.../HotCompactionMergeTaskPoolManager.java | 18 +-
.../engine/tsfilemanagement/TsFileManagement.java | 21 +-
.../tsfilemanagement/TsFileManagementStrategy.java | 8 +-
.../level/LevelTsFileManagement.java | 237 +++++++++++++--------
.../normal/NormalTsFileManagement.java | 14 +-
.../tsfilemanagement/utils/HotCompactionUtils.java | 9 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 18 +-
.../writelog/recover/TsFileRecoverPerformer.java | 5 +
.../storagegroup/StorageGroupProcessorTest.java | 4 +-
.../engine/storagegroup/TsFileProcessorTest.java | 5 +
.../db/integration/IoTDBDeleteTimeseriesIT.java | 120 +++++++++++
.../db/integration/IoTDBLoadExternalTsfileIT.java | 4 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 12 +-
.../db/integration/IoTDBRemovePartitionIT.java | 5 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 4 +-
.../db/sync/receiver/load/FileLoaderTest.java | 2 +
.../recover/SyncReceiverLogAnalyzerTest.java | 24 ++-
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 4 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 5 +-
30 files changed, 593 insertions(+), 250 deletions(-)
create mode 100644
example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteTimeseriesIT.java
