Jackie-Jiang commented on code in PR #13146: URL: https://github.com/apache/pinot/pull/13146#discussion_r1607739291
########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/array/ListAggDistinctFunction.java: ########## @@ -0,0 +1,99 @@ +/** + * 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.array; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import java.util.Collection; +import org.apache.pinot.common.request.context.ExpressionContext; +import org.apache.pinot.core.query.aggregation.AggregationResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder; + + +public class ListAggDistinctFunction extends ListAggFunction { + + public ListAggDistinctFunction(ExpressionContext expression, String separator, boolean nullHandlingEnabled) { + super(expression, separator, nullHandlingEnabled); + } + + @Override + protected ObjectArrayList<String> getObjectArrayList(AggregationResultHolder aggregationResultHolder) { + ObjectArrayListHashSet<String> valueSet = aggregationResultHolder.getResult(); + if (valueSet == null) { + valueSet = new ObjectArrayListHashSet<>(); + aggregationResultHolder.setValue(valueSet); + } + return valueSet; + } + + @Override + protected ObjectArrayList<String> getObjectArrayList(GroupByResultHolder groupByResultHolder, int groupKey) { + ObjectArrayListHashSet<String> valueSet = groupByResultHolder.getResult(groupKey); + if (valueSet == null) { + valueSet = new ObjectArrayListHashSet<>(); + groupByResultHolder.setValueForKey(groupKey, valueSet); + } + return valueSet; + } + + /** + * Custom implementation of {@link ObjectArrayList} that maintains an extra {@link ObjectOpenHashSet} to ensure that + * the elements are unique. + * Note that this implementation only overrides the methods used in {@link ListAggFunction}, so the uniqueness check + * is not guaranteed, use with your own risk. + * + * @param <T> Type of the element + */ + static class ObjectArrayListHashSet<T> extends ObjectArrayList<T> { Review Comment: This is essentially an `ObjectLinkedOpenHashSet`. Can we use it as the intermediate result instead? ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactory.java: ########## @@ -47,11 +49,16 @@ public class AggregationFunctionFactory { private AggregationFunctionFactory() { } + public static AggregationFunction getAggregationFunction(FunctionContext function, boolean nullHandlingEnabled) { + return getAggregationFunction(function, false, nullHandlingEnabled); + } + /** * Given the function information, returns a new instance of the corresponding aggregation function. * <p>NOTE: Underscores in the function name are ignored in V1. */ - public static AggregationFunction getAggregationFunction(FunctionContext function, boolean nullHandlingEnabled) { + public static AggregationFunction getAggregationFunction(FunctionContext function, boolean isDistinct, Review Comment: Let's not change this signature, and use argument to pass distinct similar to `ARRAYAGG`. In the future, we don't want to handle distinct logic within the aggregation function ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/array/ListAggFunction.java: ########## @@ -0,0 +1,155 @@ +/** + * 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.array; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import java.util.Arrays; +import java.util.Map; +import org.apache.commons.lang3.StringUtils; +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.function.NullableSingleInputAggregationFunction; +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; + + +public class ListAggFunction + extends NullableSingleInputAggregationFunction<ObjectArrayList<String>, String> { + + private final String _separator; + + public ListAggFunction(ExpressionContext expression, String separator, boolean nullHandlingEnabled) { + super(expression, nullHandlingEnabled); + _separator = separator; + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.LISTAGG; + } + + @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) { + ObjectArrayList<String> valueSet = getObjectArrayList(aggregationResultHolder); + BlockValSet blockValSet = blockValSetMap.get(_expression); + String[] values = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + valueSet.addAll(Arrays.asList(values).subList(from, to)); + }); + } + + protected ObjectArrayList<String> getObjectArrayList(AggregationResultHolder aggregationResultHolder) { + ObjectArrayList<String> valueSet = aggregationResultHolder.getResult(); + if (valueSet == null) { + valueSet = new ObjectArrayList<>(); + aggregationResultHolder.setValue(valueSet); + } + return valueSet; + } + + protected ObjectArrayList<String> getObjectArrayList(GroupByResultHolder groupByResultHolder, int groupKey) { + ObjectArrayList<String> valueSet = groupByResultHolder.getResult(groupKey); + if (valueSet == null) { + valueSet = new ObjectArrayList<>(); + groupByResultHolder.setValueForKey(groupKey, valueSet); + } + return valueSet; + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + String[] values = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + ObjectArrayList<String> groupValueList = getObjectArrayList(groupByResultHolder, groupKeyArray[i]); + groupValueList.add(values[i]); + } + }); + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + BlockValSet blockValSet = blockValSetMap.get(_expression); + String[] values = blockValSet.getStringValuesSV(); + forEachNotNull(length, blockValSet, (from, to) -> { + for (int i = from; i < to; i++) { + for (int groupKey : groupKeysArray[i]) { + ObjectArrayList<String> groupValueList = getObjectArrayList(groupByResultHolder, groupKey); + groupValueList.add(values[i]); + } + } + }); + } + + @Override + public ObjectArrayList<String> extractAggregationResult(AggregationResultHolder aggregationResultHolder) { + return aggregationResultHolder.getResult(); + } + + @Override + public ObjectArrayList<String> extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) { + return groupByResultHolder.getResult(groupKey); + } + + @Override + public ObjectArrayList<String> merge(ObjectArrayList<String> intermediateResult1, + ObjectArrayList<String> intermediateResult2) { + if (intermediateResult1 == null) { + return intermediateResult2; + } + if (intermediateResult2 == null) { + return intermediateResult1; + } + intermediateResult1.addAll(intermediateResult2); Review Comment: Will the intermediate result ever transferred to another node? If so, this will break because distinct is not honored ########## pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/array/ListAggDistinctFunction.java: ########## @@ -0,0 +1,99 @@ +/** + * 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.array; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import java.util.Collection; +import org.apache.pinot.common.request.context.ExpressionContext; +import org.apache.pinot.core.query.aggregation.AggregationResultHolder; +import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder; + + +public class ListAggDistinctFunction extends ListAggFunction { + + public ListAggDistinctFunction(ExpressionContext expression, String separator, boolean nullHandlingEnabled) { + super(expression, separator, nullHandlingEnabled); + } + + @Override + protected ObjectArrayList<String> getObjectArrayList(AggregationResultHolder aggregationResultHolder) { + ObjectArrayListHashSet<String> valueSet = aggregationResultHolder.getResult(); + if (valueSet == null) { + valueSet = new ObjectArrayListHashSet<>(); + aggregationResultHolder.setValue(valueSet); + } + return valueSet; + } + + @Override + protected ObjectArrayList<String> getObjectArrayList(GroupByResultHolder groupByResultHolder, int groupKey) { + ObjectArrayListHashSet<String> valueSet = groupByResultHolder.getResult(groupKey); + if (valueSet == null) { + valueSet = new ObjectArrayListHashSet<>(); + groupByResultHolder.setValueForKey(groupKey, valueSet); + } + return valueSet; + } + + /** + * Custom implementation of {@link ObjectArrayList} that maintains an extra {@link ObjectOpenHashSet} to ensure that + * the elements are unique. + * Note that this implementation only overrides the methods used in {@link ListAggFunction}, so the uniqueness check + * is not guaranteed, use with your own risk. + * + * @param <T> Type of the element + */ + static class ObjectArrayListHashSet<T> extends ObjectArrayList<T> { + private final ObjectOpenHashSet<T> _hashSet = new ObjectOpenHashSet<>(); + + @Override + public boolean add(T element) { + if (_hashSet.add(element)) { + return super.add(element); + } + return false; + } + + @Override + public void add(final int index, final T element) { + if (_hashSet.add(element)) { + super.add(index, element); + } + } + + @Override + public T set(final int index, final T element) { + throw new UnsupportedOperationException("set element with index operation is not supported"); + } + + public boolean contains(Object element) { + return _hashSet.contains(element); + } Review Comment: Are they used? -- 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]
