You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/09 14:37:13 UTC

[01/50] ignite git commit: Enabled test.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 fc1a38222 -> f02b9c207


Enabled test.


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

Branch: refs/heads/ignite-843
Commit: fc362fb4d530695e1a487386fd391995e9667473
Parents: 5264ec7
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 12:13:54 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 12:13:54 2015 +0300

----------------------------------------------------------------------
 .../processors/query/h2/sql/BaseH2CompareQueryTest.java         | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc362fb4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 1e89855..46076a9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -444,20 +444,15 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
      * @throws Exception If failed.
      */
     public void testCrossCache() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-829");
-
-        //TODO Investigate (should be 20 results instead of 0).
         compareQueryRes0("select firstName, lastName" +
             "  from \"part\".Person, \"part\".Purchase" +
             "  where Person.id = Purchase.personId");
 
-        //TODO Investigate.
         compareQueryRes0("select concat(firstName, ' ', lastName), Product.name " +
             "  from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
             "  where Person.id = Purchase.personId and Purchase.productId = Product.id" +
             "  group by Product.id");
 
-        //TODO Investigate.
         compareQueryRes0("select concat(firstName, ' ', lastName), count (Product.id) " +
             "  from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
             "  where Person.id = Purchase.personId and Purchase.productId = Product.id" +

[22/50] ignite git commit: Ignite-805 (cherry picked from commit adce9b9)

Posted by ak...@apache.org.
Ignite-805
(cherry picked from commit adce9b9)


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

Branch: refs/heads/ignite-843
Commit: 27150575edf54795df88640833956e01d1f5a70d
Parents: f03a530
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 8 15:05:55 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 8 15:13:12 2015 +0300

----------------------------------------------------------------------
 ...cheAbstractFullApiMultithreadedSelfTest.java | 63 +++++++++++++-------
 ...PartitionedFullApiMultithreadedSelfTest.java |  5 --
 ...eReplicatedFullApiMultithreadedSelfTest.java |  5 --
 ...dCacheLocalFullApiMultithreadedSelfTest.java |  5 --
 4 files changed, 40 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/27150575/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index bfafe69..2959b34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -163,7 +163,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testContainsKey() throws Exception {
-        runTest(new CI1<IgniteCache<String,Integer>>() {
+        runTest(new CI1<IgniteCache<String, Integer>>() {
             @Override public void apply(IgniteCache<String, Integer> cache) {
                 assert cache.containsKey("key" + random());
                 assert !cache.containsKey("wrongKey");
@@ -175,7 +175,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGet() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 
@@ -189,7 +189,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 
@@ -199,7 +199,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
                 assert cacheAsync.<Integer>future().get() == rnd;
 
-                cache.get("wrongKey");
+                cacheAsync.get("wrongKey");
 
                 assert cacheAsync.future().get() == null;
             }
@@ -210,7 +210,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAll() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
@@ -224,17 +224,20 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
         });
     }
 
-   /**
+    /**
      * @throws Exception In case of error.
      */
     public void testGetAllAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
 
-                cache.withAsync().getAll(ImmutableSet.of("key" + rnd1, "key" + rnd2));
-                Map<String, Integer> map = cache.withAsync().<Map<String, Integer>>future().get();
+                IgniteCache<String, Integer> cacheAsync = cache.withAsync();
+
+                cacheAsync.getAll(ImmutableSet.of("key" + rnd1, "key" + rnd2));
+
+                Map<String, Integer> map = cacheAsync.<Map<String, Integer>>future().get();
 
                 assert map.size() == (rnd1 != rnd2 ? 2 : 1);
                 assert map.get("key" + rnd1) == rnd1;
@@ -247,7 +250,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemove() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
@@ -255,13 +258,20 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
                 assert cache.getAndRemove("wrongKey") == null;
                 assert !cache.remove("key" + rnd1, -1);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == rnd2;
+                Integer v1 = cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP);
+                Integer v2 = cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP);
+
+                assert v1 == null || v1 == rnd1;
+                assert v2 == null || v2 == rnd2;
+
+                v1 = cache.getAndRemove("key" + rnd1);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || cache.getAndRemove("key" + rnd1) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || cache.remove("key" + rnd2, rnd2);
+                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null && (v1 == null || v1 == rnd1);
+
+                assert cache.getAndRemove("key" + rnd1) == null;
+
+                cache.remove("key" + rnd2, rnd2);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null;
                 assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null;
             }
         });
@@ -271,7 +281,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
@@ -286,13 +296,20 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
                 assert !cacheAsync.<Boolean>future().get();
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == rnd2;
+                Integer v1 = cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP);
+                Integer v2 = cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP);
+
+                assert v1 == null || v1 == rnd1;
+                assert v2 == null || v2 == rnd2;
+
+                v1 = removeAsync(cache, "key" + rnd1);
+
+                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null && (v1 == null || v1 == rnd1);
+
+                assert cache.getAndRemove("key" + rnd1) == null;
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || removeAsync(cache, "key" + rnd1) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || removeAsync(cache, "key" + rnd2, rnd2);
+                removeAsync(cache, "key" + rnd2, rnd2);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null;
                 assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null;
             }
         });
@@ -302,7 +319,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAll() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 
@@ -318,7 +335,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAllAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/27150575/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
index 337febd..905996c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
@@ -27,11 +27,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
  */
 public class GridCachePartitionedFullApiMultithreadedSelfTest extends GridCacheAbstractFullApiMultithreadedSelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-805");
-    }
-
-    /** {@inheritDoc} */
     @Override protected int gridCount() {
         return 3;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/27150575/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
index 81da1de..512713c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
@@ -27,11 +27,6 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
  */
 public class GridCacheReplicatedFullApiMultithreadedSelfTest extends GridCacheAbstractFullApiMultithreadedSelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-805");
-    }
-
-    /** {@inheritDoc} */
     @Override protected int gridCount() {
         return 2;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/27150575/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
index fc97a59..27593a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
@@ -27,11 +27,6 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
  */
 public class GridCacheLocalFullApiMultithreadedSelfTest extends GridCacheAbstractFullApiMultithreadedSelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-805");
-    }
-
-    /** {@inheritDoc} */
     @Override protected int gridCount() {
         return 1;
     }

[19/50] ignite git commit: Enabled test.

Posted by ak...@apache.org.
Enabled test.


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

Branch: refs/heads/ignite-843
Commit: 4ae409444a931a06a58c2856a1ad667841b0a3af
Parents: 55db6f0
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 14:13:29 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 14:13:29 2015 +0300

----------------------------------------------------------------------
 .../cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4ae40944/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index 811bdc8..74c9a4f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -88,8 +88,6 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect
      */
     @SuppressWarnings("WhileLoopReplaceableByForEach")
     public void testNodeRestart() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-170");
-
         IgniteSet<Integer> set = grid(0).set(SET_NAME, config(false));
 
         final int ITEMS = 10_000;

[34/50] ignite git commit: Merge remote-tracking branch 'apache/ignite-1.4' into ignite-1.4

Posted by ak...@apache.org.
Merge remote-tracking branch 'apache/ignite-1.4' into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: e4e39af68d1546b99d2ffe367ca1f3ba840db501
Parents: 108dd8f b8db248
Author: ashutak <as...@gridgain.com>
Authored: Tue Sep 8 19:34:08 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Sep 8 19:34:08 2015 +0300

----------------------------------------------------------------------
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |  2 +-
 .../cache/GridCacheMvccCandidate.java           |  2 +-
 .../processors/igfs/IgfsDataManager.java        | 14 ++--
 .../ignite/GridSuppressedExceptionSelfTest.java | 22 -------
 ...cheAbstractFullApiMultithreadedSelfTest.java | 69 ++++++++++++--------
 ...dCacheQueueMultiNodeConsistencySelfTest.java | 58 +++++++++-------
 .../GridCacheSetFailoverAbstractSelfTest.java   |  2 -
 ...PartitionedFullApiMultithreadedSelfTest.java |  5 --
 ...eReplicatedFullApiMultithreadedSelfTest.java |  5 --
 ...dCacheLocalFullApiMultithreadedSelfTest.java |  5 --
 .../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 ++++++++++++++++++
 .../unsafe/GridUnsafeMemorySelfTest.java        | 38 -----------
 .../h2/GridIndexingSpiAbstractSelfTest.java     | 13 ----
 13 files changed, 150 insertions(+), 150 deletions(-)
----------------------------------------------------------------------

[39/50] ignite git commit: Merge branch 'ignite-1.4'

Posted by ak...@apache.org.
Merge branch 'ignite-1.4'


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

Branch: refs/heads/ignite-843
Commit: fba01d61b2622f6aae4ae3f7df96285ee0cfcb49
Parents: 5ec703d 60a76bc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 11:50:41 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 11:50:41 2015 +0300

----------------------------------------------------------------------
 .../CacheClientPortableQueryExample.java        |   4 +-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |   2 +-
 .../configuration/CacheConfiguration.java       |   3 +-
 .../ignite/internal/GridUpdateNotifier.java     |  82 +++++--
 .../apache/ignite/internal/IgniteKernal.java    |   5 +-
 .../affinity/GridAffinityProcessor.java         |   8 +-
 .../processors/cache/GridCacheAdapter.java      |  11 +-
 .../processors/cache/GridCacheEntryEx.java      |  12 +-
 .../cache/GridCacheEvictionManager.java         |   2 +
 .../processors/cache/GridCacheMapEntry.java     |  11 +-
 .../cache/GridCacheMvccCandidate.java           |   6 +-
 .../cache/GridCacheSharedContext.java           |   7 +
 .../processors/cache/GridCacheSwapManager.java  |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  14 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  23 +-
 .../distributed/dht/GridDhtLockFuture.java      |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  22 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   3 +
 .../colocated/GridDhtColocatedLockFuture.java   |  14 +-
 .../dht/preloader/GridDhtPreloader.java         |  20 +-
 .../distributed/near/GridNearLockFuture.java    |  14 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   7 +-
 .../distributed/near/GridNearTxRemote.java      |   6 +-
 .../transactions/IgniteTxLocalAdapter.java      |  20 +-
 .../processors/igfs/IgfsDataManager.java        |  14 +-
 .../ignite/GridSuppressedExceptionSelfTest.java |  22 --
 .../ignite/internal/GridStartStopSelfTest.java  |  13 +-
 .../internal/GridUpdateNotifierSelfTest.java    |  23 +-
 .../ignite/internal/GridVersionSelfTest.java    |  20 +-
 .../cache/CacheAffinityCallSelfTest.java        |  16 +-
 .../cache/CacheSwapUnswapGetTest.java           | 234 +++++++++++++++++++
 .../processors/cache/GridCacheMvccSelfTest.java |  29 +--
 .../processors/cache/GridCacheStopSelfTest.java |  49 ++--
 ...gniteCacheTransactionalStopBusySelfTest.java |   5 -
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  34 +--
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  58 +++--
 .../GridCacheSetFailoverAbstractSelfTest.java   |   2 -
 .../IgniteCacheMessageRecoveryAbstractTest.java |  14 +-
 .../IgniteCacheTxMessageRecoveryTest.java       |   5 -
 ...CachePartitionedTxMultiThreadedSelfTest.java |   2 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |   2 +
 .../unsafe/GridUnsafeMemoryPerformanceTest.java |  65 ++++++
 .../unsafe/GridUnsafeMemorySelfTest.java        |  38 ---
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |   2 +
 .../junits/common/GridCommonAbstractTest.java   |  59 +++--
 .../IgniteCacheFailoverTestSuite2.java          |   3 +
 .../testsuites/IgniteCacheTestSuite4.java       |   3 +
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  13 --
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   5 -
 .../platform/cache/PlatformCache.java           |  23 +-
 .../cache/PlatformCacheEntryProcessorImpl.java  |   4 +-
 scripts/apply-pull-request.sh                   | 141 ++++++++---
 52 files changed, 834 insertions(+), 368 deletions(-)
----------------------------------------------------------------------

[06/50] ignite git commit: Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-main

Posted by ak...@apache.org.
Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-main


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

Branch: refs/heads/ignite-843
Commit: 4c917c8229d6cb00c3fc7edec53433266092f572
Parents: c315cb0 d8cd7ba
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Sep 8 12:35:32 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Sep 8 12:35:32 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridStartStopSelfTest.java  | 13 +++++++------
 .../query/h2/sql/BaseH2CompareQueryTest.java           |  5 -----
 2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------

[36/50] ignite git commit: Fixed test.

Posted by ak...@apache.org.
Fixed test.


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

Branch: refs/heads/ignite-843
Commit: 8389a7a6f4cebf722c74a163ebdc80b373f42d79
Parents: b295bc5
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 9 09:57:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 9 09:57:47 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheStopSelfTest.java | 49 ++++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8389a7a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
index 6054fbc..59c899d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
@@ -21,8 +21,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
+import javax.cache.CacheException;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteInternalFuture;
@@ -43,12 +44,11 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 public class GridCacheStopSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-257");
+        fail("https://issues.apache.org/jira/browse/IGNITE-1393");
     }
 
     /** */
-    private static final String EXPECTED_MSG = "Grid is in invalid state to perform this operation. " +
-        "It either not started yet or has already being or have stopped";
+    private static final String EXPECTED_MSG = "Cache has been closed or destroyed";
 
     /** */
     private boolean atomic;
