IGNITE-9063: Correct DataFrame Partition Ordering. - Fixes #4419. Signed-off-by: Nikolay Izhikov <nizhi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b77e979c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b77e979c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b77e979c Branch: refs/heads/ignite-8446 Commit: b77e979ccc7683e26a6cbfca38662a14d088f8f1 Parents: ac62e61 Author: Stuart Macdonald <29892836+stuartm...@users.noreply.github.com> Authored: Wed Jul 25 10:50:39 2018 +0300 Committer: Nikolay Izhikov <nizhi...@apache.org> Committed: Wed Jul 25 10:55:01 2018 +0300 ---------------------------------------------------------------------- .../src/main/scala/org/apache/ignite/spark/impl/package.scala | 2 +- .../scala/org/apache/ignite/spark/AbstractDataFrameSpec.scala | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b77e979c/modules/spark/src/main/scala/org/apache/ignite/spark/impl/package.scala ---------------------------------------------------------------------- diff --git a/modules/spark/src/main/scala/org/apache/ignite/spark/impl/package.scala b/modules/spark/src/main/scala/org/apache/ignite/spark/impl/package.scala index 6502c0f..be7b366 100644 --- a/modules/spark/src/main/scala/org/apache/ignite/spark/impl/package.scala +++ b/modules/spark/src/main/scala/org/apache/ignite/spark/impl/package.scala @@ -168,7 +168,7 @@ package object impl { nodeToParts + (primary â ArrayBuffer[Int](ignitePartIdx)) } - val partitions = nodesToParts.zipWithIndex.map { case ((node, nodesParts), i) â + val partitions = nodesToParts.toIndexedSeq.zipWithIndex.map { case ((node, nodesParts), i) â IgniteDataFramePartition(i, node, nodesParts.toList) } http://git-wip-us.apache.org/repos/asf/ignite/blob/b77e979c/modules/spark/src/test/scala/org/apache/ignite/spark/AbstractDataFrameSpec.scala ---------------------------------------------------------------------- diff --git a/modules/spark/src/test/scala/org/apache/ignite/spark/AbstractDataFrameSpec.scala b/modules/spark/src/test/scala/org/apache/ignite/spark/AbstractDataFrameSpec.scala index b46ede1..a5ea25d 100644 --- a/modules/spark/src/test/scala/org/apache/ignite/spark/AbstractDataFrameSpec.scala +++ b/modules/spark/src/test/scala/org/apache/ignite/spark/AbstractDataFrameSpec.scala @@ -42,8 +42,10 @@ abstract class AbstractDataFrameSpec extends FunSpec with Matchers with BeforeAn var client: Ignite = _ + private val NUM_SERVERS = 5 + override protected def beforeAll(): Unit = { - for (i â 0 to 3) + for (i â 0 to NUM_SERVERS) Ignition.start(configuration("grid-" + i, client = false)) client = Ignition.getOrStart(configuration("client", client = true)) @@ -54,7 +56,7 @@ abstract class AbstractDataFrameSpec extends FunSpec with Matchers with BeforeAn override protected def afterAll(): Unit = { Ignition.stop("client", false) - for (i â 0 to 3) + for (i â 0 to NUM_SERVERS) Ignition.stop("grid-" + i, false) spark.close()
