Repository: spark Updated Branches: refs/heads/master 8cc591c91 -> e3b7bb413
[SPARK-24811][FOLLOWUP][SQL] Revise package of AvroDataToCatalyst and CatalystDataToAvro ## What changes were proposed in this pull request? In https://github.com/apache/spark/pull/21838, the class `AvroDataToCatalyst` and `CatalystDataToAvro` were put in package `org.apache.spark.sql`. They should be moved to package `org.apache.spark.sql.avro`. Also optimize imports in Avro module. ## How was this patch tested? Unit test Closes #22196 from gengliangwang/avro_revise_package_name. Authored-by: Gengliang Wang <gengliang.w...@databricks.com> Signed-off-by: hyukjinkwon <gurwls...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e3b7bb41 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e3b7bb41 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e3b7bb41 Branch: refs/heads/master Commit: e3b7bb4132884872a6913b9f452e910a2e4b8e40 Parents: 8cc591c Author: Gengliang Wang <gengliang.w...@databricks.com> Authored: Thu Aug 23 15:08:46 2018 +0800 Committer: hyukjinkwon <gurwls...@apache.org> Committed: Thu Aug 23 15:08:46 2018 +0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/avro/AvroDataToCatalyst.scala | 3 +-- .../scala/org/apache/spark/sql/avro/CatalystDataToAvro.scala | 5 ++--- .../apache/spark/sql/avro/AvroCatalystDataConversionSuite.scala | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e3b7bb41/external/avro/src/main/scala/org/apache/spark/sql/avro/AvroDataToCatalyst.scala ---------------------------------------------------------------------- diff --git a/external/avro/src/main/scala/org/apache/spark/sql/avro/AvroDataToCatalyst.scala b/external/avro/src/main/scala/org/apache/spark/sql/avro/AvroDataToCatalyst.scala index 6671b3f..915769f 100644 --- a/external/avro/src/main/scala/org/apache/spark/sql/avro/AvroDataToCatalyst.scala +++ b/external/avro/src/main/scala/org/apache/spark/sql/avro/AvroDataToCatalyst.scala @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.apache.spark.sql +package org.apache.spark.sql.avro import org.apache.avro.Schema import org.apache.avro.generic.GenericDatumReader import org.apache.avro.io.{BinaryDecoder, DecoderFactory} -import org.apache.spark.sql.avro.{AvroDeserializer, SchemaConverters} import org.apache.spark.sql.catalyst.expressions.{ExpectsInputTypes, Expression, UnaryExpression} import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, CodeGenerator, ExprCode} import org.apache.spark.sql.types.{AbstractDataType, BinaryType, DataType} http://git-wip-us.apache.org/repos/asf/spark/blob/e3b7bb41/external/avro/src/main/scala/org/apache/spark/sql/avro/CatalystDataToAvro.scala ---------------------------------------------------------------------- diff --git a/external/avro/src/main/scala/org/apache/spark/sql/avro/CatalystDataToAvro.scala b/external/avro/src/main/scala/org/apache/spark/sql/avro/CatalystDataToAvro.scala index a669388..141ff37 100644 --- a/external/avro/src/main/scala/org/apache/spark/sql/avro/CatalystDataToAvro.scala +++ b/external/avro/src/main/scala/org/apache/spark/sql/avro/CatalystDataToAvro.scala @@ -15,16 +15,15 @@ * limitations under the License. */ -package org.apache.spark.sql +package org.apache.spark.sql.avro import java.io.ByteArrayOutputStream import org.apache.avro.generic.GenericDatumWriter import org.apache.avro.io.{BinaryEncoder, EncoderFactory} -import org.apache.spark.sql.avro.{AvroSerializer, SchemaConverters} import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression} -import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, CodeGenerator, ExprCode} +import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, ExprCode} import org.apache.spark.sql.types.{BinaryType, DataType} case class CatalystDataToAvro(child: Expression) extends UnaryExpression { http://git-wip-us.apache.org/repos/asf/spark/blob/e3b7bb41/external/avro/src/test/scala/org/apache/spark/sql/avro/AvroCatalystDataConversionSuite.scala ---------------------------------------------------------------------- diff --git a/external/avro/src/test/scala/org/apache/spark/sql/avro/AvroCatalystDataConversionSuite.scala b/external/avro/src/test/scala/org/apache/spark/sql/avro/AvroCatalystDataConversionSuite.scala index 4b3bf0c..8334cca 100644 --- a/external/avro/src/test/scala/org/apache/spark/sql/avro/AvroCatalystDataConversionSuite.scala +++ b/external/avro/src/test/scala/org/apache/spark/sql/avro/AvroCatalystDataConversionSuite.scala @@ -17,15 +17,12 @@ package org.apache.spark.sql.avro -import org.apache.avro.Schema - import org.apache.spark.SparkFunSuite -import org.apache.spark.sql.{AvroDataToCatalyst, CatalystDataToAvro, RandomDataGenerator} +import org.apache.spark.sql.RandomDataGenerator import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow} import org.apache.spark.sql.catalyst.expressions.{ExpressionEvalHelper, GenericInternalRow, Literal} import org.apache.spark.sql.catalyst.util.{ArrayBasedMapData, GenericArrayData, MapData} import org.apache.spark.sql.types._ -import org.apache.spark.unsafe.types.UTF8String class AvroCatalystDataConversionSuite extends SparkFunSuite with ExpressionEvalHelper { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
