This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch aggregate
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ffdb83b rename some fields for better understanding
add e8efcfe provide unified query resource control interface in
QueryResourceManager.
add 6751e16 bug fix: multiple queries in the same statement will cause
resource leak.
add 43dcf00 Merge pull request #123 from apache/unifiy_query_control
No new revisions were added by this update.
Summary of changes:
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 15 +++--
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 24 ++++----
.../iotdb/db/query/context/QueryContext.java | 17 ++++++
...edFilePathsManager.java => JobFileManager.java} | 25 ++------
.../db/query/control/QueryDataSourceManager.java | 53 ----------------
...TokenManager.java => QueryResourceManager.java} | 50 +++++++++++----
.../iotdb/db/query/control/QuerySession.java | 71 ----------------------
.../db/query/executor/AggregateEngineExecutor.java | 23 ++++---
.../executor/EngineExecutorWithTimeGenerator.java | 19 +++---
.../EngineExecutorWithoutTimeGenerator.java | 19 +++---
.../iotdb/db/query/executor/EngineQueryRouter.java | 48 ++++-----------
.../db/query/executor/FillEngineExecutor.java | 9 ++-
.../GroupByWithOnlyTimeFilterDataSetDataSet.java | 9 ++-
.../GroupByWithValueFilterDataSetDataSet.java | 11 ++--
.../db/query/factory/SeriesReaderFactory.java | 7 +--
.../query/timegenerator/EngineNodeConstructor.java | 8 +--
.../query/timegenerator/EngineTimeGenerator.java | 6 +-
.../modification => rescon}/package-info.java | 5 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 -
.../org/apache/iotdb/db/service/TSServiceImpl.java | 51 +++++++++++++---
.../engine/modification/DeletionFileNodeTest.java | 25 ++++++--
.../db/engine/modification/DeletionQueryTest.java | 16 +++--
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 20 +++---
.../db/integration/IoTDBSequenceDataQueryIT.java | 24 +++++---
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 30 ++++++---
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 13 ++--
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 9 ++-
.../db/query/control/FileReaderManagerTest.java | 11 ++--
...agerTest.java => QueryResourceManagerTest.java} | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 11 +++-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 8 ++-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 9 ++-
service-rpc/src/main/thrift/rpc.thrift | 2 +
33 files changed, 308 insertions(+), 343 deletions(-)
rename
iotdb/src/main/java/org/apache/iotdb/db/query/control/{OpenedFilePathsManager.java
=> JobFileManager.java} (84%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryDataSourceManager.java
rename
iotdb/src/main/java/org/apache/iotdb/db/query/control/{QueryTokenManager.java
=> QueryResourceManager.java} (75%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/query/control/QuerySession.java
copy iotdb/src/main/java/org/apache/iotdb/db/{engine/modification =>
rescon}/package-info.java (83%)
rename
iotdb/src/test/java/org/apache/iotdb/db/query/control/{QueryTokenManagerTest.java
=> QueryResourceManagerTest.java} (93%)
