This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty_new_vector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 68df8b013632463f70cd21b2a0bd14d266e6a7d5 Merge: dd25c97 2f62994 Author: JackieTien97 <[email protected]> AuthorDate: Tue Nov 23 09:18:30 2021 +0800 resolve conflicts .../java/org/apache/iotdb/cli/AbstractCli.java | 2 +- .../main/java/org/apache/iotdb/tool/ExportCsv.java | 4 +- .../main/java/org/apache/iotdb/tool/ImportCsv.java | 10 +- client-py/SessionExample.py | 4 +- client-py/iotdb/utils/BitMap.py | 3 +- client-py/iotdb/utils/IoTDBConstants.py | 1 + client-py/iotdb/utils/IoTDBRpcDataSet.py | 138 ++++++++++- client-py/iotdb/utils/SessionDataSet.py | 26 +-- client-py/iotdb/utils/Tablet.py | 10 +- client-py/tests/tablet_performance_comparison.py | 129 ++++++---- client-py/tests/test_dataframe.py | 29 ++- client-py/tests/test_todf.py | 216 +++++++++++++++++ .../org/apache/iotdb/cluster/ClusterIoTDB.java | 4 + .../log/snapshot/PullSnapshotTaskDescriptor.java | 2 +- .../apache/iotdb/cluster/metadata/CMManager.java | 8 +- .../cluster/partition/NodeAdditionResult.java | 4 +- .../iotdb/cluster/partition/NodeRemovalResult.java | 4 +- .../iotdb/cluster/partition/PartitionGroup.java | 33 ++- .../iotdb/cluster/partition/PartitionTable.java | 6 +- .../partition/balancer/DefaultSlotBalancer.java | 6 +- .../cluster/partition/balancer/SlotBalancer.java | 4 +- .../iotdb/cluster/partition/slot/SlotManager.java | 2 +- .../partition/slot/SlotNodeAdditionResult.java | 2 +- .../cluster/partition/slot/SlotPartitionTable.java | 48 ++-- .../iotdb/cluster/partition/slot/SlotStrategy.java | 2 +- .../partition/slot/SlotTimePartitionFilter.java | 3 +- .../iotdb/cluster/query/ClusterPlanExecutor.java | 6 +- .../cluster/query/aggregate/ClusterAggregator.java | 3 +- .../cluster/query/fill/ClusterPreviousFill.java | 2 +- .../query/last/ClusterLastQueryExecutor.java | 2 +- .../manage/ClusterSessionManager.java} | 101 +++----- .../cluster/query/reader/ClusterReaderFactory.java | 6 +- .../iotdb/cluster/server/ClusterTSServiceImpl.java | 79 +------ .../cluster/server/PullSnapshotHintService.java | 2 +- .../iotdb/cluster/server/StoppedMemberManager.java | 2 +- .../cluster/server/member/DataGroupMember.java | 7 +- .../cluster/server/member/MetaGroupMember.java | 4 +- .../iotdb/cluster/server/member/RaftMember.java | 2 +- .../cluster/server/service/DataGroupEngine.java | 4 +- .../cluster/utils/nodetool/ClusterMonitor.java | 2 +- .../cluster/utils/nodetool/function/Slot.java | 2 +- .../cluster/partition/SlotPartitionTableTest.java | 2 +- .../server/heartbeat/MetaHeartbeatThreadTest.java | 2 +- .../iotdb/cluster/server/member/BaseMember.java | 4 +- .../cluster/server/member/DataGroupMemberTest.java | 13 +- .../cluster/server/member/RaftMemberTest.java | 4 +- docs/UserGuide/API/Programming-Java-Native-API.md | 38 +-- .../IoTDB-SQL-Language/Maintenance-Command.md | 4 + .../UserGuide/API/Programming-Java-Native-API.md | 23 +- .../IoTDB-SQL-Language/Maintenance-Command.md | 3 + .../iotdb/AlignedTimeseriesSessionExample.java | 46 ++-- .../org/apache/iotdb/SessionConcurrentExample.java | 46 ++-- .../main/java/org/apache/iotdb/SessionExample.java | 46 ++-- .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 2 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 2 +- .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 58 ++--- .../dropwizard/DropwizardMetricManager.java | 134 ++++++----- .../dropwizard/type/DropwizardHistogram.java | 5 - .../dropwizard/DropwizardMetricManagerTest.java | 15 +- .../org/apache/iotdb/metrics/MetricManager.java | 6 +- .../iotdb/metrics/impl/DoNothingHistogram.java | 4 - .../org/apache/iotdb/metrics/type/Histogram.java | 3 - .../micrometer/MicrometerMetricManager.java | 162 ++++++++----- .../micrometer/type/MicrometerHistogram.java | 5 - .../micrometer/MicrometerMetricManagerTest.java | 52 +++++ .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 8 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 8 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 4 +- .../db/engine/compaction/TsFileIdentifier.java | 2 +- .../compaction/cross/CrossCompactionStrategy.java | 2 +- .../compaction/inner/InnerCompactionStrategy.java | 2 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 5 +- .../iotdb/db/engine/flush/NotifyFlushMemTable.java | 12 - .../iotdb/db/engine/memtable/AbstractMemTable.java | 237 ++++++++----------- .../engine/memtable/AlignedWritableMemChunk.java | 123 ++++++---- .../memtable/AlignedWritableMemChunkGroup.java | 81 +++++++ .../apache/iotdb/db/engine/memtable/IMemTable.java | 9 +- .../db/engine/memtable/IWritableMemChunk.java | 11 +- .../db/engine/memtable/IWritableMemChunkGroup.java | 42 ++-- .../db/engine/memtable/PrimitiveMemTable.java | 17 +- .../iotdb/db/engine/memtable/WritableMemChunk.java | 18 +- .../db/engine/memtable/WritableMemChunkGroup.java | 118 ++++++++++ .../engine/storagegroup/StorageGroupProcessor.java | 15 +- .../db/engine/storagegroup/TsFileProcessor.java | 29 +-- .../metadata/TemplateImcompatibeException.java | 28 +-- .../org/apache/iotdb/db/metadata/MManager.java | 55 ++++- .../iotdb/db/metadata/logfile/MLogWriter.java | 2 +- .../iotdb/db/metadata/mnode/EntityMNode.java | 12 - .../org/apache/iotdb/db/metadata/mnode/IMNode.java | 2 + .../iotdb/db/metadata/mnode/InternalMNode.java | 12 + .../iotdb/db/metadata/mnode/MeasurementMNode.java | 3 + .../org/apache/iotdb/db/metadata/mtree/MTree.java | 259 ++++++++++++++++----- .../db/metadata/mtree/traverser/Traverser.java | 115 ++++++--- .../traverser/collector/MeasurementCollector.java | 29 +++ .../apache/iotdb/db/metadata/path/AlignedPath.java | 7 +- .../iotdb/db/metadata/path/MeasurementPath.java | 8 +- .../apache/iotdb/db/metadata/path/PartialPath.java | 4 +- .../iotdb/db/metadata/template/Template.java | 113 ++++----- .../db/metadata/template/TemplateManager.java | 2 +- .../apache/iotdb/db/metadata/utils/MetaUtils.java | 2 +- .../iotdb/db/metrics/server/ServerArgument.java | 6 +- .../org/apache/iotdb/db/mqtt/PublishHandler.java | 68 ++++-- .../iotdb/db/qp/logical/crud/InOperator.java | 2 +- .../db/qp/physical/sys/CreateTemplatePlan.java | 2 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 8 +- .../apache/iotdb/db/qp/utils/DatetimeUtils.java | 12 +- .../iotdb/db/query/control/SessionManager.java | 2 +- .../db/query/control/SessionTimeoutManager.java | 17 +- .../iotdb/db/query/udf/builtin/UDTFCast.java | 2 +- .../iotdb/db/rest/filter/AuthorizationFilter.java | 2 +- .../db/rest/handler/AuthorizationHandler.java | 20 +- .../iotdb/db/rest/impl/RestApiServiceImpl.java | 59 ++--- .../org/apache/iotdb/db/service/TSServiceImpl.java | 42 +--- .../db/service/basic/BasicServiceProvider.java | 21 +- .../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 4 +- .../db/tools/settle/TsFileAndModSettleTool.java | 2 +- .../iotdb/db/tools/vis/TsFileExtractVisdata.java | 2 +- .../db/tools/watermark/WatermarkDetector.java | 4 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 15 +- .../iotdb/db/writelog/recover/LogReplayer.java | 25 +- .../db/engine/memtable/MemTableTestUtils.java | 6 +- .../db/engine/memtable/MemtableBenchmark.java | 7 +- .../db/engine/memtable/PrimitiveMemTableTest.java | 14 +- .../iotdb/db/metadata/MManagerBasicTest.java | 218 ++++++++++++++--- .../org/apache/iotdb/db/metadata/TemplateTest.java | 4 +- .../apache/iotdb/db/mqtt/PublishHandlerTest.java | 75 +++++- .../iotdb/db/qp/physical/InsertRowPlanTest.java | 77 +++++- .../iotdb/db/qp/physical/InsertTabletPlanTest.java | 137 +++++++++++ .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 4 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + .../java/org/apache/iotdb/session/Session.java | 96 +------- .../org/apache/iotdb/session/pool/SessionPool.java | 51 ---- .../apache/iotdb/session/template/Template.java | 2 +- .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 200 ++++++++++++++++ .../session/IoTDBSessionVectorABDeviceIT.java | 3 + .../java/org/apache/iotdb/session/SessionTest.java | 93 +++----- .../apache/iotdb/session/template/TemplateUT.java | 56 +++-- site/pom.xml | 2 +- thrift/src/main/thrift/rpc.thrift | 7 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +- .../org/apache/iotdb/tsfile/read/common/Path.java | 2 +- .../iotdb/tsfile/read/filter/operator/Like.java | 6 +- .../apache/iotdb/tsfile/utils/FilePathUtils.java | 2 +- .../tsfile/write/chunk/AlignedChunkWriterImpl.java | 28 +++ 145 files changed, 2877 insertions(+), 1532 deletions(-)
