Copilot commented on code in PR #16497: URL: https://github.com/apache/pinot/pull/16497#discussion_r2254343886
########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/MinStringAggregationFunction.java: ########## @@ -0,0 +1,173 @@ +/** + * 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.ColumnDataType; +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.exception.BadQueryRequestException; + + +public class MinStringAggregationFunction extends NullableSingleInputAggregationFunction<String, String> { + + public MinStringAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(verifySingleArgument(arguments, "MINSTRING"), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.MINSTRING; + } + + @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().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MINSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // Ignore null and "null" string literals + if (value == null || "null".equals(value)) { + continue; + } + String currentMin = aggregationResultHolder.getResult(); + // Update the currentMin if a smaller string value is found + if (currentMin == null || value.compareTo(currentMin) < 0) { + aggregationResultHolder.setValue(value); + } + } + }); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + if (blockValSet.getValueType().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MINSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // For SV, "null" as a string literal can exist and needs to be handled + if (value == null || "null".equals(value)) { + continue; + } + int groupKey = groupKeyArray[i]; + String currentMin = groupByResultHolder.getResult(groupKey); + if (currentMin == null || "null".equals(currentMin) || value.compareTo(currentMin) < 0) { Review Comment: The comparison logic checks for both null and "null" string, but this creates inconsistent behavior. If currentMin is "null" string, it should be treated consistently with the null handling elsewhere in the code. ```suggestion if (currentMin == null || value.compareTo(currentMin) < 0) { ``` ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/MinStringAggregationFunction.java: ########## @@ -0,0 +1,173 @@ +/** + * 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.ColumnDataType; +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.exception.BadQueryRequestException; + + +public class MinStringAggregationFunction extends NullableSingleInputAggregationFunction<String, String> { + + public MinStringAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(verifySingleArgument(arguments, "MINSTRING"), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.MINSTRING; + } + + @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().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MINSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // Ignore null and "null" string literals + if (value == null || "null".equals(value)) { + continue; + } + String currentMin = aggregationResultHolder.getResult(); + // Update the currentMin if a smaller string value is found + if (currentMin == null || value.compareTo(currentMin) < 0) { + aggregationResultHolder.setValue(value); + } + } + }); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + if (blockValSet.getValueType().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MINSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // For SV, "null" as a string literal can exist and needs to be handled + if (value == null || "null".equals(value)) { + continue; + } + int groupKey = groupKeyArray[i]; + String currentMin = groupByResultHolder.getResult(groupKey); + if (currentMin == null || "null".equals(currentMin) || value.compareTo(currentMin) < 0) { + groupByResultHolder.setValueForKey(groupKey, value); + } + } + }); + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + if (blockValSet.getValueType().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MINSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // For MV, "null" as a string literal can exist and needs to be handled + if (value == null || "null".equals(value)) { + continue; + } + for (int groupKey : groupKeysArray[i]) { + String currentMin = groupByResultHolder.getResult(groupKey); + if (currentMin == null || "null".equals(currentMin) || value.compareTo(currentMin) < 0) { Review Comment: Similar inconsistent null handling as in aggregateGroupBySV method. The logic should be consistent across all aggregation methods. ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/MaxStringAggregationFunction.java: ########## @@ -0,0 +1,173 @@ +/** + * 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.ColumnDataType; +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.exception.BadQueryRequestException; + + +public class MaxStringAggregationFunction extends NullableSingleInputAggregationFunction<String, String> { + + public MaxStringAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(verifySingleArgument(arguments, "MAXSTRING"), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.MAXSTRING; + } + + @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().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MAXSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // Ignore null and "null" string literals + if (value == null || "null".equals(value)) { + continue; + } + String currentMax = aggregationResultHolder.getResult(); + // Update the currentMax if a larger string value is found + if (currentMax == null || value.compareTo(currentMax) > 0) { + aggregationResultHolder.setValue(value); + } + } + }); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + if (blockValSet.getValueType().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MAXSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // For SV, "null" as a string literal can exist and needs to be handled + if (value == null || "null".equals(value)) { + continue; + } + int groupKey = groupKeyArray[i]; + String currentMax = groupByResultHolder.getResult(groupKey); + if (currentMax == null || "null".equals(currentMax) || value.compareTo(currentMax) > 0) { Review Comment: The comparison logic checks for both null and "null" string, but this creates inconsistent behavior. If currentMax is "null" string, it should be treated consistently with the null handling elsewhere in the code. ```suggestion if (currentMax == null || value.compareTo(currentMax) > 0) { ``` ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/MaxStringAggregationFunction.java: ########## @@ -0,0 +1,173 @@ +/** + * 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.ColumnDataType; +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.exception.BadQueryRequestException; + + +public class MaxStringAggregationFunction extends NullableSingleInputAggregationFunction<String, String> { + + public MaxStringAggregationFunction(List<ExpressionContext> arguments, boolean nullHandlingEnabled) { + super(verifySingleArgument(arguments, "MAXSTRING"), nullHandlingEnabled); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.MAXSTRING; + } + + @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().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MAXSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // Ignore null and "null" string literals + if (value == null || "null".equals(value)) { + continue; + } + String currentMax = aggregationResultHolder.getResult(); + // Update the currentMax if a larger string value is found + if (currentMax == null || value.compareTo(currentMax) > 0) { + aggregationResultHolder.setValue(value); + } + } + }); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + if (blockValSet.getValueType().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MAXSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // For SV, "null" as a string literal can exist and needs to be handled + if (value == null || "null".equals(value)) { + continue; + } + int groupKey = groupKeyArray[i]; + String currentMax = groupByResultHolder.getResult(groupKey); + if (currentMax == null || "null".equals(currentMax) || value.compareTo(currentMax) > 0) { + groupByResultHolder.setValueForKey(groupKey, value); + } + } + }); + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + if (blockValSet.getValueType().isNumeric()) { + throw new BadQueryRequestException("Cannot compute MAXSTRING for numeric column: " + + blockValSet.getValueType()); + } + String[] stringValues = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + String value = stringValues[i]; + // For MV, "null" as a string literal can exist and needs to be handled + if (value == null || "null".equals(value)) { + continue; + } + for (int groupKey : groupKeysArray[i]) { + String currentMax = groupByResultHolder.getResult(groupKey); + if (currentMax == null || "null".equals(currentMax) || value.compareTo(currentMax) > 0) { Review Comment: Similar inconsistent null handling as in aggregateGroupBySV method. The logic should be consistent across all aggregation methods. -- 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]
