Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resultcache multiple postaggregation restore (#15402) 

Fixes https://github.com/apache/druid/issues/15393
This commit is contained in:
Zoltan Haindrich 2023-11-21 11:28:20 +01:00 committed by GitHub
parent 1df53d6eb3
commit dff5bcb0a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
View File

@ -35,6 +35,7 @@ import com.google.common.base.Supplier;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.apache.druid.data.input.Row; import org.apache.druid.data.input.Row;
import org.apache.druid.error.DruidException;
import org.apache.druid.frame.Frame; import org.apache.druid.frame.Frame;
import org.apache.druid.frame.FrameType; import org.apache.druid.frame.FrameType;
import org.apache.druid.frame.allocation.MemoryAllocatorFactory; import org.apache.druid.frame.allocation.MemoryAllocatorFactory;
@ -62,7 +63,6 @@ import org.apache.druid.query.SubqueryQueryRunner;
import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.AggregatorFactory;
import org.apache.druid.query.aggregation.MetricManipulationFn; import org.apache.druid.query.aggregation.MetricManipulationFn;
import org.apache.druid.query.aggregation.MetricManipulatorFns; 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.cache.CacheKeyBuilder;
import org.apache.druid.query.context.ResponseContext; import org.apache.druid.query.context.ResponseContext;
import org.apache.druid.query.dimension.DefaultDimensionSpec; import org.apache.druid.query.dimension.DefaultDimensionSpec;
@ -651,9 +651,10 @@ public class GroupByQueryQueryToolChest extends QueryToolChest<ResultRow, GroupB
); );
if (isResultLevelCache) { if (isResultLevelCache) {
Iterator<PostAggregator> postItr = query.getPostAggregatorSpecs().iterator(); for (int postPos = 0; postPos < query.getPostAggregatorSpecs().size(); postPos++) {
int postPos = 0; if (!results.hasNext()) {
while (postItr.hasNext() && results.hasNext()) { throw DruidException.defensive("Ran out of objects while reading postaggs from cache!");
}
resultRow.set(postAggregatorStart + postPos, results.next()); resultRow.set(postAggregatorStart + postPos, results.next());
} }
} }

9
processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChestTest.java
View File

@ -986,7 +986,8 @@ public class GroupByQueryQueryToolChestTest extends InitializedNullHandlingTest
) )
) )
.setPostAggregatorSpecs( .setPostAggregatorSpecs(
ImmutableList.of(new ConstantPostAggregator("post", 10)) new ConstantPostAggregator("post", 10),
new ConstantPostAggregator("post2", 20)
) )
.setGranularity(QueryRunnerTestHelper.DAY_GRAN) .setGranularity(QueryRunnerTestHelper.DAY_GRAN)
.build(); .build();
@ -1017,14 +1018,14 @@ public class GroupByQueryQueryToolChestTest extends InitializedNullHandlingTest
Assert.assertEquals(result1, fromCacheResult); Assert.assertEquals(result1, fromCacheResult);
// test timestamps that result in integer size millis // 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() // Please see the comments on aggregator serde and type handling in CacheStrategy.fetchAggregatorsFromCache()
final ResultRow typeAdjustedResult2; final ResultRow typeAdjustedResult2;
if (valueType.is(ValueType.FLOAT)) { 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)) { } else if (valueType.is(ValueType.LONG)) {
typeAdjustedResult2 = ResultRow.of(123L, dimValue, 1, 2, 10); typeAdjustedResult2 = ResultRow.of(123L, dimValue, 1, 2, 10, 20);
} else { } else {
typeAdjustedResult2 = result2; typeAdjustedResult2 = result2;
} }