This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch QueryIO in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 449cd54edb0e8db683705c115be5006062121da6 Merge: 022c8cb08b6 3aef6ada2cf Author: JackieTien97 <[email protected]> AuthorDate: Wed Nov 13 16:39:51 2024 +0800 resolve conflicts .../it/env/cluster/config/MppCommonConfig.java | 18 + .../env/cluster/config/MppSharedCommonConfig.java | 21 + .../it/env/remote/config/RemoteCommonConfig.java | 15 + .../org/apache/iotdb/itbase/env/CommonConfig.java | 6 + .../db/it/query/IoTDBEncryptionValueQueryIT.java | 676 +++++++++++++++++++++ .../db/it/query/IoTDBLoadEncryptedTsFileIT.java | 204 +++++++ .../iotdb/db/it/query/IoTDBLoadPlainTsFileIT.java | 145 +++++ .../pipe/it/manual/IoTDBPipeMetaHistoricalIT.java | 56 ++ .../SubscriptionPipeTimeoutException.java | 2 +- ....java => SubscriptionPollTimeoutException.java} | 12 +- ...tion.java => SubscriptionTimeoutException.java} | 14 +- .../payload/poll/SubscriptionPollRequest.java | 2 +- .../apache/iotdb/session/SessionConnection.java | 8 +- .../consumer/SubscriptionConsumer.java | 173 ++++-- .../SubscriptionExecutorServiceManager.java | 11 +- .../consumer/SubscriptionProvider.java | 13 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 18 + .../schemaregion/SchemaExecutionVisitor.java | 32 +- .../subtask/processor/PipeProcessorSubtask.java | 4 +- .../evolvable/batch/PipeTabletEventBatch.java | 5 +- .../common/tsfile/PipeTsFileInsertionEvent.java | 55 +- .../scan/AlignedSinglePageWholeChunkReader.java | 11 +- .../parser/scan/SinglePageWholeChunkReader.java | 50 +- .../db/pipe/resource/memory/PipeMemoryManager.java | 6 + .../resource/tsfile/PipeTsFileResourceManager.java | 14 +- .../tsfile/PipeTsFileResourceSegmentLock.java | 9 +- .../pipe/resource/wal/PipeWALResourceManager.java | 14 +- .../load/LoadTsFileToTableModelAnalyzer.java | 10 + .../load/LoadTsFileToTreeModelAnalyzer.java | 10 + .../iotdb/db/storageengine/buffer/ChunkCache.java | 7 +- .../fast/reader/CompactionAlignedChunkReader.java | 18 +- .../fast/reader/CompactionChunkReader.java | 14 +- .../readchunk/loader/InstantChunkLoader.java | 3 +- .../readchunk/loader/InstantPageLoader.java | 17 +- .../compaction/repair/RepairDataFileScanUtil.java | 17 +- .../filescan/impl/DiskAlignedChunkHandleImpl.java | 11 +- .../read/filescan/impl/DiskChunkHandleImpl.java | 7 +- .../dataregion/utils/SharedTimeDataBuffer.java | 8 +- .../agent/SubscriptionReceiverAgent.java | 13 + .../broker/SubscriptionPrefetchingQueue.java | 22 +- .../broker/SubscriptionPrefetchingTabletQueue.java | 22 +- .../broker/SubscriptionPrefetchingTsFileQueue.java | 35 +- .../db/subscription/event/SubscriptionEvent.java | 6 +- .../event/batch/SubscriptionPipeEventBatch.java | 6 +- .../batch/SubscriptionPipeTabletEventBatch.java | 6 +- .../batch/SubscriptionPipeTsFileEventBatch.java | 8 +- .../SubscriptionEventExtendableResponse.java | 10 - .../event/response/SubscriptionEventResponse.java | 4 +- .../response/SubscriptionEventSingleResponse.java | 2 +- .../response/SubscriptionEventTabletResponse.java | 10 + .../response/SubscriptionEventTsFileResponse.java | 73 ++- .../receiver/SubscriptionReceiver.java | 2 + .../receiver/SubscriptionReceiverV1.java | 271 +++++---- .../execution/SubscriptionSubtaskExecutor.java | 50 ++ ...utor.java => SubscriptionSubtaskScheduler.java} | 22 +- .../task/subtask/SubscriptionConnectorSubtask.java | 44 +- .../subtask/SubscriptionReceiverSubtask.java} | 15 +- .../conf/iotdb-system.properties.template | 15 + .../apache/iotdb/commons/conf/CommonConfig.java | 22 +- .../iotdb/commons/conf/CommonDescriptor.java | 11 +- .../agent/task/execution/PipeSubtaskExecutor.java | 32 +- .../task/subtask/PipeAbstractConnectorSubtask.java | 12 +- .../pipe/agent/task/subtask/PipeSubtask.java | 4 +- .../resource/ref/PipePhantomReferenceManager.java | 4 +- .../subscription/config/SubscriptionConfig.java | 14 +- pom.xml | 1 + 66 files changed, 2046 insertions(+), 406 deletions(-) diff --cc iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java index 62a0189a4b9,0a12a529abf..5914272c7cc --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java @@@ -170,11 -144,6 +170,16 @@@ public class ChunkCache } } + private Chunk constructChunk( + Chunk chunk, List<TimeRange> timeRangeList, Statistics chunkStatistic) { - return new Chunk(chunk.getHeader(), chunk.getData().duplicate(), timeRangeList, chunkStatistic); ++ return new Chunk( ++ chunk.getHeader(), ++ chunk.getData().duplicate(), ++ timeRangeList, ++ chunkStatistic, ++ chunk.getEncryptParam()); + } + public double calculateChunkHitRatio() { return lruCache.stats().hitRate(); }
