This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from cbbdc6c fix cpp client ci on macos (#4074)
add 109e8c0 [IOTDB-1428] Ask query threads to quit if query is timeout
(#4071)
No new revisions were added by this update.
Summary of changes:
.../iotdb/cluster/query/LocalQueryExecutor.java | 6 +-
.../iotdb/cluster/query/RemoteQueryContext.java | 5 +-
.../apache/iotdb/cluster/server/ClientServer.java | 6 +-
.../IoTDB-SQL-Language/Maintenance-Command.md | 4 +-
.../IoTDB-SQL-Language/Maintenance-Command.md | 3 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 12 +-
.../query/QueryTimeoutRuntimeException.java | 4 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 27 ++--
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 17 ++-
.../iotdb/db/query/context/QueryContext.java | 70 +++++++++-
.../db/query/control/QueryResourceManager.java | 2 +-
.../iotdb/db/query/control/QueryTimeManager.java | 142 +++++++++------------
.../dataset/RawQueryDataSetWithoutValueFilter.java | 9 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 12 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 31 +++--
.../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 | 3 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 3 -
.../db/integration/IoTDBContinuousQueryIT.java | 4 -
.../iotdb/db/integration/IoTDBQueryTimeoutIT.java | 4 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 20 ---
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 23 ----
.../iotdb/db/metadata/MManagerBasicTest.java | 21 ++-
.../reader/series/SeriesAggregateReaderTest.java | 9 +-
.../reader/series/SeriesReaderByTimestampTest.java | 9 +-
.../db/query/reader/series/SeriesReaderTest.java | 8 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +
.../java/org/apache/iotdb/session/Session.java | 14 +-
34 files changed, 291 insertions(+), 294 deletions(-)
