Repository: spark Updated Branches: refs/heads/branch-1.6 215d5d884 -> 70fcbf68e
[SPARK-11780][SQL] Add catalyst type aliases backwards compatibility Changed a target at branch-1.6 from #10635. Author: Takeshi YAMAMURO <linguin....@gmail.com> Closes #10915 from maropu/pr9935-v3. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/70fcbf68 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/70fcbf68 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/70fcbf68 Branch: refs/heads/branch-1.6 Commit: 70fcbf68e412f6549ba6c2db86f7ef4518d05fe1 Parents: 215d5d8 Author: Takeshi YAMAMURO <linguin....@gmail.com> Authored: Mon Feb 1 12:13:17 2016 -0800 Committer: Michael Armbrust <mich...@databricks.com> Committed: Mon Feb 1 12:13:17 2016 -0800 ---------------------------------------------------------------------- .../sql/catalyst/CatalystTypeConverters.scala | 2 +- .../org/apache/spark/sql/types/ArrayType.scala | 7 +++---- .../org/apache/spark/sql/types/StructType.scala | 1 - .../org/apache/spark/sql/types/package.scala | 22 +++++++++++++++++++- .../datasources/json/JacksonParser.scala | 2 +- .../apache/spark/sql/hive/HiveInspectors.scala | 2 +- 6 files changed, 27 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/70fcbf68/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala index 2ec0ff5..0af8ed9 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala @@ -28,7 +28,7 @@ import scala.language.existentials import org.apache.spark.sql.Row import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.util._ -import org.apache.spark.sql.types._ +import org.apache.spark.sql.types.{ArrayBasedMapData => _, _} import org.apache.spark.unsafe.types.UTF8String /** http://git-wip-us.apache.org/repos/asf/spark/blob/70fcbf68/sql/catalyst/src/main/scala/org/apache/spark/sql/types/ArrayType.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/ArrayType.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/ArrayType.scala index a001ead..bcedead 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/ArrayType.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/ArrayType.scala @@ -17,13 +17,12 @@ package org.apache.spark.sql.types -import org.apache.spark.sql.catalyst.util.ArrayData +import scala.math.Ordering + import org.json4s.JsonDSL._ import org.apache.spark.annotation.DeveloperApi - -import scala.math.Ordering - +import org.apache.spark.sql.catalyst.util.{ArrayData => _} object ArrayType extends AbstractDataType { /** Construct a [[ArrayType]] object with the given element type. The `containsNull` is true. */ http://git-wip-us.apache.org/repos/asf/spark/blob/70fcbf68/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala index 9778df2..494bb86 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala @@ -24,7 +24,6 @@ import org.json4s.JsonDSL._ import org.apache.spark.SparkException import org.apache.spark.annotation.DeveloperApi import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, InterpretedOrdering} -import org.apache.spark.sql.catalyst.util.DataTypeParser /** http://git-wip-us.apache.org/repos/asf/spark/blob/70fcbf68/sql/catalyst/src/main/scala/org/apache/spark/sql/types/package.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/package.scala index 346a51e..779b8cd 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/package.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/package.scala @@ -21,4 +21,24 @@ package org.apache.spark.sql * Contains a type system for attributes produced by relations, including complex types like * structs, arrays and maps. */ -package object types +package object types { + + /* Aliases for backwards compatibility. See SPARK-11780. */ + @deprecated("Moved to org.apache.spark.sql.catalyst.util.ArrayBasedMapData", since = "1.6.0") + type ArrayBasedMapData = org.apache.spark.sql.catalyst.util.ArrayBasedMapData + @deprecated("Moved to org.apache.spark.sql.catalyst.util.ArrayBasedMapData", since = "1.6.0") + val ArrayBasedMapData = org.apache.spark.sql.catalyst.util.ArrayBasedMapData + @deprecated("Moved to org.apache.spark.sql.catalyst.util.ArrayData", since = "1.6.0") + type ArrayData = org.apache.spark.sql.catalyst.util.ArrayData + @deprecated("Moved to org.apache.spark.sql.catalyst.util.DataTypeException", since = "1.6.0") + type DataTypeException = org.apache.spark.sql.catalyst.util.DataTypeException + @deprecated("Moved to org.apache.spark.sql.catalyst.util.DataTypeParser", since = "1.6.0") + type DataTypeParser = org.apache.spark.sql.catalyst.util.DataTypeParser + @deprecated("Moved to org.apache.spark.sql.catalyst.util.DataTypeParser", since = "1.6.0") + val DataTypeParser = org.apache.spark.sql.catalyst.util.DataTypeParser + @deprecated("Moved to org.apache.spark.sql.catalyst.util.GenericArrayData", since = "1.6.0") + type GenericArrayData = org.apache.spark.sql.catalyst.util.GenericArrayData + @deprecated("Moved to org.apache.spark.sql.catalyst.util.MapData", since = "1.6.0") + type MapData = org.apache.spark.sql.catalyst.util.MapData + +} http://git-wip-us.apache.org/repos/asf/spark/blob/70fcbf68/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala index 55a1c24..d58d347 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala @@ -27,7 +27,7 @@ import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.util._ import org.apache.spark.sql.execution.datasources.json.JacksonUtils.nextUntil -import org.apache.spark.sql.types._ +import org.apache.spark.sql.types.{ArrayBasedMapData => _, _} import org.apache.spark.unsafe.types.UTF8String import org.apache.spark.util.Utils http://git-wip-us.apache.org/repos/asf/spark/blob/70fcbf68/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala index 95b57d6..42f4296 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala @@ -29,7 +29,7 @@ import org.apache.hadoop.{io => hadoopIo} import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.util._ -import org.apache.spark.sql.types._ +import org.apache.spark.sql.types.{ArrayBasedMapData => _, _} import org.apache.spark.sql.{AnalysisException, types} import org.apache.spark.unsafe.types.UTF8String --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org