Skip to content

[SPARK-24548][SQL] Fix incorrect schema of Dataset with tuple encoders #21576

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
viirya wants to merge 1 commit into from
Closed

[SPARK-24548][SQL] Fix incorrect schema of Dataset with tuple encoders #21576

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
3 changes: 2 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ object ExpressionEncoder {
case b: BoundReference if b == originalInputObject => newInputObject
})

if (enc.flat) {
val serializerExpr = if (enc.flat) {
newSerializer.head
} else {
// For non-flat encoder, the input object is not top level anymore after being combined to
Expand All @@ -146,6 +146,7 @@ object ExpressionEncoder {
Invoke(Literal.fromObject(None), "equals", BooleanType, newInputObject :: Nil))
If(nullCheck, Literal.create(null, struct.dataType), struct)
}
Alias(serializerExpr, s"_${index + 1}")()
}

val childrenDeserializers = encoders.zipWithIndex.map { case (enc, index) =>
Expand Down
18 changes: 18 additions & 0 deletions sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.junit.*;
import org.junit.rules.ExpectedException;

import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.api.java.function.*;
import org.apache.spark.sql.*;
Expand Down Expand Up @@ -336,6 +337,23 @@ public void testTupleEncoder() {
Assert.assertEquals(data5, ds5.collectAsList());
}

@Test
public void testTupleEncoderSchema() {
Encoder<Tuple2<String, Tuple2<String,String>>> encoder =
Encoders.tuple(Encoders.STRING(), Encoders.tuple(Encoders.STRING(), Encoders.STRING()));
List<Tuple2<String, Tuple2<String, String>>> data = Arrays.asList(tuple2("1", tuple2("a", "b")),
tuple2("2", tuple2("c", "d")));
Dataset<Row> ds1 = spark.createDataset(data, encoder).toDF("value1", "value2");

JavaPairRDD<String, Tuple2<String, String>> pairRDD = jsc.parallelizePairs(data);
Dataset<Row> ds2 = spark.createDataset(JavaPairRDD.toRDD(pairRDD), encoder)
.toDF("value1", "value2");

Assert.assertEquals(ds1.schema(), ds2.schema());
Assert.assertEquals(ds1.select(expr("value2._1")).collectAsList(),
ds2.select(expr("value2._1")).collectAsList());
}

@Test
public void testNestedTupleEncoder() {
// test ((int, string), string)
Expand Down
13 changes: 13 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,6 +1466,19 @@ class DatasetSuite extends QueryTest with SharedSQLContext {
val ds = Seq[(Option[Int], Option[Int])]((Some(1), None)).toDS()
intercept[NullPointerException](ds.as[(Int, Int)].collect())
}

test("SPARK-24548: Dataset with tuple encoders should have correct schema") {
val encoder = Encoders.tuple(newStringEncoder,
Encoders.tuple(newStringEncoder, newStringEncoder))

val data = Seq(("a", ("1", "2")), ("b", ("3", "4")))
val rdd = sparkContext.parallelize(data)

val ds1 = spark.createDataset(rdd)
val ds2 = spark.createDataset(rdd)(encoder)
assert(ds1.schema == ds2.schema)
checkDataset(ds1.select("_2._2"), ds2.select("_2._2").collect(): _*)
}
}

case class TestDataUnion(x: Int, y: Int, z: Int)
Expand Down