You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/01/19 01:57:14 UTC
[iotdb] branch flush_OOM updated (c8d849b -> 07ce7ff)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch flush_OOM
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from c8d849b time unit
add 06b576e Revert inplace merge (#2398)
add cf44a1d remove duplicate paramas in server script (#2463)
add 7a67bc5 add docker file for 0.11.1 and 0.11.2; fix invalid urls in preivous d… (#2467)
add 74cbf19 [ISSUE-2479] Remove redundant logic in session.genTSInsertRecordsOfOneDeviceReq() (#2480)
add 4acc515 [IOTDB-1094] Improve some code writing and name typo (#2382)
add a707012 [ISSUE-2476] fix the case that isNumber method returns true when the input is "NaN" (#2477)
add 0e88973 fix import csv which can't import time format str (#2409)
add 663d910 [ISSUE-2419] Server test logs contains lots of useless content (#2420)
add 344c954 [IOTDB-1108] Add error log to print file name while error happened (#2450)
add 652be96 [IOTDB-965] Add timeout in query (#2352)
add a7de988 fix the apply bug in raftLogManager
add 32317b7 fix the test in RaftLogManager
add ab49f82 remove debug message
add e09b377 Merge pull request #2489 from neuyilan/apache_master_0113_fix_apply_bug
add 2ced0e1 [IOTDB-1110] the assembly descriptor of the cluster module contains / (#2496)
add ede19b5 Remove versionInfo in Tsfile and get rid of versions in memtable (#2445)
add f87c296 extract common variables to rpcutils
add a490361 use AutoScalingBufferWrite/ReadTransport to replace the TByteBuffer in
add c1c2088 add overrive keyword
add 3413d5a add limit() and position() method in AutoScalingBufferReadTransport
add 0c831fe supplly the comment in d
add a1a383f Merge pull request #2486 from neuyilan/apache_master_0113_adjust_max_frame_size
add f657f8e add username and password when use nodetool
add 508f659 aupply the doc of node tools
add ef710b2 add default jmx user and password config
add 524cce3 revert the password config
add 8b7b997 set the default hashmap size to 1
add a521499 remend the doc of the NodeTool
add dd6d42c Merge branch 'apache_master' into apache_master_0113_fix_node_tools
add 711b3d8 Merge pull request #2483 from neuyilan/apache_master_0113_fix_node_tools
add 6d3ae90 [IOTDB-965] Add user doc for query timeout (#2494)
add f81d2fb [ISSUE-2416] Sql statement with unsupported mark doesn't be handled correctly (#2499)
add 7975dbd [ISSUE-2470] Add size limitation for all logs (#2492)
add 3c52267 support only left bracket (#2491)
add 0e1629f IOTDB-1107 Doc have a little problem (#2504)
add 3016cb9 remove duplicate codes (waitForThreadPool) in the ClusterPlanExecutor and remove duplicate params of script (#2502)
add c343d5a optime inserttablets
add 1edfa05 revert the change in sessionexample
add 8fcab59 resolve the sonar issue
add 318afac optime inserttablets
add adb0765 revert the change in sessionexample
add 245506b add insert InsertTabletMultiPlan test
add e7d28e3 add lincese header
add 5348e42 fix the serialize and unseralize method
add 4c5e1cb remove useless debug log
add f6a935a fix apply InsertMultiTabletPlan
add 8a8c094 fix some typo
add 0b51d8b fix some typo&remove insertTabletsInternalV1
add 4b7f40d merge with master
add 00c6c7a split the insertMultiTabletPlan to some have some storage group InsertTabletPlans
add 224876f fix some typo
add 0ba64dc Merge branch 'apache_master' into apache_master_0106_optimize_inserttablets
add 25bddb9 remove uncessary put operation of hashmap in ClusterPlanRouter
add 27acead Merge branch 'apache_master' into apache_master_0106_optimize_inserttablets
add 768ed2b Merge pull request #2454 from neuyilan/apache_master_0106_optimize_inserttablets
add 44e764b [IOTDB-1079] Virtual storage group first mile stone (#2405)
add d267d10 ignore PathNotExistException in recover and change recover error to warn (#2506) (#2512)
add 07ce7ff merge master
No new revisions were added by this update.
Summary of changes:
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 28 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 63 ++-
cluster/pom.xml | 6 +-
cluster/src/assembly/cluster.xml | 4 +-
cluster/src/assembly/resources/sbin/add-node.sh | 2 +-
cluster/src/assembly/resources/sbin/start-node.sh | 2 +-
.../iotdb/cluster/ClusterFileFlushPolicy.java | 2 +-
.../iotdb/cluster/coordinator/Coordinator.java | 165 ++++--
.../cluster/log/applier/AsyncDataLogApplier.java | 13 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 2 +-
.../iotdb/cluster/log/applier/DataLogApplier.java | 13 +-
.../iotdb/cluster/log/manage/RaftLogManager.java | 1 -
.../apache/iotdb/cluster/metadata/CMManager.java | 28 +-
.../apache/iotdb/cluster/metadata/MetaPuller.java | 5 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 53 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 74 +++
.../cluster/query/filter/SlotTsFileFilter.java | 4 +-
.../utils/nodetool/function/NodeToolCmd.java | 22 +-
.../cluster/log/manage/RaftLogManagerTest.java | 5 +-
.../apache/iotdb/cluster/query/BaseQueryTest.java | 10 +-
docker/src/main/Dockerfile-0.10.0 | 4 +-
docker/src/main/Dockerfile-0.10.1 | 4 +-
docker/src/main/Dockerfile-0.11.0 | 4 +-
docker/src/main/{Dockerfile => Dockerfile-0.11.1} | 18 +-
.../main/{Dockerfile-0.11.0 => Dockerfile-0.11.2} | 10 +-
docs/UserGuide/Client/Status Codes.md | 2 +
docs/UserGuide/Operation Manual/Kill Query.md | 60 +++
docs/UserGuide/Operation Manual/SQL Reference.md | 15 +
docs/UserGuide/System Tools/CSV Tool.md | 1 +
docs/UserGuide/System Tools/NodeTool.md | 9 +-
docs/zh/SystemDesign/StorageEngine/Compaction.md | 2 +-
docs/zh/UserGuide/Client/Status Codes.md | 2 +
docs/zh/UserGuide/Operation Manual/Kill Query.md | 61 +++
.../zh/UserGuide/Operation Manual/SQL Reference.md | 15 +
docs/zh/UserGuide/System Tools/CSV Tool.md | 1 +
docs/zh/UserGuide/System Tools/NodeTool.md | 10 +-
.../main/java/org/apache/iotdb/SessionExample.java | 20 +-
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 4 +-
.../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 6 +-
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 8 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 29 +-
.../resources/conf/iotdb-engine.properties | 8 +
server/src/assembly/resources/conf/iotdb-env.bat | 1 -
server/src/assembly/resources/conf/iotdb-env.sh | 1 -
server/src/assembly/resources/conf/logback.xml | 68 +--
server/src/assembly/resources/sbin/start-server.sh | 2 +-
.../assembly/resources/tools/start-WalChecker.sh | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 28 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 8 +
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 3 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 598 +++++++++++----------
.../compaction/CompactionMergeTaskPoolManager.java | 2 +-
.../db/engine/compaction/TsFileManagement.java | 11 +
.../level/LevelCompactionTsFileManagement.java | 3 +
.../engine/compaction/utils/CompactionUtils.java | 2 -
.../apache/iotdb/db/engine/flush/FlushManager.java | 24 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 78 +--
.../iotdb/db/engine/memtable/AbstractMemTable.java | 44 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 17 +-
.../db/engine/memtable/PrimitiveMemTable.java | 8 -
.../iotdb/db/engine/merge/task/MergeFileTask.java | 136 ++++-
.../db/engine/merge/task/MergeMultiChunkTask.java | 3 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 28 +-
.../iotdb/db/engine/modification/Deletion.java | 8 +-
.../iotdb/db/engine/modification/Modification.java | 18 +-
.../io/LocalTextModificationAccessor.java | 2 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 9 +-
.../engine/storagegroup/StorageGroupProcessor.java | 232 ++++----
.../db/engine/storagegroup/TsFileProcessor.java | 72 ++-
.../db/engine/storagegroup/TsFileResource.java | 15 +
.../virtualSg/HashVirtualPartitioner.java | 67 +++
.../virtualSg/VirtualPartitioner.java} | 26 +-
.../virtualSg/VirtualStorageGroupManager.java | 426 +++++++++++++++
.../apache/iotdb/db/exception/IoTDBException.java | 21 +
...xception.java => QueryIdNotExsitException.java} | 10 +-
.../iotdb/db/exception/StorageEngineException.java | 2 +-
.../iotdb/db/exception/WriteProcessException.java | 4 +
.../metadata/AliasAlreadyExistException.java | 1 +
.../exception/metadata/IllegalPathException.java | 1 +
.../db/exception/metadata/MetadataException.java | 8 +
.../metadata/PathAlreadyExistException.java | 1 +
.../exception/metadata/PathNotExistException.java | 20 +-
.../metadata/StorageGroupNotSetException.java | 5 +
.../db/exception/query/OutOfTTLException.java | 2 +-
.../db/exception/query/QueryProcessException.java | 6 +-
.../query/QueryTimeoutRuntimeException.java | 16 +-
.../org/apache/iotdb/db/metadata/MManager.java | 10 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 19 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 14 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 123 ++---
.../main/java/org/apache/iotdb/db/qp/Planner.java | 1 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 8 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 83 ++-
.../org/apache/iotdb/db/qp/logical/Operator.java | 4 +-
.../{ShowOperator.java => KillQueryOperator.java} | 18 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 7 +-
.../db/qp/physical/crud/InsertMultiTabletPlan.java | 326 +++++++++++
.../db/qp/physical/crud/InsertTabletPlan.java | 6 +
.../sys/{MergePlan.java => KillQueryPlan.java} | 14 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 2 +-
...atusPlan.java => ShowQueryProcesslistPlan.java} | 8 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 19 +
.../iotdb/db/qp/strategy/LogicalGenerator.java | 4 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 11 +-
.../db/query/aggregation/AggregateResult.java | 3 +-
.../db/query/aggregation/impl/AvgAggrResult.java | 10 +-
.../db/query/aggregation/impl/SumAggrResult.java | 10 +-
.../db/query/control/QueryResourceManager.java | 3 +
.../iotdb/db/query/control/QueryTimeManager.java | 172 ++++++
.../db/query/dataset/NonAlignEngineDataSet.java | 22 +
.../dataset/RawQueryDataSetWithoutValueFilter.java | 39 +-
.../dataset/groupby/GroupByEngineDataSet.java | 8 +-
.../groupby/GroupByWithValueFilterDataSet.java | 3 +-
.../db/query/executor/AggregationExecutor.java | 4 +-
.../db/query/executor/RawDataQueryExecutor.java | 4 +-
.../db/query/executor/fill/LastPointReader.java | 36 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 4 +
.../chunk/metadata/MemChunkMetadataLoader.java | 4 +
.../iotdb/db/query/reader/series/SeriesReader.java | 30 +-
.../reader/universal/DescPriorityMergeReader.java | 4 +-
.../reader/universal/PriorityMergeReader.java | 50 +-
.../org/apache/iotdb/db/service/ServiceType.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 135 +++--
.../apache/iotdb/db/tools/TsFileSketchTool.java | 18 +-
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 34 +-
.../db/tools/virtualsg/DeviceMappingViewer.java | 61 +++
.../org/apache/iotdb/db/utils/FilePathUtils.java | 9 +
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 5 +-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 5 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 3 +
.../iotdb/db/writelog/recover/LogReplayer.java | 14 +-
.../writelog/recover/TsFileRecoverPerformer.java | 13 +-
.../db/engine/cache/ChunkMetadataCacheTest.java | 2 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 4 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 1 +
.../iotdb/db/engine/merge/MergeOverLapTest.java | 1 -
.../iotdb/db/engine/merge/MergeTaskTest.java | 3 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 3 +
.../engine/modification/DeletionFileNodeTest.java | 27 +-
.../storagegroup/StorageGroupProcessorTest.java | 3 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 34 +-
.../engine/storagegroup/TsFileProcessorTest.java | 10 +-
.../virtualSg/HashVirtualPartitionerTest.java | 64 +++
.../iotdb/db/integration/IOTDBGroupByIT.java | 1 -
.../iotdb/db/integration/IoTDBCompleteIT.java | 5 +
.../iotdb/db/integration/IoTDBDeletionIT.java | 40 ++
.../apache/iotdb/db/integration/IoTDBFillIT.java | 6 +
.../iotdb/db/integration/IoTDBInsertNaNIT.java | 46 +-
...TDBTracingTest.java => IoTDBKillQueryTest.java} | 55 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 1 -
.../db/integration/IoTDBLevelCompactionIT.java | 4 -
.../db/integration/IoTDBLoadExternalTsfileIT.java | 33 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 5 +
.../iotdb/db/integration/IoTDBMultiDeviceIT.java | 322 +++++++++++
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 4 -
.../db/integration/IoTDBQueryTimeoutTest.java | 153 ++++++
.../iotdb/db/integration/IoTDBRestartIT.java | 16 +
.../iotdb/db/integration/IoTDBSensorUpdateIT.java | 3 -
.../aggregation/IoTDBAggregationIT.java | 10 +-
.../iotdb/db/monitor/IoTDBStatMonitorTest.java | 21 +-
.../db/qp/physical/InsertTabletMultiPlanTest.java | 99 ++++
.../iotdb/db/qp/physical/InsertTabletPlanTest.java | 105 ++++
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 2 +-
.../query/reader/series/SeriesReaderTestUtil.java | 4 +-
.../db/sync/receiver/load/FileLoaderTest.java | 38 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 3 +
.../apache/iotdb/db/utils/VersionUtilsTest.java | 55 --
.../db/utils/datastructure/PrecisionTest.java | 22 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 19 +-
.../recover/RecoverResourceFromReaderTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 4 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 5 +-
.../org/apache/iotdb/rpc/AutoResizingBuffer.java | 15 +-
.../iotdb/rpc/AutoScalingBufferReadTransport.java | 9 +
.../iotdb/rpc/AutoScalingBufferWriteTransport.java | 5 +-
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 7 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 7 +
.../rpc/TCompressedElasticFramedTransport.java | 61 +--
.../apache/iotdb/rpc/TElasticFramedTransport.java | 14 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
.../rpc/TimeoutChangeableTFastFramedTransport.java | 2 +
.../TimeoutChangeableTSnappyFramedTransport.java | 2 +
.../main/java/org/apache/iotdb/session/Config.java | 3 +-
.../java/org/apache/iotdb/session/Session.java | 33 +-
.../apache/iotdb/session/SessionConnection.java | 9 +-
.../org/apache/iotdb/session/SessionDataSet.java | 12 +-
.../iotdb/session/IoTDBSessionComplexIT.java | 3 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 29 +
site/src/main/.vuepress/config.js | 2 +
thrift/src/main/thrift/rpc.thrift | 3 +
...tion.java => QueryTimeoutRuntimeException.java} | 19 +-
.../write/UnSupportedDataTypeException.java | 4 +-
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 31 --
.../iotdb/tsfile/read/TsFileSequenceReader.java | 175 +++---
.../iotdb/tsfile/read/reader/LocalTsFileInput.java | 20 +
.../apache/iotdb/tsfile/utils/VersionUtils.java | 49 --
.../apache/iotdb/tsfile/write/TsFileWriter.java | 5 -
.../write/writer/ForceAppendTsFileWriter.java | 1 -
.../write/writer/RestorableTsFileIOWriter.java | 6 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 23 +-
.../tsfile/file/metadata/utils/TestHelper.java | 9 -
.../org/apache/iotdb/tsfile/read/ReadTest.java | 22 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 5 -
.../read/query/executor/QueryExecutorTest.java | 1 -
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 6 -
.../iotdb/tsfile/write/TsFileWriterTest.java | 1 -
.../write/writer/RestorableTsFileIOWriterTest.java | 15 +-
211 files changed, 4455 insertions(+), 1621 deletions(-)
copy docker/src/main/{Dockerfile => Dockerfile-0.11.1} (77%)
copy docker/src/main/{Dockerfile-0.11.0 => Dockerfile-0.11.2} (84%)
create mode 100644 docs/UserGuide/Operation Manual/Kill Query.md
create mode 100644 docs/zh/UserGuide/Operation Manual/Kill Query.md
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/HashVirtualPartitioner.java
copy server/src/main/java/org/apache/iotdb/db/{qp/logical/sys/ShowChildPathsOperator.java => engine/storagegroup/virtualSg/VirtualPartitioner.java} (65%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/VirtualStorageGroupManager.java
copy server/src/main/java/org/apache/iotdb/db/exception/{LoadEmptyFileException.java => QueryIdNotExsitException.java} (79%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java => server/src/main/java/org/apache/iotdb/db/exception/query/QueryTimeoutRuntimeException.java (65%)
copy server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{ShowOperator.java => KillQueryOperator.java} (72%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
copy server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{MergePlan.java => KillQueryPlan.java} (83%)
copy server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{ShowMergeStatusPlan.java => ShowQueryProcesslistPlan.java} (84%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/tools/virtualsg/DeviceMappingViewer.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/HashVirtualPartitionerTest.java
copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBTracingTest.java => IoTDBKillQueryTest.java} (54%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiDeviceIT.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryTimeoutTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletMultiPlanTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletPlanTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/utils/VersionUtilsTest.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/exception/{NotImplementedException.java => QueryTimeoutRuntimeException.java} (68%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/utils/VersionUtils.java