Skip to content

Commit 7eb27e2

Browse files
committed
Use catalogString instead of json for passing serialized schema type
1 parent 8c3222e commit 7eb27e2

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/InternalRow.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ abstract class InternalRow extends SpecializedGetters with Serializable {
6363
*/
6464
def copy(): InternalRow
6565

66-
def copyUnsafeData(dataTypeJson: String): InternalRow = {
67-
val dataType = DataType.fromJson(dataTypeJson)
66+
def copyUnsafeData(dataTypeCatalogString: String): InternalRow = {
67+
val dataType = DataType.fromDDL(dataTypeCatalogString)
6868
assert(dataType.isInstanceOf[StructType])
6969
copyUnsafeData(dataType.asInstanceOf[StructType])
7070
}

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -889,8 +889,7 @@ case class MapObjects private(
889889

890890
// Make a copy of the unsafe data if the result contains any
891891
def makeCopyUnsafeData(dataType: DataType, value: String) = {
892-
val typeToJson = StringEscapeUtils.escapeJava(StringEscapeUtils.escapeJson(dataType.json))
893-
s"""${value}.copyUnsafeData("${typeToJson}")"""
892+
s"""${value}.copyUnsafeData("${dataType.catalogString}")"""
894893
}
895894

896895
val genFunctionValue: String = lambdaFunction.dataType match {

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/ArrayData.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ abstract class ArrayData extends SpecializedGetters with Serializable {
6868

6969
def copy(): ArrayData
7070

71-
def copyUnsafeData(dataTypeJson: String): ArrayData = {
72-
val dataType = DataType.fromJson(dataTypeJson)
71+
def copyUnsafeData(dataTypeCatalogString: String): ArrayData = {
72+
val dataType = DataType.fromDDL(dataTypeCatalogString)
7373
assert(dataType.isInstanceOf[ArrayType])
7474
copyUnsafeData(dataType.asInstanceOf[ArrayType])
7575
}

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/MapData.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ abstract class MapData extends Serializable {
3535

3636
def copy(): MapData
3737

38-
def copyUnsafeData(dataTypeJson: String): MapData = {
39-
val dataType = DataType.fromJson(dataTypeJson)
38+
def copyUnsafeData(dataTypeCatalogString: String): MapData = {
39+
val dataType = DataType.fromDDL(dataTypeCatalogString)
4040
assert(dataType.isInstanceOf[MapType])
4141
copyUnsafeData(dataType.asInstanceOf[MapType])
4242
}

0 commit comments

Comments
 (0)