Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder
*/
IntermediateResult merge(IntermediateResult intermediateResult1, IntermediateResult intermediateResult2);

/**
* Returns whether the intermediate result is comparable.
*/
boolean isIntermediateResultComparable();

/**
* Returns the {@link ColumnDataType} of the intermediate result.
* <p>This column data type is used for transferring data in data table.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,6 @@ public AvgPair merge(AvgPair intermediateResult1, AvgPair intermediateResult2) {
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ public Long merge(Long intermediateResult1, Long intermediateResult2) {
return intermediateResult1 + intermediateResult2;
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.LONG;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,6 @@ public Object merge(Object intermediateResult1, Object intermediateResult2) {
throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
}

@Override
public boolean isIntermediateResultComparable() {
throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
}

@Override
public ColumnDataType getFinalResultColumnType() {
throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,6 @@ public Set merge(Set intermediateResult1, Set intermediateResult2) {
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,6 @@ public RoaringBitmap merge(RoaringBitmap intermediateResult1, RoaringBitmap inte
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,6 @@ public HyperLogLog merge(HyperLogLog intermediateResult1, HyperLogLog intermedia
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ public HyperLogLog merge(HyperLogLog intermediateResult1, HyperLogLog intermedia
return _distinctCountHLLAggregationFunction.merge(intermediateResult1, intermediateResult2);
}

@Override
public boolean isIntermediateResultComparable() {
return _distinctCountHLLAggregationFunction.isIntermediateResultComparable();
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return _distinctCountHLLAggregationFunction.getIntermediateResultColumnType();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -976,11 +976,6 @@ public List<Sketch> merge(List<Sketch> sketches1, List<Sketch> sketches2) {
return mergedSketches;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@ public HyperLogLog merge(HyperLogLog intermediateResult1, HyperLogLog intermedia
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,11 +468,6 @@ public IdSet merge(IdSet intermediateResult1, IdSet intermediateResult2) {
return IdSets.merge(intermediateResult1, intermediateResult2, _sizeThresholdInBytes, _expectedInsertions, _fpp);
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,6 @@ public List<ExpressionContext> getInputExpressions() {
return Arrays.asList(_expression, _timeCol);
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ public Double merge(Double intermediateResult1, Double intermediateResult2) {
}
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.DOUBLE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ public Double merge(Double intermediateResult1, Double intermediateResult2) {
}
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.DOUBLE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,6 @@ public MinMaxRangePair merge(MinMaxRangePair intermediateResult1, MinMaxRangePai
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,11 +454,6 @@ public Map<? extends Number, Long> merge(Map<? extends Number, Long> intermediat
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ public DoubleArrayList merge(DoubleArrayList intermediateResult1, DoubleArrayLis
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,6 @@ public QuantileDigest merge(QuantileDigest intermediateResult1, QuantileDigest i
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,6 @@ public QuantileDigest merge(QuantileDigest intermediateResult1, QuantileDigest i
return _percentileEstAggregationFunction.merge(intermediateResult1, intermediateResult2);
}

@Override
public boolean isIntermediateResultComparable() {
return _percentileEstAggregationFunction.isIntermediateResultComparable();
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return _percentileEstAggregationFunction.getIntermediateResultColumnType();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,6 @@ public TDigest merge(TDigest intermediateResult1, TDigest intermediateResult2) {
return _percentileTDigestAggregationFunction.merge(intermediateResult1, intermediateResult2);
}

@Override
public boolean isIntermediateResultComparable() {
return _percentileTDigestAggregationFunction.isIntermediateResultComparable();
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return _percentileTDigestAggregationFunction.getIntermediateResultColumnType();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,6 @@ public TDigest merge(TDigest intermediateResult1, TDigest intermediateResult2) {
return intermediateResult1;
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,6 @@ public Long merge(Long intermediateResult1, Long intermediateResult2) {
return intermediateResult1 + intermediateResult2;
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.LONG;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ public Geometry merge(Geometry intermediateResult1, Geometry intermediateResult2
return intermediateResult1.union(intermediateResult2);
}

@Override
public boolean isIntermediateResultComparable() {
return false;
}

@Override
public DataSchema.ColumnDataType getIntermediateResultColumnType() {
return DataSchema.ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ public Double merge(Double intermediateResult1, Double intermediateResult2) {
return intermediateResult1 + intermediateResult2;
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.DOUBLE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,6 @@ public BigDecimal merge(BigDecimal intermediateResult1, BigDecimal intermediateR
return intermediateResult1.add(intermediateResult2);
}

@Override
public boolean isIntermediateResultComparable() {
return true;
}

@Override
public ColumnDataType getIntermediateResultColumnType() {
return ColumnDataType.OBJECT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ public List<Map<String, Object>> trimIntermediateResultsMap(Map<String, Object[]
Sorter[] sorters = new Sorter[numAggregationFunctions];
for (int i = 0; i < numAggregationFunctions; i++) {
AggregationFunction aggregationFunction = _aggregationFunctions[i];
sorters[i] = getSorter(_trimSize, aggregationFunction, aggregationFunction.isIntermediateResultComparable());
// Assume the intermediate result may not be comparable.
sorters[i] = getSorter(_trimSize, aggregationFunction, false);
}

// Add results into sorters
Expand Down