rohangarg commented on code in PR #13819: URL: https://github.com/apache/druid/pull/13819#discussion_r1118596955
########## extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java: ########## @@ -48,6 +48,14 @@ public class ArrayOfDoublesSketchModule implements DruidModule public static final ColumnType BUILD_TYPE = ColumnType.ofComplex(ARRAY_OF_DOUBLES_SKETCH_BUILD_AGG); public static final ColumnType MERGE_TYPE = ColumnType.ofComplex(ARRAY_OF_DOUBLES_SKETCH_MERGE_AGG); + public static final String ARRAY_OF_DOUBLES_SKETCH_CONSTANT = "arrayOfDoublesSketchConstant"; + + public static final String ARRAY_OF_DOUBLES_SKETCH_TO_BASE64_STRING = "arrayOfDoublesSketchToBase64String"; + + public static final String ARRAY_OF_DOUBLES_SKETCH_METRICS_ESTIMATE = "arrayOfDoublesSketchToMetricsSumEstimate"; Review Comment: the name of the var needs update ########## extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchConstantPostAggregator.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.druid.query.aggregation.datasketches.tuple; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.cache.CacheKeyBuilder; + +import java.util.Collections; +import java.util.Comparator; +import java.util.Map; +import java.util.Set; + +/** + * This post-aggregator converts a given Base64 encoded string to an ArrayOfDoublesSketch. + * The input column contains name of post-aggregator output and base64 encoded input string. + * The output is a deserialized {@link ArrayOfDoublesSketch} . + */ +public class ArrayOfDoublesSketchConstantPostAggregator extends ArrayOfDoublesSketchPostAggregator +{ + + private final String value; + private final ArrayOfDoublesSketch sketchValue; + + @JsonCreator + public ArrayOfDoublesSketchConstantPostAggregator(@JsonProperty("name") String name, @JsonProperty("value") String value) + { + super(name); + Preconditions.checkArgument(value != null && !value.isEmpty(), + "Constant value cannot be null or empty, expecting base64 encoded sketch string"); + this.value = value; + this.sketchValue = ArrayOfDoublesSketchOperations.deserializeFromBase64EncodedStringSafe(value); + } + + @Override + public Set<String> getDependentFields() + { + return Collections.emptySet(); + } + + @Override + public Comparator getComparator() + { + return Comparators.alwaysEqual(); + } + + @Override + public Object compute(Map<String, Object> combinedAggregators) + { + return sketchValue; + } + + @Override + public ArrayOfDoublesSketchConstantPostAggregator decorate(Map<String, AggregatorFactory> aggregators) + { + return this; + } + + @JsonProperty("value") + public ArrayOfDoublesSketch getSketchValue() + { + return sketchValue; + } + + @Override + public String toString() + { + return "ArrayOfDoublesSketchConstantPostAggregator{name='" + this.getName() + "', value='" + value + "'}"; + } + + private String getRawSketchValue() + { + return value; + } + + @Override + public boolean equals(Object o) + { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfDoublesSketchConstantPostAggregator that = (ArrayOfDoublesSketchConstantPostAggregator) o; + if (!this.getSketchValue().equals(that.getSketchValue())) { + return false; + } + if (this.getName() != null ? !this.getName().equals(that.getName()) : that.getName() != null) { + return false; + } + + if (this.getRawSketchValue() != null ? !this.getRawSketchValue().equals(that.getRawSketchValue()) : that.getRawSketchValue() != null) { + return false; + } + return true; + } + + @Override + public int hashCode() + { + int result = getName() != null ? getName().hashCode() : 0; Review Comment: can this be converted to `Objects.hash(name, value)`? ########## extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchConstantPostAggregatorTest.java: ########## @@ -0,0 +1,77 @@ +/* + * 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.druid.query.aggregation.datasketches.tuple; + +import nl.jqno.equalsverifier.EqualsVerifier; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.PostAggregator; +import org.junit.Assert; +import org.junit.Test; + + +public class ArrayOfDoublesSketchConstantPostAggregatorTest Review Comment: Please consider adding the new post aggs as a part of the `ArrayOfDoublesSketchAggregationTest` so that they be tested as a part of a complete native query as well. ########## extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchConstantPostAggregator.java: ########## @@ -0,0 +1,151 @@ +/* + * 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.druid.query.aggregation.datasketches.tuple; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketches; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.data.SafeWritableMemory; + +import java.util.Collections; +import java.util.Comparator; +import java.util.Map; +import java.util.Set; + +/** + * This post-aggregator converts a given Base64 encoded string to an ArrayOfDoublesSketch. + * The input column contains name of post-aggregator output and base64 encoded input string. + * The output is a deserialized {@link ArrayOfDoublesSketch} . + */ +public class ArrayOfDoublesSketchConstantPostAggregator extends ArrayOfDoublesSketchPostAggregator Review Comment: Thanks a lot for explaining the use-case @anshu-makkar - it was very helpful! Ideally, I think it would have been better if we could just plug a deserialization function and make `ExpressionPostAggregator` work with it as @abhishekagarwal87 had mentioned. But I think it is ok to have a dedicated post agg for this now. Once there is a consolidate method of combining serdes with post aggregations, we can consider deprecating some of these post aggregations. ########## extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchConstantPostAggregator.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.druid.query.aggregation.datasketches.tuple; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.cache.CacheKeyBuilder; + +import java.util.Collections; +import java.util.Comparator; +import java.util.Map; +import java.util.Set; + +/** + * This post-aggregator converts a given Base64 encoded string to an ArrayOfDoublesSketch. + * The input column contains name of post-aggregator output and base64 encoded input string. + * The output is a deserialized {@link ArrayOfDoublesSketch} . + */ +public class ArrayOfDoublesSketchConstantPostAggregator extends ArrayOfDoublesSketchPostAggregator +{ + + private final String value; + private final ArrayOfDoublesSketch sketchValue; + + @JsonCreator + public ArrayOfDoublesSketchConstantPostAggregator(@JsonProperty("name") String name, @JsonProperty("value") String value) + { + super(name); + Preconditions.checkArgument(value != null && !value.isEmpty(), + "Constant value cannot be null or empty, expecting base64 encoded sketch string"); + this.value = value; + this.sketchValue = ArrayOfDoublesSketchOperations.deserializeFromBase64EncodedStringSafe(value); + } + + @Override + public Set<String> getDependentFields() + { + return Collections.emptySet(); + } + + @Override + public Comparator getComparator() + { + return Comparators.alwaysEqual(); + } + + @Override + public Object compute(Map<String, Object> combinedAggregators) + { + return sketchValue; + } + + @Override + public ArrayOfDoublesSketchConstantPostAggregator decorate(Map<String, AggregatorFactory> aggregators) + { + return this; + } + + @JsonProperty("value") + public ArrayOfDoublesSketch getSketchValue() Review Comment: sorry, I didn't understand the need for making the json property method on sketch object and not on the string value object. Can you please explain this? ########## extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMetricsEstimatePostAggregator.java: ########## @@ -0,0 +1,91 @@ +/* + * 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.druid.query.aggregation.datasketches.tuple; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.math3.stat.descriptive.SummaryStatistics; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.ColumnInspector; +import org.apache.druid.segment.column.ColumnType; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.Map; + +/** + * Returns a list of estimate values of metrics column from a given {@link ArrayOfDoublesSketch}. + * The result will be N double values, where N is the number of double values kept in the sketch per key. + */ +public class ArrayOfDoublesSketchToMetricsEstimatePostAggregator extends ArrayOfDoublesSketchUnaryPostAggregator Review Comment: Some of the occurrences of `MetricsEstimate` have not been updated to `MetricsSumEstimate`. Can you please do that in the changes? ########## docs/development/extensions-core/datasketches-tuple.md: ########## @@ -207,3 +207,39 @@ Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a stri "field" : <post aggregator that refers to an ArrayOfDoublesSketch (fieldAccess or another post aggregator)> } ``` + + +### Constant ArrayOfDoublesSketch + +This post aggregator adds a Base64-encoded constant ArrayOfDoublesSketch value that you can use in other post aggregators. +```json +{ + "type": "arrayOfDoublesSketchConstant", + "name": DESTINATION_COLUMN_NAME, + "value": CONSTANT_SKETCH_VALUE +} +``` + +### Base64 output of ArrayOfDoublesSketch + +This post aggregator outputs an ArrayOfDoublesSketch as a Base64-encoded string storing the constant tuple sketch value that you can use in other post aggregators. + +```json +{ + "type": "arrayOfDoublesSketchToBase64String", + "name": DESTINATION_COLUMN_NAME, + "field": <post aggregator that refers to a ArrayOfDoublesSketch (fieldAccess or another post aggregator)> +} +``` + +### Estimated metrics values for each column of ArrayOfDoublesSketch + +This post aggregator returns a list of estimated values(sum) from a given ArrayOfDoublesSketch. The result is _N_ double values, where _N_ is the number of double values kept in the sketch per key. Review Comment: could `This post aggregator returns a list of estimated values(sum) from a given ArrayOfDoublesSketch.` be more like `This post aggregator returns a list of estimated sum for each metric value from a given ArrayOfDoublesSketch.` ? ########## extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchConstantPostAggregator.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.druid.query.aggregation.datasketches.tuple; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.cache.CacheKeyBuilder; + +import java.util.Collections; +import java.util.Comparator; +import java.util.Map; +import java.util.Set; + +/** + * This post-aggregator converts a given Base64 encoded string to an ArrayOfDoublesSketch. + * The input column contains name of post-aggregator output and base64 encoded input string. + * The output is a deserialized {@link ArrayOfDoublesSketch} . + */ +public class ArrayOfDoublesSketchConstantPostAggregator extends ArrayOfDoublesSketchPostAggregator +{ + + private final String value; + private final ArrayOfDoublesSketch sketchValue; + + @JsonCreator + public ArrayOfDoublesSketchConstantPostAggregator(@JsonProperty("name") String name, @JsonProperty("value") String value) + { + super(name); + Preconditions.checkArgument(value != null && !value.isEmpty(), + "Constant value cannot be null or empty, expecting base64 encoded sketch string"); + this.value = value; + this.sketchValue = ArrayOfDoublesSketchOperations.deserializeFromBase64EncodedStringSafe(value); + } + + @Override + public Set<String> getDependentFields() + { + return Collections.emptySet(); + } + + @Override + public Comparator getComparator() + { + return Comparators.alwaysEqual(); + } + + @Override + public Object compute(Map<String, Object> combinedAggregators) + { + return sketchValue; + } + + @Override + public ArrayOfDoublesSketchConstantPostAggregator decorate(Map<String, AggregatorFactory> aggregators) + { + return this; + } + + @JsonProperty("value") + public ArrayOfDoublesSketch getSketchValue() + { + return sketchValue; + } + + @Override + public String toString() + { + return "ArrayOfDoublesSketchConstantPostAggregator{name='" + this.getName() + "', value='" + value + "'}"; + } + + private String getRawSketchValue() + { + return value; + } + + @Override + public boolean equals(Object o) + { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfDoublesSketchConstantPostAggregator that = (ArrayOfDoublesSketchConstantPostAggregator) o; Review Comment: can the below code be converted into `Objects.equals(this.name, o.name) && Objects.equals(this.value, o.value)` ? ########## processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java: ########## @@ -100,7 +100,9 @@ public static final byte ARRAY_OF_DOUBLES_SKETCH_TO_QUANTILES_SKETCH_CACHE_TYPE_ID = 0x28; public static final byte ARRAY_OF_DOUBLES_SKETCH_T_TEST_CACHE_TYPE_ID = 0x29; public static final byte ARRAY_OF_DOUBLES_SKETCH_TO_STRING_CACHE_TYPE_ID = 0x2A; - + public static final byte ARRAY_OF_DOUBLES_SKETCH_CONSTANT_SKETCH_CACHE_TYPE_ID = 0x4D; Review Comment: I think it would be better to append these at the last in a separate section in increasing hex value order. This makes it hard to know the next available id and can very possibly lead to collisions. -- 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]
