aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYin Huai <yhuai@databricks.com>2015-05-01 16:47:00 -0700
committerMichael Armbrust <michael@databricks.com>2015-05-01 16:47:00 -0700
commit41c6a44b1a6ae5c70a8e8dc82d0062de9bdee5b3 (patch)
tree9d3fd6f3c0405ddad581c8db28fdf1b9eb463841
parent5c1fabafabdb87de7a92acbefbf294b24d0713fc (diff)
downloadspark-41c6a44b1a6ae5c70a8e8dc82d0062de9bdee5b3.tar.gz
spark-41c6a44b1a6ae5c70a8e8dc82d0062de9bdee5b3.tar.bz2
spark-41c6a44b1a6ae5c70a8e8dc82d0062de9bdee5b3.zip
[SPARK-7312][SQL] SPARK-6913 broke jdk6 build
JIRA: https://issues.apache.org/jira/browse/SPARK-7312 Author: Yin Huai <yhuai@databricks.com> Closes #5847 from yhuai/jdbcJava6 and squashes the following commits: 68433a2 [Yin Huai] compile with Java 6
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
index ae9af1eabe..3a6c2c1e91 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
@@ -17,7 +17,7 @@
package org.apache.spark.sql
-import java.sql.{Connection, Driver, DriverManager, DriverPropertyInfo, PreparedStatement}
+import java.sql.{Connection, Driver, DriverManager, DriverPropertyInfo, PreparedStatement, SQLFeatureNotSupportedException}
import java.util.Properties
import scala.collection.mutable
@@ -195,7 +195,9 @@ package object jdbc {
override def getMinorVersion: Int = wrapped.getMinorVersion
- override def getParentLogger: java.util.logging.Logger = wrapped.getParentLogger
+ def getParentLogger: java.util.logging.Logger =
+ throw new SQLFeatureNotSupportedException(
+ s"${this.getClass().getName}.getParentLogger is not yet implemented.")
override def connect(url: String, info: Properties): Connection = wrapped.connect(url, info)