This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch timeoutQuit
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 5a26548 Merge branch 'master' into timeoutQuit
add 9c80342 remove QueryContext() without parameter
No new revisions were added by this update.
Summary of changes:
.../iotdb/cluster/query/LocalQueryExecutor.java | 6 ++-
.../iotdb/db/query/control/QueryTimeManager.java | 6 ++-
.../compaction/LevelCompactionMergeTest.java | 22 +++++-----
.../compaction/LevelCompactionMoreDataTest.java | 5 +--
.../compaction/LevelCompactionRecoverTest.java | 50 +++++++++++-----------
.../db/engine/compaction/LevelCompactionTest.java | 3 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 5 +--
.../iotdb/db/engine/merge/MergeTaskTest.java | 27 ++++--------
.../apache/iotdb/db/engine/merge/MergeTest.java | 3 +-
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../db/integration/IoTDBContinuousQueryIT.java | 4 --
.../iotdb/db/metadata/MManagerBasicTest.java | 21 +++++----
.../reader/series/SeriesAggregateReaderTest.java | 4 +-
.../reader/series/SeriesReaderByTimestampTest.java | 4 +-
.../db/query/reader/series/SeriesReaderTest.java | 8 ++--
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 ++++--
16 files changed, 90 insertions(+), 92 deletions(-)
