[incubator-iotdb] branch f_batch_reader updated (af28ac3 -> 774c3ba)

[qi...@apache.org]

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 af28ac3  fix EngineDataSet next and hasnext
     add 774c3ba  fix valuefilter

No new revisions were added by this update.

Summary of changes:
 .../engine/memtable/TimeValuePairInMemTable.java   |  2 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java | 12 ++--
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |  5 +-
 .../db/query/aggregation/AggregateFunction.java    |  4 +-
 .../db/query/aggregation/impl/AvgAggrFunc.java     |  4 +-
 .../db/query/aggregation/impl/CountAggrFunc.java   |  4 +-
 .../query/aggregation/impl/FirstValueAggrFunc.java |  4 +-
 .../query/aggregation/impl/LastValueAggrFunc.java  |  4 +-
 .../db/query/aggregation/impl/MaxTimeAggrFunc.java |  4 +-
 .../query/aggregation/impl/MaxValueAggrFunc.java   |  4 +-
 .../db/query/aggregation/impl/MinTimeAggrFunc.java |  4 +-
 .../query/aggregation/impl/MinValueAggrFunc.java   |  4 +-
 .../dataset/EngineDataSetWithValueFilter.java      | 10 +--
 .../groupby/GroupByWithValueFilterDataSet.java     |  4 +-
 .../db/query/executor/AggregateEngineExecutor.java |  9 +--
 .../iotdb/db/query/executor/EngineExecutor.java    |  8 +--
 .../iotdb/db/query/executor/EngineQueryRouter.java |  6 +-
 .../query/externalsort/ExternalSortJobEngine.java  |  5 +-
 .../externalsort/SimpleExternalSortEngine.java     | 12 ++--
 .../adapter/ByTimestampReaderAdapter.java          |  4 +-
 .../FixLengthIExternalSortFileDeserializer.java    |  2 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |  2 +-
 ...Timestamp.java => IPointReaderByTimestamp.java} |  2 +-
 .../query/reader/chunkRelated/ChunkReaderWrap.java |  4 +-
 .../chunkRelated/DiskChunkReaderByTimestamp.java   |  6 +-
 .../chunkRelated/MemChunkReaderByTimestamp.java    |  6 +-
 .../FileSeriesReaderByTimestampAdapter.java        |  6 +-
 .../UnSealedTsFileReaderByTimestamp.java           |  8 +--
 .../SeqResourceReaderByTimestamp.java              |  8 +--
 .../UnseqResourceReaderByTimestamp.java            |  6 +-
 .../seriesRelated/SeriesReaderWithValueFilter.java | 83 ++++++++++++++--------
 .../reader/universal/PriorityMergeReader.java      |  2 +-
 .../universal/PriorityMergeReaderByTimestamp.java  | 10 +--
 .../db/query/timegenerator/EngineLeafNode.java     | 10 +--
 .../org/apache/iotdb/db/utils/TimeValuePair.java   |  1 +
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  | 13 ++--
 .../db/engine/memtable/PrimitiveMemTableTest.java  |  3 +-
 .../db/query/externalsort/FakeChunkReaderWrap.java |  4 +-
 ...ExternalSortFileSerializerDeserializerTest.java |  2 +-
 .../resourceRelated/UnseqResourceReaderTest.java   |  5 +-
 .../reader/seriesRelated/FakedIBatchPoint.java     |  2 +-
 .../reader/seriesRelated/FakedIPointReader.java    |  2 +-
 .../query/reader/universal/FakedSeriesReader.java  |  2 +-
 .../universal/FakedSeriesReaderByTimestamp.java    |  6 +-
 .../PriorityMergeReaderByTimestampTest.java        | 12 ++--
 .../db/utils/datastructure/LongTVListTest.java     |  2 +-
 .../apache/iotdb/tsfile/read/common/BatchData.java | 26 +++++++
 .../iotdb/tsfile}/utils/TsPrimitiveType.java       |  3 +-
 48 files changed, 194 insertions(+), 157 deletions(-)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{IReaderByTimestamp.java => IPointReaderByTimestamp.java} (97%)
 rename {server/src/main/java/org/apache/iotdb/db => tsfile/src/main/java/org/apache/iotdb/tsfile}/utils/TsPrimitiveType.java (99%)