Skip to content

Commit 2013303

Browse files
committed
[SPARK-2710][SQL] fix fcalastyle checks errors
1 parent 566d154 commit 2013303

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ class SQLContext(@transient val sparkContext: SparkContext)
250250
sql, lowerBound, upperBound, numPartitions,
251251
(r: ResultSet) => r
252252
)
253-
//new SchemaRDD(this, JdbcResultSetRDD.inferSchema(resultSetRDD))
254253
val appliedSchema = JdbcResultSetRDD.inferSchema(resultSetRDD)
255254
val rowRDD = JdbcResultSetRDD.jdbcResultSetToRow(resultSetRDD, appliedSchema)
256255
applySchema(rowRDD, appliedSchema)
@@ -463,7 +462,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
463462
protected def stringOrError[A](f: => A): String =
464463
try f.toString catch { case e: Throwable => e.toString }
465464

466-
def simpleString: String =
465+
def simpleString: String =
467466
s"""== Physical Plan ==
468467
|${stringOrError(executedPlan)}
469468
"""

sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcTypes.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ private[sql] object JdbcTypes extends Logging {
5757
// case java.sql.Types.CLOB
5858

5959
// TODO: BLOB only works with getBlob or getBinaryStream
60-
//case java.sql.Types.BLOB
60+
// case java.sql.Types.BLOB
6161

6262
// TODO: nested types
63-
//case java.sql.Types.ARRAY => ArrayType
64-
//case java.sql.Types.STRUCT => StructType
63+
// case java.sql.Types.ARRAY => ArrayType
64+
// case java.sql.Types.STRUCT => StructType
6565

6666
// TODO: unsupported types
67-
//case java.sql.Types.DISTINCT
68-
//case java.sql.Types.REF
67+
// case java.sql.Types.DISTINCT
68+
// case java.sql.Types.REF
6969

7070
// TODO: more about JAVA_OBJECT:
7171
// http://docs.oracle.com/javase/6/docs/technotes/guides/jdbc/getstart/mapping.html#1038181
72-
//case java.sql.Types.JAVA_OBJECT => BinaryType
72+
// case java.sql.Types.JAVA_OBJECT => BinaryType
7373

7474
case _ => sys.error(
7575
s"Unsupported jdbc datatype")

0 commit comments

Comments
 (0)