diff options
| author | Sean Owen <sowen@cloudera.com> | 2015-04-27 19:50:55 -0400 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-04-27 19:50:55 -0400 |
| commit | ab5adb7a973eec9d95c7575c864cba9f8d83a0fd (patch) | |
| tree | ae05e0003efe275028382b16a842660f6e50e43c /sql/core | |
| parent | 5d45e1f60059e2f2fc8ad64778b9ddcc8887c570 (diff) | |
| download | spark-ab5adb7a973eec9d95c7575c864cba9f8d83a0fd.tar.gz spark-ab5adb7a973eec9d95c7575c864cba9f8d83a0fd.tar.bz2 spark-ab5adb7a973eec9d95c7575c864cba9f8d83a0fd.zip | |
[SPARK-7145] [CORE] commons-lang (2.x) classes used instead of commons-lang3 (3.x); commons-io used without dependency
Remove use of commons-lang in favor of commons-lang3 classes; remove commons-io use in favor of Guava
Author: Sean Owen <sowen@cloudera.com>
Closes #5703 from srowen/SPARK-7145 and squashes the following commits:
21fbe03 [Sean Owen] Remove use of commons-lang in favor of commons-lang3 classes; remove commons-io use in favor of Guava
Diffstat (limited to 'sql/core')
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala index f326510042..f3b5455574 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala @@ -20,7 +20,8 @@ package org.apache.spark.sql.jdbc import java.sql.{Connection, DriverManager, ResultSet, ResultSetMetaData, SQLException} import java.util.Properties -import org.apache.commons.lang.StringEscapeUtils.escapeSql +import org.apache.commons.lang3.StringUtils + import org.apache.spark.{Logging, Partition, SparkContext, TaskContext} import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.expressions.{Row, SpecificMutableRow} @@ -239,6 +240,9 @@ private[sql] class JDBCRDD( case _ => value } + private def escapeSql(value: String): String = + if (value == null) null else StringUtils.replace(value, "'", "''") + /** * Turns a single Filter into a String representing a SQL expression. * Returns null for an unhandled filter. |