Skip to content

fix all tests #32

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

Merged
marmbrus merged 1 commit into from
Mar 3, 2016
Merged

fix all tests #32

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/core/src/main/scala/org/apache/spark/sql/execution/datasources/ResolvedDataSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ object ResolvedDataSource extends Logging {
sqlContext,
fileCatalog,
partitionSchema = partitionSchema,
dataSchema = dataSchema,
dataSchema = dataSchema.asNullable,
Copy link
Author

@cloud-fan cloud-fan Mar 3, 2016

Choose a reason for hiding this comment

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

This is to keep consistent with the previous behaviour, i.e. data schema is always nullable, see https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/ResolvedDataSource.scala#L170-L171

bucketSpec = bucketSpec,
format,
options)
Expand Down
4 changes: 2 additions & 2 deletions ...re/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetIOSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@ class ParquetIOSuite extends QueryTest with ParquetTest with SharedSQLContext {
readParquetFile(path.toString) { df =>
assertResult(df.schema) {
StructType(
StructField("a", BooleanType, nullable = false) ::
StructField("b", IntegerType, nullable = false) ::
StructField("a", BooleanType, nullable = true) ::
StructField("b", IntegerType, nullable = true) ::
Copy link
Author

@cloud-fan cloud-fan Mar 3, 2016

Choose a reason for hiding this comment

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

I think we have to break this test, the reason is: before your change, SQLContext.read.parquet will create ParquetRelation directly, and it won't go through ResolvedDataSource.apply, so the returned schema is not nullable.

Nil)
}
}
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/test/TestSQLContext.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.internal.{SessionState, SQLConf}
private[sql] class TestSQLContext(sc: SparkContext) extends SQLContext(sc) { self =>

def this() {
this(new SparkContext("local[1]", "test-sql-context",
this(new SparkContext("local[2]", "test-sql-context",
new SparkConf().set("spark.sql.testkey", "true")))
}

Expand Down Expand Up @@ -63,5 +63,5 @@ private[sql] object TestSQLContext {
val overrideConfs: Map[String, String] =
Map(
// Fewer shuffle partitions to speed up testing.
SQLConf.SHUFFLE_PARTITIONS.key -> "1")
SQLConf.SHUFFLE_PARTITIONS.key -> "5")
}