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 815b7e2059e9ee16dcf42ee185d084f997a0746c Author: Minghui Liu <[email protected]> AuthorDate: Sun Aug 14 20:27:11 2022 +0800 tmp save --- .../db/mpp/execution/operator/AggregationUtil.java | 54 ++++++++++++++++++++++ .../process/RawDataAggregationOperator.java | 1 - .../AbstractSeriesAggregationScanOperator.java | 6 +-- .../AlignedSeriesAggregationScanOperator.java | 6 ++- .../source/SeriesAggregationScanOperator.java | 6 ++- .../db/mpp/plan/planner/OperatorTreeGenerator.java | 13 +++++- .../operator/AggregationOperatorTest.java | 7 ++- .../AlignedSeriesAggregationScanOperatorTest.java | 4 +- .../execution/operator/LastQueryOperatorTest.java | 13 ++++-- .../operator/LastQuerySortOperatorTest.java | 13 ++++-- .../mpp/execution/operator/OperatorMemoryTest.java | 3 +- .../SeriesAggregationScanOperatorTest.java | 4 +- .../SlidingWindowAggregationOperatorTest.java | 4 +- .../operator/UpdateLastCacheOperatorTest.java | 4 +- 14 files changed, 114 insertions(+), 24 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/AggregationUtil.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/AggregationUtil.java index 5465800553..a47a94ff38 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/AggregationUtil.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/AggregationUtil.java @@ -23,16 +23,27 @@ import org.apache.iotdb.db.mpp.aggregation.Aggregator; import org.apache.iotdb.db.mpp.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.mpp.aggregation.timerangeiterator.SingleTimeWindowIterator; import org.apache.iotdb.db.mpp.aggregation.timerangeiterator.TimeRangeIteratorFactory; +import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.GroupByTimeParameter; +import org.apache.iotdb.db.mpp.statistics.StatisticsManager; +import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; +import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.TimeRange; import org.apache.iotdb.tsfile.read.common.block.TsBlock; import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder; +import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumn; import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; +import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumn; +import org.apache.iotdb.tsfile.read.common.block.column.FloatColumn; +import org.apache.iotdb.tsfile.read.common.block.column.IntColumn; +import org.apache.iotdb.tsfile.read.common.block.column.LongColumn; +import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder; import org.apache.iotdb.tsfile.utils.Pair; import java.util.List; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.apache.iotdb.tsfile.read.common.block.TsBlockUtil.skipPointsOutOfTimeRange; public class AggregationUtil { @@ -158,4 +169,47 @@ public class AggregationUtil { } return true; } + + public static long calculateMaxAggregationResultSize( + List<AggregationDescriptor> aggregationDescriptors, + ITimeRangeIterator timeRangeIterator, + boolean isGroupByQuery) { + long valueColumnsSizePerLine = 0; + for (AggregationDescriptor descriptor : aggregationDescriptors) {} + + for (TSDataType tsDataType : outPutDataTypes) { + switch (tsDataType) { + case INT32: + valueColumnsSizePerLine += IntColumn.SIZE_IN_BYTES_PER_POSITION; + break; + case INT64: + valueColumnsSizePerLine += LongColumn.SIZE_IN_BYTES_PER_POSITION; + break; + case FLOAT: + valueColumnsSizePerLine += FloatColumn.SIZE_IN_BYTES_PER_POSITION; + break; + case DOUBLE: + valueColumnsSizePerLine += DoubleColumn.SIZE_IN_BYTES_PER_POSITION; + break; + case BOOLEAN: + valueColumnsSizePerLine += BooleanColumn.SIZE_IN_BYTES_PER_POSITION; + break; + case TEXT: + valueColumnsSizePerLine += + StatisticsManager.getInstance().getMaxBinarySizeInBytes(seriesPath); + break; + default: + throw new UnsupportedOperationException("Unknown data type " + tsDataType); + } + } + + return isGroupByQuery + ? Math.min( + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES, + Math.min( + TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(), + timeRangeIterator.getTotalIntervalNum()) + * (TimeColumn.SIZE_IN_BYTES_PER_POSITION + valueColumnsSizePerLine)) + : valueColumnsSizePerLine; + } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/RawDataAggregationOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/RawDataAggregationOperator.java index 1cd922bb46..c88345c901 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/RawDataAggregationOperator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/RawDataAggregationOperator.java @@ -43,7 +43,6 @@ import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEF * <p>Return aggregation result in many time intervals once. */ public class RawDataAggregationOperator extends SingleInputAggregationOperator { - public RawDataAggregationOperator( OperatorContext operatorContext, List<Aggregator> aggregators, diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java index fee5102441..3f4764ddf3 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java @@ -43,7 +43,6 @@ import static org.apache.iotdb.db.mpp.execution.operator.AggregationUtil.appendA import static org.apache.iotdb.db.mpp.execution.operator.AggregationUtil.calculateAggregationFromRawData; import static org.apache.iotdb.db.mpp.execution.operator.AggregationUtil.initTimeRangeIterator; import static org.apache.iotdb.db.mpp.execution.operator.AggregationUtil.isAllAggregatorsHasFinalResult; -import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; public abstract class AbstractSeriesAggregationScanOperator implements DataSourceOperator { @@ -80,7 +79,8 @@ public abstract class AbstractSeriesAggregationScanOperator implements DataSourc int subSensorSize, List<Aggregator> aggregators, boolean ascending, - GroupByTimeParameter groupByTimeParameter) { + GroupByTimeParameter groupByTimeParameter, + long maxReturnSize) { this.sourceId = sourceId; this.operatorContext = context; this.ascending = ascending; @@ -99,7 +99,7 @@ public abstract class AbstractSeriesAggregationScanOperator implements DataSourc this.maxRetainedSize = (1L + subSensorSize) * TSFileDescriptor.getInstance().getConfig().getPageSizeInByte(); - this.maxReturnSize = DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; + this.maxReturnSize = maxReturnSize; } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AlignedSeriesAggregationScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AlignedSeriesAggregationScanOperator.java index f9fa1f8d52..cd7ad09bfc 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -39,7 +39,8 @@ public class AlignedSeriesAggregationScanOperator extends AbstractSeriesAggregat List<Aggregator> aggregators, Filter timeFilter, boolean ascending, - GroupByTimeParameter groupByTimeParameter) { + GroupByTimeParameter groupByTimeParameter, + long maxReturnSize) { super( sourceId, context, @@ -53,6 +54,7 @@ public class AlignedSeriesAggregationScanOperator extends AbstractSeriesAggregat seriesPath.getMeasurementList().size(), aggregators, ascending, - groupByTimeParameter); + groupByTimeParameter, + maxReturnSize); } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java index 157f51f2fa..55547e56ee 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java @@ -46,7 +46,8 @@ public class SeriesAggregationScanOperator extends AbstractSeriesAggregationScan List<Aggregator> aggregators, Filter timeFilter, boolean ascending, - GroupByTimeParameter groupByTimeParameter) { + GroupByTimeParameter groupByTimeParameter, + long maxReturnSize) { super( sourceId, context, @@ -61,6 +62,7 @@ public class SeriesAggregationScanOperator extends AbstractSeriesAggregationScan 1, aggregators, ascending, - groupByTimeParameter); + groupByTimeParameter, + maxReturnSize); } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java index 5c4570a1fe..e057d60748 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java @@ -33,6 +33,7 @@ import org.apache.iotdb.db.mpp.execution.exchange.ISinkHandle; import org.apache.iotdb.db.mpp.execution.exchange.ISourceHandle; import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeManager; import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeService; +import org.apache.iotdb.db.mpp.execution.operator.AggregationUtil; import org.apache.iotdb.db.mpp.execution.operator.Operator; import org.apache.iotdb.db.mpp.execution.operator.OperatorContext; import org.apache.iotdb.db.mpp.execution.operator.process.AggregationOperator; @@ -150,6 +151,7 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.FillDescriptor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.GroupByLevelDescriptor; +import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.OutputColumn; import org.apache.iotdb.db.mpp.plan.statement.component.FillPolicy; @@ -185,6 +187,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.iotdb.db.mpp.execution.operator.AggregationUtil.initTimeRangeIterator; import static org.apache.iotdb.db.mpp.plan.constant.DataNodeEndPoints.isSameNode; /** This Visitor is responsible for transferring PlanNode Tree to Operator Tree */ @@ -307,6 +310,13 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP Collections.singletonList(new InputLocation[] {new InputLocation(0, seriesIndex)}))); } + GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter(); + long maxReturnSize = + AggregationUtil.calculateMaxAggregationResultSize( + node.getAggregationDescriptorList(), + initTimeRangeIterator(groupByTimeParameter, ascending, true), + groupByTimeParameter != null); + AlignedSeriesAggregationScanOperator seriesAggregationScanOperator = new AlignedSeriesAggregationScanOperator( node.getPlanNodeId(), @@ -315,7 +325,8 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP aggregators, node.getTimeFilter(), ascending, - node.getGroupByTimeParameter()); + groupByTimeParameter, + maxReturnSize); context.addSourceOperator(seriesAggregationScanOperator); context.addPath(seriesPath); diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AggregationOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AggregationOperatorTest.java index 233965aa3e..01b2813a81 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AggregationOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AggregationOperatorTest.java @@ -61,6 +61,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.junit.Assert.assertEquals; public class AggregationOperatorTest { @@ -321,7 +322,8 @@ public class AggregationOperatorTest { aggregators, null, true, - groupByTimeParameter); + groupByTimeParameter, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); List<TsFileResource> seqResources1 = new ArrayList<>(); List<TsFileResource> unSeqResources1 = new ArrayList<>(); seqResources1.add(seqResources.get(0)); @@ -343,7 +345,8 @@ public class AggregationOperatorTest { aggregators, null, true, - groupByTimeParameter); + groupByTimeParameter, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); List<TsFileResource> seqResources2 = new ArrayList<>(); List<TsFileResource> unSeqResources2 = new ArrayList<>(); seqResources2.add(seqResources.get(2)); diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesAggregationScanOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesAggregationScanOperatorTest.java index 2277299102..937bf90c27 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesAggregationScanOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesAggregationScanOperatorTest.java @@ -63,6 +63,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.mpp.execution.operator.AggregationOperatorTest.TEST_TIME_SLICE; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -634,7 +635,8 @@ public class AlignedSeriesAggregationScanOperatorTest { aggregators, timeFilter, ascending, - groupByTimeParameter); + groupByTimeParameter, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); return seriesAggregationScanOperator; diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQueryOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQueryOperatorTest.java index d914ec3ee7..a086bbe8f2 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQueryOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQueryOperatorTest.java @@ -56,6 +56,7 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.mpp.execution.operator.AggregationOperatorTest.TEST_TIME_SLICE; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -135,7 +136,8 @@ public class LastQueryOperatorTest { aggregators1, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator1.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); @@ -157,7 +159,8 @@ public class LastQueryOperatorTest { aggregators2, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator2.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); @@ -254,7 +257,8 @@ public class LastQueryOperatorTest { aggregators1, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator1.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); @@ -276,7 +280,8 @@ public class LastQueryOperatorTest { aggregators2, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator2.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQuerySortOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQuerySortOperatorTest.java index 2785f1d803..2d88d96d9c 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQuerySortOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/LastQuerySortOperatorTest.java @@ -58,6 +58,7 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.mpp.execution.operator.AggregationOperatorTest.TEST_TIME_SLICE; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -137,7 +138,8 @@ public class LastQuerySortOperatorTest { aggregators1, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator1.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); @@ -159,7 +161,8 @@ public class LastQuerySortOperatorTest { aggregators2, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator2.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); @@ -257,7 +260,8 @@ public class LastQuerySortOperatorTest { aggregators1, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator1.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); @@ -279,7 +283,8 @@ public class LastQuerySortOperatorTest { aggregators2, null, false, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator2.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/OperatorMemoryTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/OperatorMemoryTest.java index 5f1b019e89..fa6f47ec59 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/OperatorMemoryTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/OperatorMemoryTest.java @@ -667,7 +667,8 @@ public class OperatorMemoryTest { AggregationStep.SINGLE)), null, true, - null); + null, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); assertEquals( 2L * TSFileDescriptor.getInstance().getConfig().getPageSizeInByte() diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SeriesAggregationScanOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SeriesAggregationScanOperatorTest.java index 71fd167404..b30ff5b1b7 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SeriesAggregationScanOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SeriesAggregationScanOperatorTest.java @@ -59,6 +59,7 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.mpp.execution.operator.AggregationOperatorTest.TEST_TIME_SLICE; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.junit.Assert.assertEquals; public class SeriesAggregationScanOperatorTest { @@ -517,7 +518,8 @@ public class SeriesAggregationScanOperatorTest { aggregators, timeFilter, ascending, - groupByTimeParameter); + groupByTimeParameter, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); return seriesAggregationScanOperator; diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SlidingWindowAggregationOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SlidingWindowAggregationOperatorTest.java index 81ab99e1ff..4463a45cf5 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SlidingWindowAggregationOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/SlidingWindowAggregationOperatorTest.java @@ -61,6 +61,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.mpp.execution.operator.AggregationOperatorTest.TEST_TIME_SLICE; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; public class SlidingWindowAggregationOperatorTest { @@ -234,7 +235,8 @@ public class SlidingWindowAggregationOperatorTest { aggregators, null, ascending, - groupByTimeParameter); + groupByTimeParameter, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources)); diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/UpdateLastCacheOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/UpdateLastCacheOperatorTest.java index 34b9b8fa87..c2e469d224 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/UpdateLastCacheOperatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/UpdateLastCacheOperatorTest.java @@ -56,6 +56,7 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.mpp.execution.operator.AggregationOperatorTest.TEST_TIME_SLICE; +import static org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus.DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -213,7 +214,8 @@ public class UpdateLastCacheOperatorTest { aggregators, timeFilter, ascending, - groupByTimeParameter); + groupByTimeParameter, + DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES); seriesAggregationScanOperator.initQueryDataSource( new QueryDataSource(seqResources, unSeqResources));
