Jackie-Jiang commented on a change in pull request #5744: URL: https://github.com/apache/incubator-pinot/pull/5744#discussion_r461224432
########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/StUnionAggregationFunction.java ########## @@ -0,0 +1,137 @@ +/** + * 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.Map; +import org.apache.pinot.common.function.AggregationFunctionType; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.geospatial.serde.GeometrySerializer; +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.core.query.request.context.ExpressionContext; +import org.apache.pinot.spi.utils.ByteArray; +import org.locationtech.jts.geom.Geometry; + + +public class StUnionAggregationFunction extends BaseSingleInputAggregationFunction<Geometry, ByteArray> { + + /** + * Constructor for the class. + * + * @param expression Expression to aggregate on. + */ + public StUnionAggregationFunction(ExpressionContext expression) { + super(expression); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.ST_UNION; + } + + @Override + public void accept(AggregationFunctionVisitorBase visitor) { + visitor.visit(this); + } + + @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) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + Geometry geometry = aggregationResultHolder.getResult(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + geometry = geometry == null ? value : geometry.union(value); + } + aggregationResultHolder.setValue(geometry); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + int groupKey = groupKeyArray[i]; + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + for (int groupKey : groupKeysArray[i]) { + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + } + + @Override + public Geometry extractAggregationResult(AggregationResultHolder aggregationResultHolder) { + return aggregationResultHolder.getResult(); Review comment: Need to handle `null` here ########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/StUnionAggregationFunction.java ########## @@ -0,0 +1,137 @@ +/** + * 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.Map; +import org.apache.pinot.common.function.AggregationFunctionType; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.geospatial.serde.GeometrySerializer; +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.core.query.request.context.ExpressionContext; +import org.apache.pinot.spi.utils.ByteArray; +import org.locationtech.jts.geom.Geometry; + + +public class StUnionAggregationFunction extends BaseSingleInputAggregationFunction<Geometry, ByteArray> { + + /** + * Constructor for the class. + * + * @param expression Expression to aggregate on. + */ + public StUnionAggregationFunction(ExpressionContext expression) { + super(expression); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.ST_UNION; + } + + @Override + public void accept(AggregationFunctionVisitorBase visitor) { + visitor.visit(this); + } + + @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) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + Geometry geometry = aggregationResultHolder.getResult(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + geometry = geometry == null ? value : geometry.union(value); + } + aggregationResultHolder.setValue(geometry); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + int groupKey = groupKeyArray[i]; + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + for (int groupKey : groupKeysArray[i]) { + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + } + + @Override + public Geometry extractAggregationResult(AggregationResultHolder aggregationResultHolder) { + return aggregationResultHolder.getResult(); + } + + @Override + public Geometry extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) { + return groupByResultHolder.getResult(groupKey); Review comment: Need to handle `null` here (return an empty Geometry) ########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/StUnionAggregationFunction.java ########## @@ -0,0 +1,137 @@ +/** + * 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.Map; +import org.apache.pinot.common.function.AggregationFunctionType; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.geospatial.serde.GeometrySerializer; +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.core.query.request.context.ExpressionContext; +import org.apache.pinot.spi.utils.ByteArray; +import org.locationtech.jts.geom.Geometry; + + +public class StUnionAggregationFunction extends BaseSingleInputAggregationFunction<Geometry, ByteArray> { + + /** + * Constructor for the class. + * + * @param expression Expression to aggregate on. + */ + public StUnionAggregationFunction(ExpressionContext expression) { + super(expression); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.ST_UNION; + } + + @Override + public void accept(AggregationFunctionVisitorBase visitor) { + visitor.visit(this); + } + + @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) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + Geometry geometry = aggregationResultHolder.getResult(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + geometry = geometry == null ? value : geometry.union(value); + } + aggregationResultHolder.setValue(geometry); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + int groupKey = groupKeyArray[i]; + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + for (int groupKey : groupKeysArray[i]) { + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + } + + @Override + public Geometry extractAggregationResult(AggregationResultHolder aggregationResultHolder) { + return aggregationResultHolder.getResult(); + } + + @Override + public Geometry extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) { + return groupByResultHolder.getResult(groupKey); + } + + @Override + public Geometry merge(Geometry intermediateResult1, Geometry intermediateResult2) { + return intermediateResult1.union(intermediateResult2); + } + + @Override + public boolean isIntermediateResultComparable() { + return true; Review comment: Geometry is comparable? ########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/StUnionAggregationFunction.java ########## @@ -0,0 +1,137 @@ +/** + * 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.Map; +import org.apache.pinot.common.function.AggregationFunctionType; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.geospatial.serde.GeometrySerializer; +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.core.query.request.context.ExpressionContext; +import org.apache.pinot.spi.utils.ByteArray; +import org.locationtech.jts.geom.Geometry; + + +public class StUnionAggregationFunction extends BaseSingleInputAggregationFunction<Geometry, ByteArray> { + + /** + * Constructor for the class. + * + * @param expression Expression to aggregate on. + */ + public StUnionAggregationFunction(ExpressionContext expression) { + super(expression); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.ST_UNION; + } + + @Override + public void accept(AggregationFunctionVisitorBase visitor) { + visitor.visit(this); + } + + @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) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + Geometry geometry = aggregationResultHolder.getResult(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + geometry = geometry == null ? value : geometry.union(value); + } + aggregationResultHolder.setValue(geometry); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + int groupKey = groupKeyArray[i]; + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); + } + } + + @Override + public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + for (int groupKey : groupKeysArray[i]) { + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value Review comment: Same here ########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/StUnionAggregationFunction.java ########## @@ -0,0 +1,137 @@ +/** + * 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.Map; +import org.apache.pinot.common.function.AggregationFunctionType; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.core.common.BlockValSet; +import org.apache.pinot.core.geospatial.serde.GeometrySerializer; +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.core.query.request.context.ExpressionContext; +import org.apache.pinot.spi.utils.ByteArray; +import org.locationtech.jts.geom.Geometry; + + +public class StUnionAggregationFunction extends BaseSingleInputAggregationFunction<Geometry, ByteArray> { + + /** + * Constructor for the class. + * + * @param expression Expression to aggregate on. + */ + public StUnionAggregationFunction(ExpressionContext expression) { + super(expression); + } + + @Override + public AggregationFunctionType getType() { + return AggregationFunctionType.ST_UNION; + } + + @Override + public void accept(AggregationFunctionVisitorBase visitor) { + visitor.visit(this); + } + + @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) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + Geometry geometry = aggregationResultHolder.getResult(); + for (int i = 0; i < length; i++) { + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + geometry = geometry == null ? value : geometry.union(value); + } + aggregationResultHolder.setValue(geometry); + } + + @Override + public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder, + Map<ExpressionContext, BlockValSet> blockValSetMap) { + byte[][] bytesArray = blockValSetMap.get(_expression).getBytesValuesSV(); + for (int i = 0; i < length; i++) { + int groupKey = groupKeyArray[i]; + Geometry value = GeometrySerializer.deserialize(bytesArray[i]); + groupByResultHolder.setValueForKey(groupKey, groupByResultHolder.getResult(groupKey) == null ? value + : ((Geometry) groupByResultHolder.getResult(groupKey)).union(value)); Review comment: Can be optimized to reduce the result holder lookup ```suggestion Geometry geometry = groupByResultHolder.getResult(groupKey); if (geometry != null) { geometry.union(value); } else { groupByResultHolder.setValueForKey(groupKey, value); } ``` ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