@@ -153,23 +153,31 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
 
                 putFuts.add(GridTestUtils.runAsync(new Callable<Void>() {
                     @Override public Void call() throws Exception {
-                        if (startTx) {
-                            try (Transaction tx = grid(0).transactions().txStart()) {
-                                cache.put(key, key);
+                        try {
+                            if (startTx) {
+                                try (Transaction tx = grid(0).transactions().txStart()) {
+                                    cache.put(key, key);
+
+                                    readyLatch.countDown();
+
+                                    stopLatch.await();
 
+                                    tx.commit();
+                                }
+                            }
+                            else {
                                 readyLatch.countDown();
 
                                 stopLatch.await();
 
-                                tx.commit();
+                                cache.put(key, key);
                             }
                         }
-                        else {
-                            readyLatch.countDown();
-
-                            stopLatch.await();
-
-                            cache.put(key, key);
+                        catch (CacheException | IgniteException e) {
+                            log.info("Ignore error: " + e);
+                        }
+                        catch (IllegalStateException e) {
+                            assertTrue(e.getMessage().startsWith(EXPECTED_MSG));
                         }
 
                         return null;
@@ -183,17 +191,8 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
 
             stopGrid(0);
 
-            for (IgniteInternalFuture<?> fut : putFuts) {
-                try {
-                    fut.get();
-                }
-                catch (IgniteCheckedException e) {
-                    if (!e.getMessage().startsWith(EXPECTED_MSG))
-                        e.printStackTrace();
-
-                    assertTrue("Unexpected error message: " + e.getMessage(), e.getMessage().startsWith(EXPECTED_MSG));
-                }
-            }
+            for (IgniteInternalFuture<?> fut : putFuts)
+                fut.get();
 
             try {
                 cache.put(1, 1);

[14/50] ignite git commit: Fixed test.

Posted by ak...@apache.org.
Fixed test.


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

Branch: refs/heads/ignite-843
Commit: 45ced671788bc804ca01ce17872316152dfe6acd
Parents: 86f8037
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 13:31:56 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 13:31:56 2015 +0300

----------------------------------------------------------------------
 ...GridCacheQueueMultiNodeAbstractSelfTest.java | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/45ced671/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
index 1dca379..097181c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
@@ -466,8 +466,6 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl
      * @throws Exception If failed.
      */
     public void testIterator() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-583");
-
         final String queueName = UUID.randomUUID().toString();
 
         info("Queue name: " + queueName);
@@ -475,35 +473,37 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl
         try (IgniteQueue<Integer> queue = grid(0).queue(queueName, QUEUE_CAPACITY, config(false))) {
             assertTrue(queue.isEmpty());
 
-            grid(0).compute().call(new AddAllJob(queueName, RETRIES));
+            grid(0).compute().broadcast(new AddAllJob(queueName, RETRIES));
 
             assertEquals(GRID_CNT * RETRIES, queue.size());
 
             Collection<ClusterNode> nodes = grid(0).cluster().nodes();
 
             for (ClusterNode node : nodes) {
-                Collection<Integer> queueElements = compute(grid(0).cluster().forNode(node)).call(new IgniteCallable<Collection<Integer>>() {
-                    @IgniteInstanceResource
-                    private Ignite grid;
+                Collection<Integer> queueElements = compute(grid(0).cluster().forNode(node)).call(
+                    new IgniteCallable<Collection<Integer>>() {
+                        @IgniteInstanceResource
+                        private Ignite grid;
 
-                    /** {@inheritDoc} */
-                    @Override public Collection<Integer> call() throws Exception {
-                        Collection<Integer> values = new ArrayList<>();
+                        /** {@inheritDoc} */
+                        @Override public Collection<Integer> call() throws Exception {
+                            Collection<Integer> values = new ArrayList<>();
 
-                        grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
+                            grid.log().info("Running job [node=" + grid.cluster().localNode().id() + "]");
 
-                        IgniteQueue<Integer> locQueue = grid.queue(queueName, 0, null);
+                            IgniteQueue<Integer> locQueue = grid.queue(queueName, 0, null);
 
-                        grid.log().info("Queue size " + locQueue.size());
+                            grid.log().info("Queue size " + locQueue.size());
 
-                        for (Integer element : locQueue)
-                            values.add(element);
+                            for (Integer element : locQueue)
+                                values.add(element);
 
-                        grid.log().info("Returning: " + values);
+                            grid.log().info("Returning: " + values);
 
-                        return values;
+                            return values;
+                        }
                     }
-                });
+                );
 
                 assertTrue(F.eqOrdered(queue, queueElements));
             }

[15/50] ignite git commit: IGNITE-1388: Minor refactoring for platform invoke/invokeAll.

Posted by ak...@apache.org.
IGNITE-1388: Minor refactoring for platform invoke/invokeAll.


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

Branch: refs/heads/ignite-843
Commit: b2b6ce6c22734a47d1f41ffed56a525a5c025faa
Parents: 4dc4171
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 13:32:37 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 13:32:37 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/cache/PlatformCache.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b2b6ce6c/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 0829617..ecdfc2c 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -186,10 +186,10 @@ public class PlatformCache extends PlatformAbstractTarget {
     private static final GetAllWriter WRITER_GET_ALL = new GetAllWriter();
 
     /** */
-    private static final EntryProcessorExceptionWriter WRITER_PROC_ERR = new EntryProcessorExceptionWriter();
+    private static final EntryProcessorInvokeWriter WRITER_INVOKE = new EntryProcessorInvokeWriter();
 
     /** */
-    private static final EntryProcessorResultsWriter WRITER_INVOKE_ALL = new EntryProcessorResultsWriter();
+    private static final EntryProcessorInvokeAllWriter WRITER_INVOKE_ALL = new EntryProcessorInvokeAllWriter();
 
     /** Map with currently active locks. */
     private final ConcurrentMap<Long, Lock> lockMap = GridConcurrentFactory.newMap();
@@ -694,7 +694,7 @@ public class PlatformCache extends PlatformAbstractTarget {
             return WRITER_GET_ALL;
 
         if (opId == OP_INVOKE)
-            return WRITER_PROC_ERR;
+            return WRITER_INVOKE;
 
         if (opId == OP_INVOKE_ALL)
             return WRITER_INVOKE_ALL;
@@ -981,16 +981,16 @@ public class PlatformCache extends PlatformAbstractTarget {
     /**
      * Writes error with EntryProcessorException cause.
      */
-    private static class EntryProcessorExceptionWriter implements PlatformFutureUtils.Writer {
+    private static class EntryProcessorInvokeWriter implements PlatformFutureUtils.Writer {
         /** <inheritDoc /> */
         @Override public void write(PortableRawWriterEx writer, Object obj, Throwable err) {
             if (err == null) {
-                writer.writeBoolean(true);  // success
+                writer.writeBoolean(false);  // No error.
 
                 writer.writeObjectDetached(obj);
             }
             else {
-                writer.writeBoolean(false);  // failure
+                writer.writeBoolean(true);  // Error.
 
                 writeError(writer, (Exception) err);
             }
@@ -1005,7 +1005,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     /**
      * Writes results of InvokeAll method.
      */
-    private static class EntryProcessorResultsWriter implements PlatformFutureUtils.Writer {
+    private static class EntryProcessorInvokeAllWriter implements PlatformFutureUtils.Writer {
         /** <inheritDoc /> */
         @Override public void write(PortableRawWriterEx writer, Object obj, Throwable err) {
             writeInvokeAllResult(writer, (Map)obj);

[30/50] ignite git commit: Moved performance test to separate class.

Posted by ak...@apache.org.
Moved performance test to separate class.


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

Branch: refs/heads/ignite-843
Commit: 219838108e04583bd2126773ce1a84cd83522f3c
Parents: e08205d
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 16:59:09 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 16:59:09 2015 +0300

----------------------------------------------------------------------
 .../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 ++++++++++++++++++++
 .../unsafe/GridUnsafeMemorySelfTest.java        | 38 ------------
 2 files changed, 65 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/21983810/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemoryPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemoryPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemoryPerformanceTest.java
new file mode 100644
index 0000000..b231a6f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemoryPerformanceTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.util.offheap.unsafe;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class GridUnsafeMemoryPerformanceTest extends GridCommonAbstractTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGuardedOpsPerformance() throws Exception {
+        final GridUnsafeGuard guard = new GridUnsafeGuard();
+
+        final AtomicInteger i = new AtomicInteger();
+
+        final AtomicBoolean run = new AtomicBoolean(true);
+
+        IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() {
+            @Override public void run() {
+                int x = 0;
+
+                while (run.get()) {
+                    guard.begin();
+                    guard.end();
+
+                    x++;
+                }
+
+                i.addAndGet(x);
+            }
+        }, 4);
+
+        int time = 60;
+
+        Thread.sleep(time * 1000);
+
+        run.set(false);
+
+        fut.get();
+
+        X.println("Op/sec: " + (float) i.get() / time);
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/21983810/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java
index 7a8c98d..600098b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java
@@ -259,44 +259,6 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * @throws Exception If failed.
-     */
-    public void testGuardedOpsPerformance() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-823");
-
-        final GridUnsafeGuard guard = new GridUnsafeGuard();
-
-        final AtomicInteger i = new AtomicInteger();
-
-        final AtomicBoolean run = new AtomicBoolean(true);
-
-        IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() {
-            @Override public void run() {
-                int x = 0;
-
-                while (run.get()) {
-                    guard.begin();
-                    guard.end();
-
-                    x++;
-                }
-
-                i.addAndGet(x);
-            }
-        }, 4);
-
-        int time = 60;
-
-        Thread.sleep(time * 1000);
-
-        run.set(false);
-
-        fut.get();
-
-        X.println("Op/sec: " + (float)i.get() / time);
-    }
-
-    /**
      * @throws Exception if failed.
      */
     public void testGuardedOps() throws Exception {

[46/50] ignite git commit: Backported IGNITE-1391 to CPP platform.

Posted by ak...@apache.org.
Backported IGNITE-1391 to CPP platform.


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

Branch: refs/heads/ignite-843
Commit: f642a7a976d43f40cbd8763aed9274b37fcf0639
Parents: a763198
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 13:36:24 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 13:36:24 2015 +0300

----------------------------------------------------------------------
 .../platform/src/main/cpp/core/src/impl/ignite_environment.cpp    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f642a7a9/modules/platform/src/main/cpp/core/src/impl/ignite_environment.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/ignite_environment.cpp b/modules/platform/src/main/cpp/core/src/impl/ignite_environment.cpp
index b20c543..8fb1a02 100644
--- a/modules/platform/src/main/cpp/core/src/impl/ignite_environment.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/ignite_environment.cpp
@@ -33,9 +33,10 @@ namespace ignite
          * OnStart callback.
          *
          * @param target Target environment.
+         * @param proc Processor instance (not used for now).
          * @param memPtr Memory pointer.
          */
-        void IGNITE_CALL OnStart(void* target, long long memPtr)
+        void IGNITE_CALL OnStart(void* target, void* proc, long long memPtr)
         {
             SharedPointer<IgniteEnvironment>* ptr = static_cast<SharedPointer<IgniteEnvironment>*>(target);

[23/50] ignite git commit: Corrected platform toolset for CPP common project.

Posted by ak...@apache.org.
Corrected platform toolset for CPP common project.


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

Branch: refs/heads/ignite-843
Commit: 5dd785b86e091ea7be2f096fa03f48c92dbe82a7
Parents: f03a530
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 15:30:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 15:30:56 2015 +0300

----------------------------------------------------------------------
 .../platform/src/main/cpp/common/project/vs/common.vcxproj   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5dd785b8/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
index ddc0019..b7cfb8a 100644
--- a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
+++ b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
@@ -27,26 +27,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

[05/50] ignite git commit: IGNITE-1369: properly fixed example javadoc

Posted by ak...@apache.org.
IGNITE-1369: properly fixed example javadoc


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

Branch: refs/heads/ignite-843
Commit: c315cb08acb37a67e6f6b37bbb064ce3edc05521
Parents: aa35e36
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Sep 8 12:35:05 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Sep 8 12:35:05 2015 +0300

----------------------------------------------------------------------
 .../portable/datagrid/CacheClientPortableQueryExample.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c315cb08/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
index c77a6b2..3170864 100644
--- a/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/portable/datagrid/CacheClientPortableQueryExample.java
@@ -45,8 +45,8 @@ import org.apache.ignite.portable.PortableObject;
  * This example demonstrates use of portable objects with cache queries.
  * The example populates cache with sample data and runs several SQL and full text queries over this data.
  * <p>
- * Remote nodes should always be started with special configuration file which
- * enables the portable marshaller: {@code 'ignite.{sh|bat} examples/config/portable/example-ignite-portable.xml'}.
+ * Remote nodes should always be started with {@link ExamplePortableNodeStartup} which starts a node with
+ * {@code examples/config/portable/example-ignite-portable.xml} configuration.
  */
 public class CacheClientPortableQueryExample {
     /** Organization cache name. */

[16/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: db827cfdfb521eb2233424f56a99e7e3830d4e35
Parents: 45ced67 b2b6ce6
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 13:35:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 13:35:39 2015 +0300

----------------------------------------------------------------------
 .../platform/cache/PlatformCache.java           | 23 +++++++++++++-------
 .../cache/PlatformCacheEntryProcessorImpl.java  |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------

[28/50] ignite git commit: Removed test.

Posted by ak...@apache.org.
Removed test.


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

Branch: refs/heads/ignite-843
Commit: b5eeb3bbc874a8501373f3c1ae96a2b3a246bb09
Parents: 069653b
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 16:52:07 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 16:52:07 2015 +0300

----------------------------------------------------------------------
 .../ignite/GridSuppressedExceptionSelfTest.java | 22 --------------------
 1 file changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b5eeb3bb/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
index 2485cbb..6e32249 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridSuppressedExceptionSelfTest.java
@@ -88,28 +88,6 @@ public class GridSuppressedExceptionSelfTest extends TestCase {
     }
 
     /**
-     * Made to demonstrate stack printing for {@link IgniteCheckedException}. Do not enable.
-     *
-     * @throws Exception If failed.
-     */
-    public void testStackTrace() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-818");
-
-        IgniteCheckedException me = new IgniteCheckedException("Test message.");
-
-        for (int i = 5; i < 20; i++) {
-            try {
-                generateException(i, null);
-            }
-            catch (IgniteCheckedException e) {
-                me.addSuppressed(e);
-            }
-        }
-
-        me.printStackTrace();
-    }
-
-    /**
      * @return A multi exception with few nested causes and
      *  {@link IllegalAccessException} in hierarchy.
      */

[12/50] ignite git commit: IGNITE-1388 Platform .Net: cache.Invoke result in async mode should have an error flag

Posted by ak...@apache.org.
IGNITE-1388 Platform .Net: cache.Invoke result in async mode should have an error flag


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

Branch: refs/heads/ignite-843
Commit: 57555af62c93bdc8e012c1be7b6c6edd4d9d2ebe
Parents: 2326bb5
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Sep 8 13:25:18 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Sep 8 13:25:18 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/cache/PlatformCache.java       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/57555af6/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 27af344..0829617 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -984,14 +984,21 @@ public class PlatformCache extends PlatformAbstractTarget {
     private static class EntryProcessorExceptionWriter implements PlatformFutureUtils.Writer {
         /** <inheritDoc /> */
         @Override public void write(PortableRawWriterEx writer, Object obj, Throwable err) {
-            EntryProcessorException entryEx = (EntryProcessorException) err;
+            if (err == null) {
+                writer.writeBoolean(true);  // success
 
-            writeError(writer, entryEx);
+                writer.writeObjectDetached(obj);
+            }
+            else {
+                writer.writeBoolean(false);  // failure
+
+                writeError(writer, (Exception) err);
+            }
         }
 
         /** <inheritDoc /> */
         @Override public boolean canWrite(Object obj, Throwable err) {
-            return err instanceof EntryProcessorException;
+            return true;
         }
     }

[13/50] ignite git commit: Merge branch 'ignite-1388' of https://github.com/ptupitsyn/ignite into ignite-1.4

Posted by ak...@apache.org.
Merge branch 'ignite-1388' of https://github.com/ptupitsyn/ignite into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: 4dc4171b666e0515ef657572352b6c53bf503a17
Parents: a91f386 57555af
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 13:28:37 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 13:28:37 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/cache/PlatformCache.java       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------

[11/50] ignite git commit: Merge branch 'ignite-1387' of https://github.com/ptupitsyn/ignite into ignite-1.4

Posted by ak...@apache.org.
Merge branch 'ignite-1387' of https://github.com/ptupitsyn/ignite into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: a91f386e1b6df163090e48ecd97384b0411a2f9d
Parents: 86f8037 2326bb5
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 13:23:16 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 13:23:16 2015 +0300

----------------------------------------------------------------------
 .../platform/cache/PlatformCacheEntryProcessorImpl.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------

[50/50] ignite git commit: Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843

Posted by ak...@apache.org.
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843


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

Branch: refs/heads/ignite-843
Commit: f02b9c207ead5854c2107731693b3456822ecd6b
Parents: fc1a382 6771638
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Sep 9 19:35:09 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Sep 9 19:35:09 2015 +0700

----------------------------------------------------------------------
 examples/config/platform/cpp/example-cache.xml  |  87 +++++++
 examples/platform/cpp/Makefile.am               |  39 ++++
 examples/platform/cpp/README.txt                |  42 ++++
 examples/platform/cpp/configure.ac              |  30 +++
 examples/platform/cpp/include/Makefile.am       |  21 ++
 .../cpp/include/ignite/examples/address.h       | 109 +++++++++
 .../cpp/include/ignite/examples/organization.h  | 111 +++++++++
 .../platform/cpp/project/vs/ignite-examples.sln |  19 ++
 .../cpp/project/vs/ignite-examples.vcxproj      | 107 +++++++++
 .../project/vs/ignite-examples.vcxproj.filters  |  30 +++
 examples/platform/cpp/src/putgetexample.cpp     | 126 ++++++++++
 examples/pom.xml                                |   2 +-
 .../CacheClientPortableQueryExample.java        |   4 +-
 modules/aop/pom.xml                             |   2 +-
 modules/apache-license-gen/pom.xml              |   2 +-
 modules/aws/pom.xml                             |   2 +-
 modules/clients/pom.xml                         |   2 +-
 modules/cloud/pom.xml                           |   2 +-
 modules/codegen/pom.xml                         |   2 +-
 modules/core/pom.xml                            |   2 +-
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   |   2 +-
 .../configuration/CacheConfiguration.java       |   3 +-
 .../ignite/internal/GridUpdateNotifier.java     |  82 +++++--
 .../apache/ignite/internal/IgniteKernal.java    |   5 +-
 .../affinity/GridAffinityProcessor.java         |   8 +-
 .../processors/cache/GridCacheAdapter.java      |  11 +-
 .../processors/cache/GridCacheEntryEx.java      |  12 +-
 .../cache/GridCacheEvictionManager.java         |   2 +
 .../processors/cache/GridCacheMapEntry.java     |  11 +-
 .../cache/GridCacheMvccCandidate.java           |   6 +-
 .../cache/GridCacheSharedContext.java           |   7 +
 .../processors/cache/GridCacheSwapManager.java  |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  14 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  23 +-
 .../distributed/dht/GridDhtLockFuture.java      |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  22 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   3 +
 .../colocated/GridDhtColocatedLockFuture.java   |  14 +-
 .../dht/preloader/GridDhtPreloader.java         |  20 +-
 .../distributed/near/GridNearLockFuture.java    |  14 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   7 +-
 .../distributed/near/GridNearTxRemote.java      |   6 +-
 .../transactions/IgniteTxLocalAdapter.java      |  20 +-
 .../processors/igfs/IgfsDataManager.java        |  14 +-
 .../callback/PlatformCallbackGateway.java       |   5 +-
 .../callback/PlatformCallbackUtils.java         |   3 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../ignite/GridSuppressedExceptionSelfTest.java |  22 --
 .../ignite/internal/GridStartStopSelfTest.java  |  13 +-
 .../internal/GridUpdateNotifierSelfTest.java    |  23 +-
 .../ignite/internal/GridVersionSelfTest.java    |  20 +-
 .../cache/CacheAffinityCallSelfTest.java        |  16 +-
 .../cache/CacheSwapUnswapGetTest.java           | 234 +++++++++++++++++++
 ...cheAbstractFullApiMultithreadedSelfTest.java |  69 +++---
 .../processors/cache/GridCacheMvccSelfTest.java |  29 +--
 .../processors/cache/GridCacheStopSelfTest.java |  49 ++--
 ...gniteCacheTransactionalStopBusySelfTest.java |   5 -
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  34 +--
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  58 +++--
 .../GridCacheSetFailoverAbstractSelfTest.java   |   2 -
 .../IgniteCacheMessageRecoveryAbstractTest.java |  14 +-
 .../IgniteCacheTxMessageRecoveryTest.java       |   5 -
 ...PartitionedFullApiMultithreadedSelfTest.java |   5 -
 ...CachePartitionedTxMultiThreadedSelfTest.java |   2 +-
 ...eReplicatedFullApiMultithreadedSelfTest.java |   5 -
 ...dCacheLocalFullApiMultithreadedSelfTest.java |   5 -
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |   2 +
 .../unsafe/GridUnsafeMemoryPerformanceTest.java |  65 ++++++
 .../unsafe/GridUnsafeMemorySelfTest.java        |  38 ---
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |   2 +
 .../junits/common/GridCommonAbstractTest.java   |  59 +++--
 .../IgniteCacheFailoverTestSuite2.java          |   3 +
 .../testsuites/IgniteCacheTestSuite4.java       |   3 +
 modules/extdata/p2p/pom.xml                     |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml                     |   2 +-
 modules/gce/pom.xml                             |   2 +-
 modules/geospatial/pom.xml                      |   2 +-
 modules/hadoop/pom.xml                          |   2 +-
 modules/hibernate/pom.xml                       |   2 +-
 modules/indexing/pom.xml                        |   2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  13 --
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   5 -
 modules/jcl/pom.xml                             |   2 +-
 modules/jms11/pom.xml                           |   2 +-
 modules/jta/pom.xml                             |   2 +-
 modules/kafka/pom.xml                           |   2 +-
 modules/log4j/pom.xml                           |   2 +-
 modules/log4j2/pom.xml                          |   2 +-
 modules/mesos/pom.xml                           |   2 +-
 modules/platform/pom.xml                        |   2 +-
 .../platform/src/main/cpp/common/configure.ac   |   2 +-
 .../cpp/common/include/ignite/common/java.h     |   4 +-
 .../main/cpp/common/project/vs/common.vcxproj   |   8 +-
 .../platform/src/main/cpp/common/src/java.cpp   |   6 +-
 .../src/main/cpp/core-test/configure.ac         |   2 +-
 .../cpp/core-test/project/vs/core-test.vcxproj  |   4 +-
 .../main/cpp/core-test/src/cache_query_test.cpp |   5 +
 .../src/main/cpp/core-test/src/cache_test.cpp   |   5 +
 .../main/cpp/core-test/src/ignition_test.cpp    |   9 +-
 modules/platform/src/main/cpp/core/configure.ac |   2 +-
 .../cpp/core/src/impl/ignite_environment.cpp    |   3 +-
 .../platform/src/main/cpp/project/vs/ignite.sln |  48 ++++
 .../main/dotnet/Apache.Ignite.Core/Ignition.cs  |  28 ++-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  10 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |   8 +-
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   8 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   2 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   4 +-
 .../platform/PlatformProcessorImpl.java         |   2 +-
 .../platform/cache/PlatformCache.java           |  23 +-
 .../cache/PlatformCacheEntryProcessorImpl.java  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../IgniteStartStopTest.cs                      |  70 ++++++
 .../Properties/AssemblyInfo.cs                  |   4 +-
 modules/rest-http/pom.xml                       |   2 +-
 modules/scalar-2.10/pom.xml                     |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 modules/schedule/pom.xml                        |   2 +-
 modules/schema-import/pom.xml                   |   2 +-
 modules/slf4j/pom.xml                           |   2 +-
 modules/spark-2.10/pom.xml                      |   2 +-
 modules/spark/pom.xml                           |   2 +-
 modules/spring/pom.xml                          |   2 +-
 modules/ssh/pom.xml                             |   2 +-
 modules/tools/pom.xml                           |   2 +-
 modules/urideploy/pom.xml                       |   2 +-
 modules/visor-console-2.10/pom.xml              |   2 +-
 modules/visor-console/pom.xml                   |   2 +-
 modules/visor-plugins/pom.xml                   |   2 +-
 modules/web/pom.xml                             |   2 +-
 modules/yardstick/pom.xml                       |   2 +-
 modules/yarn/pom.xml                            |   2 +-
 modules/zookeeper/pom.xml                       |   2 +-
 pom.xml                                         |   2 +-
 scripts/apply-pull-request.sh                   | 141 ++++++++---
 137 files changed, 1849 insertions(+), 498 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f02b9c20/examples/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f02b9c20/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f02b9c20/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f02b9c20/modules/rest-http/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f02b9c20/modules/schema-import/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f02b9c20/pom.xml
----------------------------------------------------------------------

[17/50] ignite git commit: Fixed test.

Posted by ak...@apache.org.
Fixed test.


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

Branch: refs/heads/ignite-843
Commit: b7bdfe20c9e0bc6b3fa3883223ef978562e4f2d3
Parents: db827cf
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 13:46:40 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 13:46:40 2015 +0300

----------------------------------------------------------------------
 ...dCacheQueueMultiNodeConsistencySelfTest.java | 58 ++++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b7bdfe20/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
index e26c9ef..2d817be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
@@ -28,6 +28,8 @@ import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMemoryMode;
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.resources.IgniteInstanceResource;
 
@@ -47,9 +49,6 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
     /** */
     protected static final int RETRIES = 20;
 
-    /** */
-    private static final int PRELOAD_DELAY = 200;
-
     /** Indicates whether force repartitioning is needed or not. */
     private boolean forceRepartition;
 
@@ -60,11 +59,6 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
     private int backups;
 
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-583");
-    }
-
-    /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         // No-op.
     }
@@ -165,9 +159,23 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
         if (stopRandomGrid)
             stopGrid(1 + new Random().nextInt(GRID_CNT));
 
-        if (forceRepartition)
-            for (int i = 0; i < GRID_CNT; i++)
-                jcache(i).rebalance();
+        if (forceRepartition) {
+            for (int i = 0; i < GRID_CNT; i++) {
+                IgniteKernal ignite = (IgniteKernal)grid(i);
+
+                boolean found = false;
+
+                for (GridCacheContext ctx : ignite.context().cache().context().cacheContexts()) {
+                    if (ctx.name() != null && ctx.name().startsWith("datastructures")) {
+                        ctx.cache().rebalance().get();
+
+                        found = true;
+                    }
+                }
+
+                assertTrue(found);
+            }
+        }
 
         Ignite newIgnite = startGrid(GRID_CNT + 1);
 
@@ -175,26 +183,28 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
         // IgniteQueue<Integer> newQueue = newGrid.cache().queue(queueName);
         // assertTrue(CollectionUtils.isEqualCollection(queue0, newQueue));
 
-        Collection<Integer> locQueueContent = compute(newIgnite.cluster().forLocal()).call(new IgniteCallable<Collection<Integer>>() {
-            @IgniteInstanceResource
-            private Ignite grid;
+        Collection<Integer> locQueueContent = compute(newIgnite.cluster().forLocal()).call(
+            new IgniteCallable<Collection<Integer>>() {
+                @IgniteInstanceResource
+                private Ignite grid;
 
-            /** {@inheritDoc} */
-            @Override public Collection<Integer> call() throws Exception {
-                Collection<Integer> values = new ArrayList<>();
+                /** {@inheritDoc} */
+                @Override public Collection<Integer> call() throws Exception {
+                    Collection<Integer> values = new ArrayList<>();
 
-                grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
+                    grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
 
-                IgniteQueue<Integer> locQueue = grid.queue(queueName, QUEUE_CAPACITY, config(false));
+                    IgniteQueue<Integer> locQueue = grid.queue(queueName, QUEUE_CAPACITY, config(false));
 
-                grid.log().info("Queue size " + locQueue.size());
+                    grid.log().info("Queue size " + locQueue.size());
 
-                for (Integer element : locQueue)
-                    values.add(element);
+                    for (Integer element : locQueue)
+                        values.add(element);
 
-                return values;
+                    return values;
+                }
             }
-        });
+        );
 
         assertTrue(CollectionUtils.isEqualCollection(queue0, locQueueContent));

[21/50] ignite git commit: Ignite-805 (cherry picked from commit adce9b9)

Posted by ak...@apache.org.
Ignite-805
(cherry picked from commit adce9b9)


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

Branch: refs/heads/ignite-843
Commit: 069653b74856d99b2b7535443d15b8515d9bd15c
Parents: e5b06e3
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 8 15:05:55 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 8 15:12:26 2015 +0300

----------------------------------------------------------------------
 ...cheAbstractFullApiMultithreadedSelfTest.java | 63 +++++++++++++-------
 ...PartitionedFullApiMultithreadedSelfTest.java |  5 --
 ...eReplicatedFullApiMultithreadedSelfTest.java |  5 --
 ...dCacheLocalFullApiMultithreadedSelfTest.java |  5 --
 4 files changed, 40 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/069653b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index bfafe69..2959b34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -163,7 +163,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testContainsKey() throws Exception {
-        runTest(new CI1<IgniteCache<String,Integer>>() {
+        runTest(new CI1<IgniteCache<String, Integer>>() {
             @Override public void apply(IgniteCache<String, Integer> cache) {
                 assert cache.containsKey("key" + random());
                 assert !cache.containsKey("wrongKey");
@@ -175,7 +175,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGet() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 
@@ -189,7 +189,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 
@@ -199,7 +199,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
                 assert cacheAsync.<Integer>future().get() == rnd;
 
-                cache.get("wrongKey");
+                cacheAsync.get("wrongKey");
 
                 assert cacheAsync.future().get() == null;
             }
@@ -210,7 +210,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testGetAll() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
@@ -224,17 +224,20 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
         });
     }
 
-   /**
+    /**
      * @throws Exception In case of error.
      */
     public void testGetAllAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
 
-                cache.withAsync().getAll(ImmutableSet.of("key" + rnd1, "key" + rnd2));
-                Map<String, Integer> map = cache.withAsync().<Map<String, Integer>>future().get();
+                IgniteCache<String, Integer> cacheAsync = cache.withAsync();
+
+                cacheAsync.getAll(ImmutableSet.of("key" + rnd1, "key" + rnd2));
+
+                Map<String, Integer> map = cacheAsync.<Map<String, Integer>>future().get();
 
                 assert map.size() == (rnd1 != rnd2 ? 2 : 1);
                 assert map.get("key" + rnd1) == rnd1;
@@ -247,7 +250,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemove() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
@@ -255,13 +258,20 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
                 assert cache.getAndRemove("wrongKey") == null;
                 assert !cache.remove("key" + rnd1, -1);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == rnd2;
+                Integer v1 = cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP);
+                Integer v2 = cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP);
+
+                assert v1 == null || v1 == rnd1;
+                assert v2 == null || v2 == rnd2;
+
+                v1 = cache.getAndRemove("key" + rnd1);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || cache.getAndRemove("key" + rnd1) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || cache.remove("key" + rnd2, rnd2);
+                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null && (v1 == null || v1 == rnd1);
+
+                assert cache.getAndRemove("key" + rnd1) == null;
+
+                cache.remove("key" + rnd2, rnd2);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null;
                 assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null;
             }
         });
@@ -271,7 +281,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd1 = random();
                 int rnd2 = random();
@@ -286,13 +296,20 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
 
                 assert !cacheAsync.<Boolean>future().get();
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == rnd2;
+                Integer v1 = cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP);
+                Integer v2 = cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP);
+
+                assert v1 == null || v1 == rnd1;
+                assert v2 == null || v2 == rnd2;
+
+                v1 = removeAsync(cache, "key" + rnd1);
+
+                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null && (v1 == null || v1 == rnd1);
+
+                assert cache.getAndRemove("key" + rnd1) == null;
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null || removeAsync(cache, "key" + rnd1) == rnd1;
-                assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null || removeAsync(cache, "key" + rnd2, rnd2);
+                removeAsync(cache, "key" + rnd2, rnd2);
 
-                assert cache.localPeek("key" + rnd1, CachePeekMode.ONHEAP) == null;
                 assert cache.localPeek("key" + rnd2, CachePeekMode.ONHEAP) == null;
             }
         });
@@ -302,7 +319,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAll() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 
@@ -318,7 +335,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     public void testRemoveAllAsync() throws Exception {
-        runTest(new CIX1<IgniteCache<String,Integer>>() {
+        runTest(new CIX1<IgniteCache<String, Integer>>() {
             @Override public void applyx(IgniteCache<String, Integer> cache) {
                 int rnd = random();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/069653b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
index 337febd..905996c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiMultithreadedSelfTest.java
@@ -27,11 +27,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
  */
 public class GridCachePartitionedFullApiMultithreadedSelfTest extends GridCacheAbstractFullApiMultithreadedSelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-805");
-    }
-
-    /** {@inheritDoc} */
     @Override protected int gridCount() {
         return 3;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/069653b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
index 81da1de..512713c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest.java
@@ -27,11 +27,6 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
  */
 public class GridCacheReplicatedFullApiMultithreadedSelfTest extends GridCacheAbstractFullApiMultithreadedSelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-805");
-    }
-
-    /** {@inheritDoc} */
     @Override protected int gridCount() {
         return 2;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/069653b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
index fc97a59..27593a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java
@@ -27,11 +27,6 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
  */
 public class GridCacheLocalFullApiMultithreadedSelfTest extends GridCacheAbstractFullApiMultithreadedSelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-805");
-    }
-
-    /** {@inheritDoc} */
     @Override protected int gridCount() {
         return 1;
     }

[42/50] ignite git commit: Moved CPP examples to correct place.

Posted by ak...@apache.org.
Moved CPP examples to correct place.


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

Branch: refs/heads/ignite-843
Commit: 6b5f9311bbcd00f30395ed6b724b4ea4d8868de8
Parents: b287ef2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 12:54:41 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 12:54:41 2015 +0300

----------------------------------------------------------------------
 examples/platform/cpp/Makefile.am               |  39 ++++++
 examples/platform/cpp/README.txt                |  42 +++++++
 examples/platform/cpp/configure.ac              |  30 +++++
 examples/platform/cpp/include/Makefile.am       |  21 ++++
 .../cpp/include/ignite/examples/address.h       | 109 ++++++++++++++++
 .../cpp/include/ignite/examples/organization.h  | 111 ++++++++++++++++
 .../platform/cpp/project/vs/ignite-examples.sln |  19 +++
 .../cpp/project/vs/ignite-examples.vcxproj      | 107 ++++++++++++++++
 .../project/vs/ignite-examples.vcxproj.filters  |  30 +++++
 examples/platform/cpp/src/putgetexample.cpp     | 126 +++++++++++++++++++
 examples/src/main/cpp/Makefile.am               |  39 ------
 examples/src/main/cpp/README.txt                |  41 ------
 examples/src/main/cpp/configure.ac              |  30 -----
 examples/src/main/cpp/include/Makefile.am       |  21 ----
 .../main/cpp/include/ignite/examples/address.h  | 109 ----------------
 .../cpp/include/ignite/examples/organization.h  | 111 ----------------
 .../src/main/cpp/project/vs/ignite-examples.sln |  19 ---
 .../main/cpp/project/vs/ignite-examples.vcxproj | 107 ----------------
 .../project/vs/ignite-examples.vcxproj.filters  |  30 -----
 examples/src/main/cpp/src/putgetexample.cpp     | 126 -------------------
 20 files changed, 634 insertions(+), 633 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/Makefile.am b/examples/platform/cpp/Makefile.am
new file mode 100644
index 0000000..84fe957
--- /dev/null
+++ b/examples/platform/cpp/Makefile.am
@@ -0,0 +1,39 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+SUBDIRS = . include
+DIST_SUBDIRS = . include
+
+AM_CPPFLAGS = -I$(srcdir)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL
+AM_CXXFLAGS = -Wall -std=c++0x
+
+noinst_PROGRAMS = ignite-putgetexample
+
+ignite_putgetexample_SOURCES = src/putgetexample.cpp
+
+ignite_putgetexample_LDFLAGS = -static-libtool-libs -L/usr/local/lib -lignite
+
+run-check: check
+	./ignite-putgetexample -p
+
+clean-local: clean-check
+	$(RM) *.gcno *.gcda
+
+clean-check:
+	$(RM) $(ignite_putgetexample_OBJECTS)

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/README.txt
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/README.txt b/examples/platform/cpp/README.txt
new file mode 100644
index 0000000..c47f805
--- /dev/null
+++ b/examples/platform/cpp/README.txt
@@ -0,0 +1,42 @@
+Ignite C++ Examples
+==================================
+
+Common requirements
+----------------------------------
+ * Java Development Kit (JDK) must be installed: https://java.com/en/download/index.jsp
+ * JAVA_HOME environment variable must be set pointing to Java installation directory.
+ * IGNITE_HOME environment variable must be set to Ignite installation directory.
+ * Ignite must be build and packaged using Maven. You can use the followin Maven command: mvn clean package -DskipTests
+ * Ignite C++ must be built according to instructions for your platform.
+
+Running examples on Linux
+----------------------------------
+
+Prerequisites:
+ * GCC, g++, autotools, automake, and libtool must be installed.
+
+To build examples execute the following commands one by one from $IGNITE_HOME/examples/platform/cpp directory:
+ * libtoolize
+ * aclocal
+ * autoheader
+ * automake --add-missing
+ * autoreconf
+ * ./configure
+ * make
+
+As a result several executables will appear in example's directory.
+
+Before running examples ensure that:
+ * LD_LIBRARY_PATH environment variable is set and pointing to a directory with "libjvm.so" library. Typically this
+   library is located in $JAVA_HOME/jre/lib/amd64/server directory.
+
+
+Running examples on Windows
+----------------------------------
+
+Prerequisites:
+ * Microsoft Visual Studio (tm) 2010 or higher must be installed.
+ * Windows SDK 7.1 must be installed.
+
+Open Visual Studio solution %IGNITE_HOME%\examples\platform\cpp\project\vs\ignite-examples.sln and select proper
+platform (x64 or x86). Run the solution.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/configure.ac
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/configure.ac b/examples/platform/cpp/configure.ac
new file mode 100644
index 0000000..a5ffb98
--- /dev/null
+++ b/examples/platform/cpp/configure.ac
@@ -0,0 +1,30 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.68)
+AC_INIT([Ingnite C++ examples],[1.5.0],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_CONFIG_SRCDIR([src])
+AC_CONFIG_MACRO_DIR([m4])
+AC_LANG([C++])
+
+AC_CANONICAL_SYSTEM
+
+dnl Initialize automake
+AM_INIT_AUTOMAKE([-Wall foreign])
+AC_CONFIG_HEADER([config.h])
+
+GXX="-g -O2"
+
+AC_PROG_CXX
+
+AC_ARG_ENABLE([debug],
+ [AS_HELP_STRING([--enable-debug],[enable debug build [default=no]])],
+ [],[enable_debug=no])
+
+if test "x$enable_debug" = xyes; then
+    CXXFLAGS="-g -O0"
+else
+    CXXFLAGS="-g -O3"
+fi
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/include/Makefile.am
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/include/Makefile.am b/examples/platform/cpp/include/Makefile.am
new file mode 100644
index 0000000..13a8816
--- /dev/null
+++ b/examples/platform/cpp/include/Makefile.am
@@ -0,0 +1,21 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+nobase_include_HEADERS = ignite/examples/address.h \
+                         ignite/examples/organization.h

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/include/ignite/examples/address.h
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/include/ignite/examples/address.h b/examples/platform/cpp/include/ignite/examples/address.h
new file mode 100644
index 0000000..29dbb0c
--- /dev/null
+++ b/examples/platform/cpp/include/ignite/examples/address.h
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_EXAMPLES_ADDRESS
+#define _IGNITE_EXAMPLES_ADDRESS
+
+#include "ignite/portable/portable.h"
+
+namespace ignite
+{
+    namespace examples 
+    {
+        struct Address 
+        {
+            Address()
+            {
+                street = "";
+                zip = 0;
+            }
+            
+            Address(std::string street, int zip) : street(street), zip(zip) 
+            {
+                // No-op.
+            }
+            
+            std::string ToString() 
+            {
+                std::ostringstream oss;
+
+                oss << "Address [street=" << street << ", zip=" << zip << "]";
+
+                return oss.str();
+            }
+            
+            std::string street;
+            int zip;
+        };    
+    }
+}
+
+namespace ignite
+{
+    namespace portable 
+    {
+        template<>
+        struct PortableType<ignite::examples::Address>
+        {
+            int32_t GetTypeId()
+            {
+                return GetPortableStringHashCode("Address");
+            }
+
+            std::string GetTypeName()
+            {
+                return "Address";
+            }
+
+            int32_t GetFieldId(const char* name)
+            {
+                return GetPortableStringHashCode(name);
+            }
+
+            int32_t GetHashCode(ignite::examples::Address obj)
+            {
+                return 0;
+            }
+
+            bool IsNull(ignite::examples::Address obj)
+            {
+                return false;
+            }
+
+            ignite::examples::Address GetNull()
+            {
+                return ignite::examples::Address("", 0);
+            }
+
+            void Write(PortableWriter& writer, ignite::examples::Address obj)
+            {
+                writer.WriteString("street", obj.street);
+                writer.WriteInt32("zip", obj.zip);
+            }
+
+            ignite::examples::Address Read(PortableReader& reader)
+            {
+                std::string street = reader.ReadString("street");
+                int zip = reader.ReadInt32("zip");
+                
+                return ignite::examples::Address(street, zip);
+            }
+        };    
+    }    
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/include/ignite/examples/organization.h
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/include/ignite/examples/organization.h b/examples/platform/cpp/include/ignite/examples/organization.h
new file mode 100644
index 0000000..c9137c9
--- /dev/null
+++ b/examples/platform/cpp/include/ignite/examples/organization.h
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_EXAMPLES_ORGANIZATION
+#define _IGNITE_EXAMPLES_ORGANIZATION
+
+#include "ignite/portable/portable.h"
+
+#include "ignite/examples/address.h"
+
+namespace ignite
+{
+    namespace examples 
+    {
+        struct Organization 
+        {
+            Organization()
+            {
+                name = "";
+                addr = Address();
+            }
+            
+            Organization(std::string name, Address addr) : name(name), addr(addr) 
+            {
+                // No-op.
+            }
+            
+            std::string ToString() 
+            {
+                std::ostringstream oss;
+
+                oss << "Organization [name=" << name << ", Address=" << addr.ToString() << "]";
+
+                return oss.str();
+            }
+            
+            std::string name;
+            Address addr;
+        };    
+    }
+}
+
+namespace ignite
+{
+    namespace portable 
+    {
+        template<>
+        struct PortableType<ignite::examples::Organization>
+        {
+            int32_t GetTypeId()
+            {
+                return GetPortableStringHashCode("Organization");
+            }
+
+            std::string GetTypeName()
+            {
+                return "Organization";
+            }
+
+            int32_t GetFieldId(const char* name)
+            {
+                return GetPortableStringHashCode(name);
+            }
+
+            int32_t GetHashCode(ignite::examples::Organization obj)
+            {
+                return 0;
+            }
+
+            bool IsNull(ignite::examples::Organization obj)
+            {
+                return false;
+            }
+
+            ignite::examples::Organization GetNull()
+            {
+                return ignite::examples::Organization("", ignite::examples::Address());
+            }
+
+            void Write(PortableWriter& writer, ignite::examples::Organization obj)
+            {
+                writer.WriteString("name", obj.name);
+                writer.WriteObject<ignite::examples::Address>("addr", obj.addr);
+            }
+
+            ignite::examples::Organization Read(PortableReader& reader)
+            {
+                std::string name = reader.ReadString("name");
+                ignite::examples::Address addr = reader.ReadObject<ignite::examples::Address>("addr");
+                                
+                return ignite::examples::Organization(name, addr);
+            }
+        };    
+    }    
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/project/vs/ignite-examples.sln
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/project/vs/ignite-examples.sln b/examples/platform/cpp/project/vs/ignite-examples.sln
new file mode 100644
index 0000000..4970654
--- /dev/null
+++ b/examples/platform/cpp/project/vs/ignite-examples.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ignite-examples", "ignite-examples.vcxproj", "{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.ActiveCfg = Release|x64
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.Build.0 = Release|x64
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.ActiveCfg = Release|Win32
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/project/vs/ignite-examples.vcxproj
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/project/vs/ignite-examples.vcxproj b/examples/platform/cpp/project/vs/ignite-examples.vcxproj
new file mode 100644
index 0000000..845aa53
--- /dev/null
+++ b/examples/platform/cpp/project/vs/ignite-examples.vcxproj
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>igniteexamples</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
+copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
+copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\putgetexample.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\ignite\examples\address.h" />
+    <ClInclude Include="..\include\ignite\examples\organization.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters b/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
new file mode 100644
index 0000000..78a7847
--- /dev/null
+++ b/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\putgetexample.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\ignite\examples\address.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\ignite\examples\organization.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/platform/cpp/src/putgetexample.cpp
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/src/putgetexample.cpp b/examples/platform/cpp/src/putgetexample.cpp
new file mode 100644
index 0000000..9ba1258
--- /dev/null
+++ b/examples/platform/cpp/src/putgetexample.cpp
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+
+#include "ignite/ignite.h"
+#include "ignite/ignition.h"
+
+#include "ignite/examples/organization.h"
+
+using namespace ignite;
+using namespace cache;
+
+using namespace examples;
+
+/*
+ * Execute individual Put and Get operations.
+ * 
+ * @param cache Cache instance.
+ */
+void PutGet(Cache<int, Organization>& cache) 
+{
+    // Create new Organization to store in cache.
+    Organization org("Microsoft", Address("1096 Eddy Street, San Francisco, CA", 94109));
+    
+    // Put organization to cache.        
+    cache.Put(1, org);
+    
+    // Get recently created employee as a strongly-typed fully de-serialized instance.
+    Organization orgFromCache = cache.Get(1);
+
+    std::cout <<  ">>> Retrieved organization instance from cache: " << std::endl;
+    std::cout << orgFromCache.ToString() << std::endl;
+    std::cout << std::endl;
+}
+
+/*
+ * Execute bulk Put and Get operations.
+ */
+void PutGetAll(Cache<int, Organization>& cache) 
+{
+    // Create new Organizations to store in cache.
+    Organization org1("Microsoft", Address("1096 Eddy Street, San Francisco, CA", 94109));
+    Organization org2("Red Cross", Address("184 Fidler Drive, San Antonio, TX", 78205));
+    
+    // Put created data entries to cache.
+    std::map<int, Organization> vals;
+    
+    vals[1] = org1;
+    vals[2] = org2;
+    
+    cache.PutAll(vals);
+
+    // Get recently created organizations as a strongly-typed fully de-serialized instances.
+    std::set<int> keys;
+    
+    keys.insert(1);
+    keys.insert(2);
+    
+    std::map<int, Organization> valsFromCache = cache.GetAll(keys);
+
+    std::cout <<  ">>> Retrieved organization instances from cache: " << std::endl;
+    
+    for (std::map<int, Organization>::iterator it = valsFromCache.begin(); it != valsFromCache.end(); ++it) 
+        std::cout <<  it->second.ToString() << std::endl;
+    
+    std::cout << std::endl;
+}
+
+int main()
+{
+    IgniteConfiguration cfg;
+
+    cfg.jvmInitMem = 512;
+    cfg.jvmMaxMem = 512;
+    
+    cfg.springCfgPath = "examples/config/cpp/example-cache.xml";
+ 
+    try 
+    {
+        // Start a node.
+        Ignite grid = Ignition::Start(cfg);
+        
+        std::cout << std::endl;
+        std::cout << ">>> Cache put-get example started." << std::endl;
+        std::cout << std::endl;
+        
+        // Get cache instance.
+        Cache<int, Organization> cache = grid.GetCache<int, Organization>(NULL);
+        
+        // Clear cache.
+        cache.Clear();
+
+        PutGet(cache);
+        PutGetAll(cache);        
+        
+        // Stop node.
+        Ignition::StopAll(false);
+    }
+    catch (IgniteError& err)
+    {
+        std::cout << "An error occurred: " << err.GetText() << std::endl;
+    }
+    
+    std::cout << std::endl;
+    std::cout << ">>> Example finished, press any key to exit ..." << std::endl;
+    std::cout << std::endl;
+    
+    std::cin.get();
+    
+    return 0;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/Makefile.am b/examples/src/main/cpp/Makefile.am
deleted file mode 100644
index 84fe957..0000000
--- a/examples/src/main/cpp/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS = "-Im4"
-
-SUBDIRS = . include
-DIST_SUBDIRS = . include
-
-AM_CPPFLAGS = -I$(srcdir)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL
-AM_CXXFLAGS = -Wall -std=c++0x
-
-noinst_PROGRAMS = ignite-putgetexample
-
-ignite_putgetexample_SOURCES = src/putgetexample.cpp
-
-ignite_putgetexample_LDFLAGS = -static-libtool-libs -L/usr/local/lib -lignite
-
-run-check: check
-	./ignite-putgetexample -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_putgetexample_OBJECTS)

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/README.txt
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/README.txt b/examples/src/main/cpp/README.txt
deleted file mode 100644
index 68f35a3..0000000
--- a/examples/src/main/cpp/README.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Ignite C++ Examples
-==================================
-
-Common requirements
-----------------------------------
- * Java Development Kit (JDK) must be installed: https://java.com/en/download/index.jsp
- * JAVA_HOME environment variable must be set pointing to Java installation directory.
-  * IGNITE_HOME environment variable must be set to Ignite installation directory.
- * Ingnite C++ must be built according to instructions for your platform.
-
-Running examples on Linux
-----------------------------------
-
-Prerequisites:
- * GCC, g++, autotools, automake, and libtool must be installed.
-
-To build examples execute the following commands one by one from $IGNITE_HOME/examples/platforms/cpp directory:
- * libtoolize
- * aclocal
- * autoheader
- * automake --add-missing
- * autoreconf
- * ./configure
- * make
-
-As a result several executables will appear in example's directory.
-
-Before running examples ensure that:
- * LD_LIBRARY_PATH environment variable is set and pointing to a directory with "libjvm.so" library. Typically this
-   library is located in $JAVA_HOME/jre/lib/amd64/server directory.
-
-
-Running examples on Windows
-----------------------------------
-
-Prerequisites:
- * Microsoft Visual Studio (tm) 2010 or higher must be installed.
- * Windows SDK 7.1 must be installed.
-
-Open Visual Studio solution %IGNITE_HOME%\examples\platforms\cpp\project\vs\ignite-examples.sln and select proper
-platform (x64 or x86). Run the solution.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/configure.ac
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/configure.ac b/examples/src/main/cpp/configure.ac
deleted file mode 100644
index a5ffb98..0000000
--- a/examples/src/main/cpp/configure.ac
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.68)
-AC_INIT([Ingnite C++ examples],[1.5.0],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
-AC_CONFIG_SRCDIR([src])
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-AC_CANONICAL_SYSTEM
-
-dnl Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign])
-AC_CONFIG_HEADER([config.h])
-
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],[enable debug build [default=no]])],
- [],[enable_debug=no])
-
-if test "x$enable_debug" = xyes; then
-    CXXFLAGS="-g -O0"
-else
-    CXXFLAGS="-g -O3"
-fi
-
-AC_CONFIG_FILES(Makefile)
-AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/include/Makefile.am
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/include/Makefile.am b/examples/src/main/cpp/include/Makefile.am
deleted file mode 100644
index 13a8816..0000000
--- a/examples/src/main/cpp/include/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS = "-Im4"
-
-nobase_include_HEADERS = ignite/examples/address.h \
-                         ignite/examples/organization.h

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/include/ignite/examples/address.h
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/include/ignite/examples/address.h b/examples/src/main/cpp/include/ignite/examples/address.h
deleted file mode 100644
index 29dbb0c..0000000
--- a/examples/src/main/cpp/include/ignite/examples/address.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _IGNITE_EXAMPLES_ADDRESS
-#define _IGNITE_EXAMPLES_ADDRESS
-
-#include "ignite/portable/portable.h"
-
-namespace ignite
-{
-    namespace examples 
-    {
-        struct Address 
-        {
-            Address()
-            {
-                street = "";
-                zip = 0;
-            }
-            
-            Address(std::string street, int zip) : street(street), zip(zip) 
-            {
-                // No-op.
-            }
-            
-            std::string ToString() 
-            {
-                std::ostringstream oss;
-
-                oss << "Address [street=" << street << ", zip=" << zip << "]";
-
-                return oss.str();
-            }
-            
-            std::string street;
-            int zip;
-        };    
-    }
-}
-
-namespace ignite
-{
-    namespace portable 
-    {
-        template<>
-        struct PortableType<ignite::examples::Address>
-        {
-            int32_t GetTypeId()
-            {
-                return GetPortableStringHashCode("Address");
-            }
-
-            std::string GetTypeName()
-            {
-                return "Address";
-            }
-
-            int32_t GetFieldId(const char* name)
-            {
-                return GetPortableStringHashCode(name);
-            }
-
-            int32_t GetHashCode(ignite::examples::Address obj)
-            {
-                return 0;
-            }
-
-            bool IsNull(ignite::examples::Address obj)
-            {
-                return false;
-            }
-
-            ignite::examples::Address GetNull()
-            {
-                return ignite::examples::Address("", 0);
-            }
-
-            void Write(PortableWriter& writer, ignite::examples::Address obj)
-            {
-                writer.WriteString("street", obj.street);
-                writer.WriteInt32("zip", obj.zip);
-            }
-
-            ignite::examples::Address Read(PortableReader& reader)
-            {
-                std::string street = reader.ReadString("street");
-                int zip = reader.ReadInt32("zip");
-                
-                return ignite::examples::Address(street, zip);
-            }
-        };    
-    }    
-}
-
-#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/include/ignite/examples/organization.h
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/include/ignite/examples/organization.h b/examples/src/main/cpp/include/ignite/examples/organization.h
deleted file mode 100644
index c9137c9..0000000
--- a/examples/src/main/cpp/include/ignite/examples/organization.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _IGNITE_EXAMPLES_ORGANIZATION
-#define _IGNITE_EXAMPLES_ORGANIZATION
-
-#include "ignite/portable/portable.h"
-
-#include "ignite/examples/address.h"
-
-namespace ignite
-{
-    namespace examples 
-    {
-        struct Organization 
-        {
-            Organization()
-            {
-                name = "";
-                addr = Address();
-            }
-            
-            Organization(std::string name, Address addr) : name(name), addr(addr) 
-            {
-                // No-op.
-            }
-            
-            std::string ToString() 
-            {
-                std::ostringstream oss;
-
-                oss << "Organization [name=" << name << ", Address=" << addr.ToString() << "]";
-
-                return oss.str();
-            }
-            
-            std::string name;
-            Address addr;
-        };    
-    }
-}
-
-namespace ignite
-{
-    namespace portable 
-    {
-        template<>
-        struct PortableType<ignite::examples::Organization>
-        {
-            int32_t GetTypeId()
-            {
-                return GetPortableStringHashCode("Organization");
-            }
-
-            std::string GetTypeName()
-            {
-                return "Organization";
-            }
-
-            int32_t GetFieldId(const char* name)
-            {
-                return GetPortableStringHashCode(name);
-            }
-
-            int32_t GetHashCode(ignite::examples::Organization obj)
-            {
-                return 0;
-            }
-
-            bool IsNull(ignite::examples::Organization obj)
-            {
-                return false;
-            }
-
-            ignite::examples::Organization GetNull()
-            {
-                return ignite::examples::Organization("", ignite::examples::Address());
-            }
-
-            void Write(PortableWriter& writer, ignite::examples::Organization obj)
-            {
-                writer.WriteString("name", obj.name);
-                writer.WriteObject<ignite::examples::Address>("addr", obj.addr);
-            }
-
-            ignite::examples::Organization Read(PortableReader& reader)
-            {
-                std::string name = reader.ReadString("name");
-                ignite::examples::Address addr = reader.ReadObject<ignite::examples::Address>("addr");
-                                
-                return ignite::examples::Organization(name, addr);
-            }
-        };    
-    }    
-}
-
-#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/project/vs/ignite-examples.sln
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/project/vs/ignite-examples.sln b/examples/src/main/cpp/project/vs/ignite-examples.sln
deleted file mode 100644
index 4970654..0000000
--- a/examples/src/main/cpp/project/vs/ignite-examples.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ignite-examples", "ignite-examples.vcxproj", "{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.ActiveCfg = Release|x64
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.Build.0 = Release|x64
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.ActiveCfg = Release|Win32
-		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/project/vs/ignite-examples.vcxproj
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/project/vs/ignite-examples.vcxproj b/examples/src/main/cpp/project/vs/ignite-examples.vcxproj
deleted file mode 100644
index 845aa53..0000000
--- a/examples/src/main/cpp/project/vs/ignite-examples.vcxproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>igniteexamples</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\putgetexample.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\include\ignite\examples\organization.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters b/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters
deleted file mode 100644
index 78a7847..0000000
--- a/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\putgetexample.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\ignite\examples\address.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\ignite\examples\organization.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b5f9311/examples/src/main/cpp/src/putgetexample.cpp
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/src/putgetexample.cpp b/examples/src/main/cpp/src/putgetexample.cpp
deleted file mode 100644
index 9ba1258..0000000
--- a/examples/src/main/cpp/src/putgetexample.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <iostream>
-
-#include "ignite/ignite.h"
-#include "ignite/ignition.h"
-
-#include "ignite/examples/organization.h"
-
-using namespace ignite;
-using namespace cache;
-
-using namespace examples;
-
-/*
- * Execute individual Put and Get operations.
- * 
- * @param cache Cache instance.
- */
-void PutGet(Cache<int, Organization>& cache) 
-{
-    // Create new Organization to store in cache.
-    Organization org("Microsoft", Address("1096 Eddy Street, San Francisco, CA", 94109));
-    
-    // Put organization to cache.        
-    cache.Put(1, org);
-    
-    // Get recently created employee as a strongly-typed fully de-serialized instance.
-    Organization orgFromCache = cache.Get(1);
-
-    std::cout <<  ">>> Retrieved organization instance from cache: " << std::endl;
-    std::cout << orgFromCache.ToString() << std::endl;
-    std::cout << std::endl;
-}
-
-/*
- * Execute bulk Put and Get operations.
- */
-void PutGetAll(Cache<int, Organization>& cache) 
-{
-    // Create new Organizations to store in cache.
-    Organization org1("Microsoft", Address("1096 Eddy Street, San Francisco, CA", 94109));
-    Organization org2("Red Cross", Address("184 Fidler Drive, San Antonio, TX", 78205));
-    
-    // Put created data entries to cache.
-    std::map<int, Organization> vals;
-    
-    vals[1] = org1;
-    vals[2] = org2;
-    
-    cache.PutAll(vals);
-
-    // Get recently created organizations as a strongly-typed fully de-serialized instances.
-    std::set<int> keys;
-    
-    keys.insert(1);
-    keys.insert(2);
-    
-    std::map<int, Organization> valsFromCache = cache.GetAll(keys);
-
-    std::cout <<  ">>> Retrieved organization instances from cache: " << std::endl;
-    
-    for (std::map<int, Organization>::iterator it = valsFromCache.begin(); it != valsFromCache.end(); ++it) 
-        std::cout <<  it->second.ToString() << std::endl;
-    
-    std::cout << std::endl;
-}
-
-int main()
-{
-    IgniteConfiguration cfg;
-
-    cfg.jvmInitMem = 512;
-    cfg.jvmMaxMem = 512;
-    
-    cfg.springCfgPath = "examples/config/cpp/example-cache.xml";
- 
-    try 
-    {
-        // Start a node.
-        Ignite grid = Ignition::Start(cfg);
-        
-        std::cout << std::endl;
-        std::cout << ">>> Cache put-get example started." << std::endl;
-        std::cout << std::endl;
-        
-        // Get cache instance.
-        Cache<int, Organization> cache = grid.GetCache<int, Organization>(NULL);
-        
-        // Clear cache.
-        cache.Clear();
-
-        PutGet(cache);
-        PutGetAll(cache);        
-        
-        // Stop node.
-        Ignition::StopAll(false);
-    }
-    catch (IgniteError& err)
-    {
-        std::cout << "An error occurred: " << err.GetText() << std::endl;
-    }
-    
-    std::cout << std::endl;
-    std::cout << ">>> Example finished, press any key to exit ..." << std::endl;
-    std::cout << std::endl;
-    
-    std::cin.get();
-    
-    return 0;
-}
\ No newline at end of file

[09/50] ignite git commit: Enabled test.

Posted by ak...@apache.org.
Enabled test.


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

Branch: refs/heads/ignite-843
Commit: c6d4b461d178087a833a1b9b044261f43f6a06a9
Parents: 483dde7
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 13:06:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 13:06:21 2015 +0300

----------------------------------------------------------------------
 .../near/GridCachePartitionedTxMultiThreadedSelfTest.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c6d4b461/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
index dbe5414..6ed25eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
@@ -40,7 +40,7 @@ public class GridCachePartitionedTxMultiThreadedSelfTest extends IgniteTxMultiTh
     private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
+    @Override public void testOptimisticSerializableCommitMultithreaded() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-806");
     }

[43/50] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite; branch 'ignite-1394' of https://github.com/ptupitsyn/ignite

Posted by ak...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite; branch 'ignite-1394' of https://github.com/ptupitsyn/ignite


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

Branch: refs/heads/ignite-843
Commit: 82518735f9a5bd5475a43ae718c24eb78d3c2469
Parents: 6b5f931 7fcc14c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 12:55:25 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 12:55:25 2015 +0300

----------------------------------------------------------------------
 .../dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------

[44/50] ignite git commit: Fixing CPP examples relative paths.

Posted by ak...@apache.org.
Fixing CPP examples relative paths.


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

Branch: refs/heads/ignite-843
Commit: f7230daeb3c8b625c88eb7ca2c87fa02197175cf
Parents: 8251873
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 13:22:12 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 13:22:12 2015 +0300

----------------------------------------------------------------------
 examples/config/platform/cpp/example-cache.xml  | 87 ++++++++++++++++++++
 .../cpp/project/vs/ignite-examples.vcxproj      | 28 +++----
 .../project/vs/ignite-examples.vcxproj.filters  |  6 +-
 3 files changed, 104 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f7230dae/examples/config/platform/cpp/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/platform/cpp/example-cache.xml b/examples/config/platform/cpp/example-cache.xml
new file mode 100644
index 0000000..d720a98
--- /dev/null
+++ b/examples/config/platform/cpp/example-cache.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+    GridGain Spring configuration file to startup grid cache.
+
+    When starting a standalone GridGain node, you need to execute the following command:
+    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache-dotnet.xml
+
+    When starting GridGain from Java IDE, pass path to this file to GridGain:
+    GridGain.start("examples/config/example-cache-dotnet.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util.xsd">
+    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+        <!-- Set to true to enable distributed class loading for examples, default is false. -->
+        <property name="peerClassLoadingEnabled" value="true"/>
+
+        <property name="cacheConfiguration">
+            <list>
+                <!--
+                    Partitioned cache example configuration with portable objects enabled.
+                    Used in .NET example that is available only in enterprise edition.
+                -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="atomicityMode" value="ATOMIC"/>
+                    <property name="backups" value="1"/>
+                </bean>
+
+                <!--
+                    Partitioned cache example configuration.
+                    Used in .NET cache store example that is available only in enterprise edition.
+                -->
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="tx"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="backups" value="1"/>
+                </bean>
+            </list>
+        </property>
+
+        <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
+        <property name="discoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                <property name="ipFinder">
+                    <!--
+                        GridGain provides several options for automatic discovery that can be used
+                        instead os static IP based discovery. For information on all options refer
+                        to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery
+                    -->
+                    <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. -->
+                    <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+                        <property name="addresses">
+                            <list>
+                                <!-- In distributed environment, replace with actual host IP address. -->
+                                <value>127.0.0.1:47500..47501</value>
+                            </list>
+                        </property>
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/f7230dae/examples/platform/cpp/project/vs/ignite-examples.vcxproj
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/project/vs/ignite-examples.vcxproj b/examples/platform/cpp/project/vs/ignite-examples.vcxproj
index 845aa53..9331296 100644
--- a/examples/platform/cpp/project/vs/ignite-examples.vcxproj
+++ b/examples/platform/cpp/project/vs/ignite-examples.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -19,14 +19,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -55,7 +55,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\include;..\..\..\..\..\modules\platform\src\main\cpp\common\os\win\include;..\..\..\..\..\modules\platform\src\main\cpp\common\include;..\..\..\..\..\modules\platform\src\main\cpp\core\os\win\include;..\..\..\..\..\modules\platform\src\main\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -63,11 +63,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
+      <Command>copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
+copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -79,7 +79,7 @@ copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configurat
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\include;..\..\..\..\..\modules\platform\src\main\cpp\common\os\win\include;..\..\..\..\..\modules\platform\src\main\cpp\common\include;..\..\..\..\..\modules\platform\src\main\cpp\core\os\win\include;..\..\..\..\..\modules\platform\cpp\src\main\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,19 +87,19 @@ copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configurat
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
+      <Command>copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
+copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\putgetexample.cpp" />
+    <ClCompile Include="..\..\src\putgetexample.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\ignite\examples\address.h" />
-    <ClInclude Include="..\include\ignite\examples\organization.h" />
+    <ClInclude Include="..\..\include\ignite\examples\address.h" />
+    <ClInclude Include="..\..\include\ignite\examples\organization.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

http://git-wip-us.apache.org/repos/asf/ignite/blob/f7230dae/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters b/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
index 78a7847..ca62db7 100644
--- a/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
+++ b/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters
@@ -15,15 +15,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\putgetexample.cpp">
+    <ClCompile Include="..\..\src\putgetexample.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\ignite\examples\address.h">
+    <ClInclude Include="..\..\include\ignite\examples\address.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\ignite\examples\organization.h">
+    <ClInclude Include="..\..\include\ignite\examples\organization.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

[24/50] ignite git commit: Merge remote-tracking branch 'origin/master'

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-843
Commit: e755554598526e0c0d4dd0a46d5f7f3354195ff7
Parents: 5dd785b 2715057
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 15:31:24 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 15:31:24 2015 +0300

----------------------------------------------------------------------
 ...cheAbstractFullApiMultithreadedSelfTest.java | 63 +++++++++++++-------
 ...PartitionedFullApiMultithreadedSelfTest.java |  5 --
 ...eReplicatedFullApiMultithreadedSelfTest.java |  5 --
 ...dCacheLocalFullApiMultithreadedSelfTest.java |  5 --
 4 files changed, 40 insertions(+), 38 deletions(-)
----------------------------------------------------------------------

[38/50] ignite git commit: Fixed GridCommonAbstractTest.awaitPartitionMapExchange.

Posted by ak...@apache.org.
Fixed GridCommonAbstractTest.awaitPartitionMapExchange.


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

Branch: refs/heads/ignite-843
Commit: 60a76bc882cd5ecf8db05661a4d576fc4d09d9ab
Parents: 857ab7e
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 9 10:13:25 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 9 10:13:25 2015 +0300

----------------------------------------------------------------------
 .../ignite/testframework/junits/common/GridCommonAbstractTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/60a76bc8/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 44ca051..4bcf51e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -430,7 +430,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
                             AffinityTopologyVersion readyVer = dht.context().shared().exchange().readyAffinityVersion();
 
-                            if (readyVer.topologyVersion() > 0 && dht.context().started()) {
+                            if (readyVer.topologyVersion() > 0 && c.context().started()) {
                                 // Must map on updated version of topology.
                                 Collection<ClusterNode> affNodes =
                                     g0.affinity(cfg.getName()).mapPartitionToPrimaryAndBackups(p);

[47/50] ignite git commit: 1.4.0-SNAPSHOT

Posted by ak...@apache.org.
1.4.0-SNAPSHOT


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

Branch: refs/heads/ignite-843
Commit: a8b0f6a84f1007ac2fa8864d518bff8967d625e0
Parents: f642a7a
Author: Ignite Teamcity <ig...@apache.org>
Authored: Wed Sep 9 14:08:05 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Wed Sep 9 14:08:05 2015 +0300

----------------------------------------------------------------------
 examples/platform/cpp/configure.ac                               | 2 +-
 examples/pom.xml                                                 | 2 +-
 modules/aop/pom.xml                                              | 2 +-
 modules/apache-license-gen/pom.xml                               | 2 +-
 modules/aws/pom.xml                                              | 2 +-
 modules/clients/pom.xml                                          | 2 +-
 modules/cloud/pom.xml                                            | 2 +-
 modules/codegen/pom.xml                                          | 2 +-
 modules/core/pom.xml                                             | 2 +-
 modules/core/src/main/resources/ignite.properties                | 2 +-
 modules/extdata/p2p/pom.xml                                      | 2 +-
 modules/extdata/uri/modules/uri-dependency/pom.xml               | 2 +-
 modules/extdata/uri/pom.xml                                      | 2 +-
 modules/gce/pom.xml                                              | 2 +-
 modules/geospatial/pom.xml                                       | 2 +-
 modules/hadoop/pom.xml                                           | 2 +-
 modules/hibernate/pom.xml                                        | 2 +-
 modules/indexing/pom.xml                                         | 2 +-
 modules/jcl/pom.xml                                              | 2 +-
 modules/jms11/pom.xml                                            | 2 +-
 modules/jta/pom.xml                                              | 2 +-
 modules/kafka/pom.xml                                            | 2 +-
 modules/log4j/pom.xml                                            | 2 +-
 modules/log4j2/pom.xml                                           | 2 +-
 modules/mesos/pom.xml                                            | 2 +-
 modules/platform/pom.xml                                         | 2 +-
 modules/platform/src/main/cpp/common/configure.ac                | 2 +-
 modules/platform/src/main/cpp/core-test/configure.ac             | 2 +-
 modules/platform/src/main/cpp/core/configure.ac                  | 2 +-
 .../main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs    | 4 ++--
 .../src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs     | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 modules/rest-http/pom.xml                                        | 2 +-
 modules/scalar-2.10/pom.xml                                      | 2 +-
 modules/scalar/pom.xml                                           | 2 +-
 modules/schedule/pom.xml                                         | 2 +-
 modules/schema-import/pom.xml                                    | 2 +-
 modules/slf4j/pom.xml                                            | 2 +-
 modules/spark-2.10/pom.xml                                       | 2 +-
 modules/spark/pom.xml                                            | 2 +-
 modules/spring/pom.xml                                           | 2 +-
 modules/ssh/pom.xml                                              | 2 +-
 modules/tools/pom.xml                                            | 2 +-
 modules/urideploy/pom.xml                                        | 2 +-
 modules/visor-console-2.10/pom.xml                               | 2 +-
 modules/visor-console/pom.xml                                    | 2 +-
 modules/visor-plugins/pom.xml                                    | 2 +-
 modules/web/pom.xml                                              | 2 +-
 modules/yardstick/pom.xml                                        | 2 +-
 modules/yarn/pom.xml                                             | 2 +-
 modules/zookeeper/pom.xml                                        | 2 +-
 pom.xml                                                          | 2 +-
 53 files changed, 57 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/examples/platform/cpp/configure.ac
----------------------------------------------------------------------
diff --git a/examples/platform/cpp/configure.ac b/examples/platform/cpp/configure.ac
index a5ffb98..a665d7b 100644
--- a/examples/platform/cpp/configure.ac
+++ b/examples/platform/cpp/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.68)
-AC_INIT([Ingnite C++ examples],[1.5.0],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_INIT([Ingnite C++ examples],[1.4.0],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_MACRO_DIR([m4])
 AC_LANG([C++])

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index e4ec73a..64e8be9 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>ignite-examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index bb419fa..391f5b8 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aop</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/apache-license-gen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml
index fa6a1e2..c17f98f 100644
--- a/modules/apache-license-gen/pom.xml
+++ b/modules/apache-license-gen/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.ignite</groupId>
     <artifactId>ignite-apache-license-gen</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <build>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 8042d33..a0ca6b0 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aws</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index fe8666b..61f6694 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-clients</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index a49625d..b7aa43b 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>ignite-cloud</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 957049b..89cadf5 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-codegen</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index e02bb23..2f0dde7 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-core</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <repositories>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index 2cf7d15..50725fa 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-ignite.version=1.5.0-SNAPSHOT
+ignite.version=1.4.0-SNAPSHOT
 ignite.build=0
 ignite.revision=DEV
 ignite.rel.date=01011970

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 26d1cd2..aca3132 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-extdata-p2p</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/extdata/uri/modules/uri-dependency/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/modules/uri-dependency/pom.xml b/modules/extdata/uri/modules/uri-dependency/pom.xml
index 08edb5b..98d3fcf 100644
--- a/modules/extdata/uri/modules/uri-dependency/pom.xml
+++ b/modules/extdata/uri/modules/uri-dependency/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>ignite-extdata-uri-dep</artifactId>
     <packaging>jar</packaging>
 
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index d9a9297..7613f0c 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -32,7 +32,7 @@
     </parent>
 
     <artifactId>ignite-extdata-uri</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index 1f8de08..05f043f 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-gce</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 39ebdc4..766114b 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-geospatial</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index c2cb89b..839ffb8 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-hadoop</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 8a04ab7..a3ae729 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-hibernate</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index d539f6b..e4713b4 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-indexing</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index c94c906..335b6c8 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jcl</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/jms11/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index 47a1495..dbb385d 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jms11</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 78242e7..c0ce618 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jta</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/modules/kafka/pom.xml b/modules/kafka/pom.xml
index 89c1550..5103a32 100644
--- a/modules/kafka/pom.xml
+++ b/modules/kafka/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-kafka</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index fe95700..aaf1dca 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-log4j</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/log4j2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml
index eca3b75..2c0fd94 100644
--- a/modules/log4j2/pom.xml
+++ b/modules/log4j2/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-log4j2</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/mesos/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index 466805c..a652b60 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-mesos</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/pom.xml
----------------------------------------------------------------------
diff --git a/modules/platform/pom.xml b/modules/platform/pom.xml
index ac34436..ba5b9d0 100644
--- a/modules/platform/pom.xml
+++ b/modules/platform/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-platform</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/main/cpp/common/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/configure.ac b/modules/platform/src/main/cpp/common/configure.ac
index 5cab969..b34d7d8 100644
--- a/modules/platform/src/main/cpp/common/configure.ac
+++ b/modules/platform/src/main/cpp/common/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
+AC_INIT([Apache Ignite JNI bridge for C++], [1.4.0], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/main/cpp/core-test/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/configure.ac b/modules/platform/src/main/cpp/core-test/configure.ac
index b337fba..3a1b660 100644
--- a/modules/platform/src/main/cpp/core-test/configure.ac
+++ b/modules/platform/src/main/cpp/core-test/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [1.5.0], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++ Test], [1.4.0], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/main/cpp/core/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/configure.ac b/modules/platform/src/main/cpp/core/configure.ac
index c1657d3..cdd238f 100644
--- a/modules/platform/src/main/cpp/core/configure.ac
+++ b/modules/platform/src/main/cpp/core/configure.ac
@@ -19,7 +19,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [1.5.0], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
+AC_INIT([Apache Ignite C++], [1.4.0], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_SYSTEM

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 1876e24..5f2c018 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
 
 [assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
 
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
 
 [assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("Apache.Ignite")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs b/modules/platform/src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index 03f7fb9..ca38ea2 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 
 [assembly: Guid("0f9702ec-da7d-4ce5-b4b7-73310c885355")]
 
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index 22d74c9..cb633ed 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -45,5 +45,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 1ebcf24..947e18c 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 
 [assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")]
 
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 58eb1ed..c506df6 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-rest-http</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index c2046e9..627f2b4 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-scalar_2.10</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 1443cc1..ab03a5d 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-scalar</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 3f53df6..207a97c 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-schedule</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 1e63cae..ef36af9 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-schema-import</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index b22ae6c..807ed0d 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-slf4j</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/spark-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index 316b13b..283855e 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-spark_2.10</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/spark/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index 95e05d8..f7b2110 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-spark</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 8d1f918..bf093ef 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-spring</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index ff3e70d..5b407ad 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-ssh</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 26689760..ca0d0f4 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-tools</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index c8fac6e..df2b0fa 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-urideploy</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/visor-console-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
index 73c7a58..fa541dc 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-visor-console_2.10</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index b85cd69..dc841bf 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-visor-console</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 05b4ede..c0e5b5e 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-visor-plugins</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 99a356e..d814f47 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-web</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 2f0c5fe..eda9429 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-yardstick</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml
index 2b758dc..c93efa4 100644
--- a/modules/yarn/pom.xml
+++ b/modules/yarn/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-yarn</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/modules/zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index 9f5bc42..3993bd5 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-zookeeper</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8b0f6a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6f9c848..d026b30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.ignite</groupId>
     <artifactId>apache-ignite</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

[45/50] ignite git commit: IGNITE-1391: Fixed deadlock in discovery message processing caused by platform latch.

Posted by ak...@apache.org.
IGNITE-1391: Fixed deadlock in discovery message processing caused by platform latch.


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

Branch: refs/heads/ignite-843
Commit: a7631980ef5c0c359e8d74ae77f5d085287da139
Parents: f7230da
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Wed Sep 9 13:31:08 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 13:31:08 2015 +0300

----------------------------------------------------------------------
 .../callback/PlatformCallbackGateway.java       |  5 +-
 .../callback/PlatformCallbackUtils.java         |  3 +-
 .../cpp/common/include/ignite/common/java.h     |  4 +-
 .../platform/src/main/cpp/common/src/java.cpp   |  8 +--
 .../main/dotnet/Apache.Ignite.Core/Ignition.cs  | 28 ++++++--
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |  8 ++-
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |  8 ++-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |  2 +-
 .../platform/PlatformProcessorImpl.java         |  2 +-
 .../IgniteStartStopTest.cs                      | 70 ++++++++++++++++++++
 10 files changed, 114 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index a348888..5d5cdb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -737,13 +737,14 @@ public class PlatformCallbackGateway {
     /**
      * Kernal start callback.
      *
+     * @param proc Platform processor.
      * @param memPtr Memory pointer.
      */
-    public void onStart(long memPtr) {
+    public void onStart(Object proc, long memPtr) {
         enter();
 
         try {
-            PlatformCallbackUtils.onStart(envPtr, memPtr);
+            PlatformCallbackUtils.onStart(envPtr, proc, memPtr);
         }
         finally {
             leave();

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
index dd43e0d..64749ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
@@ -384,9 +384,10 @@ public class PlatformCallbackUtils {
      * Kernal start callback.
      *
      * @param envPtr Environment pointer.
+     * @param proc Platform processor.
      * @param memPtr Memory pointer.
      */
-    static native void onStart(long envPtr, long memPtr);
+    static native void onStart(long envPtr, Object proc, long memPtr);
 
     /*
      * Kernal stop callback.

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/cpp/common/include/ignite/common/java.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/include/ignite/common/java.h b/modules/platform/src/main/cpp/common/include/ignite/common/java.h
index e2d23b2..01ecbe3 100644
--- a/modules/platform/src/main/cpp/common/include/ignite/common/java.h
+++ b/modules/platform/src/main/cpp/common/include/ignite/common/java.h
@@ -96,7 +96,7 @@ namespace ignite
 
             typedef long long(JNICALL *NodeInfoHandler)(void* target, long long memPtr);
 
-            typedef void(JNICALL *OnStartHandler)(void* target, long long memPtr);
+            typedef void(JNICALL *OnStartHandler)(void* target, void* proc, long long memPtr);
             typedef void(JNICALL *OnStopHandler)(void* target);
             typedef void(JNICALL *ErrorHandler)(void* target, int errCode, const char* errClsChars, int errClsCharsLen, const char* errMsgChars, int errMsgCharsLen, void* errData, int errDataLen);
 
@@ -640,7 +640,7 @@ namespace ignite
 
             JNIEXPORT jlong JNICALL JniNodeInfo(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
 
-            JNIEXPORT void JNICALL JniOnStart(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr);
+            JNIEXPORT void JNICALL JniOnStart(JNIEnv *env, jclass cls, jlong envPtr, jobject proc, jlong memPtr);
             JNIEXPORT void JNICALL JniOnStop(JNIEnv *env, jclass cls, jlong envPtr);
 
             JNIEXPORT jlong JNICALL JniExtensionCallbackInLongOutLong(JNIEnv *env, jclass cls, jlong envPtr, jint typ, jlong arg1);

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/cpp/common/src/java.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/src/java.cpp b/modules/platform/src/main/cpp/common/src/java.cpp
index bb4cc20..492e7b6 100644
--- a/modules/platform/src/main/cpp/common/src/java.cpp
+++ b/modules/platform/src/main/cpp/common/src/java.cpp
@@ -311,7 +311,7 @@ namespace ignite
 
             JniMethod M_PLATFORM_CALLBACK_UTILS_MEMORY_REALLOCATE = JniMethod("memoryReallocate", "(JJI)V", true);
 
-            JniMethod M_PLATFORM_CALLBACK_UTILS_ON_START = JniMethod("onStart", "(JJ)V", true);
+            JniMethod M_PLATFORM_CALLBACK_UTILS_ON_START = JniMethod("onStart", "(JLjava/lang/Object;J)V", true);
             JniMethod M_PLATFORM_CALLBACK_UTILS_ON_STOP = JniMethod("onStop", "(J)V", true);
 
             JniMethod M_PLATFORM_CALLBACK_UTILS_EXTENSION_CALLBACK_IN_LONG_OUT_LONG = JniMethod("extensionCallbackInLongOutLong", "(JIJ)J", true);
@@ -322,7 +322,7 @@ namespace ignite
             JniMethod M_PLATFORM_UTILS_ERR_DATA = JniMethod("errorData", "(Ljava/lang/Throwable;)[B", true);
 
             const char* C_PLATFORM_IGNITION = "org/apache/ignite/internal/processors/platform/PlatformIgnition";
-            JniMethod M_PLATFORM_IGNITION_START = JniMethod("start", "(Ljava/lang/String;Ljava/lang/String;IJJ)Lorg/apache/ignite/internal/processors/platform/PlatformProcessor;", true);
+            JniMethod M_PLATFORM_IGNITION_START = JniMethod("start", "(Ljava/lang/String;Ljava/lang/String;IJJ)V", true);
             JniMethod M_PLATFORM_IGNITION_INSTANCE = JniMethod("instance", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformProcessor;", true);
             JniMethod M_PLATFORM_IGNITION_ENVIRONMENT_POINTER = JniMethod("environmentPointer", "(Ljava/lang/String;)J", true);
             JniMethod M_PLATFORM_IGNITION_STOP = JniMethod("stop", "(Ljava/lang/String;Z)Z", true);
@@ -2185,8 +2185,8 @@ namespace ignite
                 IGNITE_SAFE_FUNC(env, envPtr, NodeInfoHandler, nodeInfo, memPtr);
             }
 
-            JNIEXPORT void JNICALL JniOnStart(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr) {
-                IGNITE_SAFE_PROC(env, envPtr, OnStartHandler, onStart, memPtr);
+            JNIEXPORT void JNICALL JniOnStart(JNIEnv *env, jclass cls, jlong envPtr, jobject proc, jlong memPtr) {
+                IGNITE_SAFE_PROC(env, envPtr, OnStartHandler, onStart, env->NewGlobalRef(proc), memPtr);
             }
 
             JNIEXPORT void JNICALL JniOnStop(JNIEnv *env, jclass cls, jlong envPtr) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/dotnet/Apache.Ignite.Core/Ignition.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Ignition.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Ignition.cs
index ef79008..c9de62a 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Ignition.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Ignition.cs
@@ -172,19 +172,19 @@ namespace Apache.Ignite.Core
                 sbyte* gridName0 = IgniteUtils.StringToUtf8Unmanaged(gridName);
 
                 // 3. Create startup object which will guide us through the rest of the process.
-                _startup = new Startup(cfg) { Context = ctx };
+                _startup = new Startup(cfg, cbs) { Context = ctx };
 
                 IUnmanagedTarget interopProc = null;
 
                 try
                 {
                     // 4. Initiate Ignite start.
-                    interopProc = UU.IgnitionStart(cbs.Context, cfg.SpringConfigUrl ?? DefaultCfg, 
+                    UU.IgnitionStart(cbs.Context, cfg.SpringConfigUrl ?? DefaultCfg,
                         cfgEx != null ? cfgEx.GridName : null, ClientMode);
 
                     // 5. At this point start routine is finished. We expect STARTUP object to have all necessary data.
-                    Ignite node = new Ignite(cfg, _startup.Name, interopProc, _startup.Marshaller, 
-                        _startup.LifecycleBeans, cbs);
+                    var node = _startup.Ignite;
+                    interopProc = node.InteropProcessor;
 
                     // 6. On-start callback (notify lifecycle components).
                     node.OnStart();
@@ -351,8 +351,9 @@ namespace Apache.Ignite.Core
         /// <summary>
         /// Kernal start callback.
         /// </summary>
+        /// <param name="interopProc">Interop processor.</param>
         /// <param name="stream">Stream.</param>
-        internal static void OnStart(IPortableStream stream)
+        internal static void OnStart(IUnmanagedTarget interopProc, IPortableStream stream)
         {
             try
             {
@@ -368,6 +369,8 @@ namespace Apache.Ignite.Core
                 if (Nodes.ContainsKey(new NodeKey(name)))
                     throw new IgniteException("Ignite with the same name already started: " + name);
 
+                _startup.Ignite = new Ignite(_startup.Configuration, _startup.Name, interopProc, _startup.Marshaller, 
+                    _startup.LifecycleBeans, _startup.Callbacks);
             }
             catch (Exception e)
             {
@@ -604,17 +607,23 @@ namespace Apache.Ignite.Core
             /// Constructor.
             /// </summary>
             /// <param name="cfg">Configuration.</param>
-            internal Startup(IgniteConfiguration cfg)
+            /// <param name="cbs"></param>
+            internal Startup(IgniteConfiguration cfg, UnmanagedCallbacks cbs)
             {
                 Configuration = cfg;
+                Callbacks = cbs;
             }
-
             /// <summary>
             /// Configuration.
             /// </summary>
             internal IgniteConfiguration Configuration { get; private set; }
 
             /// <summary>
+            /// Gets unmanaged callbacks.
+            /// </summary>
+            internal UnmanagedCallbacks Callbacks { get; private set; }
+
+            /// <summary>
             /// Lifecycle beans.
             /// </summary>
             internal IList<LifecycleBeanHolder> LifecycleBeans { get; set; }
@@ -638,6 +647,11 @@ namespace Apache.Ignite.Core
             /// Gets or sets the context.
             /// </summary>
             internal void* Context { get; set; }
+
+            /// <summary>
+            /// Gets or sets the ignite.
+            /// </summary>
+            internal Ignite Ignite { get; set; }
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Ignite.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
index 7e33416..c5025b2 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
@@ -74,7 +74,7 @@ namespace Apache.Ignite.Core.Impl
         private IClusterNode _locNode;
 
         /** Transactions facade. */
-        private readonly TransactionsImpl _transactions;
+        private readonly Lazy<TransactionsImpl> _transactions;
 
         /** Callbacks */
         private readonly UnmanagedCallbacks _cbs;
@@ -119,7 +119,9 @@ namespace Apache.Ignite.Core.Impl
 
             cbs.Initialize(this);
 
-            _transactions = new TransactionsImpl(UU.ProcessorTransactions(proc), marsh, LocalNode.Id);
+            // Grid is not completely started here, can't initialize interop transactions right away.
+            _transactions = new Lazy<TransactionsImpl>(
+                    () => new TransactionsImpl(UU.ProcessorTransactions(proc), marsh, LocalNode.Id));
         }
 
         /// <summary>
@@ -423,7 +425,7 @@ namespace Apache.Ignite.Core.Impl
         /** <inheritdoc /> */
         public ITransactions Transactions
         {
-            get { return _transactions; }
+            get { return _transactions.Value; }
         }
 
         /** <inheritdoc /> */

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
index 80b33df..9edf2ef 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
@@ -153,7 +153,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 
         private delegate void NodeInfoCallbackDelegate(void* target, long memPtr);
 
-        private delegate void OnStartCallbackDelegate(void* target, long memPtr);
+        private delegate void OnStartCallbackDelegate(void* target, void* proc, long memPtr);
         private delegate void OnStopCallbackDelegate(void* target);
         
         private delegate void ErrorCallbackDelegate(void* target, int errType, sbyte* errClsChars, int errClsCharsLen, sbyte* errMsgChars, int errMsgCharsLen, void* errData, int errDataLen);
@@ -1001,11 +1001,13 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
             }, true);
         }
 
-        private void OnStart(void* target, long memPtr)
+        private void OnStart(void* target, void* proc, long memPtr)
         {
             SafeCall(() =>
             {
-                Ignition.OnStart(IgniteManager.Memory.Get(memPtr).Stream());
+                var proc0 = new UnmanagedTarget(_ctx, proc);
+
+                Ignition.OnStart(proc0, IgniteManager.Memory.Get(memPtr).Stream());
             }, true);
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 9ec2668..4bea392 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -527,7 +527,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
 
         #region NATIVE METHODS: PROCESSOR
 
-        internal static IUnmanagedTarget IgnitionStart(UnmanagedContext ctx, string cfgPath, string gridName, 
+        internal static IUnmanagedTarget IgnitionStart(UnmanagedContext ctx, string cfgPath, string gridName,
             bool clientMode)
         {
             using (var mem = IgniteManager.Memory.Allocate().Stream())

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index e5e7a57..40b1334 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -126,7 +126,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
 
             out.synchronize();
 
-            platformCtx.gateway().onStart(mem.pointer());
+            platformCtx.gateway().onStart(this, mem.pointer());
         }
 
         // At this moment all necessary native libraries must be loaded, so we can process with store creation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7631980/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
index ec7e157..2db1781 100644
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
@@ -19,8 +19,12 @@ namespace Apache.Ignite.Core.Tests
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Threading;
+    using System.Threading.Tasks;
     using Apache.Ignite.Core.Common;
+    using Apache.Ignite.Core.Messaging;
+    using Apache.Ignite.Core.Tests.Process;
     using NUnit.Framework;
 
     /// <summary>
@@ -44,6 +48,7 @@ namespace Apache.Ignite.Core.Tests
         [TearDown]
         public void TearDown()
         {
+            TestUtils.KillProcesses();
             Ignition.StopAll(true);
         }
 
@@ -348,5 +353,70 @@ namespace Apache.Ignite.Core.Tests
 
             Assert.AreEqual(1, cache.Get(1));
         }
+
+        /// <summary>
+        /// Tests the processor initialization and grid usage right after topology enter.
+        /// </summary>
+        [Test]
+        public void TestProcessorInit()
+        {
+            var cfg = new IgniteConfiguration
+            {
+                SpringConfigUrl = "config\\start-test-grid1.xml",
+                JvmOptions = TestUtils.TestJavaOptions(),
+                JvmClasspath = TestUtils.CreateTestClasspath()
+            };
+
+            // Start local node
+            var grid = Ignition.Start(cfg);
+
+            // Start remote node in a separate process
+            // ReSharper disable once UnusedVariable
+            var proc = new IgniteProcess(
+                "-jvmClasspath=" + TestUtils.CreateTestClasspath(),
+                "-springConfigUrl=" + Path.GetFullPath(cfg.SpringConfigUrl),
+                "-J-Xms512m", "-J-Xmx512m");
+
+            var cts = new CancellationTokenSource();
+            var token = cts.Token;
+
+            // Spam message subscriptions on a separate thread 
+            // to test race conditions during processor init on remote node
+            var listenTask = Task.Factory.StartNew(() =>
+            {
+                var filter = new MessageFilter();
+
+                while (!token.IsCancellationRequested)
+                {
+                    var listenId = grid.Message().RemoteListen(filter);
+
+                    grid.Message().StopRemoteListen(listenId);
+                }
+                // ReSharper disable once FunctionNeverReturns
+            });
+
+            // Wait for remote node to join
+            Assert.IsTrue(grid.WaitTopology(2, 30000));
+
+            // Wait some more for initialization
+            Thread.Sleep(1000);
+
+            // Cancel listen task and check that it finishes
+            cts.Cancel();
+            Assert.IsTrue(listenTask.Wait(5000));
+        }
+
+        /// <summary>
+        /// Noop message filter.
+        /// </summary>
+        [Serializable]
+        private class MessageFilter : IMessageFilter<int>
+        {
+            /** <inheritdoc /> */
+            public bool Invoke(Guid nodeId, int message)
+            {
+                return true;
+            }
+        }
     }
 }

[31/50] ignite git commit: ignite-1349 Use cache proxy in IgfsDataManager for tx thread-local context cleanup.

Posted by ak...@apache.org.
ignite-1349 Use cache proxy in IgfsDataManager for tx thread-local context cleanup.


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

Branch: refs/heads/ignite-843
Commit: 9f59c3f5e6503205525f7507c6d1e82f9de7b6c9
Parents: 2198381
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 17:26:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 17:26:52 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/igfs/IgfsDataManager.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9f59c3f5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index c571f41..b1b51f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -68,7 +68,6 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
-import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
 import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
 import org.apache.ignite.internal.processors.datastreamer.DataStreamerCacheUpdaters;
@@ -239,16 +238,15 @@ public class IgfsDataManager extends IgfsManager {
     }
 
     /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
     @Override protected void onKernalStart0() throws IgniteCheckedException {
-        igfsCtx.kernalContext().cache().getOrStartCache(igfsCtx.configuration().getDataCacheName());
-        dataCachePrj = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName());
+        dataCachePrj = igfsCtx.kernalContext().cache().getOrStartCache(igfsCtx.configuration().getDataCacheName());
 
-        igfsCtx.kernalContext().cache().getOrStartCache(igfsCtx.configuration().getDataCacheName());
-        dataCache = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName());
+        assert dataCachePrj != null;
 
-        metrics = igfsCtx.igfs().localMetrics();
+        dataCache = (IgniteInternalCache)dataCachePrj;
 
-        assert dataCachePrj != null;
+        metrics = igfsCtx.igfs().localMetrics();
 
         AffinityKeyMapper mapper = igfsCtx.kernalContext().cache()
             .internalCache(igfsCtx.configuration().getDataCacheName()).configuration().getAffinityMapper();
@@ -312,7 +310,7 @@ public class IgfsDataManager extends IgfsManager {
      */
     public IgniteUuid nextAffinityKey(@Nullable IgniteUuid prevAffKey) {
         // Do not generate affinity key for non-affinity nodes.
-        if (!((GridCacheAdapter)dataCache).context().affinityNode())
+        if (!dataCache.context().affinityNode())
             return null;
 
         UUID nodeId = igfsCtx.kernalContext().localNodeId();

[04/50] ignite git commit: Enabled test.

Posted by ak...@apache.org.
Enabled test.


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

Branch: refs/heads/ignite-843
Commit: d8cd7ba249e3ecea5508a387765ef12ddb6851f3
Parents: 6592208
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 12:30:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 12:30:21 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridStartStopSelfTest.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d8cd7ba2/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index ce78c5f..a08db92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal;
 
 import java.util.concurrent.CountDownLatch;
+import javax.cache.CacheException;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
@@ -69,14 +70,9 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * TODO: IGNITE-580.
-     *
      * @throws Exception If failed.
      */
     public void testStopWhileInUse() throws Exception {
-        // Test works too long.
-        fail("https://issues.apache.org/jira/browse/IGNITE-580");
-        
         IgniteConfiguration cfg = new IgniteConfiguration();
 
         cfg.setConnectorConfiguration(null);
@@ -132,7 +128,12 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
 
         info("Before remove.");
 
-        g1.cache(null).remove(1);
+        try {
+            g1.cache(null).remove(1);
+        }
+        catch (CacheException ignore) {
+            // No-op.
+        }
     }
 
     /**

[03/50] ignite git commit: IGNITE-1387 Platform .Net: cache.Invoke does not work with portable objects without Java counterpart

Posted by ak...@apache.org.
IGNITE-1387 Platform .Net: cache.Invoke does not work with portable objects without Java counterpart


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

Branch: refs/heads/ignite-843
Commit: 2326bb53fd62104b8816fe6da6f388963dc268cd
Parents: 6592208
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Sep 8 12:29:34 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Sep 8 12:29:34 2015 +0300

----------------------------------------------------------------------
 .../platform/cache/PlatformCacheEntryProcessorImpl.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2326bb53/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
index 16124fe..f59a63f 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
@@ -175,7 +175,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
 
         switch (state) {
             case ENTRY_STATE_VALUE_SET:
-                entry.setValue(reader.readObject());
+                entry.setValue(reader.readObjectDetached());
 
                 break;
 
@@ -205,7 +205,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
                 assert state == ENTRY_STATE_INTACT;
         }
 
-        return reader.readObject();
+        return reader.readObjectDetached();
     }
 
     /** {@inheritDoc} */

[49/50] ignite git commit: CPP tests: Better JVM heap adjustment for 32-bit platforms.

Posted by ak...@apache.org.
CPP tests: Better JVM heap adjustment for 32-bit platforms.


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

Branch: refs/heads/ignite-843
Commit: 6771638a5c88940073a2034e81e3f17d83c6cd69
Parents: 597c5d9
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 15:30:32 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 15:30:32 2015 +0300

----------------------------------------------------------------------
 .../src/main/cpp/core-test/project/vs/core-test.vcxproj     | 4 ++--
 .../src/main/cpp/core-test/src/cache_query_test.cpp         | 5 +++++
 modules/platform/src/main/cpp/core-test/src/cache_test.cpp  | 5 +++++
 .../platform/src/main/cpp/core-test/src/ignition_test.cpp   | 9 +++++++--
 4 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
index aa8cb98..ca6ee1a 100644
--- a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
+++ b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
@@ -124,7 +124,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
     </ClCompile>
     <Link>
@@ -158,7 +158,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
     </ClCompile>
     <Link>

http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
index 99ef727..47009f4 100644
--- a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
@@ -199,8 +199,13 @@ struct CacheQueryTestSuiteFixture {
         cfg.jvmOptsLen = 5;
         cfg.jvmOpts = opts;
 
+#ifdef IGNITE_TESTS_32
         cfg.jvmInitMem = 256;
         cfg.jvmMaxMem = 768;
+#else
+        cfg.jvmInitMem = 1024;
+        cfg.jvmMaxMem = 4096;
+#endif
 
         char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
index 4c1069c..3239d89 100644
--- a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
@@ -106,8 +106,13 @@ struct CacheTestSuiteFixture {
         cfg.jvmOptsLen = 5;
         cfg.jvmOpts = opts;
 
+#ifdef IGNITE_TESTS_32
         cfg.jvmInitMem = 256;
         cfg.jvmMaxMem = 768;
+#else
+        cfg.jvmInitMem = 1024;
+        cfg.jvmMaxMem = 4096;
+#endif
 
         char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6771638a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp b/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
index 3f5edca..e0e26d3 100644
--- a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
@@ -44,8 +44,13 @@ BOOST_AUTO_TEST_CASE(TestIgnition)
     cfg.jvmOptsLen = 5;
     cfg.jvmOpts = opts;
 
-    cfg.jvmInitMem = 256;
-    cfg.jvmMaxMem = 768;
+#ifdef IGNITE_TESTS_32
+        cfg.jvmInitMem = 256;
+        cfg.jvmMaxMem = 768;
+#else
+        cfg.jvmInitMem = 1024;
+        cfg.jvmMaxMem = 4096;
+#endif
 
     char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");

[02/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: 659220820dbc91b3001bfedb42d80b5f0f03df14
Parents: fc362fb aa35e36
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 12:14:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 12:14:10 2015 +0300

----------------------------------------------------------------------
 .../util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java      | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------

[35/50] ignite git commit: Fixed GridCommonAbstractTest.awaitPartitionMapExchange.

Posted by ak...@apache.org.
Fixed GridCommonAbstractTest.awaitPartitionMapExchange.


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

Branch: refs/heads/ignite-843
Commit: b295bc5bc1a0e98bf4a9fb6c28d7db32ff75aa6f
Parents: e4e39af
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 9 09:39:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 9 09:39:27 2015 +0300

----------------------------------------------------------------------
 .../junits/common/GridCommonAbstractTest.java   | 59 +++++++++++++-------
 1 file changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b295bc5b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 13ec665..44ca051 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -284,6 +284,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param replaceExistingValues Replace existing values.
      * @throws Exception If failed.
      */
+    @SuppressWarnings("unchecked")
     protected static <K> void loadAll(Cache<K, ?> cache, final Set<K> keys, final boolean replaceExistingValues) throws Exception {
         IgniteCache<K, Object> cacheCp = (IgniteCache<K, Object>)cache;
 
@@ -425,33 +426,54 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                         long start = 0;
 
                         for (int i = 0; ; i++) {
-                            // Must map on updated version of topology.
-                            Collection<ClusterNode> affNodes =
-                                g0.affinity(cfg.getName()).mapPartitionToPrimaryAndBackups(p);
+                            boolean match = false;
+
+                            AffinityTopologyVersion readyVer = dht.context().shared().exchange().readyAffinityVersion();
+
+                            if (readyVer.topologyVersion() > 0 && dht.context().started()) {
+                                // Must map on updated version of topology.
+                                Collection<ClusterNode> affNodes =
+                                    g0.affinity(cfg.getName()).mapPartitionToPrimaryAndBackups(p);
 
-                            int exp = affNodes.size();
+                                int exp = affNodes.size();
 
-                            GridDhtTopologyFuture topFut = top.topologyVersionFuture();
+                                GridDhtTopologyFuture topFut = top.topologyVersionFuture();
 
-                            Collection<ClusterNode> owners = (topFut != null && topFut.isDone()) ?
-                                top.nodes(p, AffinityTopologyVersion.NONE) : Collections.<ClusterNode>emptyList();
+                                Collection<ClusterNode> owners = (topFut != null && topFut.isDone()) ?
+                                    top.nodes(p, AffinityTopologyVersion.NONE) : Collections.<ClusterNode>emptyList();
 
-                            int actual = owners.size();
+                                int actual = owners.size();
 
-                            if (affNodes.size() != owners.size() || !affNodes.containsAll(owners)) {
+                                if (affNodes.size() != owners.size() || !affNodes.containsAll(owners)) {
+                                    LT.warn(log(), null, "Waiting for topology map update [" +
+                                        "grid=" + g.name() +
+                                        ", cache=" + cfg.getName() +
+                                        ", cacheId=" + dht.context().cacheId() +
+                                        ", topVer=" + top.topologyVersion() +
+                                        ", topFut=" + topFut +
+                                        ", p=" + p +
+                                        ", affNodesCnt=" + exp +
+                                        ", ownersCnt=" + actual +
+                                        ", affNodes=" + affNodes +
+                                        ", owners=" + owners +
+                                        ", locNode=" + g.cluster().localNode() + ']');
+                                }
+                                else
+                                    match = true;
+                            }
+                            else {
                                 LT.warn(log(), null, "Waiting for topology map update [" +
                                     "grid=" + g.name() +
                                     ", cache=" + cfg.getName() +
                                     ", cacheId=" + dht.context().cacheId() +
                                     ", topVer=" + top.topologyVersion() +
-                                    ", topFut=" + topFut +
+                                    ", started=" + dht.context().started() +
                                     ", p=" + p +
-                                    ", affNodesCnt=" + exp +
-                                    ", ownersCnt=" + actual +
-                                    ", affNodes=" + affNodes +
-                                    ", owners=" + owners +
+                                    ", readVer=" + readyVer +
                                     ", locNode=" + g.cluster().localNode() + ']');
+                            }
 
+                            if (!match) {
                                 if (i == 0)
                                     start = System.currentTimeMillis();
 
@@ -461,12 +483,8 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                                         ", cache=" + cfg.getName() +
                                         ", cacheId=" + dht.context().cacheId() +
                                         ", topVer=" + top.topologyVersion() +
-                                        ", topFut=" + topFut +
                                         ", p=" + p +
-                                        ", affNodesCnt=" + exp +
-                                        ", ownersCnt=" + actual +
-                                        ", affNodes=" + affNodes +
-                                        ", owners=" + owners +
+                                        ", readVer=" + readyVer +
                                         ", locNode=" + g.cluster().localNode() + ']');
 
                                 Thread.sleep(200); // Busy wait.
@@ -540,6 +558,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param startFrom Start value for keys search.
      * @return Collection of keys for which given cache is primary.
      */
+    @SuppressWarnings("unchecked")
     protected List<Integer> primaryKeys(IgniteCache<?, ?> cache, int cnt, int startFrom) {
         assert cnt > 0 : cnt;
 
@@ -591,6 +610,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param startFrom Start value for keys search.
      * @return Collection of keys for which given cache is backup.
      */
+    @SuppressWarnings("unchecked")
     protected List<Integer> backupKeys(IgniteCache<?, ?> cache, int cnt, int startFrom) {
         assert cnt > 0 : cnt;
 
@@ -621,6 +641,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @return Collection of keys for which given cache is neither primary nor backup.
      * @throws IgniteCheckedException If failed.
      */
+    @SuppressWarnings("unchecked")
     protected List<Integer> nearKeys(IgniteCache<?, ?> cache, int cnt, int startFrom)
         throws IgniteCheckedException {
         assert cnt > 0 : cnt;

[26/50] ignite git commit: Merge remote-tracking branch 'origin/master'

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-843
Commit: 5ec703d8eedf0a6c2e77f52a3a492ce8e52cf2c1
Parents: cc53981 e755554
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 8 16:47:07 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 8 16:47:07 2015 +0300

----------------------------------------------------------------------
 .../platform/src/main/cpp/common/project/vs/common.vcxproj   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------

[48/50] ignite git commit: Fixing accidental commong CPP change.

Posted by ak...@apache.org.
Fixing accidental commong CPP change.


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

Branch: refs/heads/ignite-843
Commit: 597c5d9a5f75fe8a3913a2f856b0206c312c3904
Parents: a8b0f6a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 15:13:19 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 15:13:19 2015 +0300

----------------------------------------------------------------------
 modules/platform/src/main/cpp/common/src/java.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/597c5d9a/modules/platform/src/main/cpp/common/src/java.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/src/java.cpp b/modules/platform/src/main/cpp/common/src/java.cpp
index 492e7b6..f2cccb6 100644
--- a/modules/platform/src/main/cpp/common/src/java.cpp
+++ b/modules/platform/src/main/cpp/common/src/java.cpp
@@ -322,7 +322,7 @@ namespace ignite
             JniMethod M_PLATFORM_UTILS_ERR_DATA = JniMethod("errorData", "(Ljava/lang/Throwable;)[B", true);
 
             const char* C_PLATFORM_IGNITION = "org/apache/ignite/internal/processors/platform/PlatformIgnition";
-            JniMethod M_PLATFORM_IGNITION_START = JniMethod("start", "(Ljava/lang/String;Ljava/lang/String;IJJ)V", true);
+            JniMethod M_PLATFORM_IGNITION_START = JniMethod("start", "(Ljava/lang/String;Ljava/lang/String;IJJ)Lorg/apache/ignite/internal/processors/platform/PlatformProcessor;", true);
             JniMethod M_PLATFORM_IGNITION_INSTANCE = JniMethod("instance", "(Ljava/lang/String;)Lorg/apache/ignite/internal/processors/platform/PlatformProcessor;", true);
             JniMethod M_PLATFORM_IGNITION_ENVIRONMENT_POINTER = JniMethod("environmentPointer", "(Ljava/lang/String;)J", true);
             JniMethod M_PLATFORM_IGNITION_STOP = JniMethod("stop", "(Ljava/lang/String;Z)Z", true);

[27/50] ignite git commit: Ignite-805 (cherry picked from commit cc53981)

Posted by ak...@apache.org.
Ignite-805
(cherry picked from commit cc53981)


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

Branch: refs/heads/ignite-843
Commit: de6e7d9b02890f9813c87954645e523e97951c8d
Parents: 069653b
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 8 16:46:41 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 8 16:47:50 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiMultithreadedSelfTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/de6e7d9b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 2959b34..e89288f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.cache.Cache;
@@ -59,7 +59,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
     private static final String READ_THREAD_NAME = "read-thread";
 
     /** */
-    private static final int PUT_CNT = 100;
+    private static final int PUT_CNT = 1000;
 
     /** */
     private final AtomicInteger cnt = new AtomicInteger();
@@ -152,7 +152,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @return Range of keys.
      */
     private Set<String> rangeKeys(int fromIncl, int toExcl) {
-        return new HashSet<>(F.transform(F.range(fromIncl, toExcl), new C1<Integer, String>() {
+        return new TreeSet<>(F.transform(F.range(fromIncl, toExcl), new C1<Integer, String>() {
             @Override public String apply(Integer i) {
                 return "key" + i;
             }

[08/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: 483dde7f6a1ec3e7ba3fc0f52b8125d9ae188277
Parents: a96849d 4c917c8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 12:42:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 12:42:49 2015 +0300

----------------------------------------------------------------------
 .../portable/datagrid/CacheClientPortableQueryExample.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------

[41/50] ignite git commit: Added CPP example.

Posted by ak...@apache.org.
Added CPP example.


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

Branch: refs/heads/ignite-843
Commit: b287ef240995311fb86bb03b26e4c3ee18b4d73d
Parents: fba01d6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 9 12:40:19 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 9 12:40:19 2015 +0300

----------------------------------------------------------------------
 examples/src/main/cpp/Makefile.am               |  39 ++++++
 examples/src/main/cpp/README.txt                |  41 ++++++
 examples/src/main/cpp/configure.ac              |  30 +++++
 examples/src/main/cpp/include/Makefile.am       |  21 ++++
 .../main/cpp/include/ignite/examples/address.h  | 109 ++++++++++++++++
 .../cpp/include/ignite/examples/organization.h  | 111 ++++++++++++++++
 .../src/main/cpp/project/vs/ignite-examples.sln |  19 +++
 .../main/cpp/project/vs/ignite-examples.vcxproj | 107 ++++++++++++++++
 .../project/vs/ignite-examples.vcxproj.filters  |  30 +++++
 examples/src/main/cpp/src/putgetexample.cpp     | 126 +++++++++++++++++++
 10 files changed, 633 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/Makefile.am b/examples/src/main/cpp/Makefile.am
new file mode 100644
index 0000000..84fe957
--- /dev/null
+++ b/examples/src/main/cpp/Makefile.am
@@ -0,0 +1,39 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+SUBDIRS = . include
+DIST_SUBDIRS = . include
+
+AM_CPPFLAGS = -I$(srcdir)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL
+AM_CXXFLAGS = -Wall -std=c++0x
+
+noinst_PROGRAMS = ignite-putgetexample
+
+ignite_putgetexample_SOURCES = src/putgetexample.cpp
+
+ignite_putgetexample_LDFLAGS = -static-libtool-libs -L/usr/local/lib -lignite
+
+run-check: check
+	./ignite-putgetexample -p
+
+clean-local: clean-check
+	$(RM) *.gcno *.gcda
+
+clean-check:
+	$(RM) $(ignite_putgetexample_OBJECTS)

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/README.txt
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/README.txt b/examples/src/main/cpp/README.txt
new file mode 100644
index 0000000..68f35a3
--- /dev/null
+++ b/examples/src/main/cpp/README.txt
@@ -0,0 +1,41 @@
+Ignite C++ Examples
+==================================
+
+Common requirements
+----------------------------------
+ * Java Development Kit (JDK) must be installed: https://java.com/en/download/index.jsp
+ * JAVA_HOME environment variable must be set pointing to Java installation directory.
+  * IGNITE_HOME environment variable must be set to Ignite installation directory.
+ * Ingnite C++ must be built according to instructions for your platform.
+
+Running examples on Linux
+----------------------------------
+
+Prerequisites:
+ * GCC, g++, autotools, automake, and libtool must be installed.
+
+To build examples execute the following commands one by one from $IGNITE_HOME/examples/platforms/cpp directory:
+ * libtoolize
+ * aclocal
+ * autoheader
+ * automake --add-missing
+ * autoreconf
+ * ./configure
+ * make
+
+As a result several executables will appear in example's directory.
+
+Before running examples ensure that:
+ * LD_LIBRARY_PATH environment variable is set and pointing to a directory with "libjvm.so" library. Typically this
+   library is located in $JAVA_HOME/jre/lib/amd64/server directory.
+
+
+Running examples on Windows
+----------------------------------
+
+Prerequisites:
+ * Microsoft Visual Studio (tm) 2010 or higher must be installed.
+ * Windows SDK 7.1 must be installed.
+
+Open Visual Studio solution %IGNITE_HOME%\examples\platforms\cpp\project\vs\ignite-examples.sln and select proper
+platform (x64 or x86). Run the solution.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/configure.ac
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/configure.ac b/examples/src/main/cpp/configure.ac
new file mode 100644
index 0000000..a5ffb98
--- /dev/null
+++ b/examples/src/main/cpp/configure.ac
@@ -0,0 +1,30 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.68)
+AC_INIT([Ingnite C++ examples],[1.5.0],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
+AC_CONFIG_SRCDIR([src])
+AC_CONFIG_MACRO_DIR([m4])
+AC_LANG([C++])
+
+AC_CANONICAL_SYSTEM
+
+dnl Initialize automake
+AM_INIT_AUTOMAKE([-Wall foreign])
+AC_CONFIG_HEADER([config.h])
+
+GXX="-g -O2"
+
+AC_PROG_CXX
+
+AC_ARG_ENABLE([debug],
+ [AS_HELP_STRING([--enable-debug],[enable debug build [default=no]])],
+ [],[enable_debug=no])
+
+if test "x$enable_debug" = xyes; then
+    CXXFLAGS="-g -O0"
+else
+    CXXFLAGS="-g -O3"
+fi
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/include/Makefile.am
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/include/Makefile.am b/examples/src/main/cpp/include/Makefile.am
new file mode 100644
index 0000000..13a8816
--- /dev/null
+++ b/examples/src/main/cpp/include/Makefile.am
@@ -0,0 +1,21 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+ACLOCAL_AMFLAGS = "-Im4"
+
+nobase_include_HEADERS = ignite/examples/address.h \
+                         ignite/examples/organization.h

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/include/ignite/examples/address.h
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/include/ignite/examples/address.h b/examples/src/main/cpp/include/ignite/examples/address.h
new file mode 100644
index 0000000..29dbb0c
--- /dev/null
+++ b/examples/src/main/cpp/include/ignite/examples/address.h
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_EXAMPLES_ADDRESS
+#define _IGNITE_EXAMPLES_ADDRESS
+
+#include "ignite/portable/portable.h"
+
+namespace ignite
+{
+    namespace examples 
+    {
+        struct Address 
+        {
+            Address()
+            {
+                street = "";
+                zip = 0;
+            }
+            
+            Address(std::string street, int zip) : street(street), zip(zip) 
+            {
+                // No-op.
+            }
+            
+            std::string ToString() 
+            {
+                std::ostringstream oss;
+
+                oss << "Address [street=" << street << ", zip=" << zip << "]";
+
+                return oss.str();
+            }
+            
+            std::string street;
+            int zip;
+        };    
+    }
+}
+
+namespace ignite
+{
+    namespace portable 
+    {
+        template<>
+        struct PortableType<ignite::examples::Address>
+        {
+            int32_t GetTypeId()
+            {
+                return GetPortableStringHashCode("Address");
+            }
+
+            std::string GetTypeName()
+            {
+                return "Address";
+            }
+
+            int32_t GetFieldId(const char* name)
+            {
+                return GetPortableStringHashCode(name);
+            }
+
+            int32_t GetHashCode(ignite::examples::Address obj)
+            {
+                return 0;
+            }
+
+            bool IsNull(ignite::examples::Address obj)
+            {
+                return false;
+            }
+
+            ignite::examples::Address GetNull()
+            {
+                return ignite::examples::Address("", 0);
+            }
+
+            void Write(PortableWriter& writer, ignite::examples::Address obj)
+            {
+                writer.WriteString("street", obj.street);
+                writer.WriteInt32("zip", obj.zip);
+            }
+
+            ignite::examples::Address Read(PortableReader& reader)
+            {
+                std::string street = reader.ReadString("street");
+                int zip = reader.ReadInt32("zip");
+                
+                return ignite::examples::Address(street, zip);
+            }
+        };    
+    }    
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/include/ignite/examples/organization.h
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/include/ignite/examples/organization.h b/examples/src/main/cpp/include/ignite/examples/organization.h
new file mode 100644
index 0000000..c9137c9
--- /dev/null
+++ b/examples/src/main/cpp/include/ignite/examples/organization.h
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _IGNITE_EXAMPLES_ORGANIZATION
+#define _IGNITE_EXAMPLES_ORGANIZATION
+
+#include "ignite/portable/portable.h"
+
+#include "ignite/examples/address.h"
+
+namespace ignite
+{
+    namespace examples 
+    {
+        struct Organization 
+        {
+            Organization()
+            {
+                name = "";
+                addr = Address();
+            }
+            
+            Organization(std::string name, Address addr) : name(name), addr(addr) 
+            {
+                // No-op.
+            }
+            
+            std::string ToString() 
+            {
+                std::ostringstream oss;
+
+                oss << "Organization [name=" << name << ", Address=" << addr.ToString() << "]";
+
+                return oss.str();
+            }
+            
+            std::string name;
+            Address addr;
+        };    
+    }
+}
+
+namespace ignite
+{
+    namespace portable 
+    {
+        template<>
+        struct PortableType<ignite::examples::Organization>
+        {
+            int32_t GetTypeId()
+            {
+                return GetPortableStringHashCode("Organization");
+            }
+
+            std::string GetTypeName()
+            {
+                return "Organization";
+            }
+
+            int32_t GetFieldId(const char* name)
+            {
+                return GetPortableStringHashCode(name);
+            }
+
+            int32_t GetHashCode(ignite::examples::Organization obj)
+            {
+                return 0;
+            }
+
+            bool IsNull(ignite::examples::Organization obj)
+            {
+                return false;
+            }
+
+            ignite::examples::Organization GetNull()
+            {
+                return ignite::examples::Organization("", ignite::examples::Address());
+            }
+
+            void Write(PortableWriter& writer, ignite::examples::Organization obj)
+            {
+                writer.WriteString("name", obj.name);
+                writer.WriteObject<ignite::examples::Address>("addr", obj.addr);
+            }
+
+            ignite::examples::Organization Read(PortableReader& reader)
+            {
+                std::string name = reader.ReadString("name");
+                ignite::examples::Address addr = reader.ReadObject<ignite::examples::Address>("addr");
+                                
+                return ignite::examples::Organization(name, addr);
+            }
+        };    
+    }    
+}
+
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/project/vs/ignite-examples.sln
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/project/vs/ignite-examples.sln b/examples/src/main/cpp/project/vs/ignite-examples.sln
new file mode 100644
index 0000000..4970654
--- /dev/null
+++ b/examples/src/main/cpp/project/vs/ignite-examples.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ignite-examples", "ignite-examples.vcxproj", "{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.ActiveCfg = Release|x64
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x64.Build.0 = Release|x64
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.ActiveCfg = Release|Win32
+		{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/project/vs/ignite-examples.vcxproj
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/project/vs/ignite-examples.vcxproj b/examples/src/main/cpp/project/vs/ignite-examples.vcxproj
new file mode 100644
index 0000000..845aa53
--- /dev/null
+++ b/examples/src/main/cpp/project/vs/ignite-examples.vcxproj
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34935DEC-80FC-4168-AA52-3DBFF4F79B6B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>igniteexamples</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
+copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)"
+copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\putgetexample.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\ignite\examples\address.h" />
+    <ClInclude Include="..\include\ignite\examples\organization.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters b/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters
new file mode 100644
index 0000000..78a7847
--- /dev/null
+++ b/examples/src/main/cpp/project/vs/ignite-examples.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\putgetexample.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\ignite\examples\address.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\ignite\examples\organization.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b287ef24/examples/src/main/cpp/src/putgetexample.cpp
----------------------------------------------------------------------
diff --git a/examples/src/main/cpp/src/putgetexample.cpp b/examples/src/main/cpp/src/putgetexample.cpp
new file mode 100644
index 0000000..9ba1258
--- /dev/null
+++ b/examples/src/main/cpp/src/putgetexample.cpp
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+
+#include "ignite/ignite.h"
+#include "ignite/ignition.h"
+
+#include "ignite/examples/organization.h"
+
+using namespace ignite;
+using namespace cache;
+
+using namespace examples;
+
+/*
+ * Execute individual Put and Get operations.
+ * 
+ * @param cache Cache instance.
+ */
+void PutGet(Cache<int, Organization>& cache) 
+{
+    // Create new Organization to store in cache.
+    Organization org("Microsoft", Address("1096 Eddy Street, San Francisco, CA", 94109));
+    
+    // Put organization to cache.        
+    cache.Put(1, org);
+    
+    // Get recently created employee as a strongly-typed fully de-serialized instance.
+    Organization orgFromCache = cache.Get(1);
+
+    std::cout <<  ">>> Retrieved organization instance from cache: " << std::endl;
+    std::cout << orgFromCache.ToString() << std::endl;
+    std::cout << std::endl;
+}
+
+/*
+ * Execute bulk Put and Get operations.
+ */
+void PutGetAll(Cache<int, Organization>& cache) 
+{
+    // Create new Organizations to store in cache.
+    Organization org1("Microsoft", Address("1096 Eddy Street, San Francisco, CA", 94109));
+    Organization org2("Red Cross", Address("184 Fidler Drive, San Antonio, TX", 78205));
+    
+    // Put created data entries to cache.
+    std::map<int, Organization> vals;
+    
+    vals[1] = org1;
+    vals[2] = org2;
+    
+    cache.PutAll(vals);
+
+    // Get recently created organizations as a strongly-typed fully de-serialized instances.
+    std::set<int> keys;
+    
+    keys.insert(1);
+    keys.insert(2);
+    
+    std::map<int, Organization> valsFromCache = cache.GetAll(keys);
+
+    std::cout <<  ">>> Retrieved organization instances from cache: " << std::endl;
+    
+    for (std::map<int, Organization>::iterator it = valsFromCache.begin(); it != valsFromCache.end(); ++it) 
+        std::cout <<  it->second.ToString() << std::endl;
+    
+    std::cout << std::endl;
+}
+
+int main()
+{
+    IgniteConfiguration cfg;
+
+    cfg.jvmInitMem = 512;
+    cfg.jvmMaxMem = 512;
+    
+    cfg.springCfgPath = "examples/config/cpp/example-cache.xml";
+ 
+    try 
+    {
+        // Start a node.
+        Ignite grid = Ignition::Start(cfg);
+        
+        std::cout << std::endl;
+        std::cout << ">>> Cache put-get example started." << std::endl;
+        std::cout << std::endl;
+        
+        // Get cache instance.
+        Cache<int, Organization> cache = grid.GetCache<int, Organization>(NULL);
+        
+        // Clear cache.
+        cache.Clear();
+
+        PutGet(cache);
+        PutGetAll(cache);        
+        
+        // Stop node.
+        Ignition::StopAll(false);
+    }
+    catch (IgniteError& err)
+    {
+        std::cout << "An error occurred: " << err.GetText() << std::endl;
+    }
+    
+    std::cout << std::endl;
+    std::cout << ">>> Example finished, press any key to exit ..." << std::endl;
+    std::cout << std::endl;
+    
+    std::cin.get();
+    
+    return 0;
+}
\ No newline at end of file

[20/50] ignite git commit: More info in assert.

Posted by ak...@apache.org.
More info in assert.


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

Branch: refs/heads/ignite-843
Commit: e5b06e39d97a363786f405d7de526ad79048c742
Parents: 4ae4094
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 14:39:47 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 14:39:47 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheMvccCandidate.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e5b06e39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
index 2df103d..e784f42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
@@ -531,7 +531,7 @@ public class GridCacheMvccCandidate implements Externalizable,
      * @param prev Lock that comes before in the same thread.
      */
     public void previous(GridCacheMvccCandidate prev) {
-        assert threadId == prev.threadId;
+        assert threadId == prev.threadId : "Invalid threadId [this=" + this + ", prev=" + prev + ']';
 
         this.prev = prev;
     }

[18/50] ignite git commit: Removed tests (not valid anymore).

Posted by ak...@apache.org.
Removed tests (not valid anymore).


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

Branch: refs/heads/ignite-843
Commit: 55db6f03a45723aab1a8c940cae570f4b5aaedce
Parents: b7bdfe2
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 13:53:13 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 13:53:13 2015 +0300

----------------------------------------------------------------------
 .../query/h2/GridIndexingSpiAbstractSelfTest.java      | 13 -------------
 1 file changed, 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/55db6f03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index eeddf54..acfe3b6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -428,19 +428,6 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
         }
     }
 
-    public void testResultReuse() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-828");
-
-        final IgniteH2Indexing spi = getIndexing();
-
-        multithreaded(new Callable<Object>() {
-              @Override public Object call() throws Exception {
-                  return spi.queryFields(null, "SELECT sum(x) + sum(x) + sum(x) + sum(x) FROM SYSTEM_RANGE(?, ?)",
-                      F.<Object>asList(0, 7000000), null);
-              }
-          }, 5);
-    }
-
     /**
      * Index descriptor.
      */

[33/50] ignite git commit: ignite-1261 App context should be transient.

Posted by ak...@apache.org.
ignite-1261 App context should be transient.


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

Branch: refs/heads/ignite-843
Commit: b8db248e6bca8dc1247867fbf5ecb27639dd7f68
Parents: 9f59c3f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 17:35:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 17:35:27 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b8db248e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
index d258600..c90a69b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
@@ -72,7 +72,7 @@ public class CacheJdbcPojoStoreFactory<K, V> implements Factory<CacheJdbcPojoSto
 
     /** Application context. */
     @SpringApplicationContextResource
-    private Object appContext;
+    private transient Object appContext;
 
     /** {@inheritDoc} */
     @Override public CacheJdbcPojoStore<K, V> create() {

[10/50] ignite git commit: Increased test timeout.

Posted by ak...@apache.org.
Increased test timeout.


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

Branch: refs/heads/ignite-843
Commit: 86f80372a23e502b58649b1e36c8a8a84f035318
Parents: c6d4b46
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 13:21:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 13:21:39 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridVersionSelfTest.java    | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/86f80372/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
index d383ad6..4751a0c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER;
@@ -36,20 +37,17 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
         System.setProperty(IGNITE_UPDATE_NOTIFIER, "true");
 
         try {
-            IgniteEx ignite = (IgniteEx)startGrid();
+            final IgniteEx ignite = (IgniteEx)startGrid();
 
             IgniteProductVersion currVer = ignite.version();
 
-            String newVer = null;
+            GridTestUtils.waitForCondition(new GridAbsPredicate() {
+                @Override public boolean apply() {
+                    return ignite.latestVersion() != null;
+                }
+            }, 2 * 60_000);
 
-            for (int i = 0; i < 30; i++) {
-                newVer = ignite.latestVersion();
-
-                if (newVer != null)
-                    break;
-
-                U.sleep(100);
-            }
+            String newVer = ignite.latestVersion();
 
             info("Versions [cur=" + currVer + ", latest=" + newVer + ']');

[29/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4


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

Branch: refs/heads/ignite-843
Commit: e08205d60f09ed58707358b077b5d1f132cafa2e
Parents: b5eeb3b de6e7d9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 16:52:29 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 16:52:29 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiMultithreadedSelfTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------

[25/50] ignite git commit: Ignite-805

Posted by ak...@apache.org.
Ignite-805


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

Branch: refs/heads/ignite-843
Commit: cc53981a48439edb21c9119e23ba42ab90c73c42
Parents: 2715057
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Sep 8 16:46:41 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Sep 8 16:46:41 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiMultithreadedSelfTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cc53981a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 2959b34..e89288f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.cache.Cache;
@@ -59,7 +59,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
     private static final String READ_THREAD_NAME = "read-thread";
 
     /** */
-    private static final int PUT_CNT = 100;
+    private static final int PUT_CNT = 1000;
 
     /** */
     private final AtomicInteger cnt = new AtomicInteger();
@@ -152,7 +152,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @return Range of keys.
      */
     private Set<String> rangeKeys(int fromIncl, int toExcl) {
-        return new HashSet<>(F.transform(F.range(fromIncl, toExcl), new C1<Integer, String>() {
+        return new TreeSet<>(F.transform(F.range(fromIncl, toExcl), new C1<Integer, String>() {
             @Override public String apply(Integer i) {
                 return "key" + i;
             }

[07/50] ignite git commit: Fixed test (ignite-795).

Posted by ak...@apache.org.
Fixed test (ignite-795).


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

Branch: refs/heads/ignite-843
Commit: a96849d1c28a40e339d8909bd916a05ee0f26d52
Parents: d8cd7ba
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 12:42:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 12:42:27 2015 +0300

----------------------------------------------------------------------
 .../IgniteCacheMessageRecoveryAbstractTest.java       | 14 +++++++++++---
 .../distributed/IgniteCacheTxMessageRecoveryTest.java |  5 -----
 2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a96849d1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
index 63be871..16d7e5d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
@@ -145,11 +145,15 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
         });
 
         try {
+            boolean closed = false;
+
             for (int i = 0; i < 30; i++) {
                 Thread.sleep(1000);
 
-                closeSessions();
+                closed |= closeSessions();
             }
+
+            assertTrue(closed);
         }
         finally {
             stop.set(true);
@@ -161,7 +165,7 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
-    private void closeSessions() throws Exception {
+    private boolean closeSessions() throws Exception {
         Ignite ignite = ignite(ThreadLocalRandom.current().nextInt(0, GRID_CNT));
 
         log.info("Close sessions for: " + ignite.name());
@@ -170,7 +174,7 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
 
         Map<UUID, GridCommunicationClient> clients = U.field(commSpi, "clients");
 
-        assertTrue(clients.size() > 0);
+        boolean closed = false;
 
         for (GridCommunicationClient client : clients.values()) {
             GridTcpNioCommunicationClient client0 = (GridTcpNioCommunicationClient)client;
@@ -178,6 +182,10 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
             GridNioSession ses = client0.session();
 
             ses.close();
+
+            closed = true;
         }
+
+        return closed;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/a96849d1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
index cad8607..65adfdd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
@@ -26,11 +26,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
  */
 public class IgniteCacheTxMessageRecoveryTest extends IgniteCacheMessageRecoveryAbstractTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-795");
-    }
-
-    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode atomicityMode() {
         return TRANSACTIONAL;
     }

[40/50] ignite git commit: IGNITE-1394 Platform .Net: cache.Invoke tests fail

Posted by ak...@apache.org.
IGNITE-1394 Platform .Net: cache.Invoke tests fail


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

Branch: refs/heads/ignite-843
Commit: 7fcc14c3c29452b6bfbf79f069b825838e7c1e19
Parents: fba01d6
Author: ptupitsyn <pt...@gridgain.com>
Authored: Wed Sep 9 12:20:38 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Wed Sep 9 12:20:38 2015 +0300

----------------------------------------------------------------------
 .../dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7fcc14c3/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
index 0301352..cdc9bcd 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
@@ -921,7 +921,15 @@ namespace Apache.Ignite.Core.Impl.Cache
                 return reader => (TResult)ReadGetAllDictionary(reader);
             
             if (lastAsyncOpId == (int)CacheOp.Invoke)
-                return reader => { throw ReadException(reader.Stream); };
+                return reader =>
+                {
+                    var hasError = reader.ReadBoolean();
+
+                    if (hasError)
+                        throw ReadException(reader.Stream);
+
+                    return reader.ReadObject<TResult>();
+                };
 
             if (lastAsyncOpId == (int) CacheOp.InvokeAll)
                 return _invokeAllConverter.Value as Func<PortableReaderImpl, TResult>;

[32/50] ignite git commit: ignite-1383: Fixed.

Posted by ak...@apache.org.
ignite-1383: Fixed.


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

Branch: refs/heads/ignite-843
Commit: 108dd8f9721b80a5355bd0b472037276ad7d4c5f
Parents: db827cf
Author: ashutak <as...@gridgain.com>
Authored: Tue Sep 8 17:30:15 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Sep 8 17:30:15 2015 +0300

----------------------------------------------------------------------
 scripts/apply-pull-request.sh | 141 ++++++++++++++++++++++++++++---------
 1 file changed, 109 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/108dd8f9/scripts/apply-pull-request.sh
----------------------------------------------------------------------
diff --git a/scripts/apply-pull-request.sh b/scripts/apply-pull-request.sh
index d852d78..dd2b78c 100755
--- a/scripts/apply-pull-request.sh
+++ b/scripts/apply-pull-request.sh
@@ -19,66 +19,139 @@
 #
 # Pull request applier.
 #
-echo 'Usage: scripts/apply-pull-request.sh <pull-request-id>'
-echo 'The script takes pull-request by given id and merges (with squash) all changes too master branch.'
-echo "Argument 'pull-request-id' is mandatory."
-echo
 
-IGNITE_HOME="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
+#
+# Start of Functions.
+#
+
+#
+# Prints usage.
+#
+usage () {
+    echo 'Usage: scripts/apply-pull-request.sh <pull-request-id> [-tb|--targetbranch <branch-name>]'
+    echo 'The script takes pull-request by given id and merges (with squash) all changes to target branch (master by default).'
+    echo "Argument 'pull-request-id' is mandatory."
+    echo "Target branch can be overwritten by using [-tb|--targetbranch <branch-name>] argument paramethers."
+}
+
+#
+# End of Functions.
+#
+
+if [ "${GIT_HOME}" = "" ]; then
+    GIT_HOME="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
+fi
 
-. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+cd ${GIT_HOME}
 
-# Constants.
-APACHE_GIT="https://git-wip-us.apache.org/repos/asf/ignite"
-GITHUB_MIRROR="https://github.com/apache/ignite.git"
+if [ "${SCRIPTS_HOME}" = "" ]; then
+    SCRIPTS_HOME="${GIT_HOME}/scripts/"
+fi
+
+. ${SCRIPTS_HOME}/git-patch-functions.sh # Import patch functions.
 
-# Get paramethers.
 PR_ID=$1
 
-# Initial checks.
+#
+# Start reading of command line params.
+#
 if [ "${PR_ID}" = "" ]; then
     echo $0", ERROR:"
     echo >&2 "You have to specify 'pull-request-id'."
+    echo
+    usage
     exit 1
 fi
 
-requireCleanWorkTree ${IGNITE_HOME}
+if [ "${PR_ID}" = "-h" ]; then
+    usage
+    exit 0
+fi
+
+if [ "${PR_ID}" = "--help" ]; then
+    usage
+    exit 0
+fi
+
+
+while [[ $# > 2 ]]
+do
+    key="$2"
+
+    case $key in
+        -tb|--targetbranch)
+        TARGET_BRANCH="$3"
+        shift
+        ;;
+
+        *)
+        echo "Unknown parameter: ${key}"
+        echo
+        usage
+        ;;
+    esac
+    shift
+done
+#
+# Enf reading of command line params.
+#
+
+
+# Script variables.
+if [ "${APACHE_GIT}" = "" ]; then
+    APACHE_GIT="https://git-wip-us.apache.org/repos/asf/ignite"
+fi
+
+if [ "${GITHUB_MIRROR}" = "" ]; then
+    GITHUB_MIRROR="https://github.com/apache/ignite.git"
+fi
+
+if [ "${TARGET_BRANCH}" = "" ]; then
+    TARGET_BRANCH="master"
+fi
+
+requireCleanWorkTree ${GIT_HOME}
 
 CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 
-if [ "$CURRENT_BRANCH" != "master" ]; then
+if [ "$CURRENT_BRANCH" != "${TARGET_BRANCH}" ]; then
     echo $0", ERROR:"
-    echo "You have to be on master branch."
+    echo "You have to be on ${TARGET_BRANCH} branch."
 
     exit 1
 fi
 
-# Check that master is up-to-date.
-APACHE_GIT_MASTER_BRANCH="apache-git-master-tmp"
+# Check that target branch is up-to-date.
+APACHE_GIT_TARGET_BRANCH="apache-git-target-br-tmp"
 
-git fetch ${APACHE_GIT} master:${APACHE_GIT_MASTER_BRANCH} &> /dev/null
+git fetch ${APACHE_GIT} ${TARGET_BRANCH}:${APACHE_GIT_TARGET_BRANCH} &> /dev/null
+if test $? != 0; then
+    echo $0", ERROR:"
+    echo >&2 "Couldn't fetch '${TARGET_BRANCH}' branch from ${APACHE_GIT}."
+    exit 1
+fi
 
-LOCAL_MASTER_HASH=$(git rev-parse @)
-REMOTE_MASTER_HASH=$(git rev-parse ${APACHE_GIT_MASTER_BRANCH})
-BASE_HASH=$(git merge-base @ ${APACHE_GIT_MASTER_BRANCH})
+LOCAL_TARGET_BR_HASH=$(git rev-parse @)
+REMOTE_TARGET_BR_HASH=$(git rev-parse ${APACHE_GIT_TARGET_BRANCH})
+BASE_HASH=$(git merge-base @ ${APACHE_GIT_TARGET_BRANCH})
 
-git branch -D ${APACHE_GIT_MASTER_BRANCH} &> /dev/null
+git branch -D ${APACHE_GIT_TARGET_BRANCH} &> /dev/null
 
-if [ $LOCAL_MASTER_HASH != $REMOTE_MASTER_HASH ]; then
+if [ $LOCAL_TARGET_BR_HASH != $REMOTE_TARGET_BR_HASH ]; then
     echo $0", ERROR:"
 
-    if [ $LOCAL_MASTER_HASH = $BASE_HASH ]; then
-        echo "Your local master branch is not up-to-date. You need to pull."
-    elif [ $REMOTE_MASTER_HASH = $BASE_HASH ]; then
-        echo "Your local master branch is ahead of master branch at Apache git. You need to push."
+    if [ $LOCAL_TARGET_BR_HASH = $BASE_HASH ]; then
+        echo "Your local ${TARGET_BRANCH} branch is not up-to-date. You need to pull."
+    elif [ $REMOTE_TARGET_BR_HASH = $BASE_HASH ]; then
+        echo "Your local ${TARGET_BRANCH} branch is ahead of ${TARGET_BRANCH} branch at Apache git. You need to push."
     else
-        echo "Your local master and Apache git master branches diverged. You need to pull, merge and pull."
+        echo "Your local ${TARGET_BRANCH} and Apache git ${TARGET_BRANCH} branches diverged. You need to pull, merge and pull."
     fi
 
     exit 1
 fi
 
-echo "Local master is Up-to-date."
+echo "Local ${TARGET_BRANCH} is Up-to-date."
 echo
 
 # Checkout pull-request branch.
@@ -105,8 +178,8 @@ ORIG_COMMENT="$(git log -1 --pretty=%B)"
 echo "Author of pull-request: '$AUTHOR'."
 echo
 
-# Update local master.
-git checkout master &> /dev/null
+# Update local target branch.
+git checkout ${TARGET_BRANCH} &> /dev/null
 
 # Take changes.
 git merge --squash ${PR_BRANCH_NAME} &> /dev/null
@@ -114,7 +187,7 @@ if test $? != 0; then
     git reset --hard &> /dev/null
 
     echo $0", ERROR:"
-    echo >&2 "Could not merge the pull-request to master without conflicts. All local changes have been discarded. You're on master branch."
+    echo >&2 "Could not merge the pull-request to ${TARGET_BRANCH} without conflicts. All local changes have been discarded. You're on ${TARGET_BRANCH} branch."
     exit 1
 fi
 
@@ -130,10 +203,14 @@ fi
 
 COMMENT="${COMMENT} - Fixes #${PR_ID}."
 
+if [ "${EXCLUDE_SPECIAL_FILE}" = "true" ]; then
+    git checkout HEAD ignite-pull-request-id
+fi
+
 git commit --author "${AUTHOR}" -a -s -m "${COMMENT}" &> /dev/null
 
 echo "Squash commit for pull request with id='${PR_ID}' has been added. The commit has been added with comment '${COMMENT}'."
-echo "Now you can review changes of the last commit at master and push it to Ignite Apche git after."
+echo "Now you can review changes of the last commit at ${TARGET_BRANCH} and push it into ${APACHE_GIT} git after."
 echo "If you want to decline changes, you can remove the last commit from your repo by 'git reset --hard HEAD^'."
 echo

[37/50] ignite git commit: Enabled test.

Posted by ak...@apache.org.
Enabled test.


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

Branch: refs/heads/ignite-843
Commit: 857ab7e31954e88e93d5c8b40fa0d19856ff9678
Parents: 8389a7a
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 9 10:01:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 9 10:01:49 2015 +0300

----------------------------------------------------------------------
 .../cache/IgniteCacheTransactionalStopBusySelfTest.java         | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/857ab7e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
index f2b4ad0..06e6045 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
@@ -24,11 +24,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPr
  */
 public class IgniteCacheTransactionalStopBusySelfTest extends IgniteCacheAbstractStopBusySelfTest {
     /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-257");
-    }
-
-    /** {@inheritDoc} */
     @Override public void testPut() throws Exception {
         bannedMsg.set(GridNearTxPrepareRequest.class);