yashmayya commented on code in PR #16704: URL: https://github.com/apache/pinot/pull/16704#discussion_r2329408253
########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntSumAggregationFunction.java: ########## @@ -0,0 +1,334 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.core.query.aggregation.function; + +import java.util.List; +import java.util.Map; +import org.apache.pinot.common.request.context.ExpressionContext; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.query.aggregation.AggregationResultHolder; +import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder; +import org.apache.pinot.segment.spi.AggregationFunctionType; +import org.apache.pinot.spi.data.FieldSpec.DataType; + + +/** + * Specialized INT sum aggregation function that avoids type conversion overhead. + * This function is optimized for INT columns and uses native INT arithmetic. + * + * Performance optimizations: + * - Direct INT arithmetic without DOUBLE conversion + * - Vectorized operations for better CPU utilization + * - Minimal object allocations + * - Optimized for the specific case of INT column aggregation + * - Proper null handling support using foldNotNull and forEachNotNull + */ +public class IntSumAggregationFunction extends NullableSingleInputAggregationFunction<Long, Long> { + public static final String FUNCTION_NAME = "intSum"; + + public IntSumAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(arguments.get(0), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.INTSUM; + } + + @Override + public AggregationResultHolder createAggregationResultHolder() { + return new ObjectAggregationResultHolder(); + } + + @Override + public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) { + return new ObjectGroupByResultHolder(initialCapacity, maxCapacity); + } + + @Override + public void aggregate(int length, AggregationResultHolder aggregationResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + + if (blockValSet.getValueType().getStoredType() != DataType.INT) { + throw new IllegalArgumentException("IntSumAggregationFunction only supports INT columns"); + } + + int[] values = blockValSet.getIntValuesSV(); + + // Use foldNotNull with null as initial value - this will return null if no non-null values are processed + Long sum = foldNotNull(length, blockValSet, null, (acum, from, to) -> { + long innerSum = 0; + for (int i = from; i < to; i++) { + innerSum += values[i]; + } + return acum == null ? innerSum : acum + innerSum; + }); + + // Update the result holder + ObjectAggregationResultHolder objectHolder = (ObjectAggregationResultHolder) aggregationResultHolder; + Object existingResult = objectHolder.getResult(); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + // If it's some other type, try to parse it as a number + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + // If parsing fails, start fresh with 0 + existingSum = 0L; + } + } + } + + // If sum is null (no non-null values processed), set null + if (sum == null) { + objectHolder.setValue(null); + } else { + objectHolder.setValue(existingSum + sum); + } + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + int[] values = blockValSet.getIntValuesSV(); + + if (_nullHandlingEnabled) { + // Use forEachNotNull to handle nulls properly + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + int groupKey = groupKeyArray[i]; + Object existingResult = groupByResultHolder.getResult(groupKey); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + existingSum = 0L; + } + } Review Comment: Why are all these `if`s even required - won't the `existingResult` always be a `Long` since that's what we're setting in the aggregation / group by result holders? ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntSumAggregationFunction.java: ########## @@ -0,0 +1,334 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.core.query.aggregation.function; + +import java.util.List; +import java.util.Map; +import org.apache.pinot.common.request.context.ExpressionContext; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.query.aggregation.AggregationResultHolder; +import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder; +import org.apache.pinot.segment.spi.AggregationFunctionType; +import org.apache.pinot.spi.data.FieldSpec.DataType; + + +/** + * Specialized INT sum aggregation function that avoids type conversion overhead. + * This function is optimized for INT columns and uses native INT arithmetic. + * + * Performance optimizations: + * - Direct INT arithmetic without DOUBLE conversion + * - Vectorized operations for better CPU utilization + * - Minimal object allocations + * - Optimized for the specific case of INT column aggregation + * - Proper null handling support using foldNotNull and forEachNotNull + */ +public class IntSumAggregationFunction extends NullableSingleInputAggregationFunction<Long, Long> { + public static final String FUNCTION_NAME = "intSum"; + + public IntSumAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(arguments.get(0), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.INTSUM; + } + + @Override + public AggregationResultHolder createAggregationResultHolder() { + return new ObjectAggregationResultHolder(); + } + + @Override + public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) { + return new ObjectGroupByResultHolder(initialCapacity, maxCapacity); + } + + @Override + public void aggregate(int length, AggregationResultHolder aggregationResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + + if (blockValSet.getValueType().getStoredType() != DataType.INT) { + throw new IllegalArgumentException("IntSumAggregationFunction only supports INT columns"); + } + + int[] values = blockValSet.getIntValuesSV(); + + // Use foldNotNull with null as initial value - this will return null if no non-null values are processed + Long sum = foldNotNull(length, blockValSet, null, (acum, from, to) -> { + long innerSum = 0; + for (int i = from; i < to; i++) { + innerSum += values[i]; + } + return acum == null ? innerSum : acum + innerSum; + }); + + // Update the result holder + ObjectAggregationResultHolder objectHolder = (ObjectAggregationResultHolder) aggregationResultHolder; + Object existingResult = objectHolder.getResult(); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + // If it's some other type, try to parse it as a number Review Comment: Why are these checks required? The aggregation result holder should always have a `Long` right? ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntSumAggregationFunction.java: ########## @@ -0,0 +1,334 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.core.query.aggregation.function; + +import java.util.List; +import java.util.Map; +import org.apache.pinot.common.request.context.ExpressionContext; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.query.aggregation.AggregationResultHolder; +import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder; +import org.apache.pinot.segment.spi.AggregationFunctionType; +import org.apache.pinot.spi.data.FieldSpec.DataType; + + +/** + * Specialized INT sum aggregation function that avoids type conversion overhead. + * This function is optimized for INT columns and uses native INT arithmetic. + * + * Performance optimizations: + * - Direct INT arithmetic without DOUBLE conversion + * - Vectorized operations for better CPU utilization + * - Minimal object allocations + * - Optimized for the specific case of INT column aggregation + * - Proper null handling support using foldNotNull and forEachNotNull + */ +public class IntSumAggregationFunction extends NullableSingleInputAggregationFunction<Long, Long> { + public static final String FUNCTION_NAME = "intSum"; + + public IntSumAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(arguments.get(0), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.INTSUM; + } + + @Override + public AggregationResultHolder createAggregationResultHolder() { + return new ObjectAggregationResultHolder(); + } + + @Override + public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) { + return new ObjectGroupByResultHolder(initialCapacity, maxCapacity); + } + + @Override + public void aggregate(int length, AggregationResultHolder aggregationResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + + if (blockValSet.getValueType().getStoredType() != DataType.INT) { + throw new IllegalArgumentException("IntSumAggregationFunction only supports INT columns"); + } + + int[] values = blockValSet.getIntValuesSV(); + + // Use foldNotNull with null as initial value - this will return null if no non-null values are processed + Long sum = foldNotNull(length, blockValSet, null, (acum, from, to) -> { + long innerSum = 0; + for (int i = from; i < to; i++) { + innerSum += values[i]; + } + return acum == null ? innerSum : acum + innerSum; + }); + + // Update the result holder + ObjectAggregationResultHolder objectHolder = (ObjectAggregationResultHolder) aggregationResultHolder; + Object existingResult = objectHolder.getResult(); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + // If it's some other type, try to parse it as a number + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + // If parsing fails, start fresh with 0 + existingSum = 0L; + } + } + } + + // If sum is null (no non-null values processed), set null + if (sum == null) { + objectHolder.setValue(null); + } else { + objectHolder.setValue(existingSum + sum); + } + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + int[] values = blockValSet.getIntValuesSV(); + + if (_nullHandlingEnabled) { + // Use forEachNotNull to handle nulls properly + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + int groupKey = groupKeyArray[i]; + Object existingResult = groupByResultHolder.getResult(groupKey); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + existingSum = 0L; + } + } + } + long newSum = existingSum + values[i]; + groupByResultHolder.setValueForKey(groupKey, newSum); + } + }); + } else { + // Process all values when null handling is disabled + for (int i = 0; i < length; i++) { + int groupKey = groupKeyArray[i]; + Object existingResult = groupByResultHolder.getResult(groupKey); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + existingSum = 0L; + } + } + } + long newSum = existingSum + values[i]; + groupByResultHolder.setValueForKey(groupKey, newSum); + } + } + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + int[] values = blockValSet.getIntValuesSV(); + + if (_nullHandlingEnabled) { + // Use forEachNotNull to handle nulls properly + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + int value = values[i]; + for (int groupKey : groupKeysArray[i]) { + Object existingResult = groupByResultHolder.getResult(groupKey); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + existingSum = 0L; + } + } + } + long newSum = existingSum + value; + groupByResultHolder.setValueForKey(groupKey, newSum); + } + } + }); + } else { + // Process all values when null handling is disabled + for (int i = 0; i < length; i++) { + int value = values[i]; + for (int groupKey : groupKeysArray[i]) { + Object existingResult = groupByResultHolder.getResult(groupKey); + long existingSum = 0L; + if (existingResult != null) { + if (existingResult instanceof Long) { + existingSum = (Long) existingResult; + } else if (existingResult instanceof Double) { + existingSum = ((Double) existingResult).longValue(); + } else if (existingResult instanceof Number) { + existingSum = ((Number) existingResult).longValue(); + } else { + try { + existingSum = Long.parseLong(existingResult.toString()); + } catch (NumberFormatException e) { + existingSum = 0L; + } + } + } + long newSum = existingSum + value; + groupByResultHolder.setValueForKey(groupKey, newSum); + } + } + } + } + + @Override + public Long extractAggregationResult(AggregationResultHolder aggregationResultHolder) { + Object result = aggregationResultHolder.getResult(); + if (result == null) { + // Return null when null handling is enabled, 0L when disabled + return _nullHandlingEnabled ? null : 0L; + } + if (result instanceof Long) { + return (Long) result; + } else if (result instanceof Double) { + return ((Double) result).longValue(); + } else if (result instanceof Number) { + return ((Number) result).longValue(); + } else { + try { + return Long.parseLong(result.toString()); + } catch (NumberFormatException e) { + return 0L; + } + } + } + + @Override + public Long extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) { + Object result = groupByResultHolder.getResult(groupKey); + if (result == null) { + // Return null when null handling is enabled, 0L when disabled + return _nullHandlingEnabled ? null : 0L; + } + if (result instanceof Long) { + return (Long) result; + } else if (result instanceof Double) { + return ((Double) result).longValue(); + } else if (result instanceof Number) { + return ((Number) result).longValue(); + } else { + try { + return Long.parseLong(result.toString()); + } catch (NumberFormatException e) { + return 0L; + } + } + } + + @Override + public Long merge(Long intermediateResult1, Long intermediateResult2) { + if (_nullHandlingEnabled) { + if (intermediateResult1 == null) { + return intermediateResult2; + } + if (intermediateResult2 == null) { + return intermediateResult1; + } + } + return intermediateResult1 + intermediateResult2; + } + + private Long convertToLong(Object value) { Review Comment: Unused? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
