Skip to content
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.

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

[SPARK-48545][SQL] Create to_avro and from_avro SQL functions to match DataFrame equivalents #46977

Closed
wants to merge 13 commits into from
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.avro.generic.{GenericDatumWriter, GenericRecord, GenericRecord
import org.apache.avro.io.EncoderFactory

import org.apache.spark.SparkException
import org.apache.spark.sql.{QueryTest, Row}
import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
import org.apache.spark.sql.execution.LocalTableScanExec
import org.apache.spark.sql.functions.{col, lit, struct}
import org.apache.spark.sql.internal.SQLConf
Expand Down Expand Up @@ -286,4 +286,85 @@ class AvroFunctionsSuite extends QueryTest with SharedSparkSession {
assert(msg.contains("Invalid default for field id: null not a \"long\""))
}
}

test("SPARK-48545: from_avro and to_avro SQL functions") {
withTable("t") {
sql(
"""
|create table t as
| select named_struct('u', named_struct('member0', member0, 'member1', member1)) as s
| from values (1, null), (null, 'a') tab(member0, member1)
|""".stripMargin)
val jsonFormatSchema =
"""
|{
| "type": "record",
| "name": "struct",
| "fields": [{
| "name": "u",
| "type": ["int","string"]
| }]
|}
|""".stripMargin
val toAvroSql =
s"""
|select to_avro(s, '$jsonFormatSchema') as result from t
|""".stripMargin
val avroResult = spark.sql(toAvroSql).collect()
assert(avroResult != null)
checkAnswer(
spark.sql(s"select from_avro(result, '$jsonFormatSchema', map()).u from ($toAvroSql)"),
Seq(Row(Row(1, null)),
Row(Row(null, "a"))))

// Negative tests.
checkError(
exception = intercept[AnalysisException](sql(
s"""
|select to_avro(s, 42) as result from t
|""".stripMargin)),
errorClass = "DATATYPE_MISMATCH.TYPE_CHECK_FAILURE_WITH_HINT",
parameters = Map("sqlExpr" -> "\"toavrosqlfunction(s, 42)\"",
"msg" -> ("The second argument of the TO_AVRO SQL function must be a constant string " +
"containing the JSON representation of the schema to use for converting the value to " +
"AVRO format"),
"hint" -> ""),
queryContext = Array(ExpectedContext(
fragment = "to_avro(s, 42)",
start = 8,
stop = 21)))
checkError(
exception = intercept[AnalysisException](sql(
s"""
|select from_avro(s, 42, '') as result from t
|""".stripMargin)),
errorClass = "DATATYPE_MISMATCH.TYPE_CHECK_FAILURE_WITH_HINT",
parameters = Map("sqlExpr" -> "\"fromavrosqlfunction(s, 42, )\"",
"msg" -> ("The second argument of the FROM_AVRO SQL function must be a constant string " +
"containing the JSON representation of the schema to use for converting the value " +
"from AVRO format"),
"hint" -> ""),
queryContext = Array(ExpectedContext(
fragment = "from_avro(s, 42, '')",
start = 8,
stop = 27)))
checkError(
exception = intercept[AnalysisException](sql(
s"""
|select from_avro(s, '$jsonFormatSchema', 42) as result from t
|""".stripMargin)),
errorClass = "DATATYPE_MISMATCH.TYPE_CHECK_FAILURE_WITH_HINT",
parameters = Map(
"sqlExpr" ->
s"\"fromavrosqlfunction(s, $jsonFormatSchema, 42)\"".stripMargin,
"msg" -> ("The third argument of the FROM_AVRO SQL function must be a constant map of " +
"strings to strings containing the options to use for converting the value " +
"from AVRO format"),
"hint" -> ""),
queryContext = Array(ExpectedContext(
fragment = s"from_avro(s, '$jsonFormatSchema', 42)",
start = 8,
stop = 138)))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,11 @@ object FunctionRegistry {
// Xml
expression[XmlToStructs]("from_xml"),
expression[SchemaOfXml]("schema_of_xml"),
expression[StructsToXml]("to_xml")
expression[StructsToXml]("to_xml"),

// Avro
expression[FromAvro]("from_avro"),
expression[ToAvro]("to_avro")
)

val builtin: SimpleFunctionRegistry = {
Expand Down
gengliangwang marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.sql.catalyst.expressions

import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
import org.apache.spark.sql.catalyst.util.ArrayBasedMapData
import org.apache.spark.sql.types.{MapType, NullType, StringType}
import org.apache.spark.unsafe.types.UTF8String
import org.apache.spark.util.Utils

/**
* Converts a binary column of Avro format into its corresponding Catalyst value.
* This is a thin wrapper over the [[AvroDataToCatalyst]] class to create a SQL function.
*
* @param child the Catalyst binary input column.
* @param jsonFormatSchema the Avro schema in JSON string format.
* @param options the options to use when performing the conversion.
*
* @since 4.0.0
*/
// scalastyle:off line.size.limit
@ExpressionDescription(
usage = """
_FUNC_(child, jsonFormatSchema, options) - Converts a binary Avro value into a Catalyst value.
""",
examples = """
Examples:
> SELECT IS_NULL(_FUNC_(result, '{"type": "record", "name": "struct", "fields": [{ "name": "u", "type": ["int","string"] }]}')) AS result FROM (SELECT NAMED_STRUCT('u', NAMED_STRUCT('member0', member0, 'member1', member1)) AS s FROM VALUES (1, NULL), (NULL, 'a') tab(member0, member1));
[false]
""",
note = """
The specified schema must match actual schema of the read data, otherwise the behavior
is undefined: it may fail or return arbitrary result.
To deserialize the data with a compatible and evolved schema, the expected Avro schema can be
set via the corresponding option.
""",
group = "avro_funcs",
since = "4.0.0"
)
// scalastyle:on line.size.limit
case class FromAvro(child: Expression, jsonFormatSchema: Expression, options: Expression)
extends TernaryExpression with RuntimeReplaceable {
override def first: Expression = child
override def second: Expression = jsonFormatSchema
override def third: Expression = options

override def withNewChildrenInternal(
newFirst: Expression, newSecond: Expression, newThird: Expression): Expression = {
copy(child = newFirst, jsonFormatSchema = newSecond, options = newThird)
}

override def checkInputDataTypes(): TypeCheckResult = {
val schemaCheck = jsonFormatSchema.dataType match {
case _: StringType |
_: NullType
if jsonFormatSchema.foldable =>
None
case _ =>
Some(TypeCheckResult.TypeCheckFailure(
"The second argument of the FROM_AVRO SQL function must be a constant string " +
"containing the JSON representation of the schema to use for converting the value " +
"from AVRO format"))
}
val optionsCheck = options.dataType match {
case MapType(StringType, StringType, _) |
MapType(NullType, NullType, _) |
_: NullType
if options.foldable =>
None
case _ =>
Some(TypeCheckResult.TypeCheckFailure(
"The third argument of the FROM_AVRO SQL function must be a constant map of strings to " +
"strings containing the options to use for converting the value from AVRO format"))
}
schemaCheck.getOrElse(
optionsCheck.getOrElse(
TypeCheckResult.TypeCheckSuccess))
}

override def replacement: Expression = {
val schemaValue: String = jsonFormatSchema.eval() match {
case s: UTF8String =>
s.toString
case null =>
""
}
val optionsValue: Map[String, String] = options.eval() match {
case a: ArrayBasedMapData if a.keyArray.array.nonEmpty =>
val keys: Array[String] = a.keyArray.array.map(_.toString)
val values: Array[String] = a.valueArray.array.map(_.toString)
keys.zip(values).toMap
case _ =>
Map.empty
}
val constructor =
Utils.classForName("org.apache.spark.sql.avro.AvroDataToCatalyst").getConstructors().head
gengliangwang marked this conversation as resolved.
Show resolved Hide resolved
val expr = constructor.newInstance(child, schemaValue, optionsValue)
expr.asInstanceOf[Expression]
}
}

/**
* Converts a Catalyst binary input value into its corresponding AvroAvro format result.
* This is a thin wrapper over the [[CatalystDataToAvro]] class to create a SQL function.
*
* @param child the Catalyst binary input column.
* @param jsonFormatSchema the Avro schema in JSON string format.
*
* @since 4.0.0
*/
// scalastyle:off line.size.limit
@ExpressionDescription(
usage = """
_FUNC_(child, jsonFormatSchema) - Converts a Catalyst binary input value into its corresponding
Avro format result.
""",
examples = """
Examples:
> SELECT IS_NULL(_FUNC_(result, '{"type": "record", "name": "struct", "fields": [{ "name": "u", "type": ["int","string"] }]}', MAP() ).u FROM (SELECT FROM_AVRO(result, '{"type": "record", "name": "struct", "fields": [{ "name": "u", "type": ["int","string"] }]}' ) AS result FROM (SELECT NAMED_STRUCT('u', NAMED_STRUCT('member0', member0, 'member1', member1)) AS s FROM VALUES (1, NULL), (NULL, 'a') tab(member0, member1)));
[false]
""",
group = "avro_funcs",
since = "4.0.0"
)
// scalastyle:on line.size.limit
case class ToAvro(child: Expression, jsonFormatSchema: Expression)
extends BinaryExpression with RuntimeReplaceable {
override def left: Expression = child

override def right: Expression = jsonFormatSchema

override def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = {
copy(child = newLeft, jsonFormatSchema = newRight)
}

override def checkInputDataTypes(): TypeCheckResult = {
jsonFormatSchema.dataType match {
case _: StringType if jsonFormatSchema.foldable =>
TypeCheckResult.TypeCheckSuccess
case _ =>
TypeCheckResult.TypeCheckFailure(
"The second argument of the TO_AVRO SQL function must be a constant string " +
"containing the JSON representation of the schema to use for converting the value " +
"to AVRO format")
}
}

override def replacement: Expression = {
val schemaValue: Option[String] = jsonFormatSchema.eval() match {
case null =>
None
case s: UTF8String =>
Some(s.toString)
}
val constructor =
Utils.classForName("org.apache.spark.sql.avro.CatalystDataToAvro").getConstructors().head
val expr = constructor.newInstance(child, schemaValue)
expr.asInstanceOf[Expression]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
| org.apache.spark.sql.catalyst.expressions.FormatNumber | format_number | SELECT format_number(12332.123456, 4) | struct<format_number(12332.123456, 4):string> |
| org.apache.spark.sql.catalyst.expressions.FormatString | format_string | SELECT format_string("Hello World %d %s", 100, "days") | struct<format_string(Hello World %d %s, 100, days):string> |
| org.apache.spark.sql.catalyst.expressions.FormatString | printf | SELECT printf("Hello World %d %s", 100, "days") | struct<printf(Hello World %d %s, 100, days):string> |
| org.apache.spark.sql.catalyst.expressions.FromAvroSqlFunction | from_avro | N/A | N/A |
| org.apache.spark.sql.catalyst.expressions.FromUTCTimestamp | from_utc_timestamp | SELECT from_utc_timestamp('2016-08-31', 'Asia/Seoul') | struct<from_utc_timestamp(2016-08-31, Asia/Seoul):timestamp> |
| org.apache.spark.sql.catalyst.expressions.FromUnixTime | from_unixtime | SELECT from_unixtime(0, 'yyyy-MM-dd HH:mm:ss') | struct<from_unixtime(0, yyyy-MM-dd HH:mm:ss):string> |
| org.apache.spark.sql.catalyst.expressions.Get | get | SELECT get(array(1, 2, 3), 0) | struct<get(array(1, 2, 3), 0):int> |
Expand Down Expand Up @@ -334,6 +335,7 @@
| org.apache.spark.sql.catalyst.expressions.Tan | tan | SELECT tan(0) | struct<TAN(0):double> |
| org.apache.spark.sql.catalyst.expressions.Tanh | tanh | SELECT tanh(0) | struct<TANH(0):double> |
| org.apache.spark.sql.catalyst.expressions.TimeWindow | window | SELECT a, window.start, window.end, count(*) as cnt FROM VALUES ('A1', '2021-01-01 00:00:00'), ('A1', '2021-01-01 00:04:30'), ('A1', '2021-01-01 00:06:00'), ('A2', '2021-01-01 00:01:00') AS tab(a, b) GROUP by a, window(b, '5 minutes') ORDER BY a, start | struct<a:string,start:timestamp,end:timestamp,cnt:bigint> |
| org.apache.spark.sql.catalyst.expressions.ToAvroSqlFunction | to_avro | N/A | N/A |
| org.apache.spark.sql.catalyst.expressions.ToBinary | to_binary | SELECT to_binary('abc', 'utf-8') | struct<to_binary(abc, utf-8):binary> |
| org.apache.spark.sql.catalyst.expressions.ToCharacterBuilder | to_char | SELECT to_char(454, '999') | struct<to_char(454, 999):string> |
| org.apache.spark.sql.catalyst.expressions.ToCharacterBuilder | to_varchar | SELECT to_varchar(454, '999') | struct<to_char(454, 999):string> |
Expand Down