This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch rename_table_concepts
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from f2553f4744f Fix IT
add 4e76b3d1333 Add database name for table model CLI
add 266c3b08fdc Compaction task can not stopped when abort compaction
(#14538)
add 3238ec257a1 Add the used memory calculation for
DescPriorityMergeReader which is missed before (#14548)
add 530dd0bc653 [IoTConsensus] Refine IoTConsensus Configuration logs
(#14542)
add eeb90759af4 Merge branch 'master' into rename_table_concepts
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/cli/AbstractCli.java | 26 +++--
.../src/main/java/org/apache/iotdb/cli/Cli.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 4 +
.../load/cache/node/DataNodeHeartbeatCache.java | 3 +-
.../consensus/iot/IoTConsensusServerImpl.java | 28 ++++-
.../performer/impl/FastCompactionPerformer.java | 15 +++
.../compaction/schedule/CompactionTaskManager.java | 4 +-
.../compaction/schedule/CompactionWorker.java | 7 +-
.../reader/common/CachedPriorityMergeReader.java | 97 ------------------
.../reader/common/DescPriorityMergeReader.java | 16 +--
.../read/reader/common/PriorityMergeReader.java | 22 ++--
.../compaction/CompactionWorkerTest.java | 33 ++++++
...SeriesReader.java => AscFakedSeriesReader.java} | 28 ++---
.../read/reader/common/DescFakedSeriesReader.java} | 42 +++++---
.../reader/common/PriorityMergeReaderTest.java | 113 ++++++++++++++++++---
.../reader/common/PriorityMergeReaderTest2.java | 59 -----------
16 files changed, 261 insertions(+), 240 deletions(-)
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/CachedPriorityMergeReader.java
rename
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/{FakedSeriesReader.java
=> AscFakedSeriesReader.java} (79%)
copy
iotdb-core/datanode/src/{main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/AlignedDescPriorityMergeReader.java
=>
test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/DescFakedSeriesReader.java}
(50%)
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest2.java
