[incubator-iotdb] 02/03: format query

[su...@apache.org]

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

suyue pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit f42d8eb135899f5c4286566f025a1611c8993ed8
Merge: d73668e 9bf0540
Author: suyue <23...@qq.com>
AuthorDate: Tue Jun 25 12:01:09 2019 +0800

    format query

 .../org/apache/iotdb/db/concurrent/ThreadName.java |   1 +
 .../db/engine/filenode/FileNodeProcessor.java      |   2 +-
 .../db/engine/filenodeV2/FileNodeProcessorV2.java  | 155 ++++++++++-----------
 .../filenodeV2/UnsealedTsFileProcessorV2.java      |  25 ++--
 .../db/engine/memtable/MemTableFlushTask.java      |  36 ++---
 .../db/engine/memtable/MemTableFlushTaskV2.java    | 144 ++++++++++---------
 ...leFlushTaskV2.java => MemTableFlushTaskV3.java} | 150 +++++++++++---------
 .../db/engine/memtable/MemTableFlushUtil.java      |   3 +-
 .../iotdb/db/engine/memtable/MemTablePool.java     |   2 +-
 .../iotdb/db/engine/pool/FlushPoolManager.java     |   6 +-
 ...olManager.java => FlushSubTaskPoolManager.java} |  51 +++----
 .../db/query/factory/SeriesReaderFactoryImpl.java  |   4 +-
 ...a => AllDataReaderWithOptGlobalTimeFilter.java} |   9 +-
 .../query/reader/AllDataReaderWithValueFilter.java |   2 +-
 .../query/timegenerator/EngineNodeConstructor.java |   1 +
 .../engine/filenodeV2/FileNodeProcessorV2Test.java |   2 +-
 ... AllDataReaderWithOptGlobalTimeFilterTest.java} |  10 +-
 .../apache/iotdb/tsfile/write/TsFileWriter.java    |   2 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |   6 +-
 .../iotdb/tsfile/write/TsFileIOWriterTest.java     |   2 +-
 20 files changed, 315 insertions(+), 298 deletions(-)

diff --cc iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
index 9698044,4ca159b..b95b217
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
@@@ -56,6 -56,6 +56,7 @@@ public class EngineNodeConstructor exte
        } catch (IOException e) {
          throw new FileNodeManagerException(e);
        }
++
      } else {
        return constructNotSeriesNode(expression, context);
      }