This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch delete_aligned in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 32be6691cb9934ae2dfb4e7ff10b2f8c2ebe440d Merge: 021e654 bdebc92 Author: HTHou <[email protected]> AuthorDate: Tue Nov 23 21:06:18 2021 +0800 Merge branch 'master' of https://github.com/apache/iotdb into delete_aligned .../IoTDB-SQL-Language/Maintenance-Command.md | 4 + .../IoTDB-SQL-Language/Maintenance-Command.md | 3 + .../dropwizard/DropwizardMetricManager.java | 134 +++--- .../dropwizard/type/DropwizardHistogram.java | 5 - .../dropwizard/DropwizardMetricManagerTest.java | 15 +- .../org/apache/iotdb/metrics/MetricManager.java | 6 +- .../iotdb/metrics/impl/DoNothingHistogram.java | 4 - .../org/apache/iotdb/metrics/type/Histogram.java | 3 - .../micrometer/MicrometerMetricManager.java | 162 +++++--- .../micrometer/type/MicrometerHistogram.java | 5 - .../micrometer/MicrometerMetricManagerTest.java | 52 +++ .../iotdb/db/engine/memtable/AbstractMemTable.java | 11 +- .../org/apache/iotdb/db/metadata/MManager.java | 16 +- .../apache/iotdb/db/metadata/path/AlignedPath.java | 6 +- .../iotdb/db/qp/physical/crud/InsertPlan.java | 26 +- .../db/query/aggregation/impl/CountAggrResult.java | 1 + .../db/query/executor/AggregationExecutor.java | 34 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 6 +- .../db/query/executor/fill/LastPointReader.java | 1 + .../query/reader/chunk/MemAlignedPageReader.java | 10 +- ...ader.java => AlignedSeriesAggregateReader.java} | 36 +- .../iotdb/db/query/reader/series/SeriesReader.java | 33 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 16 +- .../org/apache/iotdb/db/constant/TestConstant.java | 3 + .../apache/iotdb/db/integration/IoTDBLastIT.java | 9 +- .../IoTDBAggregationWithoutValueFilter2IT.java | 63 +++ .../IoTDBAggregationWithoutValueFilterIT.java | 444 ++++++++++++++++++++ ...gregationWithoutValueFilterWithDeletion2IT.java | 83 ++++ ...ggregationWithoutValueFilterWithDeletionIT.java | 447 +++++++++++++++++++++ .../db/integration/aligned/IoTDBLastQuery2IT.java | 63 +++ .../db/integration/aligned/IoTDBLastQueryIT.java | 374 +++++++++++++++++ .../aligned/IoTDBLastQueryWithDeletion2IT.java | 81 ++++ .../aligned/IoTDBLastQueryWithDeletionIT.java | 380 ++++++++++++++++++ .../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 66 +++ .../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 379 +++++++++++++++++ ...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 86 ++++ ...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 384 ++++++++++++++++++ .../iotdb/db/metadata/MManagerBasicTest.java | 4 - .../org/apache/iotdb/db/utils/MemUtilsTest.java | 10 +- .../session/IoTDBSessionDisableMemControlIT.java | 205 ++++++++++ .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 68 ++++ .../iotdb/session/IoTDBSessionVectorInsertIT.java | 75 ++++ .../tsfile/file/metadata/AlignedChunkMetadata.java | 4 + .../file/metadata/AlignedTimeSeriesMetadata.java | 4 + .../apache/iotdb/tsfile/read/common/BatchData.java | 16 + .../tsfile/read/reader/IAlignedPageReader.java | 2 + .../tsfile/read/reader/page/AlignedPageReader.java | 5 + 47 files changed, 3630 insertions(+), 214 deletions(-)
