Skip to content

[SPARK-11780][SQL] Add catalyst type aliases backwards compatibility #10915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-11780][SQL] Add catalyst type aliases backwards compatibility #10915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
7 changes: 3 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/types/ArrayType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
1 change: 0 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


/**
Expand Down
22 changes: 21 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/types/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

}
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down