You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2019/11/29 01:45:47 UTC
[spark] branch branch-2.4 updated: Revert "[SPARK-28152][SQL][2.4]
Mapped ShortType to SMALLINT and FloatType to REAL for MsSqlServerDialect"
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 00b61e3 Revert "[SPARK-28152][SQL][2.4] Mapped ShortType to SMALLINT and FloatType to REAL for MsSqlServerDialect"
00b61e3 is described below
commit 00b61e36958118e98c6dbfa0515c11c8672a62ac
Author: HyukjinKwon <gu...@apache.org>
AuthorDate: Fri Nov 29 10:44:25 2019 +0900
Revert "[SPARK-28152][SQL][2.4] Mapped ShortType to SMALLINT and FloatType to REAL for MsSqlServerDialect"
This reverts commit 98ba2f643bc9bba667203e4af6d72a8d2e4fcf5d.
---
.../apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala | 12 ++++++------
.../scala/org/apache/spark/sql/jdbc/MsSqlServerDialect.scala | 7 +------
.../src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala | 11 -----------
3 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
index efd7ca7..82ce16c 100644
--- a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
+++ b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
@@ -120,24 +120,24 @@ class MsSqlServerIntegrationSuite extends DockerJDBCIntegrationSuite {
assert(types.length == 12)
assert(types(0).equals("class java.lang.Boolean"))
assert(types(1).equals("class java.lang.Integer"))
- assert(types(2).equals("class java.lang.Short"))
+ assert(types(2).equals("class java.lang.Integer"))
assert(types(3).equals("class java.lang.Integer"))
assert(types(4).equals("class java.lang.Long"))
assert(types(5).equals("class java.lang.Double"))
- assert(types(6).equals("class java.lang.Float"))
- assert(types(7).equals("class java.lang.Float"))
+ assert(types(6).equals("class java.lang.Double"))
+ assert(types(7).equals("class java.lang.Double"))
assert(types(8).equals("class java.math.BigDecimal"))
assert(types(9).equals("class java.math.BigDecimal"))
assert(types(10).equals("class java.math.BigDecimal"))
assert(types(11).equals("class java.math.BigDecimal"))
assert(row.getBoolean(0) == false)
assert(row.getInt(1) == 255)
- assert(row.getShort(2) == 32767)
+ assert(row.getInt(2) == 32767)
assert(row.getInt(3) == 2147483647)
assert(row.getLong(4) == 9223372036854775807L)
assert(row.getDouble(5) == 1.2345678901234512E14) // float = float(53) has 15-digits precision
- assert(row.getFloat(6) == 1.23456788103168E14) // float(24) has 7-digits precision
- assert(row.getFloat(7) == 1.23456788103168E14) // real = float(24)
+ assert(row.getDouble(6) == 1.23456788103168E14) // float(24) has 7-digits precision
+ assert(row.getDouble(7) == 1.23456788103168E14) // real = float(24)
assert(row.getAs[BigDecimal](8).equals(new BigDecimal("123.00")))
assert(row.getAs[BigDecimal](9).equals(new BigDecimal("12345.12000")))
assert(row.getAs[BigDecimal](10).equals(new BigDecimal("922337203685477.5800")))
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MsSqlServerDialect.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MsSqlServerDialect.scala
index 805f73d..29500cf 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MsSqlServerDialect.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MsSqlServerDialect.scala
@@ -30,11 +30,7 @@ private object MsSqlServerDialect extends JdbcDialect {
// String is recommend by Microsoft SQL Server for datetimeoffset types in non-MS clients
Option(StringType)
} else {
- sqlType match {
- case java.sql.Types.SMALLINT => Some(ShortType)
- case java.sql.Types.REAL => Some(FloatType)
- case _ => None
- }
+ None
}
}
@@ -43,7 +39,6 @@ private object MsSqlServerDialect extends JdbcDialect {
case StringType => Some(JdbcType("NVARCHAR(MAX)", java.sql.Types.NVARCHAR))
case BooleanType => Some(JdbcType("BIT", java.sql.Types.BIT))
case BinaryType => Some(JdbcType("VARBINARY(MAX)", java.sql.Types.VARBINARY))
- case ShortType => Some(JdbcType("SMALLINT", java.sql.Types.SMALLINT))
case _ => None
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
index 2dcedc3..91fbc0d 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
@@ -887,17 +887,6 @@ class JDBCSuite extends QueryTest
"BIT")
assert(msSqlServerDialect.getJDBCType(BinaryType).map(_.databaseTypeDefinition).get ==
"VARBINARY(MAX)")
- assert(msSqlServerDialect.getJDBCType(ShortType).map(_.databaseTypeDefinition).get ==
- "SMALLINT")
- }
-
- test("SPARK-28152 MsSqlServerDialect catalyst type mapping") {
- val msSqlServerDialect = JdbcDialects.get("jdbc:sqlserver")
- val metadata = new MetadataBuilder().putLong("scale", 1)
- assert(msSqlServerDialect.getCatalystType(java.sql.Types.SMALLINT, "SMALLINT", 1,
- metadata).get == ShortType)
- assert(msSqlServerDialect.getCatalystType(java.sql.Types.REAL, "REAL", 1,
- metadata).get == FloatType)
}
test("table exists query by jdbc dialect") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org