You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2021/01/15 02:28:16 UTC
[iotdb] branch virtual_partition_2_merge updated (3e02078 ->
bf6482b)
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch virtual_partition_2_merge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 3e02078 fix issues
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 bf6482b Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge
No new revisions were added by this update.
Summary of changes:
cluster/pom.xml | 6 +-
cluster/src/assembly/cluster.xml | 4 +-
.../iotdb/cluster/log/manage/RaftLogManager.java | 1 -
.../utils/nodetool/function/NodeToolCmd.java | 22 +++++--
.../cluster/log/manage/RaftLogManagerTest.java | 5 +-
docs/UserGuide/System Tools/NodeTool.md | 9 ++-
docs/zh/UserGuide/System Tools/NodeTool.md | 10 ++-
server/src/assembly/resources/conf/iotdb-env.bat | 1 -
server/src/assembly/resources/conf/iotdb-env.sh | 1 -
.../engine/compaction/utils/CompactionUtils.java | 2 -
.../iotdb/db/engine/flush/MemTableFlushTask.java | 36 +++++------
.../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 | 6 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 1 -
.../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 | 37 ++---------
.../db/engine/storagegroup/TsFileProcessor.java | 72 +++++++++++++++++-----
.../db/engine/storagegroup/TsFileResource.java | 15 +++++
.../apache/iotdb/db/qp/executor/PlanExecutor.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 | 16 +++--
.../reader/universal/DescPriorityMergeReader.java | 4 +-
.../reader/universal/PriorityMergeReader.java | 50 ++++++++++++---
.../apache/iotdb/db/tools/TsFileSketchTool.java | 18 +-----
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 34 +---------
.../org/apache/iotdb/db/utils/FilePathUtils.java | 9 +++
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 5 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 8 +--
.../writelog/recover/TsFileRecoverPerformer.java | 13 ++--
.../db/engine/memtable/PrimitiveMemTableTest.java | 4 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 3 +
.../engine/storagegroup/TsFileProcessorTest.java | 10 ++-
.../iotdb/db/integration/IoTDBDeletionIT.java | 40 ++++++++++++
.../query/reader/series/SeriesReaderTestUtil.java | 4 +-
.../apache/iotdb/db/utils/VersionUtilsTest.java | 55 -----------------
.../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 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 7 +++
.../rpc/TCompressedElasticFramedTransport.java | 61 ++++--------------
.../apache/iotdb/rpc/TElasticFramedTransport.java | 14 +++--
.../rpc/TimeoutChangeableTFastFramedTransport.java | 2 +
.../TimeoutChangeableTSnappyFramedTransport.java | 2 +
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 31 ----------
.../iotdb/tsfile/read/TsFileSequenceReader.java | 14 -----
.../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 ---
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 6 --
.../iotdb/tsfile/write/TsFileWriterTest.java | 1 -
.../write/writer/RestorableTsFileIOWriterTest.java | 15 +++--
66 files changed, 392 insertions(+), 570 deletions(-)
delete mode 100644 server/src/test/java/org/apache/iotdb/db/utils/VersionUtilsTest.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/utils/VersionUtils.java