You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2020/11/03 13:54:46 UTC
[GitHub] [spark] huaxingao commented on a change in pull request #30038: [SPARK-33130][SQL] Support ALTER TABLE in JDBC v2 Table Catalog: add, update type and nullability of columns (MsSqlServer dialect)
huaxingao commented on a change in pull request #30038:
URL: https://github.com/apache/spark/pull/30038#discussion_r516197445
##########
File path: external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
##########
@@ -0,0 +1,91 @@
+/*
+ * 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.v2
+
+import java.sql.Connection
+import java.sql.SQLFeatureNotSupportedException
Review comment:
nit: combine these two lines?
##########
File path: external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
##########
@@ -0,0 +1,91 @@
+/*
+ * 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.v2
+
+import java.sql.Connection
+import java.sql.SQLFeatureNotSupportedException
+
+import org.scalatest.time.SpanSugar._
+
+import org.apache.spark.SparkConf
+import org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
+import org.apache.spark.sql.jdbc.{DatabaseOnDocker, DockerJDBCIntegrationSuite}
+import org.apache.spark.sql.types._
+import org.apache.spark.tags.DockerTest
+
+/**
+ * To run this test suite for a specific version (e.g., 2019-GA-ubuntu-16.04):
+ * {{{
+ * MSSQLSERVER_DOCKER_IMAGE_NAME=2019-GA-ubuntu-16.04
+ * ./build/sbt -Pdocker-integration-tests "testOnly *v2*MsSqlServerIntegrationSuite"
+ * }}}
+ */
+@DockerTest
+class MsSqlServerIntegrationSuite extends DockerJDBCIntegrationSuite with V2JDBCTest {
+
+ override val catalogName: String = "mssql"
+
+ override val db = new DatabaseOnDocker {
+ override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
+ "mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04")
+ override val env = Map(
+ "SA_PASSWORD" -> "Sapass123",
+ "ACCEPT_EULA" -> "Y"
+ )
+ override val usesIpc = false
+ override val jdbcPort: Int = 1433
+
+ override def getJdbcUrl(ip: String, port: Int): String =
+ s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
+ }
+
+ override def testUpdateColumnType(tbl: String): Unit = {
Review comment:
nit: shall we put this method after `def dataPreparation`?
##########
File path: external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
##########
@@ -0,0 +1,91 @@
+/*
+ * 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.v2
+
+import java.sql.Connection
+import java.sql.SQLFeatureNotSupportedException
+
+import org.scalatest.time.SpanSugar._
+
+import org.apache.spark.SparkConf
+import org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
+import org.apache.spark.sql.jdbc.{DatabaseOnDocker, DockerJDBCIntegrationSuite}
+import org.apache.spark.sql.types._
+import org.apache.spark.tags.DockerTest
+
+/**
+ * To run this test suite for a specific version (e.g., 2019-GA-ubuntu-16.04):
+ * {{{
+ * MSSQLSERVER_DOCKER_IMAGE_NAME=2019-GA-ubuntu-16.04
+ * ./build/sbt -Pdocker-integration-tests "testOnly *v2*MsSqlServerIntegrationSuite"
+ * }}}
+ */
+@DockerTest
+class MsSqlServerIntegrationSuite extends DockerJDBCIntegrationSuite with V2JDBCTest {
+
+ override val catalogName: String = "mssql"
+
+ override val db = new DatabaseOnDocker {
+ override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
+ "mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04")
+ override val env = Map(
+ "SA_PASSWORD" -> "Sapass123",
+ "ACCEPT_EULA" -> "Y"
+ )
+ override val usesIpc = false
+ override val jdbcPort: Int = 1433
+
+ override def getJdbcUrl(ip: String, port: Int): String =
+ s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
+ }
+
+ override def testUpdateColumnType(tbl: String): Unit = {
+ sql(s"CREATE TABLE $tbl (ID INTEGER) USING _")
+ var t = spark.table(tbl)
+ var expectedSchema = new StructType().add("ID", IntegerType)
+ assert(t.schema === expectedSchema)
+ sql(s"ALTER TABLE $tbl ALTER COLUMN id TYPE STRING")
+ t = spark.table(tbl)
+ expectedSchema = new StructType().add("ID", StringType)
+ assert(t.schema === expectedSchema)
+ // Update column type from STRING to INTEGER
+ val msg1 = intercept[AnalysisException] {
+ sql(s"ALTER TABLE $tbl ALTER COLUMN id TYPE INTEGER")
+ }.getMessage
+ assert(msg1.contains("Cannot update alt_table field ID: string cannot be cast to int"))
+ }
+
+ override def sparkConf: SparkConf = super.sparkConf
+ .set("spark.sql.catalog.mssql", classOf[JDBCTableCatalog].getName)
+ .set("spark.sql.catalog.mssql.url", db.getJdbcUrl(dockerIp, externalPort))
+
+ override val connectionTimeout = timeout(7.minutes)
+
+ override def dataPreparation(conn: Connection): Unit = {}
+
+ override def testUpdateColumnNullability(tbl: String): Unit = {
+ sql("CREATE TABLE mssql.alt_table (ID STRING NOT NULL) USING _")
Review comment:
```mssql.alt_table``` -> ```$tbl```?
##########
File path: external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
##########
@@ -0,0 +1,91 @@
+/*
+ * 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.v2
+
+import java.sql.Connection
+import java.sql.SQLFeatureNotSupportedException
+
+import org.scalatest.time.SpanSugar._
+
+import org.apache.spark.SparkConf
+import org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
+import org.apache.spark.sql.jdbc.{DatabaseOnDocker, DockerJDBCIntegrationSuite}
+import org.apache.spark.sql.types._
+import org.apache.spark.tags.DockerTest
+
+/**
+ * To run this test suite for a specific version (e.g., 2019-GA-ubuntu-16.04):
+ * {{{
+ * MSSQLSERVER_DOCKER_IMAGE_NAME=2019-GA-ubuntu-16.04
+ * ./build/sbt -Pdocker-integration-tests "testOnly *v2*MsSqlServerIntegrationSuite"
+ * }}}
+ */
+@DockerTest
+class MsSqlServerIntegrationSuite extends DockerJDBCIntegrationSuite with V2JDBCTest {
+
+ override val catalogName: String = "mssql"
+
+ override val db = new DatabaseOnDocker {
+ override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
+ "mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04")
+ override val env = Map(
+ "SA_PASSWORD" -> "Sapass123",
+ "ACCEPT_EULA" -> "Y"
+ )
+ override val usesIpc = false
+ override val jdbcPort: Int = 1433
+
+ override def getJdbcUrl(ip: String, port: Int): String =
+ s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
+ }
+
+ override def testUpdateColumnType(tbl: String): Unit = {
+ sql(s"CREATE TABLE $tbl (ID INTEGER) USING _")
+ var t = spark.table(tbl)
+ var expectedSchema = new StructType().add("ID", IntegerType)
+ assert(t.schema === expectedSchema)
+ sql(s"ALTER TABLE $tbl ALTER COLUMN id TYPE STRING")
+ t = spark.table(tbl)
+ expectedSchema = new StructType().add("ID", StringType)
+ assert(t.schema === expectedSchema)
+ // Update column type from STRING to INTEGER
+ val msg1 = intercept[AnalysisException] {
+ sql(s"ALTER TABLE $tbl ALTER COLUMN id TYPE INTEGER")
+ }.getMessage
+ assert(msg1.contains("Cannot update alt_table field ID: string cannot be cast to int"))
+ }
+
+ override def sparkConf: SparkConf = super.sparkConf
+ .set("spark.sql.catalog.mssql", classOf[JDBCTableCatalog].getName)
+ .set("spark.sql.catalog.mssql.url", db.getJdbcUrl(dockerIp, externalPort))
+
+ override val connectionTimeout = timeout(7.minutes)
+
+ override def dataPreparation(conn: Connection): Unit = {}
+
+ override def testUpdateColumnNullability(tbl: String): Unit = {
+ sql("CREATE TABLE mssql.alt_table (ID STRING NOT NULL) USING _")
+ // Update nullability is unsupported for mssql db.
+ val msg = intercept[AnalysisException] {
+ sql("ALTER TABLE mssql.alt_table ALTER COLUMN ID DROP NOT NULL")
Review comment:
ditto
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org