GitHub user davies opened a pull request:
https://github.com/apache/spark/pull/8602
[SPARK-9925] [SQL] [TESTS] Set SQLConf.SHUFFLE_PARTITIONS.key correctly for
tests
This PR fix the failed test and conflict for #8155
https://issues.apache.org/jira/browse/SPARK-9925
Closes #8155
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/davies/spark shuffle_partitions
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/8602.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #8602
----
commit 9bab05ff9e5f3c6fb1ae36d6af757353576b2b91
Author: Yin Huai <[email protected]>
Date: 2015-08-13T00:50:00Z
Set SHUFFLE_PARTITIONS correctly.
commit d754db4d2ad6315da526782d314a55ddada07e4c
Author: Yin Huai <[email protected]>
Date: 2015-08-13T01:03:01Z
Cover more cases.
commit 876f33df7245f402e74ca06dd097cfcf8fac7a92
Author: Yin Huai <[email protected]>
Date: 2015-08-13T01:21:15Z
mima.
commit df2f79067392fe015d1d2f2910a16e14810651af
Author: Yin Huai <[email protected]>
Date: 2015-08-13T15:47:59Z
One more.
commit 4e548f596247283ca7dc25bf1356dd23229f4c5f
Author: Yin Huai <[email protected]>
Date: 2015-08-13T22:01:46Z
One more.
commit dc11a4d6cbf65b647fee41cb60b41dab769d29fb
Author: Yin Huai <[email protected]>
Date: 2015-08-14T01:55:28Z
Merge remote-tracking branch 'upstream/master' into
setNumPartitionsCorrectly
Conflicts:
sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
sql/core/src/test/scala/org/apache/spark/sql/test/TestSQLContext.scala
commit 4d6fcf8ca18d4aa6776d6f16219d349e628d81bc
Author: Yin Huai <[email protected]>
Date: 2015-08-14T01:57:14Z
style
commit 1db871b85d56698d61b3a3d9145643a1924031f7
Author: Yin Huai <[email protected]>
Date: 2015-08-17T16:37:05Z
A better way to override confs in unit tests.
commit b1ae4acf5bf26a43205d366db9266301ddd0cfe9
Author: Yin Huai <[email protected]>
Date: 2015-08-17T16:37:38Z
Merge remote-tracking branch 'upstream/master' into
setNumPartitionsCorrectly
commit 75aeab782c82c543882166954cf53e1aa56b79b5
Author: Yin Huai <[email protected]>
Date: 2015-08-17T16:44:06Z
Remove unnecessary changes.
commit bc4b8e0910ec07507bd3231a9115cba6d9187e8f
Author: Yin Huai <[email protected]>
Date: 2015-08-17T18:44:37Z
Update tests and add comments.
commit c45cca64087ed024a2504377d0c73edc9ce116e9
Author: Davies Liu <[email protected]>
Date: 2015-09-04T17:57:35Z
fix test
commit 15d7eca1119168d19f1bede6b1d6201ab88eb1e7
Author: Davies Liu <[email protected]>
Date: 2015-09-04T17:58:25Z
Merge branch 'master' of github.com:apache/spark into shuffle_partitions
Conflicts:
sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
