forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add connector cast suite and fix found issue.
- Loading branch information
1 parent
4fc2910
commit 9761f90
Showing
6 changed files
with
488 additions
and
2 deletions.
There are no files selected for viewing
82 changes: 82 additions & 0 deletions
82
...cker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/cast/MySQLCastSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * 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.cast | ||
|
|
||
| import java.sql.{Connection, DriverManager} | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import com.databricks.sql.connector.JDBCConnectorCastSuiteBase | ||
|
|
||
| import org.apache.spark.sql.connector.catalog.{Identifier, TableCatalog} | ||
| import org.apache.spark.sql.execution.datasources.v2.jdbc.MysqlTableCatalog | ||
| import org.apache.spark.sql.jdbc.{DatabaseOnDocker, DockerJDBCIntegrationSuite, JdbcDialect, MySQLDatabaseOnDocker, MySQLDialect} | ||
| import org.apache.spark.sql.util.CaseInsensitiveStringMap | ||
|
|
||
| class MySQLCastSuite extends DockerJDBCIntegrationSuite with JDBCConnectorCastSuiteBase { | ||
| override val db: DatabaseOnDocker = new MySQLDatabaseOnDocker | ||
|
|
||
| override def dataPreparation(connection: Connection): Unit = { } | ||
|
|
||
| override protected def createConnection: Connection = { | ||
| val jdbcUrl = db.getJdbcUrl("127.0.0.1", externalPort) | ||
| DriverManager.getConnection(jdbcUrl, db.getJdbcProperties()) | ||
| } | ||
|
|
||
| override def dialect: JdbcDialect = MySQLDialect | ||
|
|
||
| override def tableCatalog: TableCatalog = { | ||
| val catalog = new MysqlTableCatalog() | ||
| val options = Map( | ||
| "host" -> "127.0.0.1", | ||
| "port" -> externalPort.toString, | ||
| "database" -> "mysql", | ||
| "user" -> "root", | ||
| "password" -> "rootpass" | ||
| ) | ||
|
|
||
| catalog.initialize("sfCat", new CaseInsensitiveStringMap(options.asJava)) | ||
| catalog | ||
| } | ||
|
|
||
| override protected def dropTable(table: Identifier): Unit = | ||
| execUpdate(s"DROP TABLE ${table.toString}") | ||
|
|
||
| override protected def dropSchema(schemaName: String): Unit = { | ||
| // MySQL does not support CASCADE drop | ||
| execUpdate(s"DROP SCHEMA $schemaName") | ||
| } | ||
|
|
||
| override def createNumericTypesTable: Identifier = { | ||
| val identifier = Identifier.of(Array(schemaName), "CAST_NUMERIC_TABLE") | ||
| execUpdate( | ||
| s"""CREATE TABLE IF NOT EXISTS $schemaName.CAST_NUMERIC_TABLE | ||
| |(COL_TINY TINYINT, COL_SMALL SMALLINT, COL_MEDIUM MEDIUMINT, COL_INT INT, COL_BIG BIGINT, | ||
| | COL_DECIMAL DECIMAL(9,2), COL_FLOAT FLOAT, COL_DOUBLE DOUBLE) | ||
| |""".stripMargin) | ||
| execUpdate( | ||
| s"""INSERT INTO $schemaName.CAST_NUMERIC_TABLE VALUES | ||
| |(-100, -100, -100, -100, -100, | ||
| | -10.25, -10.256, -10.256)""".stripMargin) | ||
| execUpdate( | ||
| s"""INSERT INTO $schemaName.CAST_NUMERIC_TABLE VALUES | ||
| |(100, 100, 100, 100, 100, | ||
| | 10.25, 10.256, 10.256)""".stripMargin) | ||
| identifier | ||
| } | ||
| } |
96 changes: 96 additions & 0 deletions
96
...integration-tests/src/test/scala/org/apache/spark/sql/jdbc/cast/PostgreSQLCastSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * 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.cast | ||
|
|
||
| import java.sql.{Connection, DriverManager} | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import com.databricks.sql.connector.JDBCConnectorCastSuiteBase | ||
|
|
||
| import org.apache.spark.sql.connector.catalog.{Identifier, TableCatalog} | ||
| import org.apache.spark.sql.execution.datasources.v2.jdbc.PostgresqlTableCatalog | ||
| import org.apache.spark.sql.jdbc.{DatabaseOnDocker, DockerJDBCIntegrationSuite, JdbcDialect, PostgresDialect} | ||
| import org.apache.spark.sql.util.CaseInsensitiveStringMap | ||
|
|
||
| class PostgreSQLCastSuite extends DockerJDBCIntegrationSuite with JDBCConnectorCastSuiteBase { | ||
| override val schemaName: String = "cast_schema" | ||
|
|
||
| override val db: DatabaseOnDocker = new DatabaseOnDocker { | ||
| override val imageName: String = | ||
| sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME", "postgres:16.2-alpine") | ||
| override val env: Map[String, String] = Map( | ||
| "POSTGRES_PASSWORD" -> "rootpass" | ||
| ) | ||
| override val usesIpc = false | ||
| override val jdbcPort = 5432 | ||
|
|
||
| override def getJdbcUrl(ip: String, port: Int): String = | ||
| s"jdbc:postgresql://$ip:$port/postgres?user=postgres&password=rootpass" | ||
| } | ||
|
|
||
| override def dataPreparation(connection: Connection): Unit = { } | ||
|
|
||
| override protected def createConnection: Connection = { | ||
| val jdbcUrl = db.getJdbcUrl("127.0.0.1", externalPort) | ||
| DriverManager.getConnection(jdbcUrl, db.getJdbcProperties()) | ||
| } | ||
|
|
||
| override def dialect: JdbcDialect = PostgresDialect | ||
|
|
||
| override def tableCatalog: TableCatalog = { | ||
| val catalog = new PostgresqlTableCatalog() | ||
| val options = Map( | ||
| "host" -> "127.0.0.1", | ||
| "port" -> externalPort.toString, | ||
| "database" -> "postgres", | ||
| "user" -> "postgres", | ||
| "password" -> "rootpass" | ||
| ) | ||
|
|
||
| catalog.initialize("postgresCat", new CaseInsensitiveStringMap(options.asJava)) | ||
| catalog | ||
| } | ||
|
|
||
| override protected def dropTable(table: Identifier): Unit = | ||
| execUpdate(s"DROP TABLE ${table.toString}") | ||
|
|
||
| override def createNumericTypesTable: Identifier = { | ||
| val identifier = Identifier.of(Array(schemaName), "cast_numeric_table") | ||
| execUpdate( | ||
| s"""CREATE TABLE IF NOT EXISTS $schemaName.cast_numeric_table | ||
| |(COL_SMALLINT SMALLINT, COL_INT INT, COL_BIGINT BIGINT, | ||
| | COL_DECIMAL DECIMAL(9,2), COL_REAL REAL, COL_DOUBLE FLOAT8) | ||
| |""".stripMargin) | ||
| execUpdate( | ||
| s"""INSERT INTO $schemaName.cast_numeric_table VALUES | ||
| |(-1000, -1000, -1000, | ||
| | -10.25, -10.256, -10.256)""".stripMargin) | ||
| execUpdate( | ||
| s"""INSERT INTO $schemaName.cast_numeric_table VALUES | ||
| |(1000, 1000, 1000, | ||
| | 10.25, 10.256, 10.256)""".stripMargin) | ||
| identifier | ||
| } | ||
|
|
||
| override def createStringTypeTable: Identifier = { | ||
| super.createStringTypeTable | ||
| // Return lower case table name | ||
| Identifier.of(Array(schemaName), "cast_string_table") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.