This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch xkf_id_table_flush_time in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9b10a3d2c661c69fad640157a7f6cf5e04d9b406 Merge: 3b4bcf5 2173678 Author: 151250176 <[email protected]> AuthorDate: Tue Jan 11 14:24:28 2022 +0800 Merge branch 'master' of https://github.com/apache/iotdb into xkf_id_table_flush_time .gitignore | 1 + NOTICE | 2 +- NOTICE-binary | 2 +- .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +- .../org/apache/iotdb/cli/utils/JlineUtils.java | 4 +- .../main/java/org/apache/iotdb/tool/ExportCsv.java | 2 +- client-cpp/src/main/CMakeLists.txt | 4 +- client-cpp/src/main/Session.cpp | 522 +++- client-cpp/src/main/Session.h | 234 +- client-cpp/src/test/CMakeLists.txt | 2 +- client-py/SessionAlignedTimeseriesExample.py | 197 ++ client-py/SessionAlignedTimeseriesTest.py | 280 ++ client-py/iotdb/Session.py | 211 +- client-py/iotdb/utils/IoTDBConstants.py | 11 +- .../java/org/apache/iotdb/cluster/ClientMain.java | 4 +- .../apache/iotdb/cluster/metadata/MetaPuller.java | 4 +- .../caller/PullMeasurementSchemaHandler.java | 4 +- .../iotdb/cluster/utils/ClusterQueryUtils.java | 5 +- .../cluster/client/sync/SyncClientAdaptorTest.java | 4 +- .../org/apache/iotdb/cluster/common/IoTDBTest.java | 5 +- .../org/apache/iotdb/cluster/common/TestUtils.java | 8 +- .../query/ClusterDataQueryExecutorTest.java | 8 +- docs/UserGuide/Advanced-Features/Select-Into.md | 19 +- docs/UserGuide/Advanced-Features/Triggers.md | 10 +- docs/UserGuide/Appendix/SQL-Reference.md | 16 +- .../UserGuide/Ecosystem Integration/Spark IoTDB.md | 39 +- .../DDL-Data-Definition-Language.md | 60 +- .../DML-Data-Manipulation-Language.md | 73 +- docs/zh/UserGuide/Advanced-Features/Select-Into.md | 20 +- docs/zh/UserGuide/Advanced-Features/Triggers.md | 10 +- docs/zh/UserGuide/Appendix/SQL-Reference.md | 16 +- .../UserGuide/Ecosystem Integration/Spark IoTDB.md | 71 +- .../DDL-Data-Definition-Language.md | 60 +- .../DML-Data-Manipulation-Language.md | 66 +- example/client-cpp-example/pom.xml | 4 + .../src/AlignedTimeseriesSessionExample.cpp | 322 +++ example/client-cpp-example/src/CMakeLists.txt | 8 +- example/client-cpp-example/src/SessionExample.cpp | 230 +- .../apache/iotdb/flink/FlinkTsFileBatchSink.java | 11 +- .../apache/iotdb/flink/FlinkTsFileStreamSink.java | 11 +- .../java/org/apache/iotdb/flink/TsFileUtils.java | 9 +- .../iotdb/hadoop/tsfile/TSMRWriteExample.java | 6 +- .../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 13 +- .../iotdb/hadoop/tsfile/TsFileWriteToHDFS.java | 8 +- .../iotdb/AlignedTimeseriesSessionExample.java | 39 +- .../org/apache/iotdb/DataMigrationExample.java | 7 +- .../iotdb/HybridTimeseriesSessionExample.java | 9 +- .../org/apache/iotdb/SessionConcurrentExample.java | 11 +- .../main/java/org/apache/iotdb/SessionExample.java | 27 +- .../main/java/org/apache/iotdb/TabletExample.java | 7 +- .../org/apache/iotdb/trigger/TriggerExample.java | 28 +- .../iotdb/tsfile/TsFileForceAppendWrite.java | 14 +- .../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 + .../tsfile/TsFileWriteAlignedWithTSRecord.java | 10 +- .../iotdb/tsfile/TsFileWriteAlignedWithTablet.java | 25 +- .../iotdb/tsfile/TsFileWriteWithTSRecord.java | 10 +- .../apache/iotdb/tsfile/TsFileWriteWithTablet.java | 15 +- .../java/org/apache/iotdb/udf/UDTFExample.java | 19 +- .../tsfile/RowTsFileOutputFormatTestBase.java | 10 +- .../apache/iotdb/flink/util/TsFileWriteUtil.java | 18 +- grafana-plugin/package.json | 3 +- grafana-plugin/pom.xml | 6 +- grafana-plugin/yarn.lock | 482 ++-- .../iotdb/hadoop/tsfile/TsFileTestHelper.java | 9 +- .../org/apache/iotdb/hive/TsFileTestHelper.java | 9 +- .../db/integration/IoTDBContinuousQueryIT.java | 8 +- .../iotdb/db/integration/IoTDBDeletionIT.java | 27 + ...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 4 +- .../apache/iotdb/db/integration/IoTDBMergeIT.java | 6 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 153 +- .../iotdb/db/integration/IoTDBSelectIntoIT.java | 55 + .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 10 +- .../db/integration/IoTDBTriggerManagementIT.java | 40 +- .../{ => aligned}/IOTDBInsertAlignedValuesIT.java | 57 +- .../db/integration/aligned/IoTDBDeletionIT.java | 31 + .../aligned/IoTDBLoadExternalAlignedTsFileIT.java | 832 ++++++ .../db/integration/auth/IoTDBAuthorizationIT.java | 38 +- .../iotdb/session/IoTDBSessionComplexIT.java | 27 +- .../iotdb/session/IoTDBSessionIteratorIT.java | 6 +- .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 78 +- jenkins.pom | 1 + pom.xml | 2 +- .../resources/conf/iotdb-engine.properties | 26 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 92 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 38 +- .../apache/iotdb/db/cq/ContinuousQueryService.java | 147 +- .../apache/iotdb/db/cq/ContinuousQueryTask.java | 73 +- .../db/cq/ContinuousQueryTaskPoolManager.java | 15 +- .../compaction/CompactionTaskComparator.java | 14 +- .../engine/compaction/CompactionTaskManager.java | 10 + .../sizetiered/SizeTieredCompactionSelector.java | 6 +- .../inner/sizetiered/SizeTieredCompactionTask.java | 17 +- .../inner/utils/InnerSpaceCompactionUtils.java | 496 +--- .../inner/utils/MultiTsFileDeviceIterator.java | 251 ++ .../utils/SingleSeriesCompactionExecutor.java | 328 +++ .../engine/memtable/AlignedWritableMemChunk.java | 12 +- .../memtable/AlignedWritableMemChunkGroup.java | 7 +- .../selectinto/InsertTabletPlanGenerator.java | 8 +- .../selectinto/InsertTabletPlansIterator.java | 8 +- .../db/engine/storagegroup/TsFileProcessor.java | 3 + .../storagegroup/VirtualStorageGroupProcessor.java | 65 +- .../service/TriggerRegistrationService.java | 54 +- .../db/exception/ContinuousQueryException.java | 6 + .../org/apache/iotdb/db/metadata/MManager.java | 19 +- .../idtable/entry/InsertMeasurementMNode.java | 4 +- .../iotdb/db/metadata/logfile/MLogWriter.java | 4 +- .../org/apache/iotdb/db/metadata/mtree/MTree.java | 22 +- .../counter/MeasurementGroupByLevelCounter.java | 74 + .../iotdb/db/metadata/path/MeasurementPath.java | 4 +- .../apache/iotdb/db/metadata/tag/TagManager.java | 7 + .../iotdb/db/metadata/template/Template.java | 13 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 86 +- .../db/qp/logical/crud/SelectIntoOperator.java | 10 +- .../iotdb/db/qp/physical/crud/InsertRowPlan.java | 4 +- .../iotdb/db/qp/physical/crud/SelectIntoPlan.java | 18 +- .../db/qp/physical/sys/MeasurementMNodePlan.java | 4 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 1 + .../iotdb/db/qp/strategy/LogicalChecker.java | 5 + .../iotdb/db/query/dataset/ShowDevicesDataSet.java | 16 +- .../iotdb/db/query/dataset/ShowDevicesResult.java | 31 +- .../db/service/thrift/impl/TSServiceImpl.java | 11 +- .../apache/iotdb/db/tools/TsFileRewriteTool.java | 18 +- .../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 10 +- .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 47 +- .../org/apache/iotdb/db/utils/SchemaUtils.java | 4 +- .../db/utils/datastructure/AlignedTVList.java | 31 +- .../writelog/manager/MultiFileLogNodeManager.java | 38 +- .../db/engine/cache/BloomFilterCacheTest.java | 13 +- .../iotdb/db/engine/cache/ChunkCacheTest.java | 12 +- .../engine/compaction/CompactionSchedulerTest.java | 3035 +++++++++++--------- .../compaction/CompactionTaskComparatorTest.java | 4 +- .../engine/compaction/cross/MergeOverLapTest.java | 4 +- .../db/engine/compaction/cross/MergeTaskTest.java | 4 +- .../db/engine/compaction/cross/MergeTest.java | 12 +- .../engine/compaction/cross/MergeUpgradeTest.java | 11 +- .../inner/AbstractInnerSpaceCompactionTest.java | 12 +- .../compaction/inner/InnerCompactionChunkTest.java | 246 -- .../inner/InnerCompactionMoreDataTest.java | 10 +- .../compaction/inner/InnerCompactionTest.java | 12 +- .../compaction/inner/InnerSeqCompactionTest.java | 989 ++++--- .../InnerSpaceCompactionUtilsNoAlignedTest.java | 827 ++++++ ....java => InnerSpaceCompactionUtilsOldTest.java} | 11 +- .../compaction/inner/InnerUnseqCompactionTest.java | 6 +- .../SizeTieredCompactionHandleExceptionTest.java | 192 +- .../inner/sizetiered/SizeTieredCompactionTest.java | 12 +- .../recover/SizeTieredCompactionRecoverTest.java | 46 + .../compaction/utils/CompactionCheckerUtils.java | 76 +- .../compaction/utils/CompactionClearUtils.java | 16 +- .../utils/CompactionFileGeneratorUtils.java | 6 +- .../db/engine/memtable/MemTableTestUtils.java | 13 +- .../db/engine/memtable/MemtableBenchmark.java | 4 +- .../db/engine/memtable/PrimitiveMemTableTest.java | 50 +- .../storagegroup/StorageGroupProcessorTest.java | 20 +- .../iotdb/db/engine/storagegroup/TTLTest.java | 14 +- .../engine/storagegroup/TsFileProcessorTest.java | 10 +- .../iotdb/db/metadata/MManagerBasicTest.java | 68 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 73 + .../org/apache/iotdb/db/metadata/TemplateTest.java | 6 +- .../db/qp/physical/InsertTabletMultiPlanTest.java | 99 + .../iotdb/db/query/dataset/ListDataSetTest.java | 23 +- .../db/query/dataset/ShowDevicesResultTest.java | 3 +- .../reader/series/SeriesAggregateReaderTest.java | 4 +- .../reader/series/SeriesReaderByTimestampTest.java | 4 +- .../db/query/reader/series/SeriesReaderTest.java | 4 +- .../query/reader/series/SeriesReaderTestUtil.java | 21 +- .../iotdb/db/rescon/ResourceManagerTest.java | 14 +- .../iotdb/db/tools/TsFileAndModSettleToolTest.java | 5 +- .../iotdb/db/tools/TsFileSketchToolTest.java | 15 +- .../iotdb/db/utils/TsFileRewriteToolTest.java | 10 +- .../db/writelog/recover/DeviceStringTest.java | 8 +- .../iotdb/db/writelog/recover/LogReplayerTest.java | 6 +- .../recover/RecoverResourceFromReaderTest.java | 12 +- .../db/writelog/recover/SeqTsFileRecoverTest.java | 12 +- .../writelog/recover/UnseqTsFileRecoverTest.java | 12 +- .../java/org/apache/iotdb/session/Session.java | 4 +- .../apache/iotdb/session/util/SessionUtils.java | 17 +- .../session/IoTDBSessionDisableMemControlIT.java | 19 +- .../session/IoTDBSessionVectorAggregationIT.java | 9 +- .../iotdb/session/IoTDBSessionVectorInsertIT.java | 17 +- .../apache/iotdb/session/SessionCacheLeaderUT.java | 27 +- .../java/org/apache/iotdb/session/SessionTest.java | 17 +- spark-iotdb-connector/pom.xml | 29 +- .../org/apache/iotdb/spark/db/DataFrameTools.scala | 131 + .../org/apache/iotdb/spark/db/DefaultSource.scala | 4 +- .../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala | 9 +- .../org/apache/iotdb/spark/db/SQLConstant.scala} | 13 +- .../org/apache/iotdb/spark/db/Transformer.scala | 18 +- .../iotdb/spark/db/tools/DataFrameTools.java | 162 -- .../org/apache/iotdb/spark/db/IoTDBWriteTest.scala | 30 +- .../DataFrameToolsTest.scala} | 63 +- .../iotdb/spark/tsfile/NarrowConverter.scala | 6 +- .../apache/iotdb/spark/tsfile/WideConverter.scala | 6 +- .../org/apache/iotdb/spark/tool/TsFileExample.java | 10 +- .../apache/iotdb/spark/tool/TsFileWriteTool.java | 22 +- .../test/java/org/apache/iotdb/db/sql/Cases.java | 57 +- .../iotdb/tsfile/read/TsFileDeviceIterator.java | 73 + .../iotdb/tsfile/read/TsFileSequenceReader.java | 93 +- .../org/apache/iotdb/tsfile/read/common/Chunk.java | 2 +- .../iotdb/tsfile/utils/MeasurementGroup.java | 15 +- .../apache/iotdb/tsfile/write/TsFileWriter.java | 30 +- .../write/chunk/AlignedChunkGroupWriterImpl.java | 10 +- .../tsfile/write/chunk/IChunkGroupWriter.java | 6 +- .../chunk/NonAlignedChunkGroupWriterImpl.java | 7 +- .../apache/iotdb/tsfile/write/record/Tablet.java | 20 +- ...asurementSchema.java => MeasurementSchema.java} | 32 +- .../apache/iotdb/tsfile/write/schema/Schema.java | 6 +- .../tsfile/file/metadata/utils/TestHelper.java | 6 +- .../apache/iotdb/tsfile/read/TsFileReaderTest.java | 44 +- .../read/query/timegenerator/ReadWriteTest.java | 8 +- .../timegenerator/TimeGeneratorReadEmptyTest.java | 8 +- .../timegenerator/TimeGeneratorReadWriteTest.java | 6 +- .../TsFileGeneratorForSeriesReaderByTimestamp.java | 26 +- .../apache/iotdb/tsfile/utils/FileGenerator.java | 28 +- .../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 18 +- .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 64 +- .../tsfile/write/DefaultSchemaTemplateTest.java | 13 +- .../tsfile/write/MetadataIndexConstructorTest.java | 13 +- .../org/apache/iotdb/tsfile/write/PerfTest.java | 24 +- .../iotdb/tsfile/write/ReadPageInMemTest.java | 26 +- ...SameMeasurementsWithDifferentDataTypesTest.java | 12 +- .../iotdb/tsfile/write/TsFileIOWriterTest.java | 12 +- .../iotdb/tsfile/write/TsFileReadWriteTest.java | 8 +- .../iotdb/tsfile/write/TsFileWriteApiTest.java | 40 +- .../iotdb/tsfile/write/TsFileWriterTest.java | 44 +- .../org/apache/iotdb/tsfile/write/WriteTest.java | 16 +- .../write/schema/converter/SchemaBuilderTest.java | 20 +- .../write/writer/ForceAppendTsFileWriterTest.java | 10 +- .../writer/MeasurementSchemaSerializeTest.java | 14 +- .../iotdb/tsfile/write/writer/PageWriterTest.java | 14 +- .../write/writer/RestorableTsFileIOWriterTest.java | 52 +- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 9 +- 232 files changed, 9411 insertions(+), 5045 deletions(-)
