This is an automated email from the ASF dual-hosted git repository. alsay pushed a commit to branch fixes_after_conflict in repository https://gitbox.apache.org/repos/asf/datasketches-spark.git
commit 84e010fa973940745e42814f2f644c64465dc7cf Author: AlexanderSaydakov <[email protected]> AuthorDate: Fri Jan 10 17:44:35 2025 -0800 fixed problems introduced while resolving a conflict --- src/main/scala/org/apache/spark/sql/functions_ds.scala | 3 ++- .../org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/org/apache/spark/sql/functions_ds.scala b/src/main/scala/org/apache/spark/sql/functions_ds.scala index 56437f5..f8338b3 100644 --- a/src/main/scala/org/apache/spark/sql/functions_ds.scala +++ b/src/main/scala/org/apache/spark/sql/functions_ds.scala @@ -22,8 +22,9 @@ import org.apache.spark.sql.aggregate.{KllDoublesSketchAgg, KllDoublesMergeAgg} import org.apache.spark.sql.aggregate.{ThetaSketchBuild, ThetaUnion} import org.apache.spark.sql.catalyst.expressions.{Expression, Literal} import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateFunction -import org.apache.spark.sql.expressions._ import org.apache.spark.sql.catalyst.expressions.Literal +import org.apache.spark.sql.expressions._ +import org.apache.spark.sql.functions.lit import org.apache.spark.sql.types.{ArrayType, BooleanType, DoubleType} // this class defines and maps all the variants of each function invocation, analagous diff --git a/src/main/scala/org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala b/src/main/scala/org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala index 3678059..3dd84ed 100644 --- a/src/main/scala/org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala +++ b/src/main/scala/org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala @@ -73,10 +73,10 @@ object DatasketchesFunctionRegistry extends DatasketchesFunctionRegistry { expression[KllGetMin]("kll_get_min"), expression[KllGetMax]("kll_get_max"), expression[KllGetPmf]("kll_get_pmf"), - expression[KllGetCdf]("kll_get_cdf") + expression[KllGetCdf]("kll_get_cdf"), expression[ThetaSketchBuild]("theta_sketch_build"), expression[ThetaUnion]("theta_union"), - expression[ThetaSketchGetEstimate]("theta_sketch_get_estimate"), + expression[ThetaSketchGetEstimate]("theta_sketch_get_estimate") ) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
