ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Date Sat, 21 Mar 2015 09:14:36 GMT
Merge remote-tracking branch 'origin/ignite-45' into ignite-45

Conflicts:
	examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeTaskSplitExample.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24c6fed2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24c6fed2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24c6fed2

Branch: refs/heads/ignite-45
Commit: 24c6fed2283bc2e29174ee7bc1e3508164f20bc2
Parents: fbdfa72 1496f80
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sat Mar 21 02:15:18 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sat Mar 21 02:15:18 2015 -0700

----------------------------------------------------------------------
 config/fabric/default-config.xml                |  50 +---
 examples/config/example-streamer.xml            | 293 -------------------
 .../computegrid/ComputeRunnableExample.java     |   2 +-
 .../computegrid/ComputeTaskMapExample.java      |   5 +-
 .../computegrid/ComputeTaskSplitExample.java    |   5 +-
 .../streaming/marketdata/StreamMarketData.java  |   3 -
 .../java8/streaming/numbers/CacheConfig.java    |   8 +-
 .../streaming/numbers/QueryPopularNumbers.java  |   2 +-
 .../streaming/numbers/StreamRandomNumbers.java  |   2 +-
 .../org/apache/ignite/compute/ComputeJob.java   |   3 +-
 .../ignite/compute/ComputeJobAdapter.java       |   2 +-
 .../ignite/internal/GridFactorySelfTest.java    |  40 +++
 12 files changed, 53 insertions(+), 362 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c6fed2/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeRunnableExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c6fed2/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeTaskSplitExample.java
----------------------------------------------------------------------
diff --cc examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeTaskSplitExample.java
index 7805728,76fb380..ea9effb
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeTaskSplitExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/ComputeTaskSplitExample.java
@@@ -20,9 -20,9 +20,8 @@@ package org.apache.ignite.examples.java
  import org.apache.ignite.*;
  import org.apache.ignite.compute.*;
  import org.apache.ignite.examples.java7.*;
- import org.jetbrains.annotations.*;
  
  import java.util.*;
 -import java.util.stream.*;
  
  /**
   * Demonstrates a simple use of Ignite with {@link ComputeTaskSplitAdapter}.
@@@ -72,11 -72,9 +71,11 @@@ public class ComputeTaskSplitExample 
           * @return The list of child jobs.
           */
          @Override protected Collection<? extends ComputeJob> split(int clusterSize,
String arg) {
 -            return Stream.of(arg.split(" ")).map(word ->
 -                new ComputeJobAdapter() {
 +            Collection<ComputeJob> jobs = new LinkedList<>();
 +
 +            for (final String word : arg.split(" ")) {
 +                jobs.add(new ComputeJobAdapter() {
-                     @Nullable @Override public Object execute() {
+                     @Override public Object execute() {
                          System.out.println();
                          System.out.println(">>> Printing '" + word + "' on this
node from ignite job.");
  


Mime
View raw message