From 8e82e59834aefb74d49e45c9c9c926bb53143b4c Mon Sep 17 00:00:00 2001
From: Pravin Gadakh <prgadakh@in.ibm.com>
Date: Wed, 21 Oct 2015 10:35:09 -0700
Subject: [PATCH] [SPARK-11037][SQL] using Option instead of Some in
JdbcDialects
Using Option instead of Some in getCatalystType method.
Author: Pravin Gadakh <prgadakh@in.ibm.com>
Closes #9195 from pravingadakh/master.
---
.../org/apache/spark/sql/jdbc/JdbcDialects.scala | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala
index a2ff4cc1c9..88ae83957a 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala
@@ -198,15 +198,15 @@ case object PostgresDialect extends JdbcDialect {
override def getCatalystType(
sqlType: Int, typeName: String, size: Int, md: MetadataBuilder): Option[DataType] = {
if (sqlType == Types.BIT && typeName.equals("bit") && size != 1) {
- Some(BinaryType)
+ Option(BinaryType)
} else if (sqlType == Types.OTHER && typeName.equals("cidr")) {
- Some(StringType)
+ Option(StringType)
} else if (sqlType == Types.OTHER && typeName.equals("inet")) {
- Some(StringType)
+ Option(StringType)
} else if (sqlType == Types.OTHER && typeName.equals("json")) {
- Some(StringType)
+ Option(StringType)
} else if (sqlType == Types.OTHER && typeName.equals("jsonb")) {
- Some(StringType)
+ Option(StringType)
} else None
}
@@ -236,9 +236,9 @@ case object MySQLDialect extends JdbcDialect {
// This could instead be a BinaryType if we'd rather return bit-vectors of up to 64 bits as
// byte arrays instead of longs.
md.putLong("binarylong", 1)
- Some(LongType)
+ Option(LongType)
} else if (sqlType == Types.BIT && typeName.equals("TINYINT")) {
- Some(BooleanType)
+ Option(BooleanType)
} else None
}
@@ -279,7 +279,7 @@ case object MsSqlServerDialect extends JdbcDialect {
sqlType: Int, typeName: String, size: Int, md: MetadataBuilder): Option[DataType] = {
if (typeName.contains("datetimeoffset")) {
// String is recommend by Microsoft SQL Server for datetimeoffset types in non-MS clients
- Some(StringType)
+ Option(StringType)
} else None
}
--
GitLab