This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch aggrVector2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 45ccd62 Fix conflict
add 9d28f8c change tryToDeleteLastCache logger to debug
add efef85f Merge remote-tracking branch 'origin/master'
add 2d86da2 Merge remote-tracking branch 'origin/master'
add 1c6af88 Merge remote-tracking branch 'origin/master'
add 9c3da93 [IOTDB-1578] Set unsequnce when loading TsFile with the same
establish time (#4021)
add 9dd88f0 [IOTDB-1581] Consider deletions when recovering
tsFileResource of incomplete tsfile (#3804)
add 10aea61 [IOTDB-1719] client-cpp should firstly use thrift head files
in thrift src (#4009)
add c8d0da8 [IOTDB-1720] client-cpp: enhance Session codes (#4010)
add 07abef0 [IOTDB-1718] correct the position of "chmod + cmake" (#4007)
add 45248d4 Merge remote-tracking branch 'origin/master'
add f864bc6 [INFRA-22355] Enable GitHub wiki (#4023)
add 69ce3e5 Merge remote-tracking branch 'origin/master'
add 6cda81b enable github issue
add 1b7add1 enable github issues
add 5c7eb25 [IOTDB-1733] Fix dropping built-in function (#4026)
add 96b5269 [IOTDB-1730] client-cpp, enhance session::insertTablet()
etc.'s performance (#4022)
add 31c8b07 UserGuideReadme.md: fix "In Progress Version" link (#4029)
add 8ce16e9 Improve ContributeGuide.md and HowToCommit.md (#4030)
add a9f582e [IOTDB-1634][IOTDB-1571] Extend more aligned timeseries
insert APIs && Fix aligned timeseries wal cannot recover (#3917)
add bc3b736 [IOTDB-1026] Support wildcard ** in Path And Replace
PrefixPath usage with PathPattern in IOTDB-SQL (#3918)
add 4a0a116 Fix conflict
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 5 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 2 +-
checkstyle.xml | 2 +-
client-cpp/src/main/CMakeLists.txt | 5 +-
client-cpp/src/main/Session.cpp | 413 ++--
client-cpp/src/main/Session.h | 313 ++--
.../java/org/apache/iotdb/cluster/ClientMain.java | 2 +-
.../iotdb/cluster/coordinator/Coordinator.java | 2 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 8 +-
.../iotdb/cluster/log/applier/DataLogApplier.java | 6 +-
.../log/manage/PartitionedSnapshotLogManager.java | 11 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 79 +-
.../iotdb/cluster/partition/PartitionTable.java | 4 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 19 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 15 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 2 +-
.../cluster/server/member/MetaGroupMember.java | 2 +-
.../apache/iotdb/cluster/utils/ClusterUtils.java | 4 +-
.../cluster/server/member/DataGroupMemberTest.java | 2 +-
compile-tools/thrift/pom.xml | 38 +-
.../tests/tools/importCsv/ImportCsvTestIT.java | 8 +-
docs/Development/ContributeGuide.md | 12 +-
docs/Development/HowToCommit.md | 18 +
docs/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
docs/UserGuide/Appendix/SQL-Reference.md | 121 +-
.../Data-Concept/Data-Model-and-Terminology.md | 23 +-
.../DDL-Data-Definition-Language.md | 69 +-
.../DML-Data-Manipulation-Language.md | 2 +-
docs/UserGuide/UserGuideReadme.md | 2 +-
docs/zh/Development/ContributeGuide.md | 10 +
docs/zh/Development/HowToCommit.md | 18 +
.../zh/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
docs/zh/UserGuide/Appendix/SQL-Reference.md | 127 +-
.../Data-Concept/Data-Model-and-Terminology.md | 28 +-
.../DDL-Data-Definition-Language.md | 72 +-
.../DML-Data-Manipulation-Language.md | 17 +-
example/client-cpp-example/src/SessionExample.cpp | 3 +-
.../iotdb/AlignedTimeseriesSessionExample.java | 238 ++-
pom.xml | 2 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 3 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 6 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 12 +
.../iotdb/db/engine/merge/task/MergeTask.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 85 +-
.../db/engine/storagegroup/TsFileProcessor.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 976 +++++-----
.../java/org/apache/iotdb/db/metadata/MTree.java | 1963 --------------------
.../org/apache/iotdb/db/metadata/PartialPath.java | 47 +-
.../org/apache/iotdb/db/metadata/mnode/IMNode.java | 3 -
.../iotdb/db/metadata/mnode/InternalMNode.java | 24 -
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 6 -
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 1280 +++++++++++++
.../mtree/traverser/PathGrouperByStorageGroup.java | 103 +
.../db/metadata/mtree/traverser/Traverser.java | 235 +++
.../traverser/collector/CollectorTraverser.java | 93 +
.../traverser/collector/EntityPathCollector.java | 65 +
.../mtree/traverser/collector/MNodeCollector.java | 76 +
.../traverser/collector/MeasurementCollector.java | 134 ++
.../collector/MeasurementPathCollector.java | 60 +
.../collector/MeasurementSchemaCollector.java | 114 ++
.../collector/StorageGroupPathCollector.java | 65 +
.../traverser/collector/TSEntityPathCollector.java | 84 +
.../mtree/traverser/counter/CounterTraverser.java} | 26 +-
.../mtree/traverser/counter/EntityCounter.java} | 28 +-
.../traverser/counter/MNodeLevelCounter.java} | 42 +-
.../traverser/counter/MeasurementCounter.java | 79 +
.../traverser/counter/StorageGroupCounter.java} | 38 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 4 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 19 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 2 +-
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 92 +-
.../physical/crud/InsertRowsOfOneDevicePlan.java | 20 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 30 +-
.../iotdb/db/query/dataset/ShowDevicesDataSet.java | 3 +-
.../query/udf/service/UDFRegistrationService.java | 4 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 39 +-
.../db/tools/virtualsg/DeviceMappingViewer.java | 2 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 4 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 71 +-
.../writelog/recover/TsFileRecoverPerformer.java | 58 +-
.../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 249 ---
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 9 +-
.../db/integration/IoTDBAutoCreateSchemaIT.java | 50 -
.../apache/iotdb/db/integration/IoTDBCloseIT.java | 2 +-
.../iotdb/db/integration/IoTDBCompleteIT.java | 26 +-
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 2 +-
.../db/integration/IoTDBDeleteStorageGroupIT.java | 2 +-
.../db/integration/IoTDBDeleteTimeseriesIT.java | 4 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 6 +-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 6 +-
.../iotdb/db/integration/IoTDBExecuteBatchIT.java | 4 +-
.../db/integration/IoTDBFloatPrecisionIT.java | 4 +-
.../db/integration/IoTDBFlushQueryMergeIT.java | 2 +-
.../db/integration/IoTDBInsertWithQueryIT.java | 4 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 4 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 2 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 31 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 10 +-
.../iotdb/db/integration/IoTDBMultiDeviceIT.java | 14 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 7 +-
.../db/integration/IoTDBMultiStatementsIT.java | 3 +-
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 13 +-
.../db/integration/IoTDBQueryMemoryControlIT.java | 6 +-
.../iotdb/db/integration/IoTDBRestartIT.java | 4 +-
.../db/integration/IoTDBRpcCompressionIT.java | 6 +-
.../IoTDBSameMeasurementsDifferentTypesIT.java | 3 +-
.../iotdb/db/integration/IoTDBSensorUpdateIT.java | 4 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 2 +-
.../IoTDBSetSystemReadOnlyWritableIT.java | 2 +-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 20 +-
.../apache/iotdb/db/integration/IoTDBTagIT.java | 9 +-
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 4 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 2 +-
.../iotdb/db/integration/IoTDBUDFManagementIT.java | 21 +
.../aggregation/IoTDBAggregationSmallDataIT.java | 2 +-
.../db/integration/auth/IoTDBAuthorizationIT.java | 6 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 12 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 139 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 276 ++-
.../apache/iotdb/db/metadata/PartialPathTest.java | 8 +
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 3 +-
.../iotdb/db/qp/logical/LogicalPlanSmallTest.java | 6 +-
.../iotdb/db/qp/physical/InsertRowPlanTest.java | 2 +
.../db/qp/physical/InsertTabletMultiPlanTest.java | 3 +-
.../iotdb/db/qp/physical/InsertTabletPlanTest.java | 23 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 2 +-
.../iotdb/db/query/dataset/SingleDataSetTest.java | 2 +-
.../apache/iotdb/db/sink/LocalIoTDBSinkTest.java | 4 +-
.../org/apache/iotdb/db/sink/MQTTSinkTest.java | 4 +-
.../db/utils/datastructure/PrecisionTest.java | 8 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 251 ++-
.../java/org/apache/iotdb/session/Session.java | 330 +++-
.../apache/iotdb/session/SessionConnection.java | 6 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 189 ++
.../iotdb/session/IoTDBSessionComplexIT.java | 6 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 6 +-
.../session/IoTDBSessionVectorRawDataQueryIT.java | 262 ++-
.../apache/iotdb/session/SessionCacheLeaderUT.java | 10 +-
.../org/apache/iotdb/spark/db/IoTDBTest.scala | 14 +-
.../test/java/org/apache/iotdb/db/sql/Cases.java | 4 +-
thrift/src/main/thrift/rpc.thrift | 15 +-
.../java/org/apache/iotdb/tsfile/utils/BitMap.java | 15 +
144 files changed, 5779 insertions(+), 4078 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/PathGrouperByStorageGroup.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/Traverser.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/CollectorTraverser.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/EntityPathCollector.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeCollector.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MeasurementCollector.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MeasurementPathCollector.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MeasurementSchemaCollector.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/StorageGroupPathCollector.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/TSEntityPathCollector.java
copy
server/src/main/java/org/apache/iotdb/db/{qp/physical/sys/ShowTTLPlan.java =>
metadata/mtree/traverser/counter/CounterTraverser.java} (62%)
copy
server/src/main/java/org/apache/iotdb/db/{qp/physical/sys/ShowTTLPlan.java =>
metadata/mtree/traverser/counter/EntityCounter.java} (57%)
copy
server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/NaivePathSelector.java
=> metadata/mtree/traverser/counter/MNodeLevelCounter.java} (53%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementCounter.java
copy
server/src/main/java/org/apache/iotdb/db/{query/dataset/SingleDataSet.java =>
metadata/mtree/traverser/counter/StorageGroupCounter.java} (55%)
delete mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAddSubDeviceIT.java