This is an automated email from the ASF dual-hosted git repository. jmalkin pushed a commit to branch rename_packages in repository https://gitbox.apache.org/repos/asf/datasketches-spark.git
commit 050710fcf4dcf70dd23f29122657be2e6b1be6ac Author: Jon Malkin <[email protected]> AuthorDate: Tue Jan 28 17:57:55 2025 -0800 Rename theta packages, too --- .../apache/spark/sql/datasketches/theta/ThetaFunctionRegistry.scala | 4 ++-- .../sql/datasketches/theta/aggregate/ThetaSketchAggBuild.scala | 6 ++++-- .../sql/datasketches/theta/aggregate/ThetaSketchAggUnion.scala | 5 +++-- .../spark/sql/datasketches/theta/expressions/ThetaExpressions.scala | 5 +++-- .../scala/org/apache/spark/sql/datasketches/theta/functions.scala | 4 ++-- .../apache/spark/sql/datasketches/theta/types/ThetaSketchType.scala | 4 +++- .../spark/sql/datasketches/theta/types/ThetaSketchWrapper.scala | 3 ++- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/ThetaFunctionRegistry.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/ThetaFunctionRegistry.scala index 02c00ee..ddbe615 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/ThetaFunctionRegistry.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/ThetaFunctionRegistry.scala @@ -21,8 +21,8 @@ import org.apache.spark.sql.catalyst.analysis.FunctionRegistry.FunctionBuilder import org.apache.spark.sql.catalyst.expressions.{ExpressionInfo} import org.apache.spark.sql.datasketches.common.DatasketchesFunctionRegistry -import org.apache.spark.sql.aggregate.{ThetaSketchAggBuild, ThetaSketchAggUnion} -import org.apache.spark.sql.expressions.ThetaSketchGetEstimate +import org.apache.spark.sql.datasketches.theta.aggregate.{ThetaSketchAggBuild, ThetaSketchAggUnion} +import org.apache.spark.sql.datasketches.theta.expressions.ThetaSketchGetEstimate import org.apache.spark.sql.datasketches.common.DatasketchesFunctionRegistry object ThetaFunctionRegistry extends DatasketchesFunctionRegistry { diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggBuild.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggBuild.scala index d88af6e..95dbd61 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggBuild.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggBuild.scala @@ -15,14 +15,16 @@ * limitations under the License. */ -package org.apache.spark.sql.aggregate +package org.apache.spark.sql.datasketches.theta.aggregate import org.apache.datasketches.theta.{UpdateSketch, SetOperation} +import org.apache.spark.sql.datasketches.theta.types.{ThetaSketchType, ThetaSketchWrapper} + import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions.{ExpectsInputTypes, Expression, ExpressionDescription, Literal} import org.apache.spark.sql.catalyst.expressions.aggregate.TypedImperativeAggregate import org.apache.spark.sql.catalyst.trees.BinaryLike -import org.apache.spark.sql.types.{AbstractDataType, DataType, IntegerType, LongType, NumericType, FloatType, DoubleType, ThetaSketchWrapper, ThetaSketchType} +import org.apache.spark.sql.types.{AbstractDataType, DataType, IntegerType, LongType, NumericType, FloatType, DoubleType} /** * The ThetaSketchBuild function creates a Theta sketch from a column of values diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggUnion.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggUnion.scala index 107382a..6e067c9 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggUnion.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/aggregate/ThetaSketchAggUnion.scala @@ -15,16 +15,17 @@ * limitations under the License. */ -package org.apache.spark.sql.aggregate +package org.apache.spark.sql.datasketches.theta.aggregate import org.apache.datasketches.memory.Memory import org.apache.datasketches.theta.{Sketch, SetOperation} +import org.apache.spark.sql.datasketches.theta.types.{ThetaSketchType, ThetaSketchWrapper} import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions.{ExpectsInputTypes, Expression, ExpressionDescription, Literal} import org.apache.spark.sql.catalyst.expressions.aggregate.TypedImperativeAggregate import org.apache.spark.sql.catalyst.trees.BinaryLike -import org.apache.spark.sql.types.{AbstractDataType, DataType, IntegerType, ThetaSketchWrapper, ThetaSketchType} +import org.apache.spark.sql.types.{AbstractDataType, DataType, IntegerType} /** * Theta Union operation. diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/expressions/ThetaExpressions.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/expressions/ThetaExpressions.scala index f30735c..c426ee4 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/expressions/ThetaExpressions.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/expressions/ThetaExpressions.scala @@ -15,16 +15,17 @@ * limitations under the License. */ -package org.apache.spark.sql.expressions +package org.apache.spark.sql.datasketches.theta.expressions import org.apache.datasketches.memory.Memory import org.apache.datasketches.theta.Sketch +import org.apache.spark.sql.datasketches.theta.types.ThetaSketchType import org.apache.spark.sql.catalyst.expressions.{Expression, ExpectsInputTypes, UnaryExpression} import org.apache.spark.sql.catalyst.expressions.NullIntolerant import org.apache.spark.sql.catalyst.expressions.ExpressionDescription import org.apache.spark.sql.catalyst.expressions.codegen.{CodeBlock, CodegenContext, ExprCode} -import org.apache.spark.sql.types.{AbstractDataType, DataType, DoubleType, ThetaSketchType} +import org.apache.spark.sql.types.{AbstractDataType, DataType, DoubleType} @ExpressionDescription( usage = """ diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/functions.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/functions.scala index 2cdd222..2a788a7 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/functions.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/functions.scala @@ -21,8 +21,8 @@ import org.apache.spark.sql.Column import org.apache.spark.sql.functions.lit import org.apache.spark.sql.datasketches.common.DatasketchesScalaFunctionBase -import org.apache.spark.sql.aggregate.{ThetaSketchAggBuild, ThetaSketchAggUnion} -import org.apache.spark.sql.expressions.ThetaSketchGetEstimate +import org.apache.spark.sql.datasketches.theta.aggregate.{ThetaSketchAggBuild, ThetaSketchAggUnion} +import org.apache.spark.sql.datasketches.theta.expressions.ThetaSketchGetEstimate import org.apache.spark.sql.datasketches.common.DatasketchesScalaFunctionBase object functions extends DatasketchesScalaFunctionBase { diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchType.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchType.scala index e5a5e2c..cfb27ad 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchType.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchType.scala @@ -15,7 +15,9 @@ * limitations under the License. */ -package org.apache.spark.sql.types +package org.apache.spark.sql.datasketches.theta.types + +import org.apache.spark.sql.types.{DataType, DataTypes, UserDefinedType} class ThetaSketchType extends UserDefinedType[ThetaSketchWrapper] { override def sqlType: DataType = DataTypes.BinaryType diff --git a/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchWrapper.scala b/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchWrapper.scala index 86e3b89..a699017 100644 --- a/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchWrapper.scala +++ b/src/main/scala/org/apache/spark/sql/datasketches/theta/types/ThetaSketchWrapper.scala @@ -15,10 +15,11 @@ * limitations under the License. */ -package org.apache.spark.sql.types +package org.apache.spark.sql.datasketches.theta.types import org.apache.datasketches.theta.{UpdateSketch, CompactSketch, Union} import org.apache.datasketches.memory.Memory +import org.apache.spark.sql.types.SQLUserDefinedType @SQLUserDefinedType(udt = classOf[ThetaSketchType]) class ThetaSketchWrapper(var updateSketch: Option[UpdateSketch] = None, var compactSketch: Option[CompactSketch] = None, var union: Option[Union] = None) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
