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 37f7a0e Merge branch 'master' into new_TsFile
add de3a174 update SeriesReader
add d193a0c some debugs
add f8bed88 Fix some bugs
add 22dbf13 Bug fix
add 7107358 Merge branch 'new_TsFile' of
https://github.com/apache/incubator-iotdb into new_TsFile
add 01c9ff6 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../db/engine/querycontext/ReadOnlyMemChunk.java | 11 +-
.../engine/storagegroup/StorageGroupProcessor.java | 39 ++-
.../db/engine/storagegroup/TsFileResource.java | 89 ++++--
.../db/query/aggregation/AggregateResult.java | 7 +-
.../db/query/dataset/groupby/GroupByExecutor.java | 5 +-
.../groupby/GroupByWithValueFilterDataSet.java | 7 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 29 +-
.../dataset/groupby/LocalGroupByExecutor.java | 45 ++-
.../db/query/executor/AggregationExecutor.java | 40 ++-
.../db/query/reader/series/IAggregateReader.java | 8 +
.../query/reader/series/SeriesAggregateReader.java | 21 ++
.../iotdb/db/query/reader/series/SeriesReader.java | 302 +++++++++++++++------
.../reader/series/SeriesReaderByTimestamp.java | 21 ++
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 25 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 29 +-
.../reader/series/SeriesAggregateReaderTest.java | 70 +++--
.../tsfile/file/metadata/TimeseriesMetadata.java | 12 +
17 files changed, 531 insertions(+), 229 deletions(-)
