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

Resultcache fetch should deserialize aggregates when they are real results (#15654) 

Fixes #15538
This commit is contained in:
Zoltan Haindrich 2024-01-10 12:42:33 +01:00 committed by GitHub
parent 99d4b7dca7
commit fefa763722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
processing/src/main/java/org/apache/druid/query/CacheStrategy.java
View File

@ -24,6 +24,7 @@ import com.google.common.base.Function;
import org.apache.druid.guice.annotations.ExtensionPoint; import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.java.util.common.ISE; import org.apache.druid.java.util.common.ISE;
import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.AggregatorFactory;
import org.apache.druid.segment.column.ColumnType;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -36,6 +37,7 @@ import java.util.List;
@ExtensionPoint @ExtensionPoint
public interface CacheStrategy<T, CacheType, QueryType extends Query<T>> public interface CacheStrategy<T, CacheType, QueryType extends Query<T>>
{ {
/** /**
* This method is deprecated and retained for backward incompatibility. * This method is deprecated and retained for backward incompatibility.
* Returns whether the given query is cacheable or not. * Returns whether the given query is cacheable or not.
@ -155,10 +157,15 @@ public interface CacheStrategy<T, CacheType, QueryType extends Query<T>>
throw new ISE("Ran out of objects while reading aggregators from cache!"); throw new ISE("Ran out of objects while reading aggregators from cache!");
} }
if (isResultLevelCache) { ColumnType resultType = aggregator.getResultType();
addToResultFunction.apply(aggregator.getName(), i, resultIter.next()); ColumnType intermediateType = aggregator.getIntermediateType();
} else {
boolean needsDeserialize = !isResultLevelCache || resultType.equals(intermediateType);
if (needsDeserialize) {
addToResultFunction.apply(aggregator.getName(), i, aggregator.deserialize(resultIter.next())); addToResultFunction.apply(aggregator.getName(), i, aggregator.deserialize(resultIter.next()));
} else {
addToResultFunction.apply(aggregator.getName(), i, resultIter.next());
} }
} }
} }