This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 721e6550b9 BugFix: Fix merge result from more than one server (#12778)
721e6550b9 is described below
commit 721e6550b983b6e44a8c18b1462fd51e60be2f95
Author: David Cromberge <davecrombe...@gmail.com>
AuthorDate: Wed Apr 3 01:19:58 2024 +0100
BugFix: Fix merge result from more than one server (#12778)
---
.../function/DistinctCountCPCSketchAggregationFunction.java | 2 ++
.../function/DistinctCountThetaSketchAggregationFunction.java | 2 ++
.../aggregation/function/IntegerTupleSketchAggregationFunction.java | 3 +++
3 files changed, 7 insertions(+)
diff --git
a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountCPCSketchAggregationFunction.java
b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountCPCSketchAggregationFunction.java
index 4a33086bb8..b42e36a091 100644
---
a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountCPCSketchAggregationFunction.java
+++
b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountCPCSketchAggregationFunction.java
@@ -391,6 +391,8 @@ public class DistinctCountCPCSketchAggregationFunction
if (intermediateResult2 == null || intermediateResult2.isEmpty()) {
return intermediateResult1;
}
+ intermediateResult1.setLgNominalEntries(_lgNominalEntries);
+ intermediateResult1.setThreshold(_accumulatorThreshold);
intermediateResult1.merge(intermediateResult2);
return intermediateResult1;
}
diff --git
a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
index 7c7234d4da..a2dd23708b 100644
---
a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
+++
b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
@@ -997,6 +997,8 @@ public class DistinctCountThetaSketchAggregationFunction
mergedAccumulators.add(thetaSketchAccumulator1);
continue;
}
+ thetaSketchAccumulator1.setSetOperationBuilder(_setOperationBuilder);
+ thetaSketchAccumulator1.setThreshold(_accumulatorThreshold);
thetaSketchAccumulator1.merge(thetaSketchAccumulator2);
mergedAccumulators.add(thetaSketchAccumulator1);
}
diff --git
a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java
b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java
index 992ef5d7a1..3941062296 100644
---
a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java
+++
b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java
@@ -250,6 +250,9 @@ public class IntegerTupleSketchAggregationFunction
if (intermediateResult2 == null || intermediateResult2.isEmpty()) {
return intermediateResult1;
}
+ intermediateResult1.setThreshold(_accumulatorThreshold);
+ intermediateResult1.setNominalEntries(_nominalEntries);
+ intermediateResult1.setSetOperations(_setOps);
intermediateResult1.merge(intermediateResult2);
return intermediateResult1;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
