You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/12/26 02:59:20 UTC

[incubator-iotdb] branch f_batch_reader updated (5144cfd -> 837aaa5)

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

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


    from 5144cfd  Merge remote-tracking branch 'origin/f_batch_reader' into f_batch_reader
     add 837aaa5  fix Zesong Sun's review

No new revisions were added by this update.

Summary of changes:
 example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java |  1 -
 .../main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java |  3 ++-
 server/src/assembly/resources/conf/iotdb-engine.properties   |  2 +-
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java  | 12 ++++++------
 .../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  4 ++--
 .../query/dataset/groupby/GroupByWithValueFilterDataSet.java |  2 +-
 .../iotdb/db/query/executor/AggregateEngineExecutor.java     |  2 +-
 .../iotdb/db/query/reader/chunkRelated/DiskChunkReader.java  |  1 -
 .../reader/resourceRelated/NewUnseqResourceMergeReader.java  |  9 +++++----
 .../reader/seriesRelated/SeriesReaderWithoutValueFilter.java |  9 +++------
 .../iotdb/tsfile/read/reader/series/FileSeriesReader.java    |  6 +-----
 11 files changed, 22 insertions(+), 29 deletions(-)