Skip to content

[SPARK-11997][SQL] NPE when save a DataFrame as parquet and partitioned by long column #10001

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
dilipbiswal wants to merge 2 commits into from
Closed

[SPARK-11997][SQL] NPE when save a DataFrame as parquet and partitioned by long column #10001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af508de
[SPARK-11997] NPE when save a DataFrame as parquet and partitioned by…
dilipbiswal Nov 26, 2015
4de7697
review comments from Davies
dilipbiswal Nov 27, 2015
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
14 changes: 11 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/sources/interfaces.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,9 +606,17 @@ abstract class HadoopFsRelation private[sql](
// we need to cast into the data type that user specified.
def castPartitionValuesToUserSchema(row: InternalRow) = {
InternalRow((0 until row.numFields).map { i =>
Cast(
Literal.create(row.getString(i), StringType),
userProvidedSchema.fields(i).dataType).eval()
row.isNullAt(i) match {
Copy link
Contributor

@davies davies Nov 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to check null in InternalRow.getString()

Copy link
Contributor Author

@dilipbiswal dilipbiswal Nov 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davies Thanks for reviewing the change. In cases when we know in advance that schema does not allow nulls , sometimes we can skip this null check. By moving it to internalRow , would we loose the opportunity to optimize ? Pl. let me know.

Copy link
Contributor

@davies davies Nov 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The null-checking is cheap.

Or we could use Literal.create(row.getUTF8String(i), StringType), to avoid the conversion between String and UTF8String.

Copy link
Contributor Author

@dilipbiswal dilipbiswal Nov 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good @davies .Made the change. Thanks a lot for your feedback.

case true =>
Cast(
Literal.create(null, StringType),
userProvidedSchema.fields(i).dataType).eval()
case false =>
Cast(
Literal.create(row.getString(i), StringType),
userProvidedSchema.fields(i).dataType).eval()

}
}: _*)
}

Expand Down
13 changes: 13 additions & 0 deletions ...src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,19 @@ class ParquetQuerySuite extends QueryTest with ParquetTest with SharedSQLContext
}
}

test("SPARK-11997 parquet with null partition values") {
withTempPath { dir =>
val path = dir.getCanonicalPath
sqlContext.range(1, 3)
.selectExpr("if(id % 2 = 0, null, id) AS n", "id")
.write.partitionBy("n").parquet(path)

checkAnswer(
sqlContext.read.parquet(path).filter("n is null"),
Row(2, null))
}
}

// This test case is ignored because of parquet-mr bug PARQUET-370
ignore("SPARK-10301 requested schema clipping - schemas with disjoint sets of fields") {
withTempPath { dir =>
Expand Down