Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -819,8 +819,10 @@ object JdbcUtils extends Logging {
if (null != customSchema && customSchema.nonEmpty) {
Copy link
Member

@maropu maropu Jul 31, 2020

Choose a reason for hiding this comment

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

Oh, I see. We need to accept a nested schema in customSchema? I checked the original PR #18266, but I couldn't find test cases for nested schemas. So, I'm not sure this is an expected behaviour... cc: @wangyum

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't know which JDBC server supports nested schema. But IIUC this feature is to specify the type, and I think it can be used to specify the data type of nested fields as well.

Copy link
Member

Choose a reason for hiding this comment

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

Yea, it can be and accepting nested fields looks okay. Either way, I think we need more test cases for customeSchema with nested fields, arrays, map, ...

Copy link
Member Author

Choose a reason for hiding this comment

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

JDBC spec mentions the STRUCT type, for example https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html#STRUCT.

At least, you can access to Spark cluster from another Spark cluster via JDBC ;-)

val userSchema = CatalystSqlParser.parseTableSchema(customSchema)

SchemaUtils.checkColumnNameDuplication(
userSchema.map(_.name), "in the customSchema option value", nameEquality)
SchemaUtils.checkSchemaColumnNameDuplication(
userSchema,
Comment on lines +822 to +823
Copy link
Member Author

Choose a reason for hiding this comment

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

Here is the fix - replacing checkColumnNameDuplication by checkSchemaColumnNameDuplication

"in the customSchema option value",
nameEquality)

// This is resolved by names, use the custom filed dataType to replace the default dataType.
val newSchema = tableSchema.map { col =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ import org.apache.spark.sql.types.{LongType, StructType}
// Datasource tests for nested schemas
trait NestedDataSourceSuiteBase extends QueryTest with SharedSparkSession {
protected val nestedDataSources: Seq[String] = Seq("orc", "parquet", "json")
protected def readOptions(schema: StructType): Map[String, String] = Map.empty
protected def save(selectExpr: Seq[String], format: String, path: String): Unit = {
spark
.range(1L)
.selectExpr(selectExpr: _*)
.write.mode("overwrite")
.format(format)
.save(path)
}
protected val colType: String = "in the data schema"

test("SPARK-32431: consistent error for nested and top-level duplicate columns") {
Seq(
Expand All @@ -44,22 +54,17 @@ trait NestedDataSourceSuiteBase extends QueryTest with SharedSparkSession {
withClue(s"format = $format select = ${selectExpr.mkString(",")}") {
withTempPath { dir =>
val path = dir.getCanonicalPath
spark
.range(1L)
.selectExpr(selectExpr: _*)
.write.mode("overwrite")
.format(format)
.save(path)
save(selectExpr, format, path)
val e = intercept[AnalysisException] {
spark
.read
.options(readOptions(caseInsensitiveSchema))
.schema(caseInsensitiveSchema)
.format(format)
.load(path)
.show
}
assert(e.getMessage.contains(
"Found duplicate column(s) in the data schema: `camelcase`"))
assert(e.getMessage.contains(s"Found duplicate column(s) $colType: `camelcase`"))
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* 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.jdbc

import org.apache.spark.sql.NestedDataSourceSuiteBase
import org.apache.spark.sql.types.StructType
import org.apache.spark.util.Utils

class JDBCNestedDataSourceSuite extends NestedDataSourceSuiteBase {
override val nestedDataSources: Seq[String] = Seq("jdbc")
private val tempDir = Utils.createTempDir()
private val url = s"jdbc:h2:${tempDir.getCanonicalPath};user=testUser;password=testPass"
override val colType: String = "in the customSchema option value"

override def afterAll(): Unit = {
Utils.deleteRecursively(tempDir)
super.afterAll()
}

override def readOptions(schema: StructType): Map[String, String] = {
Map("url" -> url, "dbtable" -> "t1", "customSchema" -> schema.toDDL)
}

override def save(selectExpr: Seq[String], format: String, path: String): Unit = {
// We ignore `selectExpr` because:
// 1. H2 doesn't support nested columns
// 2. JDBC datasource checks duplicates before comparing of user's schema with
// actual schema of `t1`.
spark
.range(1L)
.write.mode("overwrite")
.options(Map("url" -> url, "dbtable" -> "t1"))
.format(format)
.save()
}
}