yaooqinn commented on code in PR #40718:
URL: https://github.com/apache/spark/pull/40718#discussion_r1162219705
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JdbcUtils.scala:
##########
@@ -177,68 +177,56 @@ object JdbcUtils extends Logging with SQLConfHelper {
*/
private def getCatalystType(
sqlType: Int,
+ typeName: String,
precision: Int,
scale: Int,
signed: Boolean,
- isTimestampNTZ: Boolean): DataType = {
- val answer = sqlType match {
- // scalastyle:off
- case java.sql.Types.ARRAY => null
- case java.sql.Types.BIGINT => if (signed) { LongType } else {
DecimalType(20,0) }
- case java.sql.Types.BINARY => BinaryType
- case java.sql.Types.BIT => BooleanType // @see JdbcDialect for
quirks
- case java.sql.Types.BLOB => BinaryType
- case java.sql.Types.BOOLEAN => BooleanType
- case java.sql.Types.CHAR => StringType
- case java.sql.Types.CLOB => StringType
- case java.sql.Types.DATALINK => null
- case java.sql.Types.DATE => DateType
- case java.sql.Types.DECIMAL
- if precision != 0 || scale != 0 => DecimalType.bounded(precision,
scale)
- case java.sql.Types.DECIMAL => DecimalType.SYSTEM_DEFAULT
- case java.sql.Types.DISTINCT => null
- case java.sql.Types.DOUBLE => DoubleType
- case java.sql.Types.FLOAT => FloatType
- case java.sql.Types.INTEGER => if (signed) { IntegerType } else {
LongType }
- case java.sql.Types.JAVA_OBJECT => null
- case java.sql.Types.LONGNVARCHAR => StringType
- case java.sql.Types.LONGVARBINARY => BinaryType
- case java.sql.Types.LONGVARCHAR => StringType
- case java.sql.Types.NCHAR => StringType
- case java.sql.Types.NCLOB => StringType
- case java.sql.Types.NULL => null
- case java.sql.Types.NUMERIC
- if precision != 0 || scale != 0 => DecimalType.bounded(precision,
scale)
- case java.sql.Types.NUMERIC => DecimalType.SYSTEM_DEFAULT
- case java.sql.Types.NVARCHAR => StringType
- case java.sql.Types.OTHER => null
- case java.sql.Types.REAL => DoubleType
- case java.sql.Types.REF => StringType
- case java.sql.Types.REF_CURSOR => null
- case java.sql.Types.ROWID => StringType
- case java.sql.Types.SMALLINT => IntegerType
- case java.sql.Types.SQLXML => StringType
- case java.sql.Types.STRUCT => StringType
- case java.sql.Types.TIME => TimestampType
- case java.sql.Types.TIME_WITH_TIMEZONE
- => null
- case java.sql.Types.TIMESTAMP
- if isTimestampNTZ => TimestampNTZType
- case java.sql.Types.TIMESTAMP => TimestampType
- case java.sql.Types.TIMESTAMP_WITH_TIMEZONE
- => null
- case java.sql.Types.TINYINT => IntegerType
- case java.sql.Types.VARBINARY => BinaryType
- case java.sql.Types.VARCHAR => StringType
- case _ =>
- throw QueryExecutionErrors.unrecognizedSqlTypeError(sqlType)
- // scalastyle:on
- }
-
- if (answer == null) {
- throw
QueryExecutionErrors.unsupportedJdbcTypeError(JDBCType.valueOf(sqlType).getName)
- }
- answer
+ isTimestampNTZ: Boolean): DataType = sqlType match {
+ case java.sql.Types.BIGINT => if (signed) LongType else DecimalType(20, 0)
+ case java.sql.Types.BINARY => BinaryType
+ case java.sql.Types.BIT => BooleanType // @see JdbcDialect for quirks
+ case java.sql.Types.BLOB => BinaryType
+ case java.sql.Types.BOOLEAN => BooleanType
+ case java.sql.Types.CHAR => StringType
+ case java.sql.Types.CLOB => StringType
+ case java.sql.Types.DATE => DateType
+ case java.sql.Types.DECIMAL if precision != 0 || scale != 0 =>
+ DecimalType.bounded(precision, scale)
+ case java.sql.Types.DECIMAL => DecimalType.SYSTEM_DEFAULT
+ case java.sql.Types.DOUBLE => DoubleType
+ case java.sql.Types.FLOAT => FloatType
+ case java.sql.Types.INTEGER => if (signed) IntegerType else LongType
+ case java.sql.Types.LONGNVARCHAR => StringType
+ case java.sql.Types.LONGVARBINARY => BinaryType
+ case java.sql.Types.LONGVARCHAR => StringType
+ case java.sql.Types.NCHAR => StringType
+ case java.sql.Types.NCLOB => StringType
+ case java.sql.Types.NUMERIC if precision != 0 || scale != 0 =>
+ DecimalType.bounded(precision, scale)
+ case java.sql.Types.NUMERIC => DecimalType.SYSTEM_DEFAULT
+ case java.sql.Types.NVARCHAR => StringType
+ case java.sql.Types.REAL => DoubleType
+ case java.sql.Types.REF => StringType
+ case java.sql.Types.ROWID => StringType
+ case java.sql.Types.SMALLINT => IntegerType
+ case java.sql.Types.SQLXML => StringType
+ case java.sql.Types.STRUCT => StringType
+ case java.sql.Types.TIME => TimestampType
+ case java.sql.Types.TIMESTAMP if isTimestampNTZ => TimestampNTZType
+ case java.sql.Types.TIMESTAMP => TimestampType
+ case java.sql.Types.TINYINT => IntegerType
+ case java.sql.Types.VARBINARY => BinaryType
+ case java.sql.Types.VARCHAR => StringType
+ case _ =>
+ // For unmatched types:
+ // including
java.sql.Types.ARRAY,DATALINK,DISTINCT,JAVA_OBJECT,NULL,OTHER,REF_CURSOR,
+ // TIME_WITH_TIMEZONE,TIMESTAMP_WITH_TIMEZONE, and among others.
+ val jdbcType = classOf[JDBCType].getEnumConstants()
+ .filter(_.getVendorTypeNumber == sqlType)
Review Comment:
valueOf throws IllegalArgumentException, and inside which also uses what we
do here
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JdbcUtils.scala:
##########
@@ -177,68 +177,56 @@ object JdbcUtils extends Logging with SQLConfHelper {
*/
private def getCatalystType(
sqlType: Int,
+ typeName: String,
precision: Int,
scale: Int,
signed: Boolean,
- isTimestampNTZ: Boolean): DataType = {
- val answer = sqlType match {
- // scalastyle:off
- case java.sql.Types.ARRAY => null
- case java.sql.Types.BIGINT => if (signed) { LongType } else {
DecimalType(20,0) }
- case java.sql.Types.BINARY => BinaryType
- case java.sql.Types.BIT => BooleanType // @see JdbcDialect for
quirks
- case java.sql.Types.BLOB => BinaryType
- case java.sql.Types.BOOLEAN => BooleanType
- case java.sql.Types.CHAR => StringType
- case java.sql.Types.CLOB => StringType
- case java.sql.Types.DATALINK => null
- case java.sql.Types.DATE => DateType
- case java.sql.Types.DECIMAL
- if precision != 0 || scale != 0 => DecimalType.bounded(precision,
scale)
- case java.sql.Types.DECIMAL => DecimalType.SYSTEM_DEFAULT
- case java.sql.Types.DISTINCT => null
- case java.sql.Types.DOUBLE => DoubleType
- case java.sql.Types.FLOAT => FloatType
- case java.sql.Types.INTEGER => if (signed) { IntegerType } else {
LongType }
- case java.sql.Types.JAVA_OBJECT => null
- case java.sql.Types.LONGNVARCHAR => StringType
- case java.sql.Types.LONGVARBINARY => BinaryType
- case java.sql.Types.LONGVARCHAR => StringType
- case java.sql.Types.NCHAR => StringType
- case java.sql.Types.NCLOB => StringType
- case java.sql.Types.NULL => null
- case java.sql.Types.NUMERIC
- if precision != 0 || scale != 0 => DecimalType.bounded(precision,
scale)
- case java.sql.Types.NUMERIC => DecimalType.SYSTEM_DEFAULT
- case java.sql.Types.NVARCHAR => StringType
- case java.sql.Types.OTHER => null
- case java.sql.Types.REAL => DoubleType
- case java.sql.Types.REF => StringType
- case java.sql.Types.REF_CURSOR => null
- case java.sql.Types.ROWID => StringType
- case java.sql.Types.SMALLINT => IntegerType
- case java.sql.Types.SQLXML => StringType
- case java.sql.Types.STRUCT => StringType
- case java.sql.Types.TIME => TimestampType
- case java.sql.Types.TIME_WITH_TIMEZONE
- => null
- case java.sql.Types.TIMESTAMP
- if isTimestampNTZ => TimestampNTZType
- case java.sql.Types.TIMESTAMP => TimestampType
- case java.sql.Types.TIMESTAMP_WITH_TIMEZONE
- => null
- case java.sql.Types.TINYINT => IntegerType
- case java.sql.Types.VARBINARY => BinaryType
- case java.sql.Types.VARCHAR => StringType
- case _ =>
- throw QueryExecutionErrors.unrecognizedSqlTypeError(sqlType)
- // scalastyle:on
- }
-
- if (answer == null) {
- throw
QueryExecutionErrors.unsupportedJdbcTypeError(JDBCType.valueOf(sqlType).getName)
- }
- answer
+ isTimestampNTZ: Boolean): DataType = sqlType match {
+ case java.sql.Types.BIGINT => if (signed) LongType else DecimalType(20, 0)
+ case java.sql.Types.BINARY => BinaryType
+ case java.sql.Types.BIT => BooleanType // @see JdbcDialect for quirks
+ case java.sql.Types.BLOB => BinaryType
+ case java.sql.Types.BOOLEAN => BooleanType
+ case java.sql.Types.CHAR => StringType
+ case java.sql.Types.CLOB => StringType
+ case java.sql.Types.DATE => DateType
+ case java.sql.Types.DECIMAL if precision != 0 || scale != 0 =>
+ DecimalType.bounded(precision, scale)
+ case java.sql.Types.DECIMAL => DecimalType.SYSTEM_DEFAULT
+ case java.sql.Types.DOUBLE => DoubleType
+ case java.sql.Types.FLOAT => FloatType
+ case java.sql.Types.INTEGER => if (signed) IntegerType else LongType
+ case java.sql.Types.LONGNVARCHAR => StringType
+ case java.sql.Types.LONGVARBINARY => BinaryType
+ case java.sql.Types.LONGVARCHAR => StringType
+ case java.sql.Types.NCHAR => StringType
+ case java.sql.Types.NCLOB => StringType
+ case java.sql.Types.NUMERIC if precision != 0 || scale != 0 =>
+ DecimalType.bounded(precision, scale)
+ case java.sql.Types.NUMERIC => DecimalType.SYSTEM_DEFAULT
+ case java.sql.Types.NVARCHAR => StringType
+ case java.sql.Types.REAL => DoubleType
+ case java.sql.Types.REF => StringType
+ case java.sql.Types.ROWID => StringType
+ case java.sql.Types.SMALLINT => IntegerType
+ case java.sql.Types.SQLXML => StringType
+ case java.sql.Types.STRUCT => StringType
+ case java.sql.Types.TIME => TimestampType
+ case java.sql.Types.TIMESTAMP if isTimestampNTZ => TimestampNTZType
+ case java.sql.Types.TIMESTAMP => TimestampType
+ case java.sql.Types.TINYINT => IntegerType
+ case java.sql.Types.VARBINARY => BinaryType
+ case java.sql.Types.VARCHAR => StringType
+ case _ =>
+ // For unmatched types:
+ // including
java.sql.Types.ARRAY,DATALINK,DISTINCT,JAVA_OBJECT,NULL,OTHER,REF_CURSOR,
+ // TIME_WITH_TIMEZONE,TIMESTAMP_WITH_TIMEZONE, and among others.
+ val jdbcType = classOf[JDBCType].getEnumConstants()
+ .filter(_.getVendorTypeNumber == sqlType)
Review Comment:
valueOf throws IllegalArgumentException, and inside, it also uses what we do
here
--
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.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
