This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch OOMImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 00e820a add javadoc
add 74eedae add device chunk point cache (#1758)
add e5f213c [IOTDB-949] fix align by device bug (#1837)
add 64dc16b [IOTDB-927] Remove fastjson introduced by rocketmq (#1782)
add 0964b95 [IOTDB-902] Optimize max_time aggregation and fix order by
time desc aggregation bug (#1751)
add 897c663 resolve conflicts
No new revisions were added by this update.
Summary of changes:
example/rocketmq/pom.xml | 6 +
.../resources/conf/iotdb-engine.properties | 29 +-
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 1 -
.../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 23 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 21 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 101 +++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 18 +
.../db/engine/fileSystem/SystemFileFactory.java | 5 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 1 -
.../db/engine/memtable/PrimitiveMemTable.java | 1 -
.../iotdb/db/engine/merge/manage/MergeManager.java | 33 +-
.../db/engine/merge/manage/MergeResource.java | 2 -
.../engine/modification/io/ModificationReader.java | 1 -
.../engine/modification/io/ModificationWriter.java | 1 -
.../db/engine/querycontext/ReadOnlyMemChunk.java | 5 +-
.../engine/storagegroup/StorageGroupProcessor.java | 299 ++---------
.../db/engine/storagegroup/TsFileProcessor.java | 11 +-
.../db/engine/storagegroup/TsFileResource.java | 6 +-
.../HotCompactionMergeTaskPoolManager.java | 9 +-
.../engine/tsfilemanagement/TsFileManagement.java | 238 ++++++++
.../level/LevelTsFileManagement.java | 253 +++++----
.../tsfilemanagement/utils/HotCompactionUtils.java | 268 +++++----
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 9 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 11 +-
.../org/apache/iotdb/db/metadata/TagLogFile.java | 15 +-
.../apache/iotdb/db/metrics/server/JettyUtil.java | 4 +-
.../iotdb/db/metrics/server/MetricsSystem.java | 2 +-
.../iotdb/db/metrics/server/ServerArgument.java | 2 +-
.../apache/iotdb/db/metrics/sink/ConsoleSink.java | 2 +-
.../iotdb/db/metrics/sink/MetricsServletSink.java | 6 +-
.../apache/iotdb/db/metrics/source/JvmSource.java | 2 +-
.../iotdb/db/metrics/source/MetricsSource.java | 2 +-
.../apache/iotdb/db/metrics/ui/MetricsPage.java | 2 +-
.../apache/iotdb/db/metrics/ui/MetricsWebUI.java | 2 +-
.../org/apache/iotdb/db/monitor/IStatistic.java | 1 -
.../org/apache/iotdb/db/monitor/StatMonitor.java | 15 +-
.../apache/iotdb/db/mqtt/BrokerAuthenticator.java | 2 +-
.../apache/iotdb/db/mqtt/JSONPayloadFormatter.java | 1 -
.../apache/iotdb/db/mqtt/PayloadFormatManager.java | 1 -
.../org/apache/iotdb/db/mqtt/PayloadFormatter.java | 1 -
.../db/qp/logical/crud/BasicOperatorType.java | 3 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 3 +-
.../db/qp/physical/crud/GroupByTimeFillPlan.java | 3 +-
.../apache/iotdb/db/qp/physical/sys/CountPlan.java | 1 -
.../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 15 +-
.../optimizer/MergeSingleFilterOptimizer.java | 7 +-
.../db/query/aggregation/AggregateResult.java | 38 +-
.../db/query/aggregation/impl/AvgAggrResult.java | 6 +-
.../db/query/aggregation/impl/CountAggrResult.java | 2 +-
.../aggregation/impl/FirstValueAggrResult.java | 20 +-
...grResult.java => FirstValueDescAggrResult.java} | 66 +--
.../aggregation/impl/LastValueAggrResult.java | 12 +-
...ggrResult.java => LastValueDescAggrResult.java} | 70 +--
.../query/aggregation/impl/MaxTimeAggrResult.java | 25 +-
...eAggrResult.java => MaxTimeDescAggrResult.java} | 75 +--
.../query/aggregation/impl/MaxValueAggrResult.java | 9 +-
.../query/aggregation/impl/MinTimeAggrResult.java | 23 +-
...tAggrResult.java => MinTimeDescAggrResult.java} | 63 +--
.../query/aggregation/impl/MinValueAggrResult.java | 6 +-
.../db/query/aggregation/impl/SumAggrResult.java | 2 +-
.../iotdb/db/query/control/FileReaderManager.java | 15 +-
.../iotdb/db/query/control/QueryFileManager.java | 9 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 1 +
.../dataset/groupby/GroupByEngineDataSet.java | 3 +-
.../db/query/dataset/groupby/GroupByExecutor.java | 5 +-
.../query/dataset/groupby/GroupByFillDataSet.java | 86 ++-
.../groupby/GroupByWithValueFilterDataSet.java | 13 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 2 +-
.../dataset/groupby/LocalGroupByExecutor.java | 19 +-
.../db/query/executor/AggregationExecutor.java | 88 +--
.../iotdb/db/query/executor/IQueryRouter.java | 10 +-
.../db/query/executor/RawDataQueryExecutor.java | 11 +-
.../iotdb/db/query/executor/fill/LinearFill.java | 5 +-
.../query/externalsort/ExternalSortJobEngine.java | 7 +-
.../iotdb/db/query/externalsort/LineMerger.java | 2 +-
.../externalsort/SimpleExternalSortEngine.java | 11 +-
.../SingleSourceExternalSortJobPart.java | 2 +-
.../adapter/ByTimestampReaderAdapter.java | 2 +-
.../serialize/IExternalSortFileDeserializer.java | 2 +-
.../FixLengthIExternalSortFileDeserializer.java | 4 +-
.../impl/FixLengthTimeValuePairSerializer.java | 2 +-
.../db/query/factory/AggregateResultFactory.java | 54 +-
.../db/query/reader/chunk/ChunkDataIterator.java | 5 +-
.../db/query/reader/chunk/ChunkReaderWrap.java | 3 +-
.../reader/chunk/DiskChunkReaderByTimestamp.java | 3 +-
.../db/query/reader/chunk/MemChunkLoader.java | 3 +-
.../db/query/reader/chunk/MemChunkReader.java | 7 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 4 +-
.../resource/CachedUnseqResourceMergeReader.java | 5 +-
.../reader/series/DescSeriesReaderByTimestamp.java | 53 --
.../db/query/reader/series/IAggregateReader.java | 4 +-
.../query/reader/series/SeriesAggregateReader.java | 4 +
.../reader/series/SeriesRawDataPointReader.java | 3 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 5 +-
.../reader/series/SeriesReaderByTimestamp.java | 25 +-
.../universal/CachedPriorityMergeReader.java | 2 +-
.../reader/universal/PriorityMergeReader.java | 4 +-
.../org/apache/iotdb/db/rescon/MemTablePool.java | 5 +-
.../org/apache/iotdb/db/service/MQTTService.java | 5 +-
.../apache/iotdb/db/service/RegisterManager.java | 1 -
.../org/apache/iotdb/db/service/StaticResps.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 35 +-
.../receiver/recover/SyncReceiverLogAnalyzer.java | 2 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 19 +-
.../db/sync/sender/manage/SyncFileManager.java | 22 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 1 -
.../java/org/apache/iotdb/db/tools/WalChecker.java | 1 -
.../iotdb/db/tools/memestimation/MemEstTool.java | 1 -
.../org/apache/iotdb/db/utils/CommonUtils.java | 1 -
.../java/org/apache/iotdb/db/utils/MathUtils.java | 1 -
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 13 +-
.../iotdb/db/utils/datastructure/TVList.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 1 -
.../iotdb/db/engine/merge/MergeManagerTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 85 +--
.../iotdb/db/integration/IOTDBGroupByIT.java | 194 ++++++-
.../integration/IOTDBGroupByInnerIntervalIT.java | 262 +++++----
.../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 11 +-
.../IoTDBAggregationAlignByDeviceIT.java | 113 ----
.../iotdb/db/integration/IoTDBAggregationIT.java | 156 +++++-
.../integration/IoTDBAggregationLargeDataIT.java | 398 ++++++++++----
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 10 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 60 +++
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 596 +++++++++++++--------
.../integration/IoTDBGroupByFillWithRangeIT.java | 21 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 30 ++
.../iotdb/db/integration/IoTDBMergeTest.java | 14 +-
.../db/query/aggregation/AggregateResultTest.java | 94 ++--
.../reader/series/SeriesAggregateReaderTest.java | 2 +-
.../reader/series/SeriesReaderByTimestampTest.java | 8 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 3 +
.../apache/iotdb/tsfile/read/common/BatchData.java | 16 -
.../iotdb/tsfile/read/common/DescBatchData.java | 13 +-
.../iotdb/tsfile/read/filter/GroupByFilter.java | 6 +-
.../tsfile/read/filter/GroupByFilterTest.java | 2 +-
135 files changed, 2694 insertions(+), 1861 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{CountAggrResult.java
=> FirstValueDescAggrResult.java} (53%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{LastValueAggrResult.java
=> LastValueDescAggrResult.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{MaxTimeAggrResult.java
=> MaxTimeDescAggrResult.java} (53%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{CountAggrResult.java
=> MinTimeDescAggrResult.java} (51%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/reader/series/DescSeriesReaderByTimestamp.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationAlignByDeviceIT.java
