From 52ac0083f14a2454b1109b5f535c05ac7fd5a2b4 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Mon, 22 Feb 2016 22:46:15 +0530
Subject: [PATCH 01/17] Adding new test suite for [SPARK-12941][SQL]

Added this new integration suite for creating the docker based test suite for the bug fix in SPARK-12941
---
 .../sql/jdbc/OracleIntegrationSuite.scala     | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
new file mode 100644
index 0000000000000..c0c0d76de90e3
--- /dev/null
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.jdbc
+
+import java.math.BigDecimal
+import java.sql.{Connection, Date, Timestamp}
+import java.util.Properties
+import org.apache.spark.sql.types._
+import org.apache.spark.sql.test.SharedSQLContext
+import org.apache.spark.tags.DockerTest
+
+
+@DockerTest
+class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLContext {
+  import testImplicits._
+ 
+ override val db = new DatabaseOnDocker {
+    override val imageName = "wnameless/oracle-xe-11g:latest"
+    override val env = Map(
+      "ORACLE_ROOT_PASSWORD" -> "oracle"
+    )
+    override val jdbcPort: Int = 1521
+    override def getJdbcUrl(ip: String, port: Int): String =
+      s"jdbc:oracle:thin:system/oracle@//$ip:$port/xe"
+  }
+
+  test("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
+    // create a sample dataframe with string type
+    val df1 = sparkContext.parallelize(Seq(("foo"))).toDF("x")
+    // write the dataframe to the oracle table tbl
+    df1.write.jdbc(jdbcUrl, "tbl2", new Properties)
+    // read the table from the oracle
+    val dfRead = sqlContext.read.jdbc(jdbcUrl, "tbl2", new Properties)
+    // get the rows
+    val rows = dfRead.collect()
+    // verify the data type is inserted
+    val types = rows(0).toSeq.map(x => x.getClass.toString)
+    assert(types(0).equals("class java.lang.String"))
+    // verify the value is the inserted correct or not
+    assert(rows(0).getString(0).equals("foo"))
+  }
+}

From b711688be233ab78fd92f42b22bcfb852a0bb1b9 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Mon, 22 Feb 2016 22:50:19 +0530
Subject: [PATCH 02/17] Update pom.xml for [SPARK-12941] docker test suite
 addition

Updated this pom.xml with the ojdbc jar related dependency to test the OracleIntegrationSuite related to SPARK-12941 bug fix
---
 docker-integration-tests/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index 833ca29cd8218..4ca9705150e86 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -131,6 +131,12 @@
       <artifactId>postgresql</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.oracle</groupId>
+      <artifactId>ojdbc6</artifactId>
+      <version>11.2.0.2.0</version>
+      <scope>test</scope>
+    </dependency>
     <!-- Jersey dependencies, used to override version.
      See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
      background on why we need to use a newer Jersey only in this test module;

From c2c6d14353cab4e72b66f9125f964b215a977446 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Mon, 22 Feb 2016 23:16:51 +0530
Subject: [PATCH 03/17] Update DockerJDBCIntegrationSuite.scala for
 [SPARK-12941] docker test suite addition

Updated DockerJDBCIntegrationSuite.scala with the time out interval, as it is required to be atleast 200 sec for Oracle instance to be up
---
 .../org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
index f73231fc80a08..1ea2c537ad35e 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
@@ -112,7 +112,7 @@ abstract class DockerJDBCIntegrationSuite
       // Start the container and wait until the database can accept JDBC connections:
       docker.startContainer(containerId)
       jdbcUrl = db.getJdbcUrl(dockerIp, externalPort)
-      eventually(timeout(60.seconds), interval(1.seconds)) {
+      eventually(timeout(200.seconds), interval(200.seconds)) {
         val conn = java.sql.DriverManager.getConnection(jdbcUrl)
         conn.close()
       }

From 54b2d4e466e309c8c12e58cefcdf31ca690183f1 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Mon, 22 Feb 2016 23:21:21 +0530
Subject: [PATCH 04/17] Update OracleDialect.scala for [SPARK-12941] docker
 test suite addition

Updated OracleDialect.scala for [SPARK-12941]  for the fix of adding a data type mapping to Oracle
---
 .../main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
index 4165c382689f9..8e432e8f3d96b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
@@ -42,4 +42,9 @@ private case object OracleDialect extends JdbcDialect {
       None
     }
   }
