This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch xianyi
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 469cdff Merge branch 'master' of github.com:apache/iotdb into xianyi
new 9ca9cd2 modify conf
new 2dafd32 abs(extreme) && apply ns when executing select-into
add f5a7b99 [IOTDB-1899] Fix stream closed exception during compaction
(#4457)
add 6c0289e Upgrade lz4 from 1.3.0 to 1.8.0 due to CVE-2019-17543 (#4485)
new 8317fde Merge branch 'master' of github.com:apache/iotdb into xianyi
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 6 +-
.../resources/conf/iotdb-engine.properties | 12 +-
server/src/assembly/resources/conf/iotdb-env.sh | 4 +-
.../db/engine/compaction/CompactionScheduler.java | 3 +-
.../engine/compaction/CompactionTaskManager.java | 36 ++-
.../inner/AbstractInnerSpaceCompactionTask.java | 2 +
.../sizetiered/SizeTieredCompactionSelector.java | 2 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 105 ++++-----
.../compaction/task/AbstractCompactionTask.java | 2 +
.../compaction/task/CompactionRecoverTask.java | 2 +-
.../query/aggregation/impl/ExtremeAggrResult.java | 20 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 4 +-
.../engine/compaction/CompactionSchedulerTest.java | 18 +-
.../compaction/CompactionTaskManagerTest.java | 252 +++++++++++++++++++++
.../compaction/inner/InnerCompactionChunkTest.java | 4 +-
.../compaction/inner/InnerCompactionLogTest.java | 4 +-
.../inner/InnerCompactionMoreDataTest.java | 2 +-
.../inner/InnerCompactionSchedulerTest.java | 4 +-
.../compaction/inner/InnerCompactionTest.java | 2 +-
.../inner/InnerSpaceCompactionUtilsTest.java | 4 +-
.../task/FakedInnerSpaceCompactionTask.java | 44 ++--
.../engine/storagegroup/FakedTsFileResource.java | 11 +
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 2 +-
tsfile/pom.xml | 6 +-
25 files changed, 429 insertions(+), 124 deletions(-)
create mode 100644
server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManagerTest.java
