You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by li...@apache.org on 2017/09/19 16:27:09 UTC
spark git commit: [SPARK-21338][SQL] implement
isCascadingTruncateTable() method in AggregatedDialect
Repository: spark
Updated Branches:
refs/heads/master 2f962422a -> d5aefa83a
[SPARK-21338][SQL] implement isCascadingTruncateTable() method in AggregatedDialect
## What changes were proposed in this pull request?
org.apache.spark.sql.jdbc.JdbcDialect's method:
def isCascadingTruncateTable(): Option[Boolean] = None
is not overriden in org.apache.spark.sql.jdbc.AggregatedDialect class.
Because of this issue, when you add more than one dialect Spark doesn't truncate table because isCascadingTruncateTable always returns default None for Aggregated Dialect.
Will implement isCascadingTruncateTable in AggregatedDialect class in this PR.
## How was this patch tested?
In JDBCSuite, inside test("Aggregated dialects"), will add one line to test AggregatedDialect.isCascadingTruncateTable
Author: Huaxin Gao <hu...@us.ibm.com>
Closes #19256 from huaxingao/spark-21338.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d5aefa83
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d5aefa83
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d5aefa83
Branch: refs/heads/master
Commit: d5aefa83ad8608fbea7c08e8d9164f8bee00863d
Parents: 2f96242
Author: Huaxin Gao <hu...@us.ibm.com>
Authored: Tue Sep 19 09:27:05 2017 -0700
Committer: gatorsmile <ga...@gmail.com>
Committed: Tue Sep 19 09:27:05 2017 -0700
----------------------------------------------------------------------
.../main/scala/org/apache/spark/sql/jdbc/AggregatedDialect.scala | 4 ++++
.../src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d5aefa83/sql/core/src/main/scala/org/apache/spark/sql/jdbc/AggregatedDialect.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/AggregatedDialect.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/AggregatedDialect.scala
index 467d8d6..7432a15 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/AggregatedDialect.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/AggregatedDialect.scala
@@ -41,4 +41,8 @@ private class AggregatedDialect(dialects: List[JdbcDialect]) extends JdbcDialect
override def getJDBCType(dt: DataType): Option[JdbcType] = {
dialects.flatMap(_.getJDBCType(dt)).headOption
}
+
+ override def isCascadingTruncateTable(): Option[Boolean] = {
+ dialects.flatMap(_.isCascadingTruncateTable()).reduceOption(_ || _)
+ }
}
http://git-wip-us.apache.org/repos/asf/spark/blob/d5aefa83/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
----------------------------------------------------------------------
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 689f410..fd12bb9 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
@@ -740,11 +740,13 @@ class JDBCSuite extends SparkFunSuite
} else {
None
}
+ override def isCascadingTruncateTable(): Option[Boolean] = Some(true)
}, testH2Dialect))
assert(agg.canHandle("jdbc:h2:xxx"))
assert(!agg.canHandle("jdbc:h2"))
assert(agg.getCatalystType(0, "", 1, null) === Some(LongType))
assert(agg.getCatalystType(1, "", 1, null) === Some(StringType))
+ assert(agg.isCascadingTruncateTable() === Some(true))
}
test("DB2Dialect type mapping") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org