This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/AggOpMemoryControl in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 619b3f1e5bb610a031088f19979503097d1d63d6 Merge: b58a9a9252 5373f24280 Author: Minghui Liu <[email protected]> AuthorDate: Sun Aug 14 20:32:40 2022 +0800 Merge remote-tracking branch 'origin/lmh/AggOpMemoryControl' into lmh/AggOpMemoryControl # Conflicts: # server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/AggrWindowIterator.java # server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowIterator.java # server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java
