spark git commit: [SPARK-24603][SQL] Fix findTightestCommonType reference in comments
Repository: spark
Updated Branches:
refs/heads/branch-2.3 6e1f5e018 -> 0f534d3da
[SPARK-24603][SQL] Fix findTightestCommonType reference in comments
findTightestCommonTypeOfTwo has been renamed to findTightestCommonType
## What changes were proposed in this pull request?
(Please fill in changes proposed in this fix)
## How was this patch tested?
(Please explain how this patch was tested. E.g. unit tests, integration tests,
manual tests)
(If this patch involves UI changes, please attach a screenshot; otherwise,
remove this)
Please review http://spark.apache.org/contributing.html before opening a pull
request.
Author: Fokko Driesprong
Closes #21597 from Fokko/fd-typo.
(cherry picked from commit 6a97e8eb31da76fe5af912a6304c07b63735062f)
Signed-off-by: hyukjinkwon
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0f534d3d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0f534d3d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0f534d3d
Branch: refs/heads/branch-2.3
Commit: 0f534d3da284947f52b62154daaddfa77b42873c
Parents: 6e1f5e0
Author: Fokko Driesprong
Authored: Thu Jun 28 09:59:00 2018 +0800
Committer: hyukjinkwon
Committed: Thu Jun 28 10:00:38 2018 +0800
--
.../spark/sql/execution/datasources/json/JsonInferSchema.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/0f534d3d/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
--
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
index a270a64..1702fb6 100644
---
a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
+++
b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
@@ -329,8 +329,8 @@ private[sql] object JsonInferSchema {
ArrayType(compatibleType(elementType1, elementType2), containsNull1
|| containsNull2)
// The case that given `DecimalType` is capable of given
`IntegralType` is handled in
-// `findTightestCommonTypeOfTwo`. Both cases below will be executed
only when
-// the given `DecimalType` is not capable of the given `IntegralType`.
+// `findTightestCommonType`. Both cases below will be executed only
when the given
+// `DecimalType` is not capable of the given `IntegralType`.
case (t1: IntegralType, t2: DecimalType) =>
compatibleType(DecimalType.forType(t1), t2)
case (t1: DecimalType, t2: IntegralType) =>
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-24603][SQL] Fix findTightestCommonType reference in comments
Repository: spark
Updated Branches:
refs/heads/branch-2.2 47958270f -> a8537a5ab
[SPARK-24603][SQL] Fix findTightestCommonType reference in comments
findTightestCommonTypeOfTwo has been renamed to findTightestCommonType
## What changes were proposed in this pull request?
(Please fill in changes proposed in this fix)
## How was this patch tested?
(Please explain how this patch was tested. E.g. unit tests, integration tests,
manual tests)
(If this patch involves UI changes, please attach a screenshot; otherwise,
remove this)
Please review http://spark.apache.org/contributing.html before opening a pull
request.
Author: Fokko Driesprong
Closes #21597 from Fokko/fd-typo.
(cherry picked from commit 6a97e8eb31da76fe5af912a6304c07b63735062f)
Signed-off-by: hyukjinkwon
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a8537a5a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a8537a5a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a8537a5a
Branch: refs/heads/branch-2.2
Commit: a8537a5ab876e5f25c491bf3f15f339a5a7c2b79
Parents: 4795827
Author: Fokko Driesprong
Authored: Thu Jun 28 09:59:00 2018 +0800
Committer: hyukjinkwon
Committed: Thu Jun 28 10:00:59 2018 +0800
--
.../spark/sql/execution/datasources/json/JsonInferSchema.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/a8537a5a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
--
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
index fb632cf..0987969 100644
---
a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
+++
b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
@@ -326,8 +326,8 @@ private[sql] object JsonInferSchema {
ArrayType(compatibleType(elementType1, elementType2), containsNull1
|| containsNull2)
// The case that given `DecimalType` is capable of given
`IntegralType` is handled in
-// `findTightestCommonTypeOfTwo`. Both cases below will be executed
only when
-// the given `DecimalType` is not capable of the given `IntegralType`.
+// `findTightestCommonType`. Both cases below will be executed only
when the given
+// `DecimalType` is not capable of the given `IntegralType`.
case (t1: IntegralType, t2: DecimalType) =>
compatibleType(DecimalType.forType(t1), t2)
case (t1: DecimalType, t2: IntegralType) =>
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-24603][SQL] Fix findTightestCommonType reference in comments
Repository: spark
Updated Branches:
refs/heads/master 1c9acc243 -> 6a97e8eb3
[SPARK-24603][SQL] Fix findTightestCommonType reference in comments
findTightestCommonTypeOfTwo has been renamed to findTightestCommonType
## What changes were proposed in this pull request?
(Please fill in changes proposed in this fix)
## How was this patch tested?
(Please explain how this patch was tested. E.g. unit tests, integration tests,
manual tests)
(If this patch involves UI changes, please attach a screenshot; otherwise,
remove this)
Please review http://spark.apache.org/contributing.html before opening a pull
request.
Author: Fokko Driesprong
Closes #21597 from Fokko/fd-typo.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6a97e8eb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6a97e8eb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6a97e8eb
Branch: refs/heads/master
Commit: 6a97e8eb31da76fe5af912a6304c07b63735062f
Parents: 1c9acc2
Author: Fokko Driesprong
Authored: Thu Jun 28 09:59:00 2018 +0800
Committer: hyukjinkwon
Committed: Thu Jun 28 09:59:00 2018 +0800
--
.../spark/sql/execution/datasources/json/JsonInferSchema.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/6a97e8eb/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
--
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
index f6edc7b..8e1b430 100644
---
a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
+++
b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonInferSchema.scala
@@ -334,8 +334,8 @@ private[sql] object JsonInferSchema {
ArrayType(compatibleType(elementType1, elementType2), containsNull1
|| containsNull2)
// The case that given `DecimalType` is capable of given
`IntegralType` is handled in
-// `findTightestCommonTypeOfTwo`. Both cases below will be executed
only when
-// the given `DecimalType` is not capable of the given `IntegralType`.
+// `findTightestCommonType`. Both cases below will be executed only
when the given
+// `DecimalType` is not capable of the given `IntegralType`.
case (t1: IntegralType, t2: DecimalType) =>
compatibleType(DecimalType.forType(t1), t2)
case (t1: DecimalType, t2: IntegralType) =>
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
