[incubator-iotdb] branch new_series_reader updated (a87d9e4 -> 9570e2a)

[qi...@apache.org]

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

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


    from a87d9e4  [IOTDB-510][IOTDB-501]Fix nullPointException bug in TsProcessor (#831)
     add aae1f14  [IOTDB-492] Remove unused field from hadoop example
     add 086173e  [IOTDB-493] Remove author tags from source code
     add a1a56ef  (feat)Update RocketMQ Readme file
     add 0155009  [IOTDB-503] Add checkTimeseriesExists for session
     add 59cba45  [IOTDB-502] NPE bug in `org.apache.iotdb.db.service.TSServiceImpl`
     add 3ded47f  add TsFileFilter (#828)
     add 9570e2a  resolve conflict after merging master

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |  3 +++
 .../iotdb/hadoop/tsfile/TSFMRReadExample.java      |  3 ---
 .../iotdb/hadoop/tsfile/TSMRWriteExample.java      |  1 -
 example/rocketmq/readme.md                         | 22 +++++++++++-----------
 .../main/java/org/apache/iotdb/SessionExample.java | 12 +++++++++---
 .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java |  3 ---
 .../iotdb/hadoop/tsfile/TSFOutputFormat.java       |  3 ---
 .../iotdb/hadoop/tsfile/TSFRecordReader.java       |  3 ---
 .../iotdb/hadoop/tsfile/record/HDFSTSRecord.java   |  3 ---
 .../iotdb/hadoop/tsfile/TSFInputSplitTest.java     |  2 --
 .../apache/iotdb/hive/TsFileDeserializerTest.java  |  3 ---
 .../groupby/GroupByWithValueFilterDataSet.java     |  2 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  2 +-
 .../db/query/executor/AggregationExecutor.java     |  4 ++--
 .../db/query/executor/RawDataQueryExecutor.java    |  4 ++--
 .../java/org/apache/iotdb/db/query/fill/IFill.java |  2 +-
 .../filter/TsFileFilter.java}                      | 16 ++++++----------
 .../query/reader/series/SeriesAggregateReader.java |  5 +++--
 .../reader/series/SeriesRawDataBatchReader.java    |  5 +++--
 .../reader/series/SeriesRawDataPointReader.java    | 15 +--------------
 .../iotdb/db/query/reader/series/SeriesReader.java |  5 +++--
 .../reader/series/SeriesReaderByTimestamp.java     |  5 +++--
 .../query/timegenerator/ServerTimeGenerator.java   |  2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  9 ++++++---
 .../java/org/apache/iotdb/db/utils/QueryUtils.java | 14 ++++++++++++++
 .../iotdb/db/engine/storagegroup/TTLTest.java      |  2 +-
 .../reader/series/SeriesAggregateReaderTest.java   |  2 +-
 .../reader/series/SeriesReaderByTimestampTest.java |  2 +-
 .../java/org/apache/iotdb/session/Session.java     |  9 +++++++++
 29 files changed, 82 insertions(+), 81 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IFileQueryMemMeasurement.java => query/filter/TsFileFilter.java} (74%)