You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/12/16 07:26:35 UTC

[incubator-iotdb] branch refactor_session_management updated (55af417 -> eee3941)

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a change to branch refactor_session_management
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 55af417  change jobId to queryId
     add ff50e83  replace jobId with queryId
     add eee3941  Merge branch 'refactor_session_management' of github.com:apache/incubator-iotdb into refactor_session_management

No new revisions were added by this update.

Summary of changes:
 .../org/apache/iotdb/db/engine/StorageEngine.java    |  4 ++--
 .../engine/storagegroup/StorageGroupProcessor.java   |  6 +++---
 .../{JobFileManager.java => QueryFileManager.java}   | 20 ++++++++++----------
 .../iotdb/db/query/control/QueryResourceManager.java | 12 ++++++------
 .../iotdb/db/query/executor/EngineQueryRouter.java   |  3 ++-
 .../iotdb/db/query/executor/FillEngineExecutor.java  |  2 +-
 .../iotdb/db/query/externalsort/ExternalSortJob.java |  6 +++---
 .../query/externalsort/ExternalSortJobScheduler.java |  4 ++--
 .../query/externalsort/SimpleExternalSortEngine.java |  2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java   |  4 ++--
 .../db/engine/modification/DeletionFileNodeTest.java |  4 ++--
 .../apache/iotdb/db/engine/storagegroup/TTLTest.java |  2 +-
 .../db/integration/IoTDBSequenceDataQueryIT.java     |  6 +++---
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java    |  8 ++++----
 .../db/query/control/FileReaderManagerTest.java      |  6 +++---
 .../query/externalsort/ExternalSortEngineTest.java   |  2 +-
 .../org/apache/iotdb/db/utils/EnvironmentUtils.java  |  2 +-
 .../apache/iotdb/session/utils/EnvironmentUtils.java |  2 +-
 18 files changed, 48 insertions(+), 47 deletions(-)
 rename server/src/main/java/org/apache/iotdb/db/query/control/{JobFileManager.java => QueryFileManager.java} (84%)