From 7c79ef7d43de258ad9a5de15c590132bd78ce8dd Mon Sep 17 00:00:00 2001
From: Andrew Or <andrewor14@gmail.com>
Date: Wed, 21 May 2014 01:25:10 -0700
Subject: [PATCH] [Minor] Move JdbcRDDSuite to the correct package
It was in the wrong package
Author: Andrew Or <andrewor14@gmail.com>
Closes #839 from andrewor14/jdbc-suite and squashes the following commits:
f948c5a [Andrew Or] cache -> cache()
b215279 [Andrew Or] Move JdbcRDDSuite to the correct package
---
.../scala/org/apache/spark/rdd/JdbcRDDSuite.scala | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala b/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala
index 7c7f69b261..76e317d754 100644
--- a/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala
+++ b/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.spark
+package org.apache.spark.rdd
import java.sql._
import org.scalatest.{BeforeAndAfter, FunSuite}
-import org.apache.spark.rdd.JdbcRDD
+import org.apache.spark.{LocalSparkContext, SparkContext}
class JdbcRDDSuite extends FunSuite with BeforeAndAfter with LocalSparkContext {
@@ -35,18 +35,18 @@ class JdbcRDDSuite extends FunSuite with BeforeAndAfter with LocalSparkContext {
ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
DATA INTEGER
)""")
- create.close
+ create.close()
val insert = conn.prepareStatement("INSERT INTO FOO(DATA) VALUES(?)")
(1 to 100).foreach { i =>
insert.setInt(1, i * 2)
insert.executeUpdate
}
- insert.close
+ insert.close()
} catch {
case e: SQLException if e.getSQLState == "X0Y32" =>
// table exists
} finally {
- conn.close
+ conn.close()
}
}
@@ -57,7 +57,7 @@ class JdbcRDDSuite extends FunSuite with BeforeAndAfter with LocalSparkContext {
() => { DriverManager.getConnection("jdbc:derby:target/JdbcRDDSuiteDb") },
"SELECT DATA FROM FOO WHERE ? <= ID AND ID <= ?",
1, 100, 3,
- (r: ResultSet) => { r.getInt(1) } ).cache
+ (r: ResultSet) => { r.getInt(1) } ).cache()
assert(rdd.count === 100)
assert(rdd.reduce(_+_) === 10100)
--
GitLab