Skip to content

[Backport] Fix resultcache multiple postaggregation restore #15411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LakshSingla merged 1 commit into from
Nov 22, 2023
Merged

[Backport] Fix resultcache multiple postaggregation restore #15411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import org.apache.druid.data.input.Row;
import org.apache.druid.error.DruidException;
import org.apache.druid.frame.Frame;
import org.apache.druid.frame.FrameType;
import org.apache.druid.frame.allocation.MemoryAllocatorFactory;
Expand Down Expand Up @@ -62,7 +63,6 @@
import org.apache.druid.query.aggregation.AggregatorFactory;
import org.apache.druid.query.aggregation.MetricManipulationFn;
import org.apache.druid.query.aggregation.MetricManipulatorFns;
import org.apache.druid.query.aggregation.PostAggregator;
import org.apache.druid.query.cache.CacheKeyBuilder;
import org.apache.druid.query.context.ResponseContext;
import org.apache.druid.query.dimension.DefaultDimensionSpec;
Expand Down Expand Up @@ -651,9 +651,10 @@ public ResultRow apply(Object input)
);

if (isResultLevelCache) {
Iterator<PostAggregator> postItr = query.getPostAggregatorSpecs().iterator();
int postPos = 0;
while (postItr.hasNext() && results.hasNext()) {
for (int postPos = 0; postPos < query.getPostAggregatorSpecs().size(); postPos++) {
if (!results.hasNext()) {
throw DruidException.defensive("Ran out of objects while reading postaggs from cache!");
}
resultRow.set(postAggregatorStart + postPos, results.next());
}
}
Expand Down
9 changes: 5 additions & 4 deletions processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,8 @@ private void doTestCacheStrategy(final ColumnType valueType, final Object dimVal
)
)
.setPostAggregatorSpecs(
ImmutableList.of(new ConstantPostAggregator("post", 10))
new ConstantPostAggregator("post", 10),
new ConstantPostAggregator("post2", 20)
)
.setGranularity(QueryRunnerTestHelper.DAY_GRAN)
.build();
Expand Down Expand Up @@ -1017,14 +1018,14 @@ private void doTestCacheStrategy(final ColumnType valueType, final Object dimVal
Assert.assertEquals(result1, fromCacheResult);

// test timestamps that result in integer size millis
final ResultRow result2 = ResultRow.of(123L, dimValue, 1, dimValue, 10);
final ResultRow result2 = ResultRow.of(123L, dimValue, 1, dimValue, 10, 20);

// Please see the comments on aggregator serde and type handling in CacheStrategy.fetchAggregatorsFromCache()
final ResultRow typeAdjustedResult2;
if (valueType.is(ValueType.FLOAT)) {
typeAdjustedResult2 = ResultRow.of(123L, dimValue, 1, 2.1d, 10);
typeAdjustedResult2 = ResultRow.of(123L, dimValue, 1, 2.1d, 10, 20);
} else if (valueType.is(ValueType.LONG)) {
typeAdjustedResult2 = ResultRow.of(123L, dimValue, 1, 2, 10);
typeAdjustedResult2 = ResultRow.of(123L, dimValue, 1, 2, 10, 20);
} else {
typeAdjustedResult2 = result2;
}
Expand Down