+
+  override def getJDBCType(dt: DataType): Option[JdbcType] = dt match {
+    case StringType => Some(JdbcType("VARCHAR2(255)", java.sql.Types.VARCHAR))
+    case _ => None
+  }
 }

From bde06fa2189dfe9f9484d86a942eb6cfa50ffad8 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Mon, 22 Feb 2016 23:27:59 +0530
Subject: [PATCH 05/17] Update OracleIntegrationSuite.scala for [SPARK-12941]
 docker test suite addition

Updated  OracleIntegrationSuite.scala for [SPARK-12941]  with Oracle Docker test cases
---
 .../org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index c0c0d76de90e3..5731416364a36 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -28,8 +28,8 @@ import org.apache.spark.tags.DockerTest
 @DockerTest
 class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLContext {
   import testImplicits._
- 
- override val db = new DatabaseOnDocker {
+
+  override val db = new DatabaseOnDocker {
     override val imageName = "wnameless/oracle-xe-11g:latest"
     override val env = Map(
       "ORACLE_ROOT_PASSWORD" -> "oracle"

From 0861d72c3b3ad377807edb96f4016231291e792a Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 08:27:32 +0530
Subject: [PATCH 06/17] Update OracleIntegrationSuite.scala for [SPARK-12941]
 Style check fixes and ignore test case

Updated the file with style check fixes and ignore test cases, as the ojdbc jar is not present in the maven.
---
 .../org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 5731416364a36..e0533168d8eef 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -20,6 +20,7 @@ package org.apache.spark.sql.jdbc
 import java.math.BigDecimal
 import java.sql.{Connection, Date, Timestamp}
 import java.util.Properties
+
 import org.apache.spark.sql.types._
 import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.tags.DockerTest
@@ -39,7 +40,7 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLCo
       s"jdbc:oracle:thin:system/oracle@//$ip:$port/xe"
   }
 
-  test("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
+  ignore("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
     // create a sample dataframe with string type
     val df1 = sparkContext.parallelize(Seq(("foo"))).toDF("x")
     // write the dataframe to the oracle table tbl

From ca7ef4e3de03f70c7f37ede0075e31daf17ff4cc Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 08:29:23 +0530
Subject: [PATCH 07/17] Update OracleIntegrationSuite.scala for [SPARK-12941]
 Style check fixes

Style check fixes
---
 .../scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index e0533168d8eef..e1d583ff3605d 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -25,7 +25,6 @@ import org.apache.spark.sql.types._
 import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.tags.DockerTest
 
-
 @DockerTest
 class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLContext {
   import testImplicits._

From 28a9e9fc7793f0ae7dfc0fc0fae17d6ef8acd94e Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 08:44:09 +0530
Subject: [PATCH 08/17] Update OracleIntegrationSuite.scala for [SPARK-12941]
 Style check fixes

Updated the order of imports
---
 .../org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index e1d583ff3605d..d88a60cb5b88d 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -21,8 +21,8 @@ import java.math.BigDecimal
 import java.sql.{Connection, Date, Timestamp}
 import java.util.Properties
 
-import org.apache.spark.sql.types._
 import org.apache.spark.sql.test.SharedSQLContext
+import org.apache.spark.sql.types._
 import org.apache.spark.tags.DockerTest
 
 @DockerTest

From 87e3d7f4de872852a3f16bf6a31761a8cfd1d46b Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 12:05:28 +0530
Subject: [PATCH 09/17] Update pom.xml

Updating this pom.xml to comment the changes related oracle ojdbc jar dependency as the maven repository does not contain this.
---
 docker-integration-tests/pom.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index 4ca9705150e86..f481654012155 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -131,12 +131,14 @@
       <artifactId>postgresql</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>ojdbc6</artifactId>
-      <version>11.2.0.2.0</version>
-      <scope>test</scope>
-    </dependency>
+    <!--
+      <dependency>
+        <groupId>com.oracle</groupId>
+        <artifactId>ojdbc6</artifactId>
+        <version>11.2.0.2.0</version>
+        <scope>test</scope>
+      </dependency>
+    -->
     <!-- Jersey dependencies, used to override version.
      See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
      background on why we need to use a newer Jersey only in this test module;

From 7b12418ca7f75bcc17941bb713286573b7209225 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 15:13:37 +0530
Subject: [PATCH 10/17] Update OracleIntegrationSuite.scala

Updated the OracleIntegrationSuite.scala with the doc and override method
---
 .../sql/jdbc/OracleIntegrationSuite.scala     | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index d88a60cb5b88d..8598ab44feca7 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -24,7 +24,27 @@ import java.util.Properties
 import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 import org.apache.spark.tags.DockerTest
-
+/**
+ * This integration suite is created as part of Pull request(11306) and is used for the fix 
+ * SPARK-12941, creating a data type mapping to Oracle for the corresponding data type
+ * "Stringtype" from dataframe. This PR is for the master branch fix, where as another PR 
+ * is already tested with the branch 1.4
+ *
+ * This patch was tested using the Oracle docker.Created this integration suite for the same.
+ * The ojdbc6.jar was to be downloaded from the maven repository.Since there was 
+ * no jdbc jar available in the maven repository, the jar was downloaded from oracle site 
+ * manually and installed in the local; thus tested. So, for SparkQA test case run, the
+ * ojdbc jar might be manually placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0)
+ * while Spark QA test run
+ * 
+ * The following would be the steps to test this
+ * 1. Pull oracle 11g image - docker pull wnameless/oracle-xe-11g
+ * 2. Start docker - sudo service docker start
+ * 3. Download oracle 11g driver jar and put it in maven local repo: 
+ *    (com/oracle/ojdbc6/11.2.0.2.0/ojdbc6-11.2.0.2.0.jar)
+ * 4. Run spark test - ./build/sbt "test-only org.apache.spark.sql.jdbc.OracleIntegrationSuite"
+ *
+ */
 @DockerTest
 class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLContext {
   import testImplicits._
@@ -39,6 +59,16 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLCo
       s"jdbc:oracle:thin:system/oracle@//$ip:$port/xe"
   }
 
+  override def dataPreparation(conn: Connection): Unit = {
+  }
+  
+  /**
+   * For SparkQA test case run, the ojdbc6-11.2.0.2.0.jar would be required to be manually
+   * placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0) while Spark QA test
+   * run.Because, the maven repository for oracle mentioned in the pom file
+   * (commented already) does not contain the ojdbc jar.So, this test case is ignored for
+   * the temporary purpose.This testcase has been tested locally and verified.
+   */
   ignore("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
     // create a sample dataframe with string type
     val df1 = sparkContext.parallelize(Seq(("foo"))).toDF("x")

From 250591dfb7c63f446cfb09702587642da2ec026d Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 15:18:02 +0530
Subject: [PATCH 11/17] Update OracleIntegrationSuite.scala

updated doc
---
 .../org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 8598ab44feca7..2733932c0b445 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -31,7 +31,7 @@ import org.apache.spark.tags.DockerTest
  * is already tested with the branch 1.4
  *
  * This patch was tested using the Oracle docker.Created this integration suite for the same.
- * The ojdbc6.jar was to be downloaded from the maven repository.Since there was 
+ * The ojdbc6-11.2.0.2.0.jar was to be downloaded from the maven repository.Since there was 
  * no jdbc jar available in the maven repository, the jar was downloaded from oracle site 
  * manually and installed in the local; thus tested. So, for SparkQA test case run, the
  * ojdbc jar might be manually placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0)

From d77d5852b06c4003661757207868c693723210bd Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Tue, 23 Feb 2016 16:43:24 +0530
Subject: [PATCH 12/17] Update OracleIntegrationSuite.scala for [SPARK-12941]
 Style check fixes

Updated style check fixes
---
 .../spark/sql/jdbc/OracleIntegrationSuite.scala    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 2733932c0b445..8af7796eba749 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -25,22 +25,22 @@ import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 import org.apache.spark.tags.DockerTest
 /**
- * This integration suite is created as part of Pull request(11306) and is used for the fix 
+ * This integration suite is created as part of Pull request(11306) and is used for the fix
  * SPARK-12941, creating a data type mapping to Oracle for the corresponding data type
- * "Stringtype" from dataframe. This PR is for the master branch fix, where as another PR 
+ * "Stringtype" from dataframe. This PR is for the master branch fix, where as another PR
  * is already tested with the branch 1.4
  *
  * This patch was tested using the Oracle docker.Created this integration suite for the same.
- * The ojdbc6-11.2.0.2.0.jar was to be downloaded from the maven repository.Since there was 
- * no jdbc jar available in the maven repository, the jar was downloaded from oracle site 
+ * The ojdbc6-11.2.0.2.0.jar was to be downloaded from the maven repository.Since there was
+ * no jdbc jar available in the maven repository, the jar was downloaded from oracle site
  * manually and installed in the local; thus tested. So, for SparkQA test case run, the
  * ojdbc jar might be manually placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0)
  * while Spark QA test run
- * 
+ *
  * The following would be the steps to test this
  * 1. Pull oracle 11g image - docker pull wnameless/oracle-xe-11g
  * 2. Start docker - sudo service docker start
- * 3. Download oracle 11g driver jar and put it in maven local repo: 
+ * 3. Download oracle 11g driver jar and put it in maven local repo:
  *    (com/oracle/ojdbc6/11.2.0.2.0/ojdbc6-11.2.0.2.0.jar)
  * 4. Run spark test - ./build/sbt "test-only org.apache.spark.sql.jdbc.OracleIntegrationSuite"
  *
@@ -61,7 +61,7 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLCo
 
   override def dataPreparation(conn: Connection): Unit = {
   }
-  
+
   /**
    * For SparkQA test case run, the ojdbc6-11.2.0.2.0.jar would be required to be manually
    * placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0) while Spark QA test

From 7fcb16cac7e0f32c74db1c5d9e3d4968c9da183a Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Wed, 24 Feb 2016 08:08:26 +0530
Subject: [PATCH 13/17] Update OracleIntegrationSuite.scala for [SPARK-12941]
 Updated Comments

Updated OracleIntegrationSuite.scala for [SPARK-12941] for the edits in the comments section
---
 .../sql/jdbc/OracleIntegrationSuite.scala     | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 8af7796eba749..42187465e61d0 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -24,18 +24,14 @@ import java.util.Properties
 import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 import org.apache.spark.tags.DockerTest
+
 /**
- * This integration suite is created as part of Pull request(11306) and is used for the fix
- * SPARK-12941, creating a data type mapping to Oracle for the corresponding data type
- * "Stringtype" from dataframe. This PR is for the master branch fix, where as another PR
- * is already tested with the branch 1.4
- *
- * This patch was tested using the Oracle docker.Created this integration suite for the same.
- * The ojdbc6-11.2.0.2.0.jar was to be downloaded from the maven repository.Since there was
+ * This patch was tested using the Oracle docker. Created this integration suite for the same.
+ * The ojdbc6-11.2.0.2.0.jar was to be downloaded from the maven repository. Since there was
  * no jdbc jar available in the maven repository, the jar was downloaded from oracle site
  * manually and installed in the local; thus tested. So, for SparkQA test case run, the
  * ojdbc jar might be manually placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0)
- * while Spark QA test run
+ * while Spark QA test run.
  *
  * The following would be the steps to test this
  * 1. Pull oracle 11g image - docker pull wnameless/oracle-xe-11g
@@ -44,6 +40,8 @@ import org.apache.spark.tags.DockerTest
  *    (com/oracle/ojdbc6/11.2.0.2.0/ojdbc6-11.2.0.2.0.jar)
  * 4. Run spark test - ./build/sbt "test-only org.apache.spark.sql.jdbc.OracleIntegrationSuite"
  *
+ * All tests in this suite are ignored because of the dependency with the oracle jar from maven
+ * repository.
  */
 @DockerTest
 class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLContext {
@@ -62,13 +60,6 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLCo
   override def dataPreparation(conn: Connection): Unit = {
   }
 
-  /**
-   * For SparkQA test case run, the ojdbc6-11.2.0.2.0.jar would be required to be manually
-   * placed in the local maven repository(com/oracle/ojdbc6/11.2.0.2.0) while Spark QA test
-   * run.Because, the maven repository for oracle mentioned in the pom file
-   * (commented already) does not contain the ojdbc jar.So, this test case is ignored for
-   * the temporary purpose.This testcase has been tested locally and verified.
-   */
   ignore("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
     // create a sample dataframe with string type
     val df1 = sparkContext.parallelize(Seq(("foo"))).toDF("x")

From b3de7f493cc14e258cd699f395bd1241912beb4b Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Wed, 24 Feb 2016 08:08:36 +0530
Subject: [PATCH 14/17] Update pom.xml for [SPARK-12941] added comments

Added comments on why the oracle dependency was commented out
---
 docker-integration-tests/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index f481654012155..048e58d88869f 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -131,6 +131,11 @@
       <artifactId>postgresql</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Oracle ojdbc jar, used for oracle  integration suite for docker testing.
+     See https://github.com/apache/spark/pull/11306 for background on why we need
+     to use a an ojdbc jar for the testcase. The maven dependency here is commented
+     because currently the maven repository does not contain the ojdbc jar mentioned.
+     Once the jar is available in maven, this could be uncommented. -->
     <!--
       <dependency>
         <groupId>com.oracle</groupId>

From 345555f777ab09cd6426685938e5b5c935749472 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Wed, 24 Feb 2016 11:41:17 +0530
Subject: [PATCH 15/17] Update DockerJDBCIntegrationSuite.scala

Updated DockerJDBCIntegrationSuite.scala- Reverted the timeout and interval parameter to 60 and 1. This would be required to be increased for Oracle based testing.
---
 .../org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
index 1ea2c537ad35e..f73231fc80a08 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
@@ -112,7 +112,7 @@ abstract class DockerJDBCIntegrationSuite
       // Start the container and wait until the database can accept JDBC connections:
       docker.startContainer(containerId)
       jdbcUrl = db.getJdbcUrl(dockerIp, externalPort)
-      eventually(timeout(200.seconds), interval(200.seconds)) {
+      eventually(timeout(60.seconds), interval(1.seconds)) {
         val conn = java.sql.DriverManager.getConnection(jdbcUrl)
         conn.close()
       }

From 3f0f3b8105b358f580b6225f9cf1592b44e17450 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Wed, 24 Feb 2016 11:41:33 +0530
Subject: [PATCH 16/17] Updated OracleIntegrationSuite.scala

Updated the comments about the time interval change required in DockerJDBCIntegrationSuite.scala when testing with Oracle tests
---
 .../org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 42187465e61d0..b5416d7072289 100644
--- a/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -38,7 +38,9 @@ import org.apache.spark.tags.DockerTest
  * 2. Start docker - sudo service docker start
  * 3. Download oracle 11g driver jar and put it in maven local repo:
  *    (com/oracle/ojdbc6/11.2.0.2.0/ojdbc6-11.2.0.2.0.jar)
- * 4. Run spark test - ./build/sbt "test-only org.apache.spark.sql.jdbc.OracleIntegrationSuite"
+ * 4. The timeout and interval parameter to be increased from 60,1 to a high value for oracle test
+ *    in DockerJDBCIntegrationSuite.scala (Locally tested with 200,200 and executed successfully).
+ * 5. Run spark test - ./build/sbt "test-only org.apache.spark.sql.jdbc.OracleIntegrationSuite"
  *
  * All tests in this suite are ignored because of the dependency with the oracle jar from maven
  * repository.

From 3ba7dc52e1980eef320faea07cc12eef7863a621 Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Thu, 3 Mar 2016 09:54:17 +0530
Subject: [PATCH 17/17] Update JDBCSuite.scala [SPARK-12941][Master]

Adding a test suite for the SPARK 12941 for the testing of the StringType mapping to Oracle Varchar
---
 .../test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
index 30a5e2ea4acd1..c1f3267980ff9 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
@@ -645,4 +645,10 @@ class JDBCSuite extends SparkFunSuite
       r => assert(!List("testPass", "testUser").exists(r.toString.contains))
     }
   }
+
+  test("SPARK 12941: The data type mapping for StringType to Oracle") {
+    val oracleDialect = JdbcDialects.get("jdbc:oracle://127.0.0.1/db")
+    assert(oracleDialect.getJDBCType(StringType).
+      map(_.databaseTypeDefinition).get == "VARCHAR2(255)")
+  }
 }