[incubator-iotdb] branch new_TsFile updated (7cd97bc -> a54da14)

[ja...@apache.org]

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

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


    from 7cd97bc  Merge pull request #957 from wshao08/new_TsFile
     add 995db50  repair the restart bug
     add 933537c  improve cache
     add 1ec96e8  Merge branch 'new_TsFile' of https://github.com/apache/incubator-iotdb into new_TsFile
     add 1572237  change to cache
     add 6d06e32  resolve conflicts
     add a54da14  adapt to last

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/iotdb/SessionExample.java |  15 +--
 .../apache/iotdb/jdbc/AbstractIoTDBResultSet.java  |  35 +++++--
 .../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java    |  21 +++--
 .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java |  10 +-
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |   8 +-
 .../resources/conf/iotdb-engine.properties         |   2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   8 +-
 .../apache/iotdb/db/engine/cache/ChunkCache.java   |  17 +++-
 .../db/engine/cache/TimeSeriesMetadataCache.java   |  35 ++++++-
 .../engine/storagegroup/StorageGroupProcessor.java |   1 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  16 +++-
 .../db/qp/physical/crud/RawDataQueryPlan.java      |  11 ++-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 102 ++++++++-------------
 .../groupby/GroupByWithValueFilterDataSet.java     |  13 +--
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  11 +--
 .../dataset/groupby/LocalGroupByExecutor.java      |   7 +-
 .../db/query/executor/AggregationExecutor.java     |  26 +++---
 .../iotdb/db/query/executor/FillQueryExecutor.java |  13 ++-
 .../iotdb/db/query/executor/QueryRouter.java       |  25 +++--
 .../db/query/executor/RawDataQueryExecutor.java    |  29 +++---
 .../java/org/apache/iotdb/db/query/fill/IFill.java |   5 +-
 .../query/reader/series/SeriesAggregateReader.java |   7 +-
 .../reader/series/SeriesRawDataBatchReader.java    |  11 ++-
 .../iotdb/db/query/reader/series/SeriesReader.java |  20 ++--
 .../reader/series/SeriesReaderByTimestamp.java     |   8 +-
 .../query/timegenerator/ServerTimeGenerator.java   |  10 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  65 +++----------
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java |  14 +--
 .../iotdb/db/engine/storagegroup/TTLTest.java      |  21 ++---
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  26 +++---
 .../reader/series/SeriesAggregateReaderTest.java   |   6 +-
 .../reader/series/SeriesReaderByTimestampTest.java |   9 +-
 .../db/query/reader/series/SeriesReaderTest.java   |  25 +++--
 service-rpc/src/main/thrift/rpc.thrift             |   1 +
 .../read/query/timegenerator/TimeGenerator.java    |   9 +-
 35 files changed, 346 insertions(+), 296 deletions(-)