This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch groupbyfill
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from cf31d9c resolve conflixts
add 9340de3 [IOTDB-380] Update storage group path (#853)
add 6f80172 Revert "[IOTDB-520] Result of IBatchReader should not cross
partition" (#860)
add dc4247e Several fixes. - Fixed an issue in Utils and added test -
Fixed BasicDaoImpl (query was invalid) in IoTDB-Grafana
add 5676094 [IOTDB-376] fix metric to show executeQuery (#863)
add dea6737 [IOTDB-529] Relative times and NOW() operator cannot be used
in Group By (#871)
add 6404d6d [IOTDB-298]Last time-value query (#821)
add 9aa6176 reorganize series reader and aggregate reader
add d229e98 fix point reader
add 18068a9 fix bytimestamp
add 1dadf07 combine nextPage (#861)
add fe759e8 remove set chunkmetadata=null in hasNextChunk
add 17365a7 remove hasOverlappedPage
add 34476e5 new groupby (#862)
add 986f758 fix hasNextPage in SeriesReader
add b7c10da remove unused interfaces in IAggregateReader
add 3b33fbb push down value filter and add log
add e51e07e fix nextPage non-stop
add 0114481 make hasNextPage and nextPage more robust
add d9a19dc add stack
add 6ad42e9 add mergeReaer check in isPageOverlapped
add b725c72 fix hasNextOverlappedPage when no data in this page under
value filter
add 1c39133 Merge remote-tracking branch 'origin/master' into
optimize_series_reader
add 9e85181 add log
add f06043b add filter overlapped data test and add log
add 3e6a61f add log for point 100492
add 46a133b add log in hasNextOverlappedPage
add 80456bd add log
add 6ba2969 Optimize_series_reader_fix (#867)
add 23d620a Merge remote-tracking branch 'origin/optimize_series_reader'
into optimize_series_reader
add 3954860 fix tmp bug
add 2d6e8fc remove debug log
add 60c0f5e add test and fix review
add ad50583 fix code smell
add e455a96 fix review
add 8f5cf8b Update
server/src/test/java/org/apache/iotdb/db/integration/IoTDBCloseIT.java
add 2843e8c Merge remote-tracking branch 'origin/optimize_series_reader'
into optimize_series_reader
add 7a28519 fix import
add 9101bcf fix review
add c00b63f Merge pull request #864 from apache/optimize_series_reader
add b3f035b merge last
No new revisions were added by this update.
Summary of changes:
.../SystemDesign/5-DataQuery/1-DataQuery.md | 1 +
.../SystemDesign/5-DataQuery/2-SeriesReader.md | 16 +-
.../SystemDesign/5-DataQuery/6-LastQuery.md | 119 +++++
.../2-DML (Data Manipulation Language).md | 33 ++
.../5-Operation Manual/4-SQL Reference.md | 44 +-
.../1-DDL (Data Definition Language).md | 2 +
.../2-DML (Data Manipulation Language).md | 35 ++
.../5-Operation Manual/4-SQL Reference.md | 43 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 32 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 11 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 17 +-
.../resources/conf/iotdb-engine.properties | 6 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 151 +++---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 9 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +
.../iotdb/db/engine/memtable/AbstractMemTable.java | 41 +-
.../engine/storagegroup/StorageGroupProcessor.java | 105 ++++-
.../iotdb/db/metadata/mnode/InternalMNode.java | 1 +
.../apache/iotdb/db/metadata/mnode/LeafMNode.java | 29 ++
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 2 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 5 +-
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../iotdb/db/qp/logical/crud/SFWOperator.java | 8 +
.../iotdb/db/qp/logical/crud/SelectOperator.java | 7 +
.../iotdb/db/qp/physical/crud/BatchInsertPlan.java | 46 ++
.../iotdb/db/qp/physical/crud/InsertPlan.java | 13 +
.../iotdb/db/qp/physical/crud/LastQueryPlan.java | 13 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 46 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +
.../db/query/aggregation/AggregateResult.java | 9 +-
.../db/query/aggregation/impl/AvgAggrResult.java | 6 +
.../query/dataset/groupby/GroupByFillDataSet.java | 36 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 347 +++++++-------
.../db/query/executor/AggregationExecutor.java | 12 +-
.../iotdb/db/query/executor/IQueryRouter.java | 9 +
.../iotdb/db/query/executor/LastQueryExecutor.java | 169 +++++++
.../iotdb/db/query/executor/QueryRouter.java | 7 +
.../iotdb/db/query/reader/chunk/MemPageReader.java | 19 +-
.../db/query/reader/series/IAggregateReader.java | 3 +-
.../query/reader/series/SeriesAggregateReader.java | 13 +-
.../reader/series/SeriesRawDataBatchReader.java | 52 +-
.../reader/series/SeriesRawDataPointReader.java | 43 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 522 +++++++++++++--------
.../reader/series/SeriesReaderByTimestamp.java | 45 +-
.../reader/universal/PriorityMergeReader.java | 25 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 47 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 43 ++
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 42 ++
.../org/apache/iotdb/db/constant/TestConstant.java | 82 +++-
.../org/apache/iotdb/db/integration/Constant.java | 100 ----
.../iotdb/db/integration/IOTDBGroupByIT.java | 80 +++-
.../integration/IOTDBGroupByInnerIntervalIT.java | 2 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 18 +-
.../integration/IoTDBAggregationLargeDataIT.java | 18 +-
.../integration/IoTDBAggregationSmallDataIT.java | 18 +-
.../db/integration/IoTDBAutoCreateSchemaIT.java | 3 +-
.../apache/iotdb/db/integration/IoTDBCloseIT.java | 11 +-
.../iotdb/db/integration/IoTDBCompleteIT.java | 3 +-
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 2 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 15 +-
.../db/integration/IoTDBFloatPrecisionIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 46 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 35 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 170 +++++++
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 4 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 41 +-
.../db/integration/IoTDBMultiStatementsIT.java | 9 +-
.../iotdb/db/integration/IoTDBNumberPathIT.java | 3 +-
.../iotdb/db/integration/IoTDBQuotedPathIT.java | 2 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 9 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 43 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 56 ++-
.../iotdb/db/integration/IoTDBSimpleQueryTest.java | 86 ++++
.../iotdb/db/metadata/MManagerAdvancedTest.java | 20 +
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 25 +
.../reader/series/SeriesAggregateReaderTest.java | 4 +-
.../reader/series/SeriesReaderByTimestampTest.java | 2 -
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 21 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 1 -
.../file/metadata/statistics/BinaryStatistics.java | 2 +-
.../metadata/statistics/BooleanStatistics.java | 2 +-
.../file/metadata/statistics/DoubleStatistics.java | 2 +-
.../file/metadata/statistics/FloatStatistics.java | 2 +-
.../metadata/statistics/IntegerStatistics.java | 2 +-
.../file/metadata/statistics/LongStatistics.java | 2 +-
.../file/metadata/statistics/Statistics.java | 5 +
.../iotdb/tsfile/read/reader/IPageReader.java | 3 +
.../iotdb/tsfile/read/reader/page/PageReader.java | 5 +
89 files changed, 2293 insertions(+), 958 deletions(-)
create mode 100644
docs/Documentation-CHN/SystemDesign/5-DataQuery/6-LastQuery.md
copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java
=> server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java
(77%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/integration/Constant.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastIT.java
