-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-32510][SQL] Check duplicate nested columns in read from JDBC datasource #29317
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -819,8 +819,10 @@ object JdbcUtils extends Logging { | |
| if (null != customSchema && customSchema.nonEmpty) { | ||
| 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
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here is the fix - replacing |
||
| "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 => | ||
|
|
||
| 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() | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
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: @wangyumThere was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
customeSchemawith nested fields, arrays, map, ...There was a problem hiding this comment.
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 ;-)