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

[01/50] [abbrv] incubator-ignite git commit: #ignite-180: Add tests.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-80 cbfb98296 -> 8ef3fbe85


#ignite-180: Add tests.


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

Branch: refs/heads/ignite-80
Commit: 9ec77118f9073ab6a17a545a9012ceef379bae0d
Parents: 90f91d7
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 12:54:13 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 12:54:13 2015 +0300

----------------------------------------------------------------------
 .../GridCacheQueueApiSelfAbstractTest.java      | 28 +++++++++++++++
 .../GridCacheQueueCleanupSelfTest.java          |  5 +++
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  5 +++
 .../IgniteCollectionAbstractTest.java           | 14 ++++++++
 .../IgniteDataStructureUniqueNameTest.java      |  5 +++
 .../GridCacheLocalAtomicOffheapSetSelfTest.java | 30 ++++++++++++++++
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |  5 +++
 .../local/GridCacheLocalAtomicSetSelfTest.java  |  5 +++
 .../GridCacheLocalOffheapQueueApiSelfTest.java  | 29 ++++++++++++++++
 .../local/GridCacheLocalQueueApiSelfTest.java   |  5 +++
 .../local/GridCacheLocalSetSelfTest.java        |  5 +++
 ...artitionedAtomicOffheapQueueApiSelfTest.java | 30 ++++++++++++++++
 ...omicOffheapQueueCreateMultiNodeSelfTest.java | 30 ++++++++++++++++
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java | 30 ++++++++++++++++
 ...dCachePartitionedAtomicQueueApiSelfTest.java |  5 +++
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |  5 +++
 ...micQueueFailoverDataConsistencySelfTest.java |  5 +++
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |  5 +++
 ...itionedAtomicQueueRotativeMultiNodeTest.java |  5 +++
 ...chePartitionedAtomicSetFailoverSelfTest.java |  5 +++
 ...rtitionedDataStructuresFailoverSelfTest.java |  5 +++
 ...edOffheapDataStructuresFailoverSelfTest.java | 36 ++++++++++++++++++++
 ...hePartitionedOffheapSetFailoverSelfTest.java | 30 ++++++++++++++++
 .../GridCachePartitionedQueueApiSelfTest.java   |  5 +++
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  5 +++
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  5 +++
 ...nedQueueFailoverDataConsistencySelfTest.java |  5 +++
 ...CachePartitionedQueueJoinedNodeSelfTest.java |  5 +++
 ...dCachePartitionedQueueMultiNodeSelfTest.java |  5 +++
 ...hePartitionedQueueRotativeMultiNodeTest.java |  5 +++
 ...GridCachePartitionedSetFailoverSelfTest.java |  5 +++
 .../GridCachePartitionedSetSelfTest.java        |  5 +++
 ...eplicatedDataStructuresFailoverSelfTest.java |  5 +++
 .../GridCacheReplicatedQueueApiSelfTest.java    | 10 ++++++
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |  5 +++
 ...cheReplicatedQueueRotativeMultiNodeTest.java |  5 +++
 .../GridCacheReplicatedSetSelfTest.java         |  5 +++
 .../IgniteCacheDataStructuresSelfTestSuite.java | 13 +++++--
 38 files changed, 412 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
index 7a43ff4..012401d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
@@ -19,7 +19,10 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.datastructures.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.*;
 
 import java.io.*;
 import java.util.*;
@@ -505,6 +508,31 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection
     }
 
     /**
+     * @throws Exception If failed.
+     */
+    public void testReuseHash() throws Exception {
+        CollectionConfiguration colCfg = collectionConfiguration();
+
+        IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg);
+
+        IgniteQueue queue2 = grid(0).queue("Queue2", 0, colCfg);
+
+        assertEquals(getQueueCache(queue1), getQueueCache(queue2));
+    }
+
+    /**
+     * @param queue Ignite queue.
+     * @return Cache configuration.
+     */
+    private CacheConfiguration getQueueCache(IgniteQueue queue) {
+        GridCacheQueueAdapter delegate = GridTestUtils.getFieldValue(queue, "delegate");
+
+        GridCacheAdapter cache = GridTestUtils.getFieldValue(delegate, GridCacheQueueAdapter.class, "cache");
+
+        return cache.configuration();
+    }
+
+    /**
      *  Test class with the same hash code.
      */
     private static class SameHashItem implements Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index e0b6094..8bf30fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -55,6 +55,11 @@ public class GridCacheQueueCleanupSelfTest extends IgniteCollectionAbstractTest
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/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 36d7758..495bcef 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
@@ -68,6 +68,11 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
index 92a94dd..3ef9ebd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
@@ -71,6 +71,8 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes
 
         colCfg.setCacheMode(collectionCacheMode());
         colCfg.setAtomicityMode(collectionCacheAtomicityMode());
+        colCfg.setMemoryMode(collectionMemoryMode());
+        colCfg.setOffHeapMaxMemory(collectionOffHeapMaxMemory());
 
         if (colCfg.getCacheMode() == PARTITIONED)
             colCfg.setBackups(1);
@@ -89,10 +91,22 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes
     protected abstract CacheMode collectionCacheMode();
 
     /**
+     * @return Collection cache memory mode.
+     */
+    protected abstract CacheMemoryMode collectionMemoryMode();
+
+    /**
      * @return Collection cache atomicity mode.
      */
     protected abstract CacheAtomicityMode collectionCacheAtomicityMode();
 
+    /**
+     * @return Collection cache off-heap max memory.
+     */
+    protected long collectionOffHeapMaxMemory() {
+        return -1;
+    }
+
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(gridCount());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
index 92b88ff..1255153 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
@@ -46,6 +46,11 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
new file mode 100644
index 0000000..394eaab
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache.datastructures.local;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Set tests.
+ */
+public class GridCacheLocalAtomicOffheapSetSelfTest extends GridCacheLocalAtomicSetSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
index 7c818cf..51c08a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
@@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  */
 public class GridCacheLocalAtomicQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
index 17ef6a8..d149a06 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
@@ -38,6 +38,11 @@ public class GridCacheLocalAtomicSetSelfTest extends GridCacheSetAbstractSelfTes
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
new file mode 100644
index 0000000..c8e5bf7
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.processors.cache.datastructures.local;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Queue tests with local cache.
+ */
+public class GridCacheLocalOffheapQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
index 3c90d0e..837c94b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
@@ -33,6 +33,11 @@ public class GridCacheLocalQueueApiSelfTest extends GridCacheQueueApiSelfAbstrac
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
index a2e24a3..b312a65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
@@ -38,6 +38,11 @@ public class GridCacheLocalSetSelfTest extends GridCacheSetAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
new file mode 100644
index 0000000..f571f60
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Queue tests with partitioned atomic cache.
+ */
+public class GridCachePartitionedAtomicOffheapQueueApiSelfTest extends GridCachePartitionedAtomicQueueApiSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
new file mode 100644
index 0000000..9c31319
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+
+/**
+ *
+ */
+public class GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest
+    extends GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
new file mode 100644
index 0000000..5efc2ed
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Queue multi node test.
+ */
+public class GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest extends GridCachePartitionedAtomicQueueMultiNodeSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
index 94c04a0..02fc8ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
@@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  */
 public class GridCachePartitionedAtomicQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
index 0e9fdea..1b36a74 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
@@ -27,6 +27,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest
     extends GridCachePartitionedQueueCreateMultiNodeSelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
index 19854be..1772d5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
@@ -28,6 +28,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest extends
     GridCacheAbstractQueueFailoverDataConsistencySelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
index 68c0090..914f7d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
@@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  */
 public class GridCachePartitionedAtomicQueueMultiNodeSelfTest extends GridCachePartitionedQueueMultiNodeSelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
index ff24222..7451e38 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
@@ -27,6 +27,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedAtomicQueueRotativeMultiNodeTest extends
     GridCachePartitionedQueueRotativeMultiNodeTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
index 9e2ffd2..771d685 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
@@ -27,6 +27,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  */
 public class GridCachePartitionedAtomicSetFailoverSelfTest extends GridCacheSetFailoverAbstractSelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return ATOMIC;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
index 03c7b99..fdb344d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
@@ -34,6 +34,11 @@ public class GridCachePartitionedDataStructuresFailoverSelfTest
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
new file mode 100644
index 0000000..74bbd53
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.processors.cache.datastructures.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Failover tests for cache data structures.
+ */
+public class GridCachePartitionedOffheapDataStructuresFailoverSelfTest extends GridCachePartitionedDataStructuresFailoverSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
new file mode 100644
index 0000000..0b28dd8
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Set failover tests.
+ */
+public class GridCachePartitionedOffheapSetFailoverSelfTest extends GridCachePartitionedSetFailoverSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
index c46e86b..41d8417 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
@@ -33,6 +33,11 @@ public class GridCachePartitionedQueueApiSelfTest extends GridCacheQueueApiSelfA
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 67491fa..4bbbf8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -51,6 +51,11 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index 66e5e89..92b61f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@ -62,6 +62,11 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends IgniteCollection
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
index 8579c7a..495036e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
@@ -28,6 +28,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedQueueFailoverDataConsistencySelfTest extends
     GridCacheAbstractQueueFailoverDataConsistencySelfTest {
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
index 8bda877..b3a575f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
@@ -33,6 +33,11 @@ public class GridCachePartitionedQueueJoinedNodeSelfTest extends GridCacheQueueJ
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
index 717517d..bdf7f95 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
@@ -33,6 +33,11 @@ public class GridCachePartitionedQueueMultiNodeSelfTest extends GridCacheQueueMu
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
index a9a5c87..0807d46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
@@ -33,6 +33,11 @@ public class GridCachePartitionedQueueRotativeMultiNodeTest extends GridCacheQue
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index 6cbf65e..68659c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -30,4 +30,9 @@ public class GridCachePartitionedSetFailoverSelfTest extends GridCacheSetFailove
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }
+
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
index c18553e..a76fec1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
@@ -33,6 +33,11 @@ public class GridCachePartitionedSetSelfTest extends GridCacheSetAbstractSelfTes
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
index 73826c7..f2dbdcf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
@@ -34,6 +34,11 @@ public class GridCacheReplicatedDataStructuresFailoverSelfTest
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
index 9c02b14..0a854cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
@@ -33,6 +33,16 @@ public class GridCacheReplicatedQueueApiSelfTest extends GridCacheQueueApiSelfAb
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected long collectionOffHeapMaxMemory() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
index 6ac82b8..5969bcd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
@@ -33,6 +33,11 @@ public class GridCacheReplicatedQueueMultiNodeSelfTest extends GridCacheQueueMul
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
index 665562d..d013c2f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
@@ -33,6 +33,11 @@ public class GridCacheReplicatedQueueRotativeMultiNodeTest extends GridCacheQueu
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
index adab5f6..897660c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
@@ -33,6 +33,11 @@ public class GridCacheReplicatedSetSelfTest extends GridCacheSetAbstractSelfTest
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.ONHEAP_TIERED;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ec77118/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 99beb0f..729be28 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -42,7 +42,9 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class));
         suite.addTest(new TestSuite(GridCacheLocalSetSelfTest.class));
         suite.addTest(new TestSuite(GridCacheLocalAtomicSetSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheLocalAtomicOffheapSetSelfTest.class));
         suite.addTest(new TestSuite(GridCacheLocalQueueApiSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class));
         suite.addTest(new TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class));
         suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class));
 
@@ -60,17 +62,21 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
-        // TODO: IGNITE-80.
-        //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
-        //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
+
+        suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class));
         suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class));
         suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class));
 
         suite.addTest(new TestSuite(GridCachePartitionedSetFailoverSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedOffheapSetFailoverSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicSetFailoverSelfTest.class));
 
         suite.addTest(new TestSuite(GridCachePartitionedQueueRotativeMultiNodeTest.class));
@@ -82,6 +88,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
 
         // TODO: GG-2699
         //suite.addTest(new TestSuite(GridCachePartitionedDataStructuresFailoverSelfTest.class));
+        //suite.addTest(new TestSuite(GridCachePartitionedOffheapDataStructuresFailoverSelfTest.class));
         // TODO: GG-4807 Uncomment when fix
         // suite.addTest(new TestSuite(GridCacheQueueMultiNodeConsistencySelfTest.class));

[43/50] [abbrv] incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration

Posted by sb...@apache.org.
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/ignite-80
Commit: 8b63c8a7af47f03bbbd9084e14041704f8c61ed3
Parents: de4c61a
Author: Ignite Teamcity <ig...@apache.org>
Authored: Thu Apr 9 12:48:41 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Thu Apr 9 12:48:41 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml              | 6 +-----
 modules/aop/pom.xml           | 6 +-----
 modules/aws/pom.xml           | 6 +-----
 modules/clients/pom.xml       | 6 +-----
 modules/codegen/pom.xml       | 6 +-----
 modules/core/pom.xml          | 6 +-----
 modules/extdata/p2p/pom.xml   | 6 +-----
 modules/extdata/uri/pom.xml   | 6 +-----
 modules/geospatial/pom.xml    | 6 +-----
 modules/hadoop/pom.xml        | 6 +-----
 modules/hibernate/pom.xml     | 6 +-----
 modules/indexing/pom.xml      | 6 +-----
 modules/jcl/pom.xml           | 6 +-----
 modules/jta/pom.xml           | 6 +-----
 modules/log4j/pom.xml         | 6 +-----
 modules/rest-http/pom.xml     | 6 +-----
 modules/scalar/pom.xml        | 6 +-----
 modules/schedule/pom.xml      | 6 +-----
 modules/schema-import/pom.xml | 6 +-----
 modules/slf4j/pom.xml         | 6 +-----
 modules/spring/pom.xml        | 6 +-----
 modules/ssh/pom.xml           | 6 +-----
 modules/tools/pom.xml         | 6 +-----
 modules/urideploy/pom.xml     | 6 +-----
 modules/visor-console/pom.xml | 6 +-----
 modules/visor-plugins/pom.xml | 6 +-----
 modules/web/pom.xml           | 6 +-----
 modules/yardstick/pom.xml     | 6 +-----
 pom.xml                       | 4 ++--
 29 files changed, 30 insertions(+), 142 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index f3af253..c25a00d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>ignite-examples</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -225,8 +225,4 @@
             </build>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index d15b41f..d8223ac 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aop</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -107,8 +107,4 @@
             </testResource>
         </testResources>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 91e62b0..5b05476 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aws</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -99,8 +99,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 51d0183..f18171f 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-clients</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -128,8 +128,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index ec56e3d..5bd781f 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-codegen</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -52,8 +52,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index c2c49df..3877801 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-core</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -424,8 +424,4 @@
             </build>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 97be6f8..93a825c 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.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -93,8 +93,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index be96f4c..3dde312 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-extdata-uri</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -122,8 +122,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 1b1f146..3bdaa5b 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-geospatial</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -81,8 +81,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 91ac659..8c3a133 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-hadoop</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -224,8 +224,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 7435825..2930c84 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-hibernate</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -120,8 +120,4 @@
             </testResource>
         </testResources>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index b453b06..0890931 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-indexing</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -93,8 +93,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 5c2f288..84e5030 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jcl</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -54,8 +54,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index f72a5f1..35393c1 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jta</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -82,8 +82,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 14351c9..c180539 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-log4j</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -53,8 +53,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index e232407..b81d77c 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.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -113,8 +113,4 @@
             <version>1.8.3</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 400c165..b7cd39d 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-scalar</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -185,8 +185,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index cddb0f2..bd4ebf2 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-schedule</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -74,8 +74,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 074abcb..441479f 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.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -99,8 +99,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 087f1f5..3527591 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-slf4j</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -46,8 +46,4 @@
             <version>1.6.4</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 2038112..49b97ae 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-spring</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -115,8 +115,4 @@
             </testResource>
         </testResources>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 0611271..528bf1d 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-ssh</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -68,8 +68,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index d17b719..d1f91a7 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-tools</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,8 +74,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 616eaad..82e87e6 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-urideploy</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -150,8 +150,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 761dcc1..4fff01d 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.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -153,8 +153,4 @@
              </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index b83856c..f05a68b 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.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <!-- Ignite dependencies -->
@@ -73,8 +73,4 @@
             </resource>
         </resources>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 95b9abc..09bdbfa 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-web</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -88,8 +88,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 8c4904a..61406b7 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-yardstick</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
 
     <properties>
         <yardstick.version>0.7.0</yardstick.version>
@@ -194,8 +194,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>1.0.2QAILS01</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b63c8a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 74fe0ba..38d2303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.ignite</groupId>
     <artifactId>incubator-ignite</artifactId>
-    <version>1.0.1-RC1-SNAPSHOT</version>
+    <version>1.0.1-RC2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -43,7 +43,7 @@
         <url>https://git-wip-us.apache.org/repos/asf/incubator-ignite</url>
         <connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite</developerConnection>
-        <tag>1.0.2QAILS01</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>

[45/50] [abbrv] incubator-ignite git commit: sprint-3 version rollback

Posted by sb...@apache.org.
sprint-3 version rollback


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

Branch: refs/heads/ignite-80
Commit: fd9cdff66f2f3022f2028900d4a019aa0e3c7d21
Parents: ca568f5
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Thu Apr 9 13:01:43 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Thu Apr 9 13:01:43 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml              | 2 +-
 modules/aop/pom.xml           | 2 +-
 modules/aws/pom.xml           | 2 +-
 modules/clients/pom.xml       | 2 +-
 modules/codegen/pom.xml       | 2 +-
 modules/core/pom.xml          | 2 +-
 modules/extdata/p2p/pom.xml   | 2 +-
 modules/extdata/uri/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/jta/pom.xml           | 2 +-
 modules/log4j/pom.xml         | 2 +-
 modules/rest-http/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/spring/pom.xml        | 2 +-
 modules/ssh/pom.xml           | 2 +-
 modules/tools/pom.xml         | 2 +-
 modules/urideploy/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 +-
 pom.xml                       | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index c25a00d..08f44eb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>ignite-examples</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index d8223ac..917ccc6 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aop</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 5b05476..b738450 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aws</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index f18171f..29250f4 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-clients</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 5bd781f..2990330 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-codegen</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 3877801..466ccb9 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-core</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 93a825c..c8f0d63 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.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 3dde312..ed7bff5 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-extdata-uri</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 3bdaa5b..d0ae253 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-geospatial</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 8c3a133..69d5294 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-hadoop</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 2930c84..eba98b5 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-hibernate</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 0890931..5851e66 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-indexing</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 84e5030..c2d1851 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jcl</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 35393c1..dbf4eac 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-jta</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index c180539..6f88587 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-log4j</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index b81d77c..cbade02 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.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index b7cd39d..83de256 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-scalar</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index bd4ebf2..fe11f3f 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-schedule</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 441479f..9eb95c1 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.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 3527591..9feba39 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-slf4j</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 49b97ae..533c1f2 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-spring</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 528bf1d..1f70406 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-ssh</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index d1f91a7..68b1fb9 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-tools</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 82e87e6..d8a9aa1 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-urideploy</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 4fff01d..bd1d20c 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.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index f05a68b..a63289d 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.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <!-- Ignite dependencies -->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 09bdbfa..eeeec39 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-web</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 61406b7..0d2e81a 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-yardstick</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
 
     <properties>
         <yardstick.version>0.7.0</yardstick.version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd9cdff6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 38d2303..c9dfce4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.ignite</groupId>
     <artifactId>incubator-ignite</artifactId>
-    <version>1.0.1-RC2-SNAPSHOT</version>
+    <version>1.0.1-RC1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

[26/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-30' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-30' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 382229c51c7b869778e8dce846c111f51f70c699
Parents: 2f458d2 c31dbd2
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 19:48:05 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 19:48:05 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/ClusterMetricsSnapshot.java | 384 ++++++-------------
 .../messages/TcpDiscoveryAbstractMessage.java   |  24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |  24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  30 +-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |  22 --
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  44 +--
 .../TcpDiscoveryJoinRequestMessage.java         |  28 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |  28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  60 +--
 .../messages/TcpDiscoveryNodeFailedMessage.java |  28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |  25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |  14 -
 .../TcpDiscoveryStatusCheckMessage.java         |  30 +-
 20 files changed, 148 insertions(+), 729 deletions(-)
----------------------------------------------------------------------

[47/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 245f46765b673d3a45300874781a898c9ad321fd
Parents: 59d9374 fd9cdff
Author: Artem Shutak <as...@gridgain.com>
Authored: Thu Apr 9 13:54:34 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Thu Apr 9 13:54:34 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/ClusterMetricsSnapshot.java |   2 +-
 .../processors/cache/GridCacheIoManager.java    |  87 +++++++-----
 .../processors/cache/GridCacheMessage.java      |   7 +
 .../GridCachePartitionExchangeManager.java      | 136 ++++++++++++++++++-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   5 +
 .../dht/GridDhtAffinityAssignmentResponse.java  |   5 +
 .../GridDhtPartitionsAbstractMessage.java       |  15 +-
 .../IgniteCacheAtomicNodeJoinTest.java          |  44 ++++++
 .../IgniteCacheNodeJoinAbstractTest.java        | 109 +++++++++++++++
 .../distributed/IgniteCacheTxNodeJoinTest.java  |  38 ++++++
 .../IgniteCacheFailoverTestSuite.java           |   4 +
 11 files changed, 410 insertions(+), 42 deletions(-)
----------------------------------------------------------------------

[11/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639

Posted by sb...@apache.org.
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639


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

Branch: refs/heads/ignite-80
Commit: 4d44e6106666c57870938b4c1699249c8d68beca
Parents: 36c330a fa552bc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 17:55:20 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 17:55:20 2015 +0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  15 +
 .../apache/ignite/internal/IgniteKernal.java    |  37 ++
 .../org/apache/ignite/internal/IgnitionEx.java  | 171 ++++-----
 .../internal/managers/GridManagerAdapter.java   |  34 +-
 .../cache/DynamicCacheChangeRequest.java        |  17 +
 .../cache/DynamicCacheDescriptor.java           |  17 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 349 +++++++++++++++---
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../distributed/dht/GridDhtLockFuture.java      |  10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  49 +--
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |  24 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  14 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  47 ++-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  78 ++--
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   8 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   4 +-
 .../resources/META-INF/classnames.properties    |  19 +-
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
 .../IgniteCacheConfigurationTemplateTest.java   | 364 +++++++++++++++++++
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  23 ++
 ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +-----
 .../GridAbstractCommunicationSelfTest.java      |   3 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |   5 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   3 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   3 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   3 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   2 +-
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   5 +-
 .../org/apache/ignite/IgniteSpringBean.java     |  14 +
 .../commands/cache/VisorCacheClearCommand.scala |   3 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  12 +-
 parent/pom.xml                                  |   2 +-
 pom.xml                                         |   1 +
 39 files changed, 1192 insertions(+), 401 deletions(-)
----------------------------------------------------------------------


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

[29/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 9d183c50c1bab91f0fd03a10a588e7c7a63731a7
Parents: fe74390 382229c
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 19:55:42 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 19:55:42 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/ClusterMetricsSnapshot.java | 384 ++++++-------------
 .../messages/TcpDiscoveryAbstractMessage.java   |  24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |  24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  30 +-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |  22 --
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  44 +--
 .../TcpDiscoveryJoinRequestMessage.java         |  28 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |  28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  60 +--
 .../messages/TcpDiscoveryNodeFailedMessage.java |  28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |  25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |  14 -
 .../TcpDiscoveryStatusCheckMessage.java         |  30 +-
 20 files changed, 148 insertions(+), 729 deletions(-)
----------------------------------------------------------------------

[20/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-180-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-180-1

Posted by sb...@apache.org.
Merge branch 'ignite-180-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-180-1


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

Branch: refs/heads/ignite-80
Commit: ef2bacc6462e4773cf2ecb33f7d7451888210e37
Parents: 672e9b2 597c6c0
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 16:11:32 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 16:11:32 2015 +0300

----------------------------------------------------------------------
 .../ignite/examples/datastructures/IgniteQueueExample.java     | 3 ---
 .../ignite/examples/datastructures/IgniteSetExample.java       | 3 ---
 .../processors/cache/transactions/IgniteTxManager.java         | 6 ++++--
 3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------

[35/50] [abbrv] incubator-ignite git commit: sprint-3 - Updated cache examples.

Posted by sb...@apache.org.
sprint-3 - Updated cache examples.


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

Branch: refs/heads/ignite-80
Commit: 6e84a3b3e4284b4818aec03a51988bdc51de7d54
Parents: 3e6da9c
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Thu Apr 9 01:05:54 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Thu Apr 9 01:05:54 2015 -0700

----------------------------------------------------------------------
 .../ignite/examples/datagrid/CacheAffinityExample.java    |  9 +--------
 .../apache/ignite/examples/datagrid/CacheApiExample.java  |  9 +--------
 .../ignite/examples/datagrid/CacheAsyncApiExample.java    |  9 +--------
 .../examples/datagrid/CacheContinuousQueryExample.java    |  8 +-------
 .../examples/datagrid/CacheDataStreamerExample.java       |  9 +--------
 .../ignite/examples/datagrid/CacheEventsExample.java      |  9 +--------
 .../ignite/examples/datagrid/CachePutGetExample.java      | 10 +---------
 .../ignite/examples/datagrid/CacheTransactionExample.java |  8 ++------
 .../datagrid/hibernate/HibernateL2CacheExample.java       |  5 +----
 .../datagrid/starschema/CacheStarSchemaExample.java       | 10 ++++------
 .../datagrid/store/auto/CacheAutoStoreExample.java        |  8 ++++----
 .../store/auto/CacheAutoStoreLoadDataExample.java         |  5 ++++-
 .../ignite/examples/datagrid/store/auto/CacheConfig.java  |  4 ++--
 .../datagrid/store/dummy/CacheDummyStoreExample.java      |  5 ++++-
 .../store/hibernate/CacheHibernateStoreExample.java       |  5 ++++-
 .../datagrid/store/jdbc/CacheJdbcStoreExample.java        |  5 ++++-
 .../ignite/examples/streaming/StreamVisitorExample.java   |  5 +----
 17 files changed, 37 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
index 7780e2e..a389dcb 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
@@ -18,9 +18,7 @@
 package org.apache.ignite.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.lang.*;
 
@@ -55,12 +53,7 @@ public final class CacheAffinityExample {
             System.out.println();
             System.out.println(">>> Cache affinity example started.");
 
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 for (int i = 0; i < KEY_CNT; i++)
                     cache.put(i, Integer.toString(i));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
index 35b7ac6..3d06b2e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 
 import javax.cache.processor.*;
@@ -49,12 +47,7 @@ public class CacheApiExample {
             System.out.println();
             System.out.println(">>> Cache API example started.");
 
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 // Demonstrate atomic map operations.
                 atomicMapOperations(cache);
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
index e7daa09..e9d6e04 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAsyncApiExample.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.lang.*;
 
@@ -49,12 +47,7 @@ public class CacheAsyncApiExample {
             System.out.println();
             System.out.println(">>> Cache asynchronous API example started.");
 
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 // Enable asynchronous mode.
                 IgniteCache<Integer, String> asyncCache = cache.withAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index 34014c8..a209d42 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@ -20,7 +20,6 @@ package org.apache.ignite.examples.datagrid;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.lang.*;
 
@@ -51,12 +50,7 @@ public class CacheContinuousQueryExample {
             System.out.println();
             System.out.println(">>> Cache continuous query example started.");
 
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 int keyCnt = 20;
 
                 // These entries will be queried by initial predicate.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
index db00bab..4994388 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 
 /**
@@ -57,12 +55,7 @@ public class CacheDataStreamerExample {
             System.out.println();
             System.out.println(">>> Cache data streamer example started.");
 
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 long start = System.currentTimeMillis();
 
                 try (IgniteDataStreamer<Integer, String> stmr = ignite.dataStreamer(CACHE_NAME)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
index 1c9e29e..32fab75 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.lang.*;
@@ -53,12 +51,7 @@ public class CacheEventsExample {
             System.out.println();
             System.out.println(">>> Cache events example started.");
 
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 // This optional local callback is called for each event notification
                 // that passed remote predicate listener.
                 IgniteBiPredicate<UUID, CacheEvent> locLsnr = new IgniteBiPredicate<UUID, CacheEvent>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
index acb46ed..8fd5376 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 
 import java.util.*;
@@ -45,13 +43,7 @@ public class CachePutGetExample {
      */
     public static void main(String[] args) throws IgniteException {
         try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
-
-            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
-
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
-
-            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
+            try (IgniteCache<Integer, String> cache = ignite.getOrCreateCache(CACHE_NAME)) {
                 // Individual puts and gets.
                 putGet(cache);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
index c24ada1..67f6376 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
@@ -52,15 +52,11 @@ public class CacheTransactionExample {
             System.out.println();
             System.out.println(">>> Cache transaction example started.");
 
-            CacheConfiguration<Integer, Account> cfg = new CacheConfiguration<>();
+            CacheConfiguration<Integer, Account> cfg = new CacheConfiguration<>(CACHE_NAME);
 
-            cfg.setCacheMode(CacheMode.PARTITIONED);
-            cfg.setName(CACHE_NAME);
             cfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
 
-            NearCacheConfiguration<Integer, Account> nearCacheCfg = new NearCacheConfiguration<>();
-
-            try (IgniteCache<Integer, Account> cache = ignite.createCache(cfg, nearCacheCfg)) {
+            try (IgniteCache<Integer, Account> cache = ignite.getOrCreateCache(cfg, new NearCacheConfiguration<>())) {
                 // Initialize.
                 cache.put(1, new Account(1, 100));
                 cache.put(2, new Account(1, 200));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index 6bb3f33..af2decf 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -31,7 +31,6 @@ import java.net.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
@@ -188,10 +187,8 @@ public class HibernateL2CacheExample {
      * @return Cache configuration.
      */
     private static IgniteCache createCache(String name, CacheAtomicityMode atomicityMode) {
-        CacheConfiguration ccfg = new CacheConfiguration();
+        CacheConfiguration ccfg = new CacheConfiguration(name);
 
-        ccfg.setName(name);
-        ccfg.setCacheMode(PARTITIONED);
         ccfg.setAtomicityMode(atomicityMode);
         ccfg.setWriteSynchronizationMode(FULL_SYNC);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
index 302d963..bef2457 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
@@ -73,25 +73,23 @@ public class CacheStarSchemaExample {
             System.out.println();
             System.out.println(">>> Cache star schema example started.");
 
-            CacheConfiguration<Integer, FactPurchase> factCacheCfg = new CacheConfiguration<>();
+            CacheConfiguration<Integer, FactPurchase> factCacheCfg = new CacheConfiguration<>(PARTITIONED_CACHE_NAME);
 
             factCacheCfg.setCacheMode(CacheMode.PARTITIONED);
-            factCacheCfg.setName(PARTITIONED_CACHE_NAME);
             factCacheCfg.setIndexedTypes(
                 Integer.class, FactPurchase.class
             );
 
-            CacheConfiguration<Integer, Object> dimCacheCfg = new CacheConfiguration<>();
+            CacheConfiguration<Integer, Object> dimCacheCfg = new CacheConfiguration<>(REPLICATED_CACHE_NAME);
 
             dimCacheCfg.setCacheMode(CacheMode.REPLICATED);
-            dimCacheCfg.setName(REPLICATED_CACHE_NAME);
             dimCacheCfg.setIndexedTypes(
                 Integer.class, DimStore.class,
                 Integer.class, DimProduct.class
             );
 
-            try (IgniteCache<Integer, FactPurchase> factCache = ignite.createCache(factCacheCfg);
-                 IgniteCache<Integer, Object> dimCache = ignite.createCache(dimCacheCfg)) {
+            try (IgniteCache<Integer, FactPurchase> factCache = ignite.getOrCreateCache(factCacheCfg);
+                 IgniteCache<Integer, Object> dimCache = ignite.getOrCreateCache(dimCacheCfg)) {
                 populateDimensions(dimCache);
                 populateFacts(factCache);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
index abc5fc5..0176451 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
@@ -19,7 +19,6 @@ package org.apache.ignite.examples.datagrid.store.auto;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.examples.datagrid.store.*;
 import org.apache.ignite.transactions.*;
@@ -45,6 +44,9 @@ import java.util.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class CacheAutoStoreExample {
+    /** Cache name. */
+    public static final String CACHE_NAME = CacheAutoStoreLoadDataExample.class.getSimpleName();
+
     /** Global person ID to use across entire example. */
     private static final Long id = Math.abs(UUID.randomUUID().getLeastSignificantBits());
 
@@ -60,9 +62,7 @@ public class CacheAutoStoreExample {
             System.out.println();
             System.out.println(">>> Cache auto store example started.");
 
-            CacheConfiguration<Long, Person> cacheCfg = CacheConfig.jdbcPojoStoreCache();
-
-            try (IgniteCache<Long, Person> cache = ignite.getOrCreateCache(cacheCfg)) {
+            try (IgniteCache<Long, Person> cache = ignite.getOrCreateCache(CacheConfig.jdbcPojoStoreCache(CACHE_NAME))) {
                 try (Transaction tx = ignite.transactions().txStart()) {
                     Person val = cache.get(id);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
index 8a3b5c0..4cfd520 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreLoadDataExample.java
@@ -42,6 +42,9 @@ import org.apache.ignite.examples.datagrid.store.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class CacheAutoStoreLoadDataExample {
+    /** Cache name. */
+    public static final String CACHE_NAME = CacheAutoStoreLoadDataExample.class.getSimpleName();
+
     /** Heap size required to run this example. */
     public static final int MIN_MEMORY = 1024 * 1024 * 1024;
 
@@ -58,7 +61,7 @@ public class CacheAutoStoreLoadDataExample {
             System.out.println();
             System.out.println(">>> Cache auto store load data example started.");
 
-            CacheConfiguration<Long, Person> cacheCfg = CacheConfig.jdbcPojoStoreCache();
+            CacheConfiguration<Long, Person> cacheCfg = CacheConfig.jdbcPojoStoreCache(CACHE_NAME);
 
             try (IgniteCache<Long, Person> cache = ignite.getOrCreateCache(cacheCfg)) {
                 // Load cache on all data nodes with custom SQL statement.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
index 5c63694..6c148a6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheConfig.java
@@ -37,8 +37,8 @@ public class CacheConfig {
     /**
      * Configure cache with store.
      */
-    public static CacheConfiguration<Long, Person> jdbcPojoStoreCache() {
-        CacheConfiguration<Long, Person> cfg = new CacheConfiguration<>();
+    public static CacheConfiguration<Long, Person> jdbcPojoStoreCache(String name) {
+        CacheConfiguration<Long, Person> cfg = new CacheConfiguration<>(name);
 
         // Set atomicity as transaction, since we are showing transactions in the example.
         cfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
index ce103d8..d79b895 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyStoreExample.java
@@ -37,6 +37,9 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class CacheDummyStoreExample {
+    /** Cache name. */
+    private static final String CACHE_NAME = CacheDummyStoreExample.class.getSimpleName();
+
     /** Heap size required to run this example. */
     public static final int MIN_MEMORY = 1024 * 1024 * 1024;
 
@@ -60,7 +63,7 @@ public class CacheDummyStoreExample {
             System.out.println();
             System.out.println(">>> Cache store example started.");
 
-            CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>();
+            CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>(CACHE_NAME);
 
             // Set atomicity as transaction, since we are showing transactions in example.
             cacheCfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
index 7dc80c6..a37bac4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
@@ -40,6 +40,9 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class CacheHibernateStoreExample {
+    /** Cache name. */
+    private static final String CACHE_NAME = CacheHibernateStoreExample.class.getSimpleName();
+
     /** Heap size required to run this example. */
     public static final int MIN_MEMORY = 1024 * 1024 * 1024;
 
@@ -63,7 +66,7 @@ public class CacheHibernateStoreExample {
             System.out.println();
             System.out.println(">>> Cache store example started.");
 
-            CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>();
+            CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>(CACHE_NAME);
 
             // Set atomicity as transaction, since we are showing transactions in example.
             cacheCfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
index 8e68f59..ff8e143 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcStoreExample.java
@@ -40,6 +40,9 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class CacheJdbcStoreExample {
+    /** Cache name. */
+    private static final String CACHE_NAME = CacheJdbcStoreExample.class.getSimpleName();
+
     /** Heap size required to run this example. */
     public static final int MIN_MEMORY = 1024 * 1024 * 1024;
 
@@ -63,7 +66,7 @@ public class CacheJdbcStoreExample {
             System.out.println();
             System.out.println(">>> Cache store example started.");
 
-            CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>();
+            CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>(CACHE_NAME);
 
             // Set atomicity as transaction, since we are showing transactions in example.
             cacheCfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e84a3b3/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index 01259ff..0fbce68 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -55,9 +55,6 @@ public class StreamVisitorExample {
             if (!ExamplesUtils.hasServerNodes(ignite))
                 return;
 
-            // Market data cache with default configuration.
-            CacheConfiguration<String, Double> mktDataCfg = new CacheConfiguration<>("marketTicks");
-
             // Financial instrument cache configuration.
             CacheConfiguration<String, Instrument> instCfg = new CacheConfiguration<>("instCache");
 
@@ -67,7 +64,7 @@ public class StreamVisitorExample {
 
             // Auto-close caches at the end of the example.
             try (
-                IgniteCache<String, Double> mktCache = ignite.getOrCreateCache(mktDataCfg);
+                IgniteCache<String, Double> mktCache = ignite.getOrCreateCache("marketTicks"); // Default config.
                 IgniteCache<String, Instrument> instCache = ignite.getOrCreateCache(instCfg)
             ) {
                 try (IgniteDataStreamer<String, Double> mktStmr = ignite.dataStreamer(mktCache.getName())) {

[23/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-30

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-30


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

Branch: refs/heads/ignite-80
Commit: c31dbd2a20f0a2715dfa158102e1b879bfee657b
Parents: cb21533 7eef373
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 18:25:27 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 18:25:27 2015 +0300

----------------------------------------------------------------------
 bin/ignite.bat                                  |   2 +-
 bin/ignite.sh                                   |   2 +-
 bin/include/service.sh                          |   8 +-
 config/hadoop/default-config.xml                |  15 +-
 .../streaming/StreamTransformerExample.java     |   3 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  15 +
 .../apache/ignite/internal/IgniteKernal.java    |  55 ++-
 .../org/apache/ignite/internal/IgnitionEx.java  | 171 +++-----
 .../internal/managers/GridManagerAdapter.java   |  34 +-
 .../cache/DynamicCacheChangeRequest.java        |  17 +
 .../cache/DynamicCacheDescriptor.java           |  17 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 350 +++++++++++++--
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../distributed/dht/GridDhtLockFuture.java      |  10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  49 ++-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |  48 ++-
 .../ignite/internal/util/lang/GridFunc.java     |  33 ++
 .../ignite/internal/visor/cache/VisorCache.java |   2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  38 +-
 .../visor/cache/VisorCacheConfiguration.java    |  17 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  53 ++-
 .../cache/VisorCacheMetricsCollectorTask.java   |  59 ++-
 .../visor/cache/VisorCacheStopTask.java         |  69 +++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |  24 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  14 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  47 +--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  78 ++--
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   8 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   4 +-
 .../resources/META-INF/classnames.properties    |  19 +-
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 +++++
 .../IgniteCacheConfigurationTemplateTest.java   | 364 ++++++++++++++++
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  23 +
 ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +----
 ...ridCacheFifoBatchEvictionPolicySelfTest.java |   3 +-
 .../GridAbstractCommunicationSelfTest.java      |   3 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |   5 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   3 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   3 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   3 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   2 +-
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../IgniteCacheEvictionSelfTestSuite.java       |   1 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   5 +-
 .../processors/query/h2/sql/GridSqlElement.java |   8 -
 .../processors/query/h2/sql/GridSqlQuery.java   | 183 ++++++++
 .../query/h2/sql/GridSqlQueryParser.java        |  97 +++--
 .../query/h2/sql/GridSqlQuerySplitter.java      | 111 ++++-
 .../processors/query/h2/sql/GridSqlSelect.java  | 209 +++------
 .../query/h2/sql/GridSqlSubquery.java           |   8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   | 134 ++++++
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  26 +-
 .../query/h2/sql/IgniteVsH2QueryTest.java       |  27 +-
 .../org/apache/ignite/IgniteSpringBean.java     |  14 +
 .../commands/cache/VisorCacheClearCommand.scala |   3 +-
 .../commands/cache/VisorCacheCommand.scala      | 423 +++++++++++--------
 .../commands/cache/VisorCacheStopCommand.scala  | 145 +++++++
 .../scala/org/apache/ignite/visor/visor.scala   |  12 +-
 parent/pom.xml                                  |   2 +-
 pom.xml                                         |   2 +
 66 files changed, 2474 insertions(+), 865 deletions(-)
----------------------------------------------------------------------

[19/50] [abbrv] incubator-ignite git commit: #ignite-180: fix review comments.

Posted by sb...@apache.org.
#ignite-180: fix review comments.


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

Branch: refs/heads/ignite-80
Commit: 672e9b21132446a7499de28c1392c25068414432
Parents: 2cda69f
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 16:11:19 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 16:11:19 2015 +0300

----------------------------------------------------------------------
 .../configuration/CacheConfiguration.java       | 20 +++++-
 .../configuration/CollectionConfiguration.java  | 19 ++++++
 .../datastructures/DataStructuresProcessor.java | 12 +++-
 .../GridCacheQueueApiSelfAbstractTest.java      | 70 +++++++++++++++++---
 .../IgniteCollectionAbstractTest.java           | 21 ++++--
 ...artitionedOffHeapValuesQueueApiSelfTest.java | 29 ++++++++
 ...achePartitionedOffHeapValuesSetSelfTest.java | 30 +++++++++
 .../IgniteCacheDataStructuresSelfTestSuite.java |  4 +-
 8 files changed, 186 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index c90de92..bd3fac7 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -154,10 +154,28 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
 
             return attr != null && !attr;
         }
+
+        @Override public boolean equals(Object obj) {
+            if (obj == null)
+                return false;
+
+            return obj.getClass().equals(this.getClass());
+        }
     };
 
     /** Filter that accepts all nodes. */
-    public static final IgnitePredicate<ClusterNode> ALL_NODES = F.alwaysTrue();
+    public static final IgnitePredicate<ClusterNode> ALL_NODES = new IgnitePredicate<ClusterNode>() {
+        @Override public boolean apply(ClusterNode clusterNode) {
+            return true;
+        }
+
+        @Override public boolean equals(Object obj) {
+            if (obj == null)
+                return false;
+
+            return obj.getClass().equals(this.getClass());
+        }
+    };
 
     /** Default timeout after which long query warning will be printed. */
     public static final long DFLT_LONG_QRY_WARN_TIMEOUT = 3000;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
index 85daadb..5a1ae0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
@@ -18,7 +18,9 @@
 package org.apache.ignite.configuration;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
 
 import java.io.*;
 
@@ -42,6 +44,9 @@ public class CollectionConfiguration implements Serializable {
     /** Cache memory mode. */
     private CacheMemoryMode memoryMode = ONHEAP_TIERED;
 
+    /** Node filter specifying nodes on which this cache should be deployed. */
+    private IgnitePredicate<ClusterNode> nodeFilter;
+
     /** Number of backups. */
     private int backups = 0;
 
@@ -110,6 +115,20 @@ public class CollectionConfiguration implements Serializable {
     }
 
     /**
+     * @return Predicate specifying on which nodes the cache should be started.
+     */
+    public IgnitePredicate<ClusterNode> getNodeFilter() {
+        return nodeFilter;
+    }
+
+    /**
+     * @param nodeFilter Predicate specifying on which nodes the cache should be started.
+     */
+    public void setNodeFilter(IgnitePredicate<ClusterNode> nodeFilter) {
+        this.nodeFilter = nodeFilter;
+    }
+
+    /**
      * @return Number of backups.
      */
     public int getBackups() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 20baf94..c8e1d93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -727,6 +727,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
         ccfg.setMemoryMode(cfg.getMemoryMode());
         ccfg.setAtomicityMode(cfg.getAtomicityMode());
         ccfg.setOffHeapMaxMemory(cfg.getOffHeapMaxMemory());
+        ccfg.setNodeFilter(cfg.getNodeFilter());
         ccfg.setWriteSynchronizationMode(FULL_SYNC);
         ccfg.setAtomicWriteOrderMode(PRIMARY);
         ccfg.setRebalanceMode(SYNC);
@@ -1253,7 +1254,9 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
                 col.cfg.getMemoryMode() == cfg.getMemoryMode() &&
                 col.cfg.getCacheMode() == cfg.getCacheMode() &&
                 col.cfg.getBackups() == cfg.getBackups() &&
-                col.cfg.getOffHeapMaxMemory() == cfg.getOffHeapMaxMemory())
+                col.cfg.getOffHeapMaxMemory() == cfg.getOffHeapMaxMemory() &&
+                ((col.cfg.getNodeFilter() == null && cfg.getNodeFilter() == null) ||
+                (col.cfg.getNodeFilter() != null && col.cfg.getNodeFilter().equals(cfg.getNodeFilter()))))
                 return col.cacheName;
         }
 
@@ -1714,6 +1717,9 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
      */
     static class AddDataCacheProcessor implements
         EntryProcessor<CacheDataStructuresCacheKey, List<CacheCollectionInfo>, String>, Externalizable {
+        /** Cache name prefix. */
+        private static final String CACHE_NAME_PREFIX = "datastructures_";
+
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -1744,7 +1750,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
             if (list == null) {
                 list = new ArrayList<>();
 
-                String newName = "datastructeres_" + 0;
+                String newName = CACHE_NAME_PREFIX + 0;
 
                 list.add(new CacheCollectionInfo(newName, cfg));
 
@@ -1758,7 +1764,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
             if (oldName != null)
                 return oldName;
 
-            String newName = "datastructeres_" + list.size();
+            String newName = CACHE_NAME_PREFIX + list.size();
 
             List<CacheCollectionInfo> newList = new ArrayList<>(list);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
index 012401d..12397b2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
@@ -19,8 +19,7 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.datastructures.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.*;
 
@@ -28,6 +27,8 @@ import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
 
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+
 /**
  * Queue basic tests.
  */
@@ -510,7 +511,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection
     /**
      * @throws Exception If failed.
      */
-    public void testReuseHash() throws Exception {
+    public void testReuseCache() throws Exception {
         CollectionConfiguration colCfg = collectionConfiguration();
 
         IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg);
@@ -521,15 +522,66 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection
     }
 
     /**
-     * @param queue Ignite queue.
-     * @return Cache configuration.
+     * @throws Exception If failed.
      */
-    private CacheConfiguration getQueueCache(IgniteQueue queue) {
-        GridCacheQueueAdapter delegate = GridTestUtils.getFieldValue(queue, "delegate");
+    public void testNotReuseCache() throws Exception {
+        CollectionConfiguration colCfg1 = collectionConfiguration();
+
+        CollectionConfiguration colCfg2 = collectionConfiguration();
+
+        if (colCfg2.getAtomicityMode() == ATOMIC)
+            colCfg2.setAtomicityMode(TRANSACTIONAL);
+        else
+            colCfg2.setAtomicityMode(ATOMIC);
+
+        IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg1);
+
+        IgniteQueue queue2 = grid(0).queue("Queue2", 0, colCfg2);
+
+        assertNotSame(getQueueCache(queue1), getQueueCache(queue2));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testFilterNode() throws Exception {
+        CollectionConfiguration colCfg1 = collectionConfiguration();
+
+        CollectionConfiguration colCfg2 = collectionConfiguration();
+
+        colCfg2.setNodeFilter(CacheConfiguration.SERVER_NODES);
+
+        IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg1);
 
-        GridCacheAdapter cache = GridTestUtils.getFieldValue(delegate, GridCacheQueueAdapter.class, "cache");
+        IgniteQueue queue2 = grid(0).queue("Queue2", 0, colCfg2);
+
+        assertNotSame(getQueueCache(queue1), getQueueCache(queue2));
+
+        colCfg1.setNodeFilter(CacheConfiguration.SERVER_NODES);
+
+        IgniteQueue queue3 = grid(0).queue("Queue3", 0, colCfg1);
+
+        assertEquals(getQueueCache(queue2), getQueueCache(queue3));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSystemCache() throws Exception {
+        CollectionConfiguration colCfg = collectionConfiguration();
+
+        IgniteQueue queue = grid(0).queue("Queue1", 0, colCfg);
+
+        final CacheConfiguration ccfg = getQueueCache(queue);
+
+        GridTestUtils.assertThrows(log, new Callable<Object>() {
+            @Override public Object call() throws Exception {
+                grid(0).cache(ccfg.getName());
+                return null;
+            }
+        }, IllegalStateException.class, "Failed to get cache because it is a system cache");
 
-        return cache.configuration();
+        assertNotNull(((IgniteKernal)grid(0)).internalCache(ccfg.getName()));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
index 3ef9ebd..5d1e16e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
@@ -17,19 +17,18 @@
 
 package org.apache.ignite.internal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.datastructures.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  *
@@ -116,4 +115,16 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes
     @Override protected void afterTestsStopped() throws Exception {
         stopAllGrids();
     }
+
+    /**
+     * @param queue Ignite queue.
+     * @return Cache configuration.
+     */
+    protected CacheConfiguration getQueueCache(IgniteQueue queue) {
+        GridCacheQueueAdapter delegate = GridTestUtils.getFieldValue(queue, "delegate");
+
+        GridCacheAdapter cache = GridTestUtils.getFieldValue(delegate, GridCacheQueueAdapter.class, "cache");
+
+        return cache.configuration();
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
new file mode 100644
index 0000000..1cffd46
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Queue tests with partitioned cache.
+ */
+public class GridCachePartitionedOffHeapValuesQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_VALUES;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
new file mode 100644
index 0000000..7c6041f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache.datastructures.partitioned;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * Set tests with off-heap values cache memory mode.
+ */
+public class GridCachePartitionedOffHeapValuesSetSelfTest extends GridCachePartitionedSetSelfTest {
+    /** {@inheritDoc} */
+    @Override protected CacheMemoryMode collectionMemoryMode() {
+        return CacheMemoryMode.OFFHEAP_VALUES;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/672e9b21/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 7ae9553..d17b3db 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -61,17 +61,19 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesQueueApiSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
 
-        // TODO: IGNITE-80.
+        // TODO: IGNITE-180.
         //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
         //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
         //suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesSetSelfTest.class));
         suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class));
         suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class));

[12/50] [abbrv] incubator-ignite git commit: # IGNITE-639 minor changes.

Posted by sb...@apache.org.
# IGNITE-639 minor changes.


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

Branch: refs/heads/ignite-80
Commit: 5e9addb568125d8ce5b375c64169178e8fc85137
Parents: 4d44e61
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 18:05:42 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 18:05:42 2015 +0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/internal/IgniteEx.java   | 2 +-
 .../internal/visor/cache/VisorCacheMetricsCollectorTask.java | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e9addb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index bea4ab5..867e26d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -117,7 +117,7 @@ public interface IgniteEx extends Ignite {
     public Hadoop hadoop();
 
     /** {@inheritDoc} */
-    @Override public IgniteClusterEx cluster();
+    @Override IgniteClusterEx cluster();
 
     /**
      * Get latest version in string form.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e9addb5/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index ee0b962..8fd42a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -109,13 +109,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
                 if (ca.context().started()) {
                     VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, ca);
 
-                    boolean addCache = allCaches || cacheNames.contains(ca.name());
-
-                    if (showSysCaches) {
-                        if (cm.system() && addCache)
-                            res.add(cm);
-                    }
-                    else if (!cm.system() && addCache)
+                    if ((allCaches || cacheNames.contains(ca.name())) && (showSysCaches || !cm.system()))
                         res.add(cm);
                 }
             }

[44/50] [abbrv] incubator-ignite git commit: # IGNITE-30 Fix broken test ClusterMetricsSnapshotSerializeSelfTest.

Posted by sb...@apache.org.
# IGNITE-30 Fix broken test ClusterMetricsSnapshotSerializeSelfTest.


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

Branch: refs/heads/ignite-80
Commit: ca568f5b4b1e0d181bd19b86f8b3f362ea05c2d6
Parents: 8b63c8a
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Apr 9 12:52:57 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Apr 9 12:53:11 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/ClusterMetricsSnapshot.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca568f5b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index 558b0c3..8cfdd8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -1311,7 +1311,7 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
         assert !buf.hasRemaining() : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual="
             + (buf.position() - off) + ']';
 
-        return off;
+        return buf.position();
     }
 
     /**

[42/50] [abbrv] incubator-ignite git commit: [maven-release-plugin] prepare branch 1.0.2QAILS01

Posted by sb...@apache.org.
[maven-release-plugin] prepare branch 1.0.2QAILS01


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

Branch: refs/heads/ignite-80
Commit: de4c61a2b54d7016be13dce06e63cb7e99170053
Parents: 8803e17
Author: Ignite Teamcity <ig...@apache.org>
Authored: Thu Apr 9 12:48:23 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Thu Apr 9 12:48:23 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml              | 4 ++++
 modules/aop/pom.xml           | 4 ++++
 modules/aws/pom.xml           | 4 ++++
 modules/clients/pom.xml       | 4 ++++
 modules/codegen/pom.xml       | 4 ++++
 modules/core/pom.xml          | 4 ++++
 modules/extdata/p2p/pom.xml   | 4 ++++
 modules/extdata/uri/pom.xml   | 4 ++++
 modules/geospatial/pom.xml    | 4 ++++
 modules/hadoop/pom.xml        | 4 ++++
 modules/hibernate/pom.xml     | 4 ++++
 modules/indexing/pom.xml      | 4 ++++
 modules/jcl/pom.xml           | 4 ++++
 modules/jta/pom.xml           | 4 ++++
 modules/log4j/pom.xml         | 4 ++++
 modules/rest-http/pom.xml     | 4 ++++
 modules/scalar/pom.xml        | 4 ++++
 modules/schedule/pom.xml      | 4 ++++
 modules/schema-import/pom.xml | 4 ++++
 modules/slf4j/pom.xml         | 4 ++++
 modules/spring/pom.xml        | 4 ++++
 modules/ssh/pom.xml           | 4 ++++
 modules/tools/pom.xml         | 4 ++++
 modules/urideploy/pom.xml     | 4 ++++
 modules/visor-console/pom.xml | 4 ++++
 modules/visor-plugins/pom.xml | 4 ++++
 modules/web/pom.xml           | 4 ++++
 modules/yardstick/pom.xml     | 4 ++++
 pom.xml                       | 2 +-
 29 files changed, 113 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 08f44eb..f3af253 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -225,4 +225,8 @@
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 917ccc6..d15b41f 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -107,4 +107,8 @@
             </testResource>
         </testResources>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index b738450..91e62b0 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -99,4 +99,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 29250f4..51d0183 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -128,4 +128,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 2990330..ec56e3d 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -52,4 +52,8 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 466ccb9..c2c49df 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -424,4 +424,8 @@
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index c8f0d63..97be6f8 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -93,4 +93,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index ed7bff5..be96f4c 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -122,4 +122,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index d0ae253..1b1f146 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -81,4 +81,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 69d5294..91ac659 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -224,4 +224,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index eba98b5..7435825 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -120,4 +120,8 @@
             </testResource>
         </testResources>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 5851e66..b453b06 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -93,4 +93,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index c2d1851..5c2f288 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -54,4 +54,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index dbf4eac..f72a5f1 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -82,4 +82,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 6f88587..14351c9 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -53,4 +53,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index cbade02..e232407 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -113,4 +113,8 @@
             <version>1.8.3</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 83de256..400c165 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -185,4 +185,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index fe11f3f..cddb0f2 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -74,4 +74,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 9eb95c1..074abcb 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -99,4 +99,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 9feba39..087f1f5 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -46,4 +46,8 @@
             <version>1.6.4</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 533c1f2..2038112 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -115,4 +115,8 @@
             </testResource>
         </testResources>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 1f70406..0611271 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -68,4 +68,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 68b1fb9..d17b719 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -74,4 +74,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index d8a9aa1..616eaad 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -150,4 +150,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index bd1d20c..761dcc1 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -153,4 +153,8 @@
              </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index a63289d..b83856c 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -73,4 +73,8 @@
             </resource>
         </resources>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index eeeec39..95b9abc 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -88,4 +88,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 0d2e81a..8c4904a 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -194,4 +194,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>1.0.2QAILS01</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de4c61a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9dfce4..74fe0ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <url>https://git-wip-us.apache.org/repos/asf/incubator-ignite</url>
         <connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite</developerConnection>
-        <tag>HEAD</tag>
+        <tag>1.0.2QAILS01</tag>
     </scm>
 
     <distributionManagement>

[41/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-694' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-694' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 8803e17981fac145c94780220eff18093376df9f
Parents: 5fcb072 998d1fa
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 12:19:25 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 12:19:25 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheIoManager.java    |  87 +++++++-----
 .../processors/cache/GridCacheMessage.java      |   7 +
 .../GridCachePartitionExchangeManager.java      | 136 ++++++++++++++++++-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   5 +
 .../dht/GridDhtAffinityAssignmentResponse.java  |   5 +
 .../GridDhtPartitionsAbstractMessage.java       |  15 +-
 .../IgniteCacheAtomicNodeJoinTest.java          |  44 ++++++
 .../IgniteCacheNodeJoinAbstractTest.java        | 109 +++++++++++++++
 .../distributed/IgniteCacheTxNodeJoinTest.java  |  38 ++++++
 .../IgniteCacheFailoverTestSuite.java           |   4 +
 10 files changed, 409 insertions(+), 41 deletions(-)
----------------------------------------------------------------------

[15/50] [abbrv] incubator-ignite git commit: ignite-624 - minor2

Posted by sb...@apache.org.
ignite-624 - minor2


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

Branch: refs/heads/ignite-80
Commit: c2c4da48a9ebaf5d41e61bb006e9d590edcd5f8b
Parents: ab2fe77
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:33:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:33:23 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/query/h2/sql/GridSqlSelect.java    | 3 +++
 .../ignite/internal/processors/query/h2/sql/GridSqlUnion.java     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index dadba7c..0786eac 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -148,6 +148,9 @@ public class GridSqlSelect extends GridSqlQuery {
      * @param expression Expression.
      */
     public void setSelectExpression(int colIdx, GridSqlElement expression) {
+        if (expression == null)
+            throw new NullPointerException();
+
         if (colIdx < select.size()) // Assuming that all the needed expressions were already added.
             select.set(colIdx, expression);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index dcc2c84..23c18ed 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -42,7 +42,7 @@ public class GridSqlUnion extends GridSqlQuery {
 
     /** {@inheritDoc} */
     @Override protected GridSqlElement expression(int col) {
-        return null;
+        throw new IllegalStateException();
     }
 
     /** {@inheritDoc} */

[25/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 2f458d28ac965da64ec6e30918bba3541cde9bc1
Parents: 7f4c5ee 7eef373
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 18:27:39 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 18:27:39 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/IgniteKernal.java    | 11 ++++++++++-
 .../internal/processors/cache/GridCacheProcessor.java    | 11 ++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------

[05/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 0cf79e467ab532e21ccac9ee6d36f57145c457de
Parents: 21c8e89 682dcd1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 8 13:00:10 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 8 13:00:10 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  15 +
 .../apache/ignite/internal/IgniteKernal.java    |  37 ++
 .../internal/managers/GridManagerAdapter.java   |  34 +-
 .../cache/DynamicCacheChangeRequest.java        |  17 +
 .../cache/DynamicCacheDescriptor.java           |  17 +-
 .../processors/cache/GridCacheProcessor.java    | 349 +++++++++++++++---
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
 .../IgniteCacheConfigurationTemplateTest.java   | 364 +++++++++++++++++++
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../org/apache/ignite/IgniteSpringBean.java     |  14 +
 12 files changed, 920 insertions(+), 54 deletions(-)
----------------------------------------------------------------------

[34/50] [abbrv] incubator-ignite git commit: # ignite-694

Posted by sb...@apache.org.
# ignite-694


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

Branch: refs/heads/ignite-80
Commit: 998d1fa4e2f5515ed7f008ac2f866ce0178638cd
Parents: 9eb3fce
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 10:41:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 10:41:27 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePartitionExchangeManager.java       | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/998d1fa4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 0955328..7a1324f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -796,6 +796,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
                     GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
 
+                    if (cacheCtx != null && !cacheCtx.started())
+                        continue; // Can safely ignore background exchange.
+
                     GridDhtPartitionTopology top = null;
 
                     if (cacheCtx == null)

[08/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624

Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624


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

Branch: refs/heads/ignite-80
Commit: e0d88d3a0dc0f07316d9f48910203a8dd1428346
Parents: d9e2a64 0cf79e4
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 13:12:36 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 13:12:36 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  15 +
 .../apache/ignite/internal/IgniteKernal.java    |  37 ++
 .../internal/managers/GridManagerAdapter.java   |  34 +-
 .../cache/DynamicCacheChangeRequest.java        |  17 +
 .../cache/DynamicCacheDescriptor.java           |  17 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 349 +++++++++++++++---
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../distributed/dht/GridDhtLockFuture.java      |  10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  49 +--
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../resources/META-INF/classnames.properties    |  19 +-
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
 .../IgniteCacheConfigurationTemplateTest.java   | 364 +++++++++++++++++++
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  23 ++
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   5 +-
 .../org/apache/ignite/IgniteSpringBean.java     |  14 +
 .../commands/cache/VisorCacheClearCommand.scala |   3 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  12 +-
 23 files changed, 1011 insertions(+), 104 deletions(-)
----------------------------------------------------------------------

[22/50] [abbrv] incubator-ignite git commit: # Minor fix to cache object processor.

Posted by sb...@apache.org.
# Minor fix to cache object processor.


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

Branch: refs/heads/ignite-80
Commit: 7eef373aa8ba17561c9d89dfbc6c0af8bbc23ec9
Parents: 71439bc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 8 17:54:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 8 17:55:49 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/IgniteKernal.java    | 11 ++++++++++-
 .../internal/processors/cache/GridCacheProcessor.java    | 11 ++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eef373a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 88bec0f..768bbd3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2240,10 +2240,19 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
 
     /** {@inheritDoc} */
     @Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) {
+        return cache(name, true);
+    }
+
+    /**
+     * @param name Cache name.
+     * @param failIfSys Fail if requestsed cache is system cache.
+     * @return Cache.
+     */
+    public <K, V> IgniteCache<K, V> cache(@Nullable String name, boolean failIfSys) {
         guard();
 
         try {
-            return ctx.cache().publicJCache(name);
+            return ctx.cache().publicJCache(name, true, failIfSys);
         }
         catch (IgniteCheckedException e) {
             throw CU.convertToCacheException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eef373a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index fcf65b9..35cfd0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1713,7 +1713,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      */
     public IgniteInternalFuture<?> dynamicStartCache(String cacheName) {
         try {
-            if (publicJCache(cacheName, false) != null) // Cache with given name already started.
+            if (publicJCache(cacheName, false, true) != null) // Cache with given name already started.
                 return new GridFinishedFuture<>();
 
             CacheConfiguration cfgTemplate = null;
@@ -2483,21 +2483,22 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @throws IgniteCheckedException If failed.
      */
     public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName) throws IgniteCheckedException {
-        return publicJCache(cacheName, true);
+        return publicJCache(cacheName, true, true);
     }
 
     /**
      * @param cacheName Cache name.
      * @param failIfNotStarted If {@code true} throws {@link IllegalArgumentException} if cache is not started,
      *        otherwise returns {@code null} in this case.
+     * @param failIfSys Fail is cache is system.
      * @param <K> type of keys.
      * @param <V> type of values.
      * @return Cache instance for given name.
      * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings("unchecked")
-    @Nullable private <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName, boolean failIfNotStarted)
-        throws IgniteCheckedException
+    @Nullable public <K, V> IgniteCache<K, V> publicJCache(@Nullable String cacheName, boolean failIfNotStarted,
+        boolean failIfSys) throws IgniteCheckedException
     {
         if (log.isDebugEnabled())
             log.debug("Getting public cache for name: " + cacheName);
@@ -2508,7 +2509,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
         DynamicCacheDescriptor desc = registeredCaches.get(masked);
 
-        if (desc != null && !desc.cacheType().userCache())
+        if (desc != null && !desc.cacheType().userCache() && failIfSys)
             throw new IllegalStateException("Failed to get cache because it is a system cache: " + cacheName);
 
         if (cache == null) {

[31/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-694' into ignite-694

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


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

Branch: refs/heads/ignite-80
Commit: 32aa57c5875cc4bc07ef9b3bc3fa61a8985ea31d
Parents: 7908aea 7f7c829
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 09:03:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 09:03:39 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/GridDhtAffinityAssignmentRequest.java | 5 +++++
 .../distributed/dht/GridDhtAffinityAssignmentResponse.java      | 5 +++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------

[27/50] [abbrv] incubator-ignite git commit: ignite-437: test for bigQuery sql

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
deleted file mode 100644
index 5845a2e..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ /dev/null
@@ -1,875 +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.
- */
-
-package org.apache.ignite.internal.processors.query.h2.sql;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
-/**
- * Test to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned) 
- * which have the same data models and data content. 
- */
-public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
-    /** */
-    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
-    /** Partitioned cache. */
-    private static IgniteCache pCache;
-
-    /** Replicated cache. */
-    private static IgniteCache rCache;
-    
-    /** H2 db connection. */
-    private static Connection conn;
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(IP_FINDER);
-
-        c.setDiscoverySpi(disco);
-
-        c.setMarshaller(new OptimizedMarshaller(true));
-
-        c.setCacheConfiguration(createCache("part", CacheMode.PARTITIONED),
-            createCache("repl", CacheMode.REPLICATED)
-        );
-
-        return c;
-    }
-
-    /**
-     * Creates new cache configuration.
-     *
-     * @param name Cache name.
-     * @param mode Cache mode.
-     * @return Cache configuration.
-     */
-    private static CacheConfiguration createCache(String name, CacheMode mode) {
-        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
-
-        cc.setName(name);
-        cc.setCacheMode(mode);
-        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
-
-        if (mode == CacheMode.PARTITIONED)
-            cc.setIndexedTypes(
-                Integer.class, Organization.class,
-                AffinityKey.class, Person.class,
-                AffinityKey.class, Purchase.class
-            );
-        else if (mode == CacheMode.REPLICATED)
-            cc.setIndexedTypes(
-                Integer.class, Product.class
-            );
-        else
-            throw new IllegalStateException("mode: " + mode);
-
-        return cc;
-    }
-
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        super.beforeTestsStarted();
-
-        Ignite ignite = startGrids(4);
-
-        pCache = ignite.cache("part");
-        
-        rCache = ignite.cache("repl");
-
-        awaitPartitionMapExchange();
-        
-        conn = openH2Connection(false);
-
-        initializeH2Schema();
-
-        initCacheAndDbData();
-
-        checkAllDataEquals();
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-        
-        conn.close();
-        
-        stopAllGrids();
-    }
-
-    /**
-     * Populate cache and h2 database with test data.
-     */
-    @SuppressWarnings("unchecked")
-    private void initCacheAndDbData() throws SQLException {
-        int idGen = 0;
-        
-        // Organizations.
-        List<Organization> organizations = new ArrayList<>();
-
-        for (int i = 0; i < 3; i++) {
-            int id = idGen++;
-            
-            Organization org = new Organization(id, "Org" + id);
-            
-            organizations.add(org);
-            
-            pCache.put(org.id, org);
-            
-            insertInDb(org);
-        }
-
-        // Persons.
-        List<Person> persons = new ArrayList<>();
-        
-        for (int i = 0; i < 5; i++) {
-            int id = idGen++;
-
-            Person person = new Person(id, organizations.get(i % organizations.size()), 
-                "name" + id, "lastName" + id, id * 100.0);
-            
-            // Add a Person without lastname.
-            if (id == organizations.size() + 1)
-                person.lastName = null;
-
-            persons.add(person);
-
-            pCache.put(person.key(), person);
-            
-            insertInDb(person);
-        }
-
-        // Products.
-        List<Product> products = new ArrayList<>();
-
-        for (int i = 0; i < 10; i++) {
-            int id = idGen++;
-            
-            Product product = new Product(id, "Product" + id, id*1000);
-            
-            products.add(product);
-            
-            rCache.put(product.id, product);
-            
-            insertInDb(product);
-        }
-
-        // Purchases.
-        for (int i = 0; i < products.size() * 2; i++) {
-            int id = idGen++;
-
-            Purchase purchase = new Purchase(id, products.get(i % products.size()), persons.get(i % persons.size()));
-
-            pCache.put(purchase.key(), purchase);
-            
-            insertInDb(purchase);
-        }
-    }
-
-    /**
-     * Insert {@link Organization} at h2 database.
-     *  
-     * @param org Organization.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Organization org) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement(
-            "insert into \"part\".ORGANIZATION (_key, _val, id, name) values(?, ?, ?, ?)")) {
-            st.setObject(1, org.id);
-            st.setObject(2, org);
-            st.setObject(3, org.id);
-            st.setObject(4, org.name);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Insert {@link Person} at h2 database.
-     *
-     * @param p Person.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Person p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement("insert into \"part\".PERSON " +
-            "(_key, _val, id, firstName, lastName, orgId, salary) values(?, ?, ?, ?, ?, ?, ?)")) {
-            st.setObject(1, p.key());
-            st.setObject(2, p);
-            st.setObject(3, p.id);
-            st.setObject(4, p.firstName);
-            st.setObject(5, p.lastName);
-            st.setObject(6, p.orgId);
-            st.setObject(7, p.salary);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Insert {@link Product} at h2 database.
-     *
-     * @param p Product.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Product p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement(
-            "insert into \"repl\".PRODUCT (_key, _val, id, name, price) values(?, ?, ?, ?, ?)")) {
-            st.setObject(1, p.id);
-            st.setObject(2, p);
-            st.setObject(3, p.id);
-            st.setObject(4, p.name);
-            st.setObject(5, p.price);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Insert {@link Purchase} at h2 database.
-     *
-     * @param p Purchase.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Purchase p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement(
-            "insert into \"part\".PURCHASE (_key, _val, id, personId, productId) values(?, ?, ?, ?, ?)")) {
-            st.setObject(1, p.key());
-            st.setObject(2, p);
-            st.setObject(3, p.id);
-            st.setObject(4, p.personId);
-            st.setObject(5, p.productId);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Initialize h2 database schema.
-     *
-     * @throws SQLException If exception.
-     */
-    private void initializeH2Schema() throws SQLException {
-        Statement st = conn.createStatement();
-
-        st.execute("CREATE SCHEMA \"part\"");
-        st.execute("CREATE SCHEMA \"repl\"");
-
-        st.execute("create table \"part\".ORGANIZATION" +
-            "  (_key int not null," +
-            "  _val other not null," +
-            "  id int unique," +
-            "  name varchar(255))");
-        
-        st.execute("create table \"part\".PERSON" +
-            "  (_key other not null ," +
-            "   _val other not null ," +
-            "  id int unique, " +
-            "  firstName varchar(255), " +
-            "  lastName varchar(255)," +
-            "  orgId int not null," +
-            "  salary double )");
-
-        st.execute("create table \"repl\".PRODUCT" +
-            "  (_key int not null ," +
-            "   _val other not null ," +
-            "  id int unique, " +
-            "  name varchar(255), " +
-            "  price int)");
-
-        st.execute("create table \"part\".PURCHASE" +
-            "  (_key other not null ," +
-            "   _val other not null ," +
-            "  id int unique, " +
-            "  personId int, " +
-            "  productId int)");
-
-        conn.commit();
-    }
-
-    /**
-     * Gets connection from a pool.
-     *
-     * @param autocommit {@code true} If connection should use autocommit mode.
-     * @return Pooled connection.
-     * @throws SQLException In case of error.
-     */
-    private Connection openH2Connection(boolean autocommit) throws SQLException {
-        System.setProperty("h2.serializeJavaObject", "false");
-        
-        String dbName = "test";
-        
-        Connection conn = DriverManager.getConnection("jdbc:h2:mem:" + dbName + ";DB_CLOSE_DELAY=-1");
-
-        conn.setAutoCommit(autocommit);
-
-        return conn;
-    }
-
-    /**
-     * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
-     *
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution. 
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> compareQueryRes0(String sql, @Nullable Object... args) throws SQLException {
-        return compareQueryRes0(pCache, sql, args, Order.RANDOM);
-    }
-
-    /**
-     * Execute given sql query on h2 database and on ignite cache and compare results. 
-     * Expected that results are not ordered.
-     *
-     * @param cache Ignite cache.
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution. 
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object... args) throws SQLException {
-        return compareQueryRes0(cache, sql, args, Order.RANDOM);
-    }
-
-    /**
-     * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
-     * Expected that results are ordered.
-     *
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution.
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> compareOrderedQueryRes0(String sql, @Nullable Object... args) throws SQLException {
-        return compareQueryRes0(pCache, sql, args, Order.ORDERED);
-    }
-
-    /**
-     * Execute given sql query on h2 database and on ignite cache and compare results.
-     *
-     * @param cache Ignite cache.
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * @param order Expected ordering of SQL results. If {@link Order#ORDERED} 
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution.
-     * @throws SQLException If exception.
-     */    
-    @SuppressWarnings("unchecked")
-    private List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object[] args, Order order) throws SQLException {
-        if (args == null)
-            args = new Object[] {null};
-        
-        log.info("Sql=\"" + sql + "\", args=" + Arrays.toString(args));
-
-        List<List<?>> h2Res = executeH2Query(sql, args);
-
-        List<List<?>> cacheRes = cache.query(new SqlFieldsQuery(sql).setArgs(args)).getAll();
-
-        assertRsEquals(h2Res, cacheRes, order);
-        
-        return cacheRes;
-    }
-
-    /**
-     * Execute SQL query on h2 database.
-     *
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * @return Result of SQL query on h2 database.
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> executeH2Query(String sql, Object[] args) throws SQLException {
-        List<List<?>> res = new ArrayList<>();
-        ResultSet rs = null;
-
-        try(PreparedStatement st = conn.prepareStatement(sql)) {
-            for (int idx = 0; idx < args.length; idx++)
-                st.setObject(idx + 1, args[idx]);
-
-            rs = st.executeQuery();
-
-            int colCnt = rs.getMetaData().getColumnCount();
-
-            while (rs.next()) {
-                List<Object> row = new ArrayList<>(colCnt);
-                
-                for (int i = 1; i <= colCnt; i++)
-                    row.add(rs.getObject(i));
-                
-                res.add(row);
-            }
-        }
-        finally {
-            U.closeQuiet(rs);
-        }
-
-        return res;
-    }
-
-    /**
-     * Assert equals of result sets according to expected ordering.
-     *
-     * @param rs1 Expected result set.
-     * @param rs2 Actual result set.
-     * @param order Expected ordering of SQL results. If {@link Order#ORDERED} 
-     * then results will compare as ordered queries.
-     */
-    private void assertRsEquals(List<List<?>> rs1, List<List<?>> rs2, Order order) {
-        assertEquals("Rows count has to be equal.", rs1.size(), rs2.size());
-        
-        switch (order){
-            case ORDERED:
-                for (int rowNum = 0; rowNum < rs1.size(); rowNum++) {
-                    List<?> row1 = rs1.get(rowNum);
-                    List<?> row2 = rs2.get(rowNum);
-
-                    assertEquals("Columns count have to be equal.", row1.size(), row2.size());
-
-                    for (int colNum = 0; colNum < row1.size(); colNum++)
-                        assertEquals("Row=" + rowNum + ", column=" + colNum, row1.get(colNum), row2.get(colNum));
-                }
-
-                break;
-            case RANDOM:
-                Map<List<?>, Integer> rowsWithCnt1 = extractUniqueRowsWithCounts(rs1);
-                Map<List<?>, Integer> rowsWithCnt2 = extractUniqueRowsWithCounts(rs2);
-                
-                assertEquals("Unique rows count has to be equal.", rowsWithCnt1.size(), rowsWithCnt2.size());
-
-                for (Map.Entry<List<?>, Integer> entry1 : rowsWithCnt1.entrySet()) {
-                    List<?> row = entry1.getKey();
-                    Integer cnt1 = entry1.getValue();
-
-                    Integer cnt2 = rowsWithCnt2.get(row);
-
-                    assertEquals("Row has different occurance number.\nRow=" + row, cnt1, cnt2);
-                }
-                
-                break;
-            default: 
-                throw new IllegalStateException();
-        }
-    }
-
-    /**
-     * @param rs Result set.
-     * @return Map of unique rows at the result set to number of occuriances at the result set.
-     */
-    private Map<List<?>, Integer> extractUniqueRowsWithCounts(Iterable<List<?>> rs) {
-        Map<List<?>, Integer> res = new HashMap<>();
-
-        for (List<?> row : rs) {
-            Integer cnt = res.get(row);
-            
-            if (cnt == null)
-                cnt = 0;
-            
-            res.put(row, cnt + 1);
-        }
-        return res;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    private void checkAllDataEquals() throws Exception {
-        compareQueryRes0("select _key, _val, id, name from \"part\".Organization");
-
-        compareQueryRes0("select _key, _val, id, firstName, lastName, orgId, salary from \"part\".Person");
-
-        compareQueryRes0("select _key, _val, id, personId, productId from \"part\".Purchase");
-
-        compareQueryRes0(rCache, "select _key, _val, id, name, price from \"repl\".Product");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void _testSimpleReplSelect() throws Exception {
-        compareQueryRes0("select id, name, price from \"repl\".Product");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testParamSubstitution() throws Exception {
-        compareQueryRes0("select ? from \"part\".Person", "Some arg");
-    }
-
-    /**
-     * @throws SQLException If failed.
-     */
-    public void testAggregateOrderBy() throws SQLException {
-        compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNullParamSubstitution() throws Exception {
-        List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null);
-
-        // Ensure we find something.
-        assertNotSame(0, rs1.size());
-    }
-
-    /**
-     *
-     */
-    public void testUnion() throws SQLException {
-        String base = "select _val v from \"part\".Person";
-
-        compareQueryRes0(base + " union all " + base);
-        compareQueryRes0(base + " union " + base);
-
-        base = "select firstName||lastName name, salary from \"part\".Person";
-
-        assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
-        assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testEmptyResult() throws Exception {
-        compareQueryRes0("select id from \"part\".Person where 0 = 1");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSqlQueryWithAggregation() throws Exception {
-        compareQueryRes0("select avg(salary) from \"part\".Person, \"part\".Organization where Person.orgId = Organization.id and "
-            + "lower(Organization.name) = lower(?)", "Org1");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSqlFieldsQuery() throws Exception {
-        compareQueryRes0("select concat(firstName, ' ', lastName) from \"part\".Person");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSqlFieldsQueryWithJoin() throws Exception {
-        compareQueryRes0("select concat(firstName, ' ', lastName), "
-            + "Organization.name from \"part\".Person, \"part\".Organization where "
-            + "Person.orgId = Organization.id");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testOrdered() throws Exception {
-        compareOrderedQueryRes0("select firstName, lastName" +
-                " from \"part\".Person" +
-                " order by lastName, firstName"
-        );
-    }
-
-    /**
-     * //TODO Investigate.
-     *  
-     * @throws Exception If failed.
-     */
-    public void _testSimpleJoin() throws Exception {
-        // Have expected results.
-        compareQueryRes0("select id, firstName, lastName" +
-            "  from \"part\".Person" +
-            "  where Person.id = ?", 3);
-
-        // Ignite cache return 0 results...
-        compareQueryRes0("select pe.firstName" +
-            "  from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
-            "  where pe.id = ?", 3);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSimpleReplicatedSelect() throws Exception {
-        compareQueryRes0(rCache, "select id, name from \"repl\".Product");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void _testCrossCache() throws Exception {
-        //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" +
-            "  group by Product.id");
-    }
-
-    /**
-     * Person class. Stored at partitioned cache.
-     */
-    private static class Person implements Serializable {
-        /** Person ID (indexed). */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Organization ID (indexed). */
-        @QuerySqlField(index = true)
-        private int orgId;
-
-        /** First name (not-indexed). */
-        @QuerySqlField
-        private String firstName;
-
-        /** Last name (not indexed). */
-        @QuerySqlField
-        private String lastName;
-
-        /** Salary (indexed). */
-        @QuerySqlField(index = true)
-        private double salary;
-
-        /**
-         * Constructs person record.
-         *
-         * @param org Organization.
-         * @param firstName First name.
-         * @param lastName Last name.
-         * @param salary Salary.
-         */
-        Person(int id, Organization org, String firstName, String lastName, double salary) {
-            this.id = id;
-            this.firstName = firstName;
-            this.lastName = lastName;
-            this.salary = salary;
-            orgId = org.id;
-        }
-
-        /**
-         * @return Custom affinity key to guarantee that person is always collocated with organization.
-         */
-        public AffinityKey<Integer> key() {
-            return new AffinityKey<>(id, orgId);
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Person && id == ((Person)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Person [firstName=" + firstName +
-                ", lastName=" + lastName +
-                ", id=" + id +
-                ", orgId=" + orgId +
-                ", salary=" + salary + ']';
-        }
-    }
-
-    /**
-     * Organization class. Stored at partitioned cache.
-     */
-    private static class Organization implements Serializable {
-        /** Organization ID (indexed). */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Organization name (indexed). */
-        @QuerySqlField(index = true)
-        private String name;
-
-        /**
-         * Create Organization.
-         *
-         * @param id Organization ID.
-         * @param name Organization name.
-         */
-        Organization(int id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Organization && id == ((Organization)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Organization [id=" + id + ", name=" + name + ']';
-        }
-    }
-
-    /**
-     * Product class. Stored at replicated cache.
-     */
-    private static class Product implements Serializable {
-        /** Primary key. */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Product name. */
-        @QuerySqlField
-        private String name;
-
-        /** Product price */
-        @QuerySqlField
-        private int price;
-
-        /**
-         * Create Product.
-         *
-         * @param id Product ID.
-         * @param name Product name.
-         * @param price Product price.
-         */
-        Product(int id, String name, int price) {
-            this.id = id;
-            this.name = name;
-            this.price = price;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Product && id == ((Product)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Product [id=" + id + ", name=" + name + ", price=" + price + ']';
-        }
-    }
-
-    /**
-     * Purchase class. Stored at partitioned cache.
-     */
-    private static class Purchase implements Serializable {
-        /** Primary key. */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Product ID. */
-        @QuerySqlField
-        private int productId;
-
-        /** Person ID. */
-        @QuerySqlField
-        private int personId;
-
-        /**
-         * Create Purchase.
-         *
-         * @param id Purchase ID.
-         * @param product Purchase product.
-         * @param person Purchase person.
-         */
-        Purchase(int id, Product product, Person person) {
-            this.id = id;
-            productId = product.id;
-            personId = person.id;
-        }
-
-        /**
-         * @return Custom affinity key to guarantee that purchase is always collocated with person.
-         */
-        public AffinityKey<Integer> key() {
-            return new AffinityKey<>(id, personId);
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Purchase && id == ((Purchase)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Purchase [id=" + id + ", productId=" + productId + ", personId=" + personId + ']';
-        }
-    }
-
-    /**
-     * Order type. 
-     */
-    private enum Order {
-        /** Random. */
-        RANDOM, 
-        /** Ordered. */
-        ORDERED
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 43e54fe..552205a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -100,8 +100,9 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
 
         suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
 
-        // H2 comparison.
-        suite.addTestSuite(IgniteVsH2QueryTest.class);
+        // Ignite cache and H2 comparison.
+        suite.addTestSuite(BaseH2CompareQueryTest.class);
+        suite.addTestSuite(H2CompareBigQueryTest.class);
 
         return suite;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql b/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
new file mode 100644
index 0000000..5f5cb74
--- /dev/null
+++ b/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
@@ -0,0 +1,55 @@
+--
+-- 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.
+--
+
+select *
+from (
+  select rootOrderId as custOrderId, co.date, co.orderId, replace(co.alias,'_ALGO','') as alias, op.parentAlgo
+  from (
+	select  date, orderId, rootOrderId, origOrderId, archSeq, alias 
+	from "part".CustOrder where alias='CUSTOM'
+	
+	union all
+	
+	select  date, orderId, rootOrderId, refOrderId as origOrderId, archSeq, alias
+	from "part".ReplaceOrder where alias='CUSTOM'
+  ) co, "part".OrderParams op
+  where co.date = op.date and co.orderId = op.orderId and co.archSeq = -- TODO: replace with 'dateToLong(co.date)+archSeq'.
+	(
+	  select max(archSeq) -- TODO: replace with 'dateToLong(co.date)+archSeq'.
+	  from (
+		  select  date, orderId, rootOrderId, origOrderId, archSeq, alias 
+		  from "part".CustOrder where alias='CUSTOM'
+		  
+		  union all
+		  
+		  select  date, orderId, rootOrderId, refOrderId as origOrderId, archSeq, alias
+		  from "part".ReplaceOrder where alias='CUSTOM'
+	  ) 
+	  where origOrderId = co.origOrderId and date = co.date
+	) and co.alias='CUSTOM'
+) cop 
+inner join (
+  select e.date, e.rootOrderId as eRootOrderId, e.rootOrderId, sum(e.execShares) as execShares, 
+	sum(e.execShares*e.price)/sum(e.execShares) as price,
+	case when min(e.lastMkt) = max(e.lastMkt) then min(e.lastMkt) else min('XOFF') end as execMeet
+  from "repl".Exec e
+  group by e.date, e.rootOrderId
+) oep on (cop.date = oep.date and cop.custOrderId = oep.eRootOrderId)
+left outer join (
+  select top 1 refOrderId, date from "part".Cancel
+) cc on (cc.refOrderId = cop.orderId and cc.date = cop.date)
+where cop.alias='CUSTOM'

[13/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180-1

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180-1


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

Branch: refs/heads/ignite-80
Commit: 8c74c787baf8e74d84436a7e82d4e5c84ae8ddc6
Parents: 2cda69f 0cf79e4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 14:26:59 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 14:26:59 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxManager.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------

[37/50] [abbrv] incubator-ignite git commit: GG-9829 Need examples for IGridCache.LoadCache() and IGridCacheStore.LoadCache() in .NET - done.

Posted by sb...@apache.org.
GG-9829 Need examples for IGridCache.LoadCache() and IGridCacheStore.LoadCache() in .NET - done.


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

Branch: refs/heads/ignite-80
Commit: 5fcb072927925ac2342a43bc0b81e226043439e2
Parents: bb0ce4b
Author: ptupitsyn <pt...@gridgain.com>
Authored: Thu Apr 9 11:50:42 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Thu Apr 9 11:50:42 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 57 +++++++++++---------
 .../cache/GridLoadCacheCloseablePredicate.java  | 30 +++++++++++
 .../distributed/dht/GridDhtCacheAdapter.java    | 22 +++++---
 3 files changed, 79 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fcb0729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index b35dbd3..5ade136 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3452,39 +3452,48 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
         final ExpiryPolicy plc = plc0 != null ? plc0 : ctx.expiry();
 
-        if (ctx.store().isLocal()) {
-            DataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.namex());
+        if (p != null)
+            ctx.kernalContext().resource().injectGeneric(p);
 
-            try {
-                ldr.receiver(new IgniteDrDataStreamerCacheUpdater());
+        try {
+            if (ctx.store().isLocal()) {
+                DataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.namex());
+
+                try {
+                    ldr.receiver(new IgniteDrDataStreamerCacheUpdater());
 
-                LocalStoreLoadClosure c = new LocalStoreLoadClosure(p, ldr, plc);
+                    LocalStoreLoadClosure c = new LocalStoreLoadClosure(p, ldr, plc);
 
-                ctx.store().loadCache(c, args);
+                    ctx.store().loadCache(c, args);
 
-                c.onDone();
-            }
-            finally {
-                ldr.closeEx(false);
+                    c.onDone();
+                }
+                finally {
+                    ldr.closeEx(false);
+                }
             }
-        }
-        else {
-            // Version for all loaded entries.
-            final GridCacheVersion ver0 = ctx.versions().nextForLoad();
+            else {
+                // Version for all loaded entries.
+                final GridCacheVersion ver0 = ctx.versions().nextForLoad();
 
-            ctx.store().loadCache(new CIX3<KeyCacheObject, Object, GridCacheVersion>() {
-                @Override public void applyx(KeyCacheObject key, Object val, @Nullable GridCacheVersion ver)
-                    throws IgniteException {
-                    assert ver == null;
+                ctx.store().loadCache(new CIX3<KeyCacheObject, Object, GridCacheVersion>() {
+                    @Override public void applyx(KeyCacheObject key, Object val, @Nullable GridCacheVersion ver)
+                        throws IgniteException {
+                        assert ver == null;
 
-                    long ttl = CU.ttlForLoad(plc);
+                        long ttl = CU.ttlForLoad(plc);
 
-                    if (ttl == CU.TTL_ZERO)
-                        return;
+                        if (ttl == CU.TTL_ZERO)
+                            return;
 
-                    loadEntry(key, val, ver0, (IgniteBiPredicate<Object, Object>)p, topVer, replicate, ttl);
-                }
-            }, args);
+                        loadEntry(key, val, ver0, (IgniteBiPredicate<Object, Object>) p, topVer, replicate, ttl);
+                    }
+                }, args);
+            }
+        }
+        finally {
+            if (p instanceof GridLoadCacheCloseablePredicate)
+                ((GridLoadCacheCloseablePredicate)p).onClose();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fcb0729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java
new file mode 100644
index 0000000..1331a42
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLoadCacheCloseablePredicate.java
@@ -0,0 +1,30 @@
+/*
+ * 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.processors.cache;
+
+import org.apache.ignite.lang.*;
+
+/**
+ * Special version of bi-predicate for LoadCache with close callback.
+ */
+public interface GridLoadCacheCloseablePredicate<K, V> extends IgniteBiPredicate<K, V> {
+    /**
+     * Callback invoked when predicate is no longer needed.
+     */
+    public void onClose();
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fcb0729/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index e19b971..a875a26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -411,13 +411,23 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
 
         final ExpiryPolicy plc = plc0 != null ? plc0 : ctx.expiry();
 
-        ctx.store().loadCache(new CI3<KeyCacheObject, Object, GridCacheVersion>() {
-            @Override public void apply(KeyCacheObject key, Object val, @Nullable GridCacheVersion ver) {
-                assert ver == null;
+        if (p != null)
+            ctx.kernalContext().resource().injectGeneric(p);
 
-                loadEntry(key, val, ver0, p, topVer, replicate, plc);
-            }
-        }, args);
+        try {
+            ctx.store().loadCache(new CI3<KeyCacheObject, Object, GridCacheVersion>() {
+                @Override public void apply(KeyCacheObject key, Object val, @Nullable GridCacheVersion ver) {
+                    assert ver == null;
+
+                    loadEntry(key, val, ver0, p, topVer, replicate, plc);
+                }
+            }, args);
+
+        }
+        finally {
+            if (p instanceof GridLoadCacheCloseablePredicate)
+                ((GridLoadCacheCloseablePredicate)p).onClose();
+        }
     }
 
     /**

[50/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-80

Posted by sb...@apache.org.
# Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-80


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

Branch: refs/heads/ignite-80
Commit: 8ef3fbe85347c2e113c07e4aa40591200024026a
Parents: 54eca28
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 15:33:30 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 15:33:30 2015 +0300

----------------------------------------------------------------------
 .../processors/datastructures/DataStructuresProcessor.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ef3fbe8/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 21e11fd..8106be0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -97,7 +97,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
     private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> dsInfoView;
 
     /** */
-    private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache;
+    private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> dsCacheInfoView;
 
     /**
      * @param ctx Context.
@@ -122,6 +122,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
 
         dsInfoView = (GridCacheProjectionEx)atomicsCache;
 
+        dsCacheInfoView = (GridCacheProjectionEx)atomicsCache;
+
         dsView = atomicsCache;
 
         cntDownLatchView = atomicsCache;
@@ -674,12 +676,12 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
      * @return Cache name.
      */
     private String compatibleConfiguration(CollectionConfiguration cfg) throws IgniteCheckedException {
-        List<CacheCollectionInfo> caches = utilityDataCache.localPeek(DATA_STRUCTURES_CACHE_KEY, null, null);
+        List<CacheCollectionInfo> caches = dsCacheInfoView.localPeek(DATA_STRUCTURES_CACHE_KEY, null, null);
 
         String cacheName = findCompatibleConfiguration(cfg, caches);
 
         if (cacheName == null)
-            cacheName = utilityDataCache.invoke(DATA_STRUCTURES_CACHE_KEY, new AddDataCacheProcessor(cfg)).get();
+            cacheName = dsCacheInfoView.invoke(DATA_STRUCTURES_CACHE_KEY, new AddDataCacheProcessor(cfg)).get();
 
         assert cacheName != null;

[02/50] [abbrv] incubator-ignite git commit: #ignite-180: Commit tests

Posted by sb...@apache.org.
#ignite-180: Commit tests


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

Branch: refs/heads/ignite-80
Commit: 8cc456ca6f4f3b296d71e94bd0612266bf185734
Parents: 9ec7711
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 12:56:50 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 12:56:50 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8cc456ca/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 729be28..f63f477 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -67,9 +67,9 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
 
-        suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
+        //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
+        //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
+        //suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class));
         suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class));

[30/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694


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

Branch: refs/heads/ignite-80
Commit: 7908aea91ad23d04efd1e6bbbc0ae796e72c0880
Parents: 8474a0a 5e9addb
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 09:02:56 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 09:02:56 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |   7 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 171 +++-----
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../ignite/internal/visor/cache/VisorCache.java |   2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  38 +-
 .../visor/cache/VisorCacheConfiguration.java    |  17 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  53 ++-
 .../cache/VisorCacheMetricsCollectorTask.java   |  59 ++-
 .../visor/cache/VisorCacheStopTask.java         |  69 +++
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../commands/cache/VisorCacheCommand.scala      | 423 +++++++++++--------
 .../commands/cache/VisorCacheStopCommand.scala  | 145 +++++++
 12 files changed, 657 insertions(+), 335 deletions(-)
----------------------------------------------------------------------

[21/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180-1

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180-1


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

Branch: refs/heads/ignite-80
Commit: c8444ec535e2275239174bba3b3d13ee56567b4f
Parents: ef2bacc 71439bc
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 16:16:27 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 16:16:27 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |   7 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 171 +++-----
 .../ignite/internal/util/lang/GridFunc.java     |  33 ++
 .../ignite/internal/visor/cache/VisorCache.java |   2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  38 +-
 .../visor/cache/VisorCacheConfiguration.java    |  17 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  53 ++-
 .../cache/VisorCacheMetricsCollectorTask.java   |  59 ++-
 .../visor/cache/VisorCacheStopTask.java         |  69 +++
 .../processors/query/h2/sql/GridSqlElement.java |   8 -
 .../processors/query/h2/sql/GridSqlQuery.java   | 183 ++++++++
 .../query/h2/sql/GridSqlQueryParser.java        |  97 +++--
 .../query/h2/sql/GridSqlQuerySplitter.java      | 111 ++++-
 .../processors/query/h2/sql/GridSqlSelect.java  | 209 +++------
 .../query/h2/sql/GridSqlSubquery.java           |   8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   | 134 ++++++
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  26 +-
 .../query/h2/sql/IgniteVsH2QueryTest.java       |  27 +-
 .../commands/cache/VisorCacheCommand.scala      | 423 +++++++++++--------
 .../commands/cache/VisorCacheStopCommand.scala  | 145 +++++++
 21 files changed, 1277 insertions(+), 545 deletions(-)
----------------------------------------------------------------------

[06/50] [abbrv] incubator-ignite git commit: #ignite-180: Remove unused imports.

Posted by sb...@apache.org.
#ignite-180: Remove unused imports.


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

Branch: refs/heads/ignite-80
Commit: 2cda69f10725be5bfdc1da6071cd2862a89d2161
Parents: 01d51b6
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 13:02:59 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 13:02:59 2015 +0300

----------------------------------------------------------------------
 ...ridCachePartitionedOffheapDataStructuresFailoverSelfTest.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2cda69f1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
index 74bbd53..e729e96 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
@@ -18,10 +18,6 @@
 package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.datastructures.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
 
 /**
  * Failover tests for cache data structures.

[16/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624

Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624


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

Branch: refs/heads/ignite-80
Commit: 71439bc0e5040b9df0b3e27e5632133049bc4432
Parents: c2c4da4 5e9addb
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:37:41 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:37:41 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |   7 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 171 +++-----
 .../ignite/internal/visor/cache/VisorCache.java |   2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  38 +-
 .../visor/cache/VisorCacheConfiguration.java    |  17 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  53 ++-
 .../cache/VisorCacheMetricsCollectorTask.java   |  59 ++-
 .../visor/cache/VisorCacheStopTask.java         |  69 +++
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../commands/cache/VisorCacheCommand.scala      | 423 +++++++++++--------
 .../commands/cache/VisorCacheStopCommand.scala  | 145 +++++++
 11 files changed, 653 insertions(+), 333 deletions(-)
----------------------------------------------------------------------

[24/50] [abbrv] incubator-ignite git commit: ignite-635: IgniteCluster # startNodes return ClusterStartNodeResult-s instead of Tuple3-s

Posted by sb...@apache.org.
ignite-635: IgniteCluster # startNodes return ClusterStartNodeResult-s instead of Tuple3-s


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

Branch: refs/heads/ignite-80
Commit: 7f4c5eed0af2b56b1dd671cbe76a4224b72f5045
Parents: 71439bc
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 18:27:23 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 18:27:23 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCluster.java   |   9 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |  46 +++
 .../cluster/ClusterStartNodeResultImpl.java     |  87 ++++++
 .../cluster/IgniteClusterAsyncImpl.java         |   5 +-
 .../internal/cluster/IgniteClusterImpl.java     |  37 +--
 .../util/nodestart/IgniteNodeCallable.java      |  30 --
 .../util/nodestart/IgniteSshHelper.java         |   2 +-
 .../util/nodestart/StartNodeCallable.java       |  30 ++
 .../util/nodestart/IgniteNodeCallableImpl.java  | 308 ------------------
 .../util/nodestart/IgniteSshHelperImpl.java     |   4 +-
 .../util/nodestart/StartNodeCallableImpl.java   | 309 +++++++++++++++++++
 ...gniteProjectionStartStopRestartSelfTest.java | 261 ++++++++--------
 .../IgniteStartStopRestartTestSuite.java        |   1 +
 .../commands/start/VisorStartCommand.scala      |   4 +-
 14 files changed, 631 insertions(+), 502 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 7d7d2fb..02fea14 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -19,7 +19,6 @@ package org.apache.ignite;
 
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -170,12 +169,12 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
      *      nodes on the host than expected.
      * @param timeout Connection timeout.
      * @param maxConn Number of parallel SSH connections to one host.
-     * @return Collection of tuples, each containing host name, result (success of failure)
+     * @return Collection of start node results, each containing host name, result (success or failure)
      *      and error message (if any).
      * @throws IgniteException In case of error.
      */
     @IgniteAsyncSupported
-    public Collection<GridTuple3<String, Boolean, String>> startNodes(File file, boolean restart, int timeout,
+    public Collection<ClusterStartNodeResult> startNodes(File file, boolean restart, int timeout,
         int maxConn) throws IgniteException;
 
     /**
@@ -272,12 +271,12 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
      *      nodes on the host than expected.
      * @param timeout Connection timeout in milliseconds.
      * @param maxConn Number of parallel SSH connections to one host.
-     * @return Collection of tuples, each containing host name, result (success of failure)
+     * @return Collection of start node results, each containing host name, result (success or failure)
      *      and error message (if any).
      * @throws IgniteException In case of error.
      */
     @IgniteAsyncSupported
-    public Collection<GridTuple3<String, Boolean, String>> startNodes(Collection<Map<String, Object>> hosts,
+    public Collection<ClusterStartNodeResult> startNodes(Collection<Map<String, Object>> hosts,
         @Nullable Map<String, Object> dflts, boolean restart, int timeout, int maxConn) throws IgniteException;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
new file mode 100644
index 0000000..b6c3619
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterStartNodeResult.java
@@ -0,0 +1,46 @@
+/*
+ * 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.cluster;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Cluster start node result information.
+ */
+public interface ClusterStartNodeResult {
+    /**
+     * Gets host name.
+     *
+     * @return Host name.
+     */
+    public String getHostName();
+    
+    /**
+     * Gets result of success or failure.
+     *
+     * @return Success or failure. <code>True</code> if success.
+     */
+    public boolean isSuccess();
+    
+    /**
+     * Gets error message if any.
+     *
+     * @return Error massage.
+     */
+    @Nullable public String getError();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
new file mode 100644
index 0000000..39301b3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterStartNodeResultImpl.java
@@ -0,0 +1,87 @@
+/*
+ * 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.cluster;
+
+import org.apache.ignite.cluster.*;
+
+/**
+ * Implementation for cluster start node result. 
+ */
+public class ClusterStartNodeResultImpl implements ClusterStartNodeResult {
+    /** Host name. */
+    private String hostName;
+
+    /** Result (success or failure). */
+    private boolean success;
+
+    /** Error message (if any) */
+    private String error;
+
+    /**
+     * @param hostName Host name.
+     * @param success Success or not.
+     * @param error Error message.
+     */
+    public ClusterStartNodeResultImpl(String hostName, boolean success, String error) {
+        this.hostName = hostName;
+        this.success = success;
+        this.error = error;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String getHostName() {
+        return hostName;
+    }
+
+    /**
+     * Sets host name.
+     *
+     * @param hostName Host name.
+     */
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isSuccess() {
+        return success;
+    }
+
+    /**
+     * Sets success result.
+     *
+     * @param success Success result.
+     */
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String getError() {
+        return error;
+    }
+
+    /**
+     * Sets error message.
+     *
+     * @param error Error message.
+     */
+    public void setError(String error) {
+        this.error = error;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
index 5a5daab..7f67b4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.cluster;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
@@ -98,7 +97,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(File file,
+    @Override public Collection<ClusterStartNodeResult> startNodes(File file,
         boolean restart,
         int timeout,
         int maxConn)
@@ -112,7 +111,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(
+    @Override public Collection<ClusterStartNodeResult> startNodes(
         Collection<Map<String, Object>> hosts,
         @Nullable Map<String, Object> dflts,
         boolean restart,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index 76a49dd..3c937b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.nodestart.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
@@ -189,7 +188,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(File file,
+    @Override public Collection<ClusterStartNodeResult> startNodes(File file,
         boolean restart,
         int timeout,
         int maxConn)
@@ -204,7 +203,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(Collection<Map<String, Object>> hosts,
+    @Override public Collection<ClusterStartNodeResult> startNodes(Collection<Map<String, Object>> hosts,
         @Nullable Map<String, Object> dflts,
         boolean restart,
         int timeout,
@@ -304,7 +303,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
      * @return Future with results.
      * @see IgniteCluster#startNodes(java.io.File, boolean, int, int)
      */
-    IgniteInternalFuture<Collection<GridTuple3<String, Boolean, String>>> startNodesAsync(File file,
+    IgniteInternalFuture<Collection<ClusterStartNodeResult>> startNodesAsync(File file,
       boolean restart,
       int timeout,
       int maxConn)
@@ -332,7 +331,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
      * @return Future with results.
      * @see IgniteCluster#startNodes(java.util.Collection, java.util.Map, boolean, int, int)
      */
-    IgniteInternalFuture<Collection<GridTuple3<String, Boolean, String>>> startNodesAsync(
+    IgniteInternalFuture<Collection<ClusterStartNodeResult>> startNodesAsync(
         Collection<Map<String, Object>> hosts,
         @Nullable Map<String, Object> dflts,
         boolean restart,
@@ -348,7 +347,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
 
             Map<String, Collection<IgniteRemoteStartSpecification>> specsMap = specifications(hosts, dflts);
 
-            Map<String, ConcurrentLinkedQueue<IgniteNodeCallable>> runMap = new HashMap<>();
+            Map<String, ConcurrentLinkedQueue<StartNodeCallable>> runMap = new HashMap<>();
 
             int nodeCallCnt = 0;
 
@@ -393,7 +392,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
                         startIdx = neighbors.size() + 1;
                 }
 
-                ConcurrentLinkedQueue<IgniteNodeCallable> nodeRuns = new ConcurrentLinkedQueue<>();
+                ConcurrentLinkedQueue<StartNodeCallable> nodeRuns = new ConcurrentLinkedQueue<>();
 
                 runMap.put(host, nodeRuns);
 
@@ -410,19 +409,17 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
 
             // If there is nothing to start, return finished future with empty result.
             if (nodeCallCnt == 0)
-                return new GridFinishedFuture<Collection<GridTuple3<String, Boolean, String>>>(
-                    Collections.<GridTuple3<String, Boolean, String>>emptyList());
+                return new GridFinishedFuture<Collection<ClusterStartNodeResult>>(
+                    Collections.<ClusterStartNodeResult>emptyList());
 
             // Exceeding max line width for readability.
-            GridCompoundFuture<GridTuple3<String, Boolean, String>, Collection<GridTuple3<String, Boolean, String>>>
-                fut = new GridCompoundFuture<>(
-                CU.<GridTuple3<String, Boolean, String>>objectsReducer()
-            );
+            GridCompoundFuture<ClusterStartNodeResult, Collection<ClusterStartNodeResult>> fut = 
+                new GridCompoundFuture<>(CU.<ClusterStartNodeResult>objectsReducer());
 
             AtomicInteger cnt = new AtomicInteger(nodeCallCnt);
 
             // Limit maximum simultaneous connection number per host.
-            for (ConcurrentLinkedQueue<IgniteNodeCallable> queue : runMap.values()) {
+            for (ConcurrentLinkedQueue<StartNodeCallable> queue : runMap.values()) {
                 for (int i = 0; i < maxConn; i++) {
                     if (!runNextNodeCallable(queue, fut, cnt))
                         break;
@@ -471,25 +468,25 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
      * @param cnt Atomic counter to check if all futures are added to compound future.
      * @return {@code True} if task was started, {@code false} if queue was empty.
      */
-    private boolean runNextNodeCallable(final ConcurrentLinkedQueue<IgniteNodeCallable> queue,
-        final GridCompoundFuture<GridTuple3<String, Boolean, String>, Collection<GridTuple3<String, Boolean, String>>>
+    private boolean runNextNodeCallable(final ConcurrentLinkedQueue<StartNodeCallable> queue,
+        final GridCompoundFuture<ClusterStartNodeResult, Collection<ClusterStartNodeResult>>
         comp,
         final AtomicInteger cnt)
     {
-        IgniteNodeCallable call = queue.poll();
+        StartNodeCallable call = queue.poll();
 
         if (call == null)
             return false;
 
-        IgniteInternalFuture<GridTuple3<String, Boolean, String>> fut = ctx.closure().callLocalSafe(call, true);
+        IgniteInternalFuture<ClusterStartNodeResult> fut = ctx.closure().callLocalSafe(call, true);
 
         comp.add(fut);
 
         if (cnt.decrementAndGet() == 0)
             comp.markInitialized();
 
-        fut.listen(new CI1<IgniteInternalFuture<GridTuple3<String, Boolean, String>>>() {
-            @Override public void apply(IgniteInternalFuture<GridTuple3<String, Boolean, String>> f) {
+        fut.listen(new CI1<IgniteInternalFuture<ClusterStartNodeResult>>() {
+            @Override public void apply(IgniteInternalFuture<ClusterStartNodeResult> f) {
                 runNextNodeCallable(queue, comp, cnt);
             }
         });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java
deleted file mode 100644
index 6c34efb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallable.java
+++ /dev/null
@@ -1,30 +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.
- */
-
-package org.apache.ignite.internal.util.nodestart;
-
-import org.apache.ignite.internal.util.lang.*;
-
-import java.util.concurrent.*;
-
-/**
- * SSH-based node starter, returns tuple which contains hostname, success flag and error message
- * if attempt was not successful.
- */
-public interface IgniteNodeCallable extends Callable<GridTuple3<String, Boolean, String>> {
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
index 2cb620f..14a35b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelper.java
@@ -30,5 +30,5 @@ public interface IgniteSshHelper {
      * @param timeout Connection timeout.
      * @return {@link Callable} starting node using SSH.
      */
-    public IgniteNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout);
+    public StartNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
new file mode 100644
index 0000000..a1a2046
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallable.java
@@ -0,0 +1,30 @@
+/*
+ * 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.nodestart;
+
+import org.apache.ignite.cluster.*;
+
+import java.util.concurrent.*;
+
+/**
+ * SSH-based node starter, returns tuple which contains hostname, success flag and error message
+ * if attempt was not successful.
+ */
+public interface StartNodeCallable extends Callable<ClusterStartNodeResult> {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
deleted file mode 100644
index 9b873bf..0000000
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java
+++ /dev/null
@@ -1,308 +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.
- */
-
-package org.apache.ignite.internal.util.nodestart;
-
-import com.jcraft.jsch.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-
-/**
- * SSH-based node starter.
- */
-public class IgniteNodeCallableImpl implements IgniteNodeCallable {
-    /** Default Ignite home path for Windows (taken from environment variable). */
-    private static final String DFLT_IGNITE_HOME_WIN = "%IGNITE_HOME%";
-
-    /** Default Ignite home path for Linux (taken from environment variable). */
-    private static final String DFLT_IGNITE_HOME_LINUX = "$IGNITE_HOME";
-
-    /** Default start script path for Linux. */
-    private static final String DFLT_SCRIPT_LINUX = "bin/ignite.sh -v";
-
-    /** Date format for log file name. */
-    private static final SimpleDateFormat FILE_NAME_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy--HH-mm-ss");
-
-    /** Specification. */
-    private final IgniteRemoteStartSpecification spec;
-
-    /** Connection timeout. */
-    private final int timeout;
-
-    /** Logger. */
-    @LoggerResource
-    private IgniteLogger log;
-
-    /**
-     * Required by Externalizable.
-     */
-    public IgniteNodeCallableImpl() {
-        spec = null;
-        timeout = 0;
-
-        assert false;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param spec Specification.
-     * @param timeout Connection timeout.
-     */
-    public IgniteNodeCallableImpl(IgniteRemoteStartSpecification spec, int timeout) {
-        assert spec != null;
-
-        this.spec = spec;
-        this.timeout = timeout;
-    }
-
-    /** {@inheritDoc} */
-    @Override public GridTuple3<String, Boolean, String> call() {
-        JSch ssh = new JSch();
-
-        Session ses = null;
-
-        try {
-            if (spec.key() != null)
-                ssh.addIdentity(spec.key().getAbsolutePath());
-
-            ses = ssh.getSession(spec.username(), spec.host(), spec.port());
-
-            if (spec.password() != null)
-                ses.setPassword(spec.password());
-
-            ses.setConfig("StrictHostKeyChecking", "no");
-
-            ses.connect(timeout);
-
-            boolean win = isWindows(ses);
-
-            char separator = win ? '\\' : '/';
-
-            spec.fixPaths(separator);
-
-            String igniteHome = spec.igniteHome();
-
-            if (igniteHome == null)
-                igniteHome = win ? DFLT_IGNITE_HOME_WIN : DFLT_IGNITE_HOME_LINUX;
-
-            String script = spec.script();
-
-            if (script == null)
-                script = DFLT_SCRIPT_LINUX;
-
-            String cfg = spec.configuration();
-
-            if (cfg == null)
-                cfg = "";
-
-            String startNodeCmd;
-            String scriptOutputFileName = FILE_NAME_DATE_FORMAT.format(new Date()) + '-'
-                + UUID.randomUUID().toString().substring(0, 8) + ".log";
-
-            if (win)
-                throw new UnsupportedOperationException("Apache Ignite cannot be auto-started on Windows from IgniteCluster.startNodes(…) API.");
-            else { // Assume Unix.
-                int spaceIdx = script.indexOf(' ');
-
-                String scriptPath = spaceIdx > -1 ? script.substring(0, spaceIdx) : script;
-                String scriptArgs = spaceIdx > -1 ? script.substring(spaceIdx + 1) : "";
-                String rmtLogArgs = buildRemoteLogArguments(spec.username(), spec.host());
-                String tmpDir = env(ses, "$TMPDIR", "/tmp/");
-                String scriptOutputDir = tmpDir + "ignite-startNodes";
-
-                shell(ses, "mkdir " + scriptOutputDir);
-
-                // Mac os don't support ~ in double quotes. Trying get home path from remote system.
-                if (igniteHome.startsWith("~")) {
-                    String homeDir = env(ses, "$HOME", "~");
-
-                    igniteHome = igniteHome.replaceFirst("~", homeDir);
-                }
-
-                startNodeCmd = new SB().
-                    // Console output is consumed, started nodes must use Ignite file appenders for log.
-                        a("nohup ").
-                    a("\"").a(igniteHome).a('/').a(scriptPath).a("\"").
-                    a(" ").a(scriptArgs).
-                    a(!cfg.isEmpty() ? " \"" : "").a(cfg).a(!cfg.isEmpty() ? "\"" : "").
-                    a(rmtLogArgs).
-                    a(" > ").a(scriptOutputDir).a("/").a(scriptOutputFileName).a(" 2>& 1 &").
-                    toString();
-            }
-
-            info("Starting remote node with SSH command: " + startNodeCmd, spec.logger(), log);
-
-            shell(ses, startNodeCmd);
-
-            return new GridTuple3<>(spec.host(), true, null);
-        }
-        catch (IgniteInterruptedCheckedException e) {
-            return new GridTuple3<>(spec.host(), false, e.getMessage());
-        }
-        catch (Exception e) {
-            return new GridTuple3<>(spec.host(), false, X.getFullStackTrace(e));
-        }
-        finally {
-            if (ses != null && ses.isConnected())
-                ses.disconnect();
-        }
-    }
-
-    /**
-     * Executes command using {@code shell} channel.
-     *
-     * @param ses SSH session.
-     * @param cmd Command.
-     * @throws JSchException In case of SSH error.
-     * @throws IOException If IO error occurs.
-     * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread was interrupted while waiting.
-     */
-    private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedCheckedException {
-        ChannelShell ch = null;
-
-        try {
-            ch = (ChannelShell)ses.openChannel("shell");
-
-            ch.connect();
-
-            try (PrintStream out = new PrintStream(ch.getOutputStream(), true)) {
-                out.println(cmd);
-
-                U.sleep(1000);
-            }
-        }
-        finally {
-            if (ch != null && ch.isConnected())
-                ch.disconnect();
-        }
-    }
-
-    /**
-     * Checks whether host is running Windows OS.
-     *
-     * @param ses SSH session.
-     * @return Whether host is running Windows OS.
-     * @throws JSchException In case of SSH error.
-     */
-    private boolean isWindows(Session ses) throws JSchException {
-        try {
-            return exec(ses, "cmd.exe") != null;
-        }
-        catch (IOException ignored) {
-            return false;
-        }
-    }
-
-    /**
-     * Gets the value of the specified environment variable.
-     *
-     * @param ses SSH session.
-     * @param name environment variable name.
-     * @param dflt default value.
-     * @return environment variable value.
-     * @throws JSchException In case of SSH error.
-     */
-    private String env(Session ses, String name, String dflt) throws JSchException {
-        try {
-            return exec(ses, "echo " + name);
-        }
-        catch (IOException ignored) {
-            return dflt;
-        }
-    }
-
-    /**
-     * Gets the value of the specified environment variable.
-     *
-     * @param ses SSH session.
-     * @param cmd environment variable name.
-     * @return environment variable value.
-     * @throws JSchException In case of SSH error.
-     * @throws IOException If failed.
-     */
-    private String exec(Session ses, String cmd) throws JSchException, IOException {
-        ChannelExec ch = null;
-
-        try {
-            ch = (ChannelExec)ses.openChannel("exec");
-
-            ch.setCommand(cmd);
-
-            ch.connect();
-
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(ch.getInputStream()))) {
-                return reader.readLine();
-            }
-        }
-        finally {
-            if (ch != null && ch.isConnected())
-                ch.disconnect();
-        }
-    }
-
-    /**
-     * Builds ignite.sh attributes to set up SSH username and password and log directory for started node.
-     *
-     * @param username SSH user name.
-     * @param host Host.
-     * @return {@code ignite.sh} script arguments.
-     */
-    private String buildRemoteLogArguments(String username, String host) {
-        assert username != null;
-        assert host != null;
-
-        SB sb = new SB();
-
-        sb.a(" -J-D").a(IGNITE_SSH_HOST).a("=\"").a(host).a("\"").
-            a(" -J-D").a(IGNITE_SSH_USER_NAME).a("=\"").a(username).a("\"");
-
-        return sb.toString();
-    }
-
-    /**
-     * @param log Logger.
-     * @return This callable for chaining method calls.
-     */
-    public IgniteNodeCallable setLogger(IgniteLogger log) {
-        this.log = log;
-
-        return this;
-    }
-
-    /**
-     * Log info message to loggers.
-     *
-     * @param msg Message text.
-     * @param loggers Loggers.
-     */
-    private void info(String msg, IgniteLogger... loggers) {
-        for (IgniteLogger logger : loggers)
-            if (logger != null && logger.isInfoEnabled())
-                logger.info(msg);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
index cccf678..c2370b6 100644
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteSshHelperImpl.java
@@ -22,7 +22,7 @@ package org.apache.ignite.internal.util.nodestart;
  */
 public class IgniteSshHelperImpl implements IgniteSshHelper {
     /** {@inheritDoc} */
-    @Override public IgniteNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout) {
-        return new IgniteNodeCallableImpl(spec, timeout);
+    @Override public StartNodeCallable nodeStartCallable(IgniteRemoteStartSpecification spec, int timeout) {
+        return new StartNodeCallableImpl(spec, timeout);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
new file mode 100644
index 0000000..7c6010f
--- /dev/null
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
@@ -0,0 +1,309 @@
+/*
+ * 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.nodestart;
+
+import com.jcraft.jsch.*;
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.resources.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+
+/**
+ * SSH-based node starter.
+ */
+public class StartNodeCallableImpl implements StartNodeCallable {
+    /** Default Ignite home path for Windows (taken from environment variable). */
+    private static final String DFLT_IGNITE_HOME_WIN = "%IGNITE_HOME%";
+
+    /** Default Ignite home path for Linux (taken from environment variable). */
+    private static final String DFLT_IGNITE_HOME_LINUX = "$IGNITE_HOME";
+
+    /** Default start script path for Linux. */
+    private static final String DFLT_SCRIPT_LINUX = "bin/ignite.sh -v";
+
+    /** Date format for log file name. */
+    private static final SimpleDateFormat FILE_NAME_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy--HH-mm-ss");
+
+    /** Specification. */
+    private final IgniteRemoteStartSpecification spec;
+
+    /** Connection timeout. */
+    private final int timeout;
+
+    /** Logger. */
+    @LoggerResource
+    private IgniteLogger log;
+
+    /**
+     * Required by Externalizable.
+     */
+    public StartNodeCallableImpl() {
+        spec = null;
+        timeout = 0;
+
+        assert false;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param spec Specification.
+     * @param timeout Connection timeout.
+     */
+    public StartNodeCallableImpl(IgniteRemoteStartSpecification spec, int timeout) {
+        assert spec != null;
+
+        this.spec = spec;
+        this.timeout = timeout;
+    }
+
+    /** {@inheritDoc} */
+    @Override public ClusterStartNodeResult call() {
+        JSch ssh = new JSch();
+
+        Session ses = null;
+
+        try {
+            if (spec.key() != null)
+                ssh.addIdentity(spec.key().getAbsolutePath());
+
+            ses = ssh.getSession(spec.username(), spec.host(), spec.port());
+
+            if (spec.password() != null)
+                ses.setPassword(spec.password());
+
+            ses.setConfig("StrictHostKeyChecking", "no");
+
+            ses.connect(timeout);
+
+            boolean win = isWindows(ses);
+
+            char separator = win ? '\\' : '/';
+
+            spec.fixPaths(separator);
+
+            String igniteHome = spec.igniteHome();
+
+            if (igniteHome == null)
+                igniteHome = win ? DFLT_IGNITE_HOME_WIN : DFLT_IGNITE_HOME_LINUX;
+
+            String script = spec.script();
+
+            if (script == null)
+                script = DFLT_SCRIPT_LINUX;
+
+            String cfg = spec.configuration();
+
+            if (cfg == null)
+                cfg = "";
+
+            String startNodeCmd;
+            String scriptOutputFileName = FILE_NAME_DATE_FORMAT.format(new Date()) + '-'
+                + UUID.randomUUID().toString().substring(0, 8) + ".log";
+
+            if (win)
+                throw new UnsupportedOperationException("Apache Ignite cannot be auto-started on Windows from IgniteCluster.startNodes(…) API.");
+            else { // Assume Unix.
+                int spaceIdx = script.indexOf(' ');
+
+                String scriptPath = spaceIdx > -1 ? script.substring(0, spaceIdx) : script;
+                String scriptArgs = spaceIdx > -1 ? script.substring(spaceIdx + 1) : "";
+                String rmtLogArgs = buildRemoteLogArguments(spec.username(), spec.host());
+                String tmpDir = env(ses, "$TMPDIR", "/tmp/");
+                String scriptOutputDir = tmpDir + "ignite-startNodes";
+
+                shell(ses, "mkdir " + scriptOutputDir);
+
+                // Mac os don't support ~ in double quotes. Trying get home path from remote system.
+                if (igniteHome.startsWith("~")) {
+                    String homeDir = env(ses, "$HOME", "~");
+
+                    igniteHome = igniteHome.replaceFirst("~", homeDir);
+                }
+
+                startNodeCmd = new SB().
+                    // Console output is consumed, started nodes must use Ignite file appenders for log.
+                        a("nohup ").
+                    a("\"").a(igniteHome).a('/').a(scriptPath).a("\"").
+                    a(" ").a(scriptArgs).
+                    a(!cfg.isEmpty() ? " \"" : "").a(cfg).a(!cfg.isEmpty() ? "\"" : "").
+                    a(rmtLogArgs).
+                    a(" > ").a(scriptOutputDir).a("/").a(scriptOutputFileName).a(" 2>& 1 &").
+                    toString();
+            }
+
+            info("Starting remote node with SSH command: " + startNodeCmd, spec.logger(), log);
+
+            shell(ses, startNodeCmd);
+
+            return new ClusterStartNodeResultImpl(spec.host(), true, null);
+        }
+        catch (IgniteInterruptedCheckedException e) {
+            return new ClusterStartNodeResultImpl(spec.host(), false, e.getMessage());
+        }
+        catch (Exception e) {
+            return new ClusterStartNodeResultImpl(spec.host(), false, X.getFullStackTrace(e));
+        }
+        finally {
+            if (ses != null && ses.isConnected())
+                ses.disconnect();
+        }
+    }
+
+    /**
+     * Executes command using {@code shell} channel.
+     *
+     * @param ses SSH session.
+     * @param cmd Command.
+     * @throws JSchException In case of SSH error.
+     * @throws IOException If IO error occurs.
+     * @throws IgniteInterruptedCheckedException If thread was interrupted while waiting.
+     */
+    private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedCheckedException {
+        ChannelShell ch = null;
+
+        try {
+            ch = (ChannelShell)ses.openChannel("shell");
+
+            ch.connect();
+
+            try (PrintStream out = new PrintStream(ch.getOutputStream(), true)) {
+                out.println(cmd);
+
+                U.sleep(1000);
+            }
+        }
+        finally {
+            if (ch != null && ch.isConnected())
+                ch.disconnect();
+        }
+    }
+
+    /**
+     * Checks whether host is running Windows OS.
+     *
+     * @param ses SSH session.
+     * @return Whether host is running Windows OS.
+     * @throws JSchException In case of SSH error.
+     */
+    private boolean isWindows(Session ses) throws JSchException {
+        try {
+            return exec(ses, "cmd.exe") != null;
+        }
+        catch (IOException ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * Gets the value of the specified environment variable.
+     *
+     * @param ses SSH session.
+     * @param name environment variable name.
+     * @param dflt default value.
+     * @return environment variable value.
+     * @throws JSchException In case of SSH error.
+     */
+    private String env(Session ses, String name, String dflt) throws JSchException {
+        try {
+            return exec(ses, "echo " + name);
+        }
+        catch (IOException ignored) {
+            return dflt;
+        }
+    }
+
+    /**
+     * Gets the value of the specified environment variable.
+     *
+     * @param ses SSH session.
+     * @param cmd environment variable name.
+     * @return environment variable value.
+     * @throws JSchException In case of SSH error.
+     * @throws IOException If failed.
+     */
+    private String exec(Session ses, String cmd) throws JSchException, IOException {
+        ChannelExec ch = null;
+
+        try {
+            ch = (ChannelExec)ses.openChannel("exec");
+
+            ch.setCommand(cmd);
+
+            ch.connect();
+
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(ch.getInputStream()))) {
+                return reader.readLine();
+            }
+        }
+        finally {
+            if (ch != null && ch.isConnected())
+                ch.disconnect();
+        }
+    }
+
+    /**
+     * Builds ignite.sh attributes to set up SSH username and password and log directory for started node.
+     *
+     * @param username SSH user name.
+     * @param host Host.
+     * @return {@code ignite.sh} script arguments.
+     */
+    private String buildRemoteLogArguments(String username, String host) {
+        assert username != null;
+        assert host != null;
+
+        SB sb = new SB();
+
+        sb.a(" -J-D").a(IGNITE_SSH_HOST).a("=\"").a(host).a("\"").
+            a(" -J-D").a(IGNITE_SSH_USER_NAME).a("=\"").a(username).a("\"");
+
+        return sb.toString();
+    }
+
+    /**
+     * @param log Logger.
+     * @return This callable for chaining method calls.
+     */
+    public StartNodeCallable setLogger(IgniteLogger log) {
+        this.log = log;
+
+        return this;
+    }
+
+    /**
+     * Log info message to loggers.
+     *
+     * @param msg Message text.
+     * @param loggers Loggers.
+     */
+    private void info(String msg, IgniteLogger... loggers) {
+        for (IgniteLogger logger : loggers)
+            if (logger != null && logger.isInfoEnabled())
+                logger.info(msg);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index d4c5fc5..7fa5b4b 100644
--- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.nodestart.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -178,19 +177,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartOneNode() throws Exception {
         joinedLatch = new CountDownLatch(1);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 1;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -208,19 +207,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartThreeNodes() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, DFLT_TIMEOUT, 1);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -238,19 +237,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartThreeNodesAndDoEmptyCall() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -279,19 +278,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartThreeNodesAndTryToStartOneNode() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -320,19 +319,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartFiveNodesInTwoCalls() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -351,12 +350,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         assert res.size() == 2;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -374,7 +373,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartFiveWithTwoSpecs() throws Exception {
         joinedLatch = new CountDownLatch(5);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 F.asList(map(HOST, SSH_UNAME, pwd, key, 2, U.getIgniteHome(), CFG_NO_ATTR, null),
                     map(HOST, SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null)),
@@ -382,12 +381,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         assert res.size() == 5;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -405,19 +404,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStartThreeNodesAndRestart() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -437,12 +436,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -465,19 +464,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         script = Paths.get(U.getIgniteHome()).relativize(U.resolveIgnitePath(script).toPath()).toString();
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 1, U.getIgniteHome(), null, script),
                 null, false, 0, 16);
 
         assert res.size() == 1;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -497,19 +496,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStopNodes() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, null, 3, U.getIgniteHome(), CFG_NO_ATTR,
                 null), null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -532,19 +531,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStopNodesFiltered() throws Exception {
         joinedLatch = new CountDownLatch(2);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2, U.getIgniteHome(), CFG_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 2;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -558,12 +557,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         assert res.size() == 1;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -595,19 +594,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStopNodeById() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -630,19 +629,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStopNodesByIds() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -672,19 +671,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testStopNodesByIdsC() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -709,19 +708,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testRestartNodes() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -746,19 +745,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testRestartNodesFiltered() throws Exception {
         joinedLatch = new CountDownLatch(2);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 2, U.getIgniteHome(), CFG_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 2;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -772,12 +771,12 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         assert res.size() == 1;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -812,19 +811,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testRestartNodeById() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -849,19 +848,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testRestartNodesByIds() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -888,19 +887,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
     public void testRestartNodesByIdsC() throws Exception {
         joinedLatch = new CountDownLatch(3);
 
-        Collection<GridTuple3<String, Boolean, String>> res =
+        Collection<ClusterStartNodeResult> res =
             startNodes(ignite.cluster(),
                 maps(Collections.singleton(HOST), SSH_UNAME, pwd, key, 3, U.getIgniteHome(), CFG_NO_ATTR, null),
                 null, false, 0, 16);
 
         assert res.size() == 3;
 
-        F.forEach(res, new CI1<GridTuple3<String, Boolean, String>>() {
-            @Override public void apply(GridTuple3<String, Boolean, String> t) {
-                assert t.get1().equals(HOST);
+        F.forEach(res, new CI1<ClusterStartNodeResult>() {
+            @Override public void apply(ClusterStartNodeResult t) {
+                assert t.getHostName().equals(HOST);
 
-                if (!t.get2())
-                    throw new IgniteException(t.get3());
+                if (!t.isSuccess())
+                    throw new IgniteException(t.getError());
             }
         });
 
@@ -1016,7 +1015,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
      * @param maxConn Maximum connections.
      * @return Results collection.
      */
-    private Collection<GridTuple3<String, Boolean, String>> startNodes(IgniteCluster cluster,
+    private Collection<ClusterStartNodeResult> startNodes(IgniteCluster cluster,
         Collection<Map<String, Object>> hosts,
         @Nullable Map<String, Object> dflts,
         boolean restart,
@@ -1026,6 +1025,6 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         assertNull(cluster.startNodes(hosts, dflts, restart, timeout, maxConn));
 
-        return cluster.<Collection<GridTuple3<String, Boolean, String>>>future().get(WAIT_TIMEOUT);
+        return cluster.<Collection<ClusterStartNodeResult>>future().get(WAIT_TIMEOUT);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
index 65fcb44..6d09eb2 100644
--- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
+++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
@@ -37,3 +37,4 @@ public class IgniteStartStopRestartTestSuite {
         return suite;
     }
 }
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f4c5eed/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
index 5342fc1..a6de108 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
@@ -228,7 +228,7 @@ class VisorStartCommand {
 
                 try
                     res = ignite.cluster.startNodes(file, restart, timeout, maxConn).map(t => {
-                        Result(t.get1, t.get2, t.get3)
+                        Result(t.getHostName, t.isSuccess, t.getError)
                     }).toSeq
                 catch {
                     case e: IgniteException => scold(e.getMessage).^^
@@ -284,7 +284,7 @@ class VisorStartCommand {
 
                 try
                     res = ignite.cluster.startNodes(asJavaCollection(Seq(params)), null, restart, timeout, maxConn).
-                        map(t => Result(t.get1, t.get2, t.get3)).toSeq
+                        map(t => Result(t.getHostName, t.isSuccess, t.getError)).toSeq
                 catch {
                     case e: IgniteException => scold(e.getMessage).^^
                     case _: RejectedExecutionException => scold("Failed due to system error.").^^

[17/50] [abbrv] incubator-ignite git commit: # ignite-180-1

Posted by sb...@apache.org.
# ignite-180-1


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

Branch: refs/heads/ignite-80
Commit: 597c6c002ce9beb645c7db8ea4557e6afe58aa78
Parents: 8c74c78
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 14:43:14 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 14:43:14 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/examples/datastructures/IgniteQueueExample.java | 3 ---
 .../apache/ignite/examples/datastructures/IgniteSetExample.java   | 3 ---
 .../cache/datastructures/GridCacheQueueApiSelfAbstractTest.java   | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/597c6c00/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
index af2cf09..fae9523 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
@@ -36,9 +36,6 @@ import java.util.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class IgniteQueueExample {
-    /** Cache name. */
-    private static final String CACHE_NAME = IgniteQueueExample.class.getSimpleName();
-
     /** Number of retries */
     private static final int RETRIES = 20;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/597c6c00/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
index 02f043c..29f7f37 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
@@ -35,9 +35,6 @@ import java.util.*;
  * start node with {@code examples/config/example-ignite.xml} configuration.
  */
 public class IgniteSetExample {
-    /** Cache name. */
-    private static final String CACHE_NAME = IgniteSetExample.class.getSimpleName();
-
     /** Set instance. */
     private static IgniteSet<String> set;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/597c6c00/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
index 012401d..22e8170 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
@@ -510,7 +510,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection
     /**
      * @throws Exception If failed.
      */
-    public void testReuseHash() throws Exception {
+    public void testReuseCache() throws Exception {
         CollectionConfiguration colCfg = collectionConfiguration();
 
         IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg);

[18/50] [abbrv] incubator-ignite git commit: # ignite-694

Posted by sb...@apache.org.
# ignite-694


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

Branch: refs/heads/ignite-80
Commit: 7f7c829c8f9a65016fcae4847c7991f5a6acc59d
Parents: 8474a0a
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 8 15:47:35 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 8 15:47:35 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/GridDhtAffinityAssignmentRequest.java | 5 +++++
 .../distributed/dht/GridDhtAffinityAssignmentResponse.java      | 5 +++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f7c829c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index cdb52c7..2f3fa23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -56,6 +56,11 @@ public class GridDhtAffinityAssignmentRequest extends GridCacheMessage {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override public boolean partitionExchangeMessage() {
+        return true;
+    }
+
     /**
      * @return Requested topology version.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f7c829c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 375d5fc..73b4a48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -72,6 +72,11 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override public boolean partitionExchangeMessage() {
+        return true;
+    }
+
     /**
      * @return Topology version.
      */

[28/50] [abbrv] incubator-ignite git commit: ignite-437: test for bigQuery sql

Posted by sb...@apache.org.
ignite-437: test for bigQuery sql


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

Branch: refs/heads/ignite-80
Commit: fe743909cf483d00ab5189049523ed3353bf5a3d
Parents: 2f458d2
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Apr 8 19:55:29 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Apr 8 19:55:29 2015 +0300

----------------------------------------------------------------------
 .../h2/sql/AbstractH2CompareQueryTest.java      | 341 ++++++++
 .../query/h2/sql/BaseH2CompareQueryTest.java    | 823 +++++++++++++++++
 .../query/h2/sql/H2CompareBigQueryTest.java     | 707 +++++++++++++++
 .../query/h2/sql/IgniteVsH2QueryTest.java       | 875 -------------------
 .../IgniteCacheQuerySelfTestSuite.java          |   5 +-
 .../processors/query/h2/sql/bigQuery.sql        |  55 ++
 6 files changed, 1929 insertions(+), 877 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
new file mode 100644
index 0000000..c74493f
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -0,0 +1,341 @@
+/*
+ * 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.processors.query.h2.sql;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+
+/**
+ * Abstract test framework to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
+ * which have the same data models and data content. 
+ */
+public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest {
+    /** */
+    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+    /** Partitioned cache. */
+    protected static IgniteCache pCache;
+
+    /** Replicated cache. */
+    protected static IgniteCache rCache;
+    
+    /** H2 db connection. */
+    protected static Connection conn;
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+        IgniteConfiguration c = super.getConfiguration(gridName);
+
+        TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+        disco.setIpFinder(IP_FINDER);
+
+        c.setDiscoverySpi(disco);
+
+        c.setMarshaller(new OptimizedMarshaller(true));
+
+        c.setCacheConfiguration(createCache("part", CacheMode.PARTITIONED),
+            createCache("repl", CacheMode.REPLICATED)
+        );
+
+        return c;
+    }
+
+    /**
+     * Creates new cache configuration.
+     *
+     * @param name Cache name.
+     * @param mode Cache mode.
+     * @return Cache configuration.
+     */
+    private CacheConfiguration createCache(String name, CacheMode mode) {
+        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
+
+        cc.setName(name);
+        cc.setCacheMode(mode);
+        cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+        cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
+
+        setIndexedTypes(cc, mode);
+
+        return cc;
+    }
+
+    /**
+     * @param cc Cache configuration.
+     * @param mode Cache Mode.
+     */
+    protected abstract void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) ;
+
+    /** {@inheritDoc} */
+    @Override protected void beforeTestsStarted() throws Exception {
+        super.beforeTestsStarted();
+
+        Ignite ignite = startGrids(4);
+
+        pCache = ignite.cache("part");
+        
+        rCache = ignite.cache("repl");
+
+        awaitPartitionMapExchange();
+        
+        conn = openH2Connection(false);
+
+        initializeH2Schema();
+
+        initCacheAndDbData();
+
+        checkAllDataEquals();
+    }
+    
+    /** {@inheritDoc} */
+    @Override protected void afterTestsStopped() throws Exception {
+        super.afterTestsStopped();
+        
+        conn.close();
+        
+        stopAllGrids();
+    }
+
+    /**
+     * Populate cache and h2 database with test data.
+     */
+    protected abstract void initCacheAndDbData() throws SQLException;
+
+    /**
+     * @throws Exception If failed.
+     */
+    protected abstract void checkAllDataEquals() throws Exception;
+
+    /**
+     * Initialize h2 database schema.
+     *
+     * @throws SQLException If exception.
+     */
+    protected abstract void initializeH2Schema() throws SQLException;
+
+    /**
+     * Gets connection from a pool.
+     *
+     * @param autocommit {@code true} If connection should use autocommit mode.
+     * @return Pooled connection.
+     * @throws SQLException In case of error.
+     */
+    private Connection openH2Connection(boolean autocommit) throws SQLException {
+        System.setProperty("h2.serializeJavaObject", "false");
+        
+        String dbName = "test";
+        
+        Connection conn = DriverManager.getConnection("jdbc:h2:mem:" + dbName + ";DB_CLOSE_DELAY=-1");
+
+        conn.setAutoCommit(autocommit);
+
+        return conn;
+    }
+
+    /**
+     * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
+     *
+     * @param sql SQL query.
+     * @param args SQL arguments.
+     * then results will compare as ordered queries.
+     * @return Result set after SQL query execution. 
+     * @throws SQLException If exception.
+     */
+    protected final List<List<?>> compareQueryRes0(String sql, @Nullable Object... args) throws SQLException {
+        return compareQueryRes0(pCache, sql, args, Ordering.RANDOM);
+    }
+
+    /**
+     * Execute given sql query on h2 database and on ignite cache and compare results. 
+     * Expected that results are not ordered.
+     *
+     * @param cache Ignite cache.
+     * @param sql SQL query.
+     * @param args SQL arguments.
+     * then results will compare as ordered queries.
+     * @return Result set after SQL query execution. 
+     * @throws SQLException If exception.
+     */
+    protected final List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object... args) throws SQLException {
+        return compareQueryRes0(cache, sql, args, Ordering.RANDOM);
+    }
+
+    /**
+     * Execute given sql query on h2 database and on partitioned ignite cache and compare results.
+     * Expected that results are ordered.
+     *
+     * @param sql SQL query.
+     * @param args SQL arguments.
+     * then results will compare as ordered queries.
+     * @return Result set after SQL query execution.
+     * @throws SQLException If exception.
+     */
+    protected final List<List<?>> compareOrderedQueryRes0(String sql, @Nullable Object... args) throws SQLException {
+        return compareQueryRes0(pCache, sql, args, Ordering.ORDERED);
+    }
+
+    /**
+     * Execute given sql query on h2 database and on ignite cache and compare results.
+     *
+     * @param cache Ignite cache.
+     * @param sql SQL query.
+     * @param args SQL arguments.
+     * @param ordering Expected ordering of SQL results. If {@link Ordering#ORDERED}
+     * then results will compare as ordered queries.
+     * @return Result set after SQL query execution.
+     * @throws SQLException If exception.
+     */    
+    @SuppressWarnings("unchecked")
+    protected final List<List<?>> compareQueryRes0(IgniteCache cache, String sql, @Nullable Object[] args, Ordering ordering) throws SQLException {
+        if (args == null)
+            args = new Object[] {null};
+        
+        info("Sql query:\n" + sql + "\nargs=" + Arrays.toString(args));
+
+        List<List<?>> h2Res = executeH2Query(sql, args);
+
+        List<List<?>> cacheRes = cache.query(new SqlFieldsQuery(sql).setArgs(args)).getAll();
+
+        assertRsEquals(h2Res, cacheRes, ordering);
+        
+        return h2Res;
+    }
+
+    /**
+     * Execute SQL query on h2 database.
+     *
+     * @param sql SQL query.
+     * @param args SQL arguments.
+     * @return Result of SQL query on h2 database.
+     * @throws SQLException If exception.
+     */
+    private List<List<?>> executeH2Query(String sql, Object[] args) throws SQLException {
+        List<List<?>> res = new ArrayList<>();
+        ResultSet rs = null;
+
+        try(PreparedStatement st = conn.prepareStatement(sql)) {
+            for (int idx = 0; idx < args.length; idx++)
+                st.setObject(idx + 1, args[idx]);
+
+            rs = st.executeQuery();
+
+            int colCnt = rs.getMetaData().getColumnCount();
+
+            while (rs.next()) {
+                List<Object> row = new ArrayList<>(colCnt);
+                
+                for (int i = 1; i <= colCnt; i++)
+                    row.add(rs.getObject(i));
+                
+                res.add(row);
+            }
+        }
+        finally {
+            U.closeQuiet(rs);
+        }
+
+        return res;
+    }
+
+    /**
+     * Assert equals of result sets according to expected ordering.
+     *
+     * @param rs1 Expected result set.
+     * @param rs2 Actual result set.
+     * @param ordering Expected ordering of SQL results. If {@link Ordering#ORDERED}
+     * then results will compare as ordered queries.
+     */
+    private void assertRsEquals(List<List<?>> rs1, List<List<?>> rs2, Ordering ordering) {
+        assertEquals("Rows count has to be equal.", rs1.size(), rs2.size());
+        
+        switch (ordering){
+            case ORDERED:
+                for (int rowNum = 0; rowNum < rs1.size(); rowNum++) {
+                    List<?> row1 = rs1.get(rowNum);
+                    List<?> row2 = rs2.get(rowNum);
+
+                    assertEquals("Columns count have to be equal.", row1.size(), row2.size());
+
+                    for (int colNum = 0; colNum < row1.size(); colNum++)
+                        assertEquals("Row=" + rowNum + ", column=" + colNum, row1.get(colNum), row2.get(colNum));
+                }
+
+                break;
+            case RANDOM:
+                Map<List<?>, Integer> rowsWithCnt1 = extractUniqueRowsWithCounts(rs1);
+                Map<List<?>, Integer> rowsWithCnt2 = extractUniqueRowsWithCounts(rs2);
+                
+                assertEquals("Unique rows count has to be equal.", rowsWithCnt1.size(), rowsWithCnt2.size());
+
+                for (Map.Entry<List<?>, Integer> entry1 : rowsWithCnt1.entrySet()) {
+                    List<?> row = entry1.getKey();
+                    Integer cnt1 = entry1.getValue();
+
+                    Integer cnt2 = rowsWithCnt2.get(row);
+
+                    assertEquals("Row has different occurance number.\nRow=" + row, cnt1, cnt2);
+                }
+                
+                break;
+            default: 
+                throw new IllegalStateException();
+        }
+    }
+
+    /**
+     * @param rs Result set.
+     * @return Map of unique rows at the result set to number of occuriances at the result set.
+     */
+    private Map<List<?>, Integer> extractUniqueRowsWithCounts(Iterable<List<?>> rs) {
+        Map<List<?>, Integer> res = new HashMap<>();
+
+        for (List<?> row : rs) {
+            Integer cnt = res.get(row);
+            
+            if (cnt == null)
+                cnt = 0;
+            
+            res.put(row, cnt + 1);
+        }
+        return res;
+    }
+    
+    /**
+     * Ordering type.
+     */
+    protected enum Ordering {
+        /** Random. */
+        RANDOM, 
+        /** Ordered. */
+        ORDERED
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/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
new file mode 100644
index 0000000..eea834d
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -0,0 +1,823 @@
+/*
+ * 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.processors.query.h2.sql;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+
+import java.io.*;
+import java.sql.*;
+import java.sql.Date;
+import java.util.*;
+
+/**
+ * Base set of queries to compare query results from h2 database instance and mixed ignite caches (replicated and partitioned)
+ * which have the same data models and data content.
+ */
+public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
+    /** Org count. */
+    public static final int ORG_CNT = 30;
+    
+    /** Address count. */
+    public static final int ADDR_CNT = 10;
+    
+    /** Person count. */
+    public static final int PERS_CNT = 50;
+    
+    /** Product count. */
+    public static final int PROD_CNT = 100;
+
+    /** Purchase count. */
+    public static final int PURCH_CNT = PROD_CNT * 5;
+
+    /** {@inheritDoc} */
+    @Override protected void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) {
+        if (mode == CacheMode.PARTITIONED)
+            cc.setIndexedTypes(
+                Integer.class, Organization.class,
+                AffinityKey.class, Person.class,
+                AffinityKey.class, Purchase.class
+            );
+        else if (mode == CacheMode.REPLICATED)
+            cc.setIndexedTypes(
+                Integer.class, Product.class,
+                Integer.class, Address.class
+            );
+        else
+            throw new IllegalStateException("mode: " + mode);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override protected void initCacheAndDbData() throws SQLException {
+        int idGen = 0;
+
+        // Organizations.
+        List<Organization> organizations = new ArrayList<>();
+
+        for (int i = 0; i < ORG_CNT; i++) {
+            int id = idGen++;
+
+            Organization org = new Organization(id, "Org" + id);
+
+            organizations.add(org);
+
+            pCache.put(org.id, org);
+
+            insertInDb(org);
+        }
+        
+       // Adresses.
+        List<Address> addreses = new ArrayList<>();
+
+        for (int i = 0; i < ADDR_CNT; i++) {
+            int id = idGen++;
+
+            Address addr = new Address(id, "Addr" + id);
+
+            addreses.add(addr);
+
+            rCache.put(addr.id, addr);
+
+            insertInDb(addr);
+        }
+
+        // Persons.
+        List<Person> persons = new ArrayList<>();
+
+        for (int i = 0; i < PERS_CNT; i++) {
+            int id = idGen++;
+
+            Person person = new Person(id, organizations.get(i % organizations.size()),
+                "name" + id, "lastName" + id, id * 100.0, addreses.get(i % addreses.size()));
+
+            // Add a Person without lastname.
+            if (id == organizations.size() + 1)
+                person.lastName = null;
+
+            persons.add(person);
+
+            pCache.put(person.key(), person);
+
+            insertInDb(person);
+        }
+
+        // Products.
+        List<Product> products = new ArrayList<>();
+
+        for (int i = 0; i < PROD_CNT; i++) {
+            int id = idGen++;
+
+            Product product = new Product(id, "Product" + id, id*1000);
+
+            products.add(product);
+
+            rCache.put(product.id, product);
+
+            insertInDb(product);
+        }
+
+        // Purchases.
+        for (int i = 0; i < PURCH_CNT; i++) {
+            int id = idGen++;
+
+            Person person = persons.get(i % persons.size());
+            
+            Purchase purchase = new Purchase(id, products.get(i % products.size()), person.orgId, person);
+
+            pCache.put(purchase.key(), purchase);
+
+            insertInDb(purchase);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void checkAllDataEquals() throws Exception {
+        compareQueryRes0("select _key, _val, id, name from \"part\".Organization");
+
+        compareQueryRes0("select _key, _val, id, firstName, lastName, orgId, salary from \"part\".Person");
+
+        compareQueryRes0("select _key, _val, id, personId, productId, organizationId from \"part\".Purchase");
+
+        compareQueryRes0(rCache, "select _key, _val, id, name, price from \"repl\".Product");
+    }
+
+    /**
+     * *
+     * @throws Exception
+     */
+    public void testAllExamples() throws Exception {
+//        compareQueryRes0("select ? limit ? offset ?");
+
+//        compareQueryRes0("select cool1()");
+//        compareQueryRes0("select cool1() z");
+//
+//        compareQueryRes0("select b,a from table0('aaa', 100)");
+//        compareQueryRes0("select * from table0('aaa', 100)");
+//        compareQueryRes0("select * from table0('aaa', 100) t0");
+//        compareQueryRes0("select x.a, y.b from table0('aaa', 100) x natural join table0('bbb', 100) y");
+//        compareQueryRes0("select * from table0('aaa', 100) x join table0('bbb', 100) y on x.a=y.a and x.b = 'bbb'");
+//        compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a and x.b = 'bbb'");
+//        compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a where x.b = 'bbb'");
+//        compareQueryRes0("select * from table0('aaa', 100) x left join table0('bbb', 100) y where x.b = 'bbb'");
+
+        final String addStreet = "Addr" + ORG_CNT + 1;
+        
+        List<List<?>> res = compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address " +
+            " on Person.addrId = Address.id where lower(Address.street) = lower(?)", addStreet);
+        
+        assertNotSame(0, res);
+
+        compareQueryRes0("select avg(old) from \"part\".Person join \"repl\".Address on Person.addrId = Address.id " +
+            "where lower(Address.street) = lower(?)", addStreet);
+
+        compareQueryRes0("select avg(old) from \"part\".Person left join \"repl\".Address where Person.addrId = Address.id " +
+            "and lower(Address.street) = lower(?)", addStreet);
+
+        compareQueryRes0("select avg(old) from \"part\".Person, \"repl\".Address where Person.addrId = Address.id " +
+            "and lower(Address.street) = lower(?)", addStreet);
+
+        compareQueryRes0("select firstName, date from \"part\".Person");
+        compareQueryRes0("select distinct firstName, date from \"part\".Person");
+        
+        final String star = " _key, _val, id, firstName, lastName, orgId, salary, addrId, old, date ";
+        
+        compareQueryRes0("select " + star + " from \"part\".Person p");
+        compareQueryRes0("select " + star + " from \"part\".Person");
+        compareQueryRes0("select distinct " + star + " from \"part\".Person");
+        compareQueryRes0("select p.firstName, date from \"part\".Person p");
+        
+        compareQueryRes0("select p._key, p._val, p.id, p.firstName, p.lastName, p.orgId, p.salary, p.addrId, p.old, " +
+            " p.date, a._key, a._val, a.id, a.street" +
+            " from \"part\".Person p, \"repl\".Address a");
+//        compareQueryRes0("select p.* from \"part\".Person p, \"repl\".Address a");
+//        compareQueryRes0("select person.* from \"part\".Person, \"repl\".Address a");
+//        compareQueryRes0("select p.*, street from \"part\".Person p, \"repl\".Address a");
+        compareQueryRes0("select p.firstName, a.street from \"part\".Person p, \"repl\".Address a");
+        compareQueryRes0("select distinct p.firstName, a.street from \"part\".Person p, \"repl\".Address a");
+        compareQueryRes0("select distinct firstName, street from \"part\".Person, \"repl\".Address group by firstName, street ");
+        compareQueryRes0("select distinct firstName, street from \"part\".Person, \"repl\".Address");
+        // TODO uncomment and investigate (Rows count has to be equal.: Expected :2500, Actual :900)
+//        compareQueryRes0("select p1.firstName, a2.street from \"part\".Person p1, \"repl\".Address a1, \"part\".Person p2, \"repl\".Address a2");
+
+        //TODO look at it (org.h2.jdbc.JdbcSQLException: Feature not supported: "VARCHAR +" // at H2)
+//        compareQueryRes0("select p.firstName n, a.street s from \"part\".Person p, \"repl\".Address a");
+        compareQueryRes0("select p.firstName, 1 as i, 'aaa' s from \"part\".Person p");
+
+//        compareQueryRes0("select p.firstName + 'a', 1 * 3 as i, 'aaa' s, -p.old, -p.old as old from \"part\".Person p");
+//        compareQueryRes0("select p.firstName || 'a' + p.firstName, (p.old * 3) % p.old - p.old / p.old, p.firstName = 'aaa', " +
+//            " p.firstName is p.firstName, p.old > 0, p.old >= 0, p.old < 0, p.old <= 0, p.old <> 0, p.old is not p.old, " +
+//            " p.old is null, p.old is not null " +
+//            " from \"part\".Person p");
+
+        compareQueryRes0("select p.firstName from \"part\".Person p where firstName <> 'ivan'");
+        compareQueryRes0("select p.firstName from \"part\".Person p where firstName like 'i%'");
+        compareQueryRes0("select p.firstName from \"part\".Person p where firstName regexp 'i%'");
+        compareQueryRes0("select p.firstName from \"part\".Person p, \"repl\".Address a where p.firstName <> 'ivan' and a.id > 10 or not (a.id = 100)");
+
+        compareQueryRes0("select case p.firstName when 'a' then 1 when 'a' then 2 end as a from \"part\".Person p");
+        compareQueryRes0("select case p.firstName when 'a' then 1 when 'a' then 2 else -1 end as a from \"part\".Person p");
+
+        compareQueryRes0("select abs(p.old)  from \"part\".Person p");
+        compareQueryRes0("select cast(p.old as numeric(10, 2)) from \"part\".Person p");
+        compareQueryRes0("select cast(p.old as numeric(10, 2)) z from \"part\".Person p");
+        compareQueryRes0("select cast(p.old as numeric(10, 2)) as z from \"part\".Person p");
+
+        // TODO alanyse
+//        compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in ('a', 'b', '_' + RAND())"); // test ConditionIn
+        compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in ('a', 'b', 'c')"); // test ConditionInConstantSet
+        compareQueryRes0("select " + star + " from \"part\".Person p where p.firstName in (select a.street from \"repl\".Address a)"); // test ConditionInConstantSet
+
+        compareQueryRes0("select (select a.street from \"repl\".Address a where a.id = p.addrId) from \"part\".Person p"); // test ConditionInConstantSet
+
+        compareQueryRes0("select p.firstName, ? from \"part\".Person p where firstName regexp ? and p.old < ?", 10, "Iv*n", 40);
+
+        compareQueryRes0("select count(*) as a from \"part\".Person");
+        compareQueryRes0("select count(*) as a, count(p.*), count(p.firstName) from \"part\".Person p");
+        compareQueryRes0("select count(distinct p.firstName) from \"part\".Person p");
+
+        compareQueryRes0("select p.firstName, avg(p.old), max(p.old) from \"part\".Person p group by p.firstName");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by n");
+
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.addrId, p.firstName");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName, p.addrId");
+        compareQueryRes0("select p.firstName n, max(p.old) + min(p.old) / count(distinct p.old) from \"part\".Person p group by p.firstName");
+        compareQueryRes0("select p.firstName n, max(p.old) maxOld, min(p.old) minOld from \"part\".Person p group by p.firstName having maxOld > 10 and min(p.old) < 1");
+
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by n");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName, m");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName, max(p.old) desc");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName nulls first");
+        compareQueryRes0("select p.firstName n, avg(p.old) a, max(p.old) m from \"part\".Person p group by p.firstName order by p.firstName nulls last");
+        compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10");
+        compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10, p.firstName");
+        compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10, p.firstName desc");
+
+        compareQueryRes0("select p.firstName n from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) ");
+        compareQueryRes0("select street from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) ");
+        compareQueryRes0("select addr.street from \"part\".Person p, (select a.street from \"repl\".Address a where a.street is not null) addr");
+
+        compareQueryRes0("select p.firstName n from \"part\".Person p order by p.old + 10");
+
+        compareQueryRes0("select 'foo' as bar union select 'foo' as bar");
+        compareQueryRes0("select 'foo' as bar union all select 'foo' as bar");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testParamSubstitution() throws Exception {
+        compareQueryRes0("select ? from \"part\".Person", "Some arg");
+    }
+
+    /**
+     * @throws SQLException If failed.
+     */
+    public void testAggregateOrderBy() throws SQLException {
+        compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNullParamSubstitution() throws Exception {
+        List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null);
+
+        // Ensure we find something.
+        assertNotSame(0, rs1.size());
+    }
+
+    /**
+     *
+     */
+    public void testUnion() throws SQLException {
+        String base = "select _val v from \"part\".Person";
+
+        compareQueryRes0(base + " union all " + base);
+        compareQueryRes0(base + " union " + base);
+
+        base = "select firstName||lastName name, salary from \"part\".Person";
+
+        assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
+        assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testEmptyResult() throws Exception {
+        compareQueryRes0("select id from \"part\".Person where 0 = 1");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSqlQueryWithAggregation() throws Exception {
+        compareQueryRes0("select avg(salary) from \"part\".Person, \"part\".Organization where Person.orgId = Organization.id and "
+            + "lower(Organization.name) = lower(?)", "Org1");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSqlFieldsQuery() throws Exception {
+        compareQueryRes0("select concat(firstName, ' ', lastName) from \"part\".Person");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSqlFieldsQueryWithJoin() throws Exception {
+        compareQueryRes0("select concat(firstName, ' ', lastName), "
+            + "Organization.name from \"part\".Person, \"part\".Organization where "
+            + "Person.orgId = Organization.id");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testOrdered() throws Exception {
+        compareOrderedQueryRes0("select firstName, lastName" +
+                " from \"part\".Person" +
+                " order by lastName, firstName"
+        );
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSimpleJoin() throws Exception {
+        // Have expected results.
+        compareQueryRes0("select id, firstName, lastName" +
+            "  from \"part\".Person" +
+            "  where Person.id = ?", 3);
+
+        // Ignite cache return 0 results...
+        compareQueryRes0("select pe.firstName" +
+            "  from \"part\".Person pe join \"part\".Purchase pu on pe.id = pu.personId " +
+            "  where pe.id = ?", 3);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSimpleReplicatedSelect() throws Exception {
+        compareQueryRes0(rCache, "select id, name from \"repl\".Product");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void _testCrossCache() throws Exception {
+        //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" +
+            "  group by Product.id");
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void initializeH2Schema() throws SQLException {
+        Statement st = conn.createStatement();
+
+        st.execute("CREATE SCHEMA \"part\"");
+        st.execute("CREATE SCHEMA \"repl\"");
+
+        st.execute("create table \"part\".ORGANIZATION" +
+            "  (_key int not null," +
+            "  _val other not null," +
+            "  id int unique," +
+            "  name varchar(255))");
+
+        st.execute("create table \"part\".PERSON" +
+            "  (_key other not null ," +
+            "   _val other not null ," +
+            "  id int unique, " +
+            "  firstName varchar(255), " +
+            "  lastName varchar(255)," +
+            "  orgId int not null," +
+            "  salary double," +
+            "  addrId int," +
+            "  old int," +
+            "  date Date )");
+
+        st.execute("create table \"repl\".PRODUCT" +
+            "  (_key int not null ," +
+            "   _val other not null ," +
+            "  id int unique, " +
+            "  name varchar(255), " +
+            "  price int)");
+
+        st.execute("create table \"part\".PURCHASE" +
+            "  (_key other not null ," +
+            "   _val other not null ," +
+            "  id int unique, " +
+            "  personId int, " +
+            "  organizationId int, " +
+            "  productId int)");
+
+        st.execute("create table \"repl\".ADDRESS" +
+            "  (_key int not null ," +
+            "   _val other not null ," +
+            "  id int unique, " +
+            "  street varchar(255))");
+
+        conn.commit();
+    }
+    
+    /**
+     * Insert {@link Organization} at h2 database.
+     *
+     * @param org Organization.
+     * @throws SQLException If exception.
+     */
+    private void insertInDb(Organization org) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"part\".ORGANIZATION (_key, _val, id, name) values(?, ?, ?, ?)")) {
+            st.setObject(1, org.id);
+            st.setObject(2, org);
+            st.setObject(3, org.id);
+            st.setObject(4, org.name);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link Person} at h2 database.
+     *
+     * @param p Person.
+     * @throws SQLException If exception.
+     */
+    private void insertInDb(Person p) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement("insert into \"part\".PERSON " +
+            "(_key, _val, id, firstName, lastName, orgId, salary, addrId, old, date) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
+            st.setObject(1, p.key());
+            st.setObject(2, p);
+            st.setObject(3, p.id);
+            st.setObject(4, p.firstName);
+            st.setObject(5, p.lastName);
+            st.setObject(6, p.orgId);
+            st.setObject(7, p.salary);
+            st.setObject(8, p.addrId);
+            st.setObject(9, p.old);
+            st.setObject(10, p.date);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link Product} at h2 database.
+     *
+     * @param p Product.
+     * @throws SQLException If exception.
+     */
+    private void insertInDb(Product p) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"repl\".PRODUCT (_key, _val, id, name, price) values(?, ?, ?, ?, ?)")) {
+            st.setObject(1, p.id);
+            st.setObject(2, p);
+            st.setObject(3, p.id);
+            st.setObject(4, p.name);
+            st.setObject(5, p.price);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link Purchase} at h2 database.
+     *
+     * @param p Purchase.
+     * @throws SQLException If exception.
+     */
+    private void insertInDb(Purchase p) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"part\".PURCHASE (_key, _val, id, personId, productId, organizationId) values(?, ?, ?, ?, ?, ?)")) {
+            st.setObject(1, p.key());
+            st.setObject(2, p);
+            st.setObject(3, p.id);
+            st.setObject(4, p.personId);
+            st.setObject(5, p.productId);
+            st.setObject(6, p.organizationId);
+
+            st.executeUpdate();
+        }
+    }
+    
+    /**
+     * Insert {@link Address} at h2 database.
+     *
+     * @param a Address.
+     * @throws SQLException If exception.
+     */
+    private void insertInDb(Address a) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"repl\".ADDRESS (_key, _val, id, street) values(?, ?, ?, ?)")) {
+            st.setObject(1, a.id);
+            st.setObject(2, a);
+            st.setObject(3, a.id);
+            st.setObject(4, a.street);
+
+            st.executeUpdate();
+        }
+    }
+
+    @QuerySqlFunction
+    public static int cool1() {
+        return 1;
+    }
+
+    @QuerySqlFunction
+    public static ResultSet table0(Connection c, String a, int b) throws SQLException {
+        return c.createStatement().executeQuery("select '" + a + "' as a, " +  b + " as b");
+    }
+
+    /**
+     * Person class. Stored at partitioned cache.
+     */
+    private static class Person implements Serializable {
+        /** Person ID (indexed). */
+        @QuerySqlField(index = true)
+        private int id;
+
+        /** Organization ID (indexed). */
+        @QuerySqlField(index = true)
+        private int orgId;
+
+        /** First name (not-indexed). */
+        @QuerySqlField
+        private String firstName;
+
+        /** Last name (not indexed). */
+        @QuerySqlField
+        private String lastName;
+
+        /** Salary (indexed). */
+        @QuerySqlField(index = true)
+        private double salary;
+
+        /** Address Id (indexed). */
+        @QuerySqlField(index = true)
+        private int addrId;
+
+        /** Date. */
+        @QuerySqlField(index = true)
+        public Date date = new Date(System.currentTimeMillis());
+
+        /** Old. */
+        @QuerySqlField(index = true)
+        public int old = 17;
+
+
+        /**
+         * Constructs person record.
+         *
+         * @param org Organization.
+         * @param firstName First name.
+         * @param lastName Last name.
+         * @param salary Salary.
+         */
+        Person(int id, Organization org, String firstName, String lastName, double salary, Address addr) {
+            this.id = id;
+            this.firstName = firstName;
+            this.lastName = lastName;
+            this.salary = salary;
+            orgId = org.id;
+            addrId = addr.id;
+        }
+
+        /**
+         * @return Custom affinity key to guarantee that person is always collocated with organization.
+         */
+        public AffinityKey<Integer> key() {
+            return new AffinityKey<>(id, orgId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Person && id == ((Person)o).id;
+
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return "Person [firstName=" + firstName +
+                ", lastName=" + lastName +
+                ", id=" + id +
+                ", orgId=" + orgId +
+                ", salary=" + salary + 
+                ", addrId=" + addrId + ']';
+        }
+    }
+
+    /**
+     * Organization class. Stored at partitioned cache.
+     */
+    private static class Organization implements Serializable {
+        /** Organization ID (indexed). */
+        @QuerySqlField(index = true)
+        private int id;
+
+        /** Organization name (indexed). */
+        @QuerySqlField(index = true)
+        private String name;
+
+        /**
+         * Create Organization.
+         *
+         * @param id Organization ID.
+         * @param name Organization name.
+         */
+        Organization(int id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Organization && id == ((Organization)o).id;
+
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return "Organization [id=" + id + ", name=" + name + ']';
+        }
+    }
+
+    /**
+     * Product class. Stored at replicated cache.
+     */
+    private static class Product implements Serializable {
+        /** Primary key. */
+        @QuerySqlField(index = true)
+        private int id;
+
+        /** Product name. */
+        @QuerySqlField
+        private String name;
+
+        /** Product price */
+        @QuerySqlField
+        private int price;
+
+        /**
+         * Create Product.
+         *
+         * @param id Product ID.
+         * @param name Product name.
+         * @param price Product price.
+         */
+        Product(int id, String name, int price) {
+            this.id = id;
+            this.name = name;
+            this.price = price;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Product && id == ((Product)o).id;
+
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return "Product [id=" + id + ", name=" + name + ", price=" + price + ']';
+        }
+    }
+
+    /**
+     * Purchase class. Stored at partitioned cache.
+     */
+    private static class Purchase implements Serializable {
+        /** Primary key. */
+        @QuerySqlField(index = true)
+        private int id;
+
+        /** Product ID. */
+        @QuerySqlField
+        private int productId;
+
+        /** Person ID. */
+        @QuerySqlField
+        private int personId;
+        
+        /** Organization id. */
+        @QuerySqlField
+        private int organizationId;
+
+        /**
+         * Create Purchase.
+         *  @param id Purchase ID.
+         * @param product Purchase product.
+         * @param organizationId Organization Id.
+         * @param person Purchase person.
+         */
+        Purchase(int id, Product product, int organizationId, Person person) {
+            this.id = id;
+            productId = product.id;
+            personId = person.id;
+            this.organizationId = organizationId;
+        }
+
+        /**
+         * @return Custom affinity key to guarantee that purchase is always collocated with person.
+         */
+        public AffinityKey<Integer> key() {
+            return new AffinityKey<>(id, organizationId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Purchase && id == ((Purchase)o).id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return "Purchase [id=" + id + ", productId=" + productId + ", personId=" + personId + ']';
+        }
+    }
+
+    /**
+     * Address class. Stored at replicated cache.
+     */
+    private static class Address implements Serializable {
+        @QuerySqlField(index = true)
+        private int id;
+
+        @QuerySqlField(index = true)
+        private String street;
+
+        Address(int id, String street) {
+            this.id = id;
+            this.street = street;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Address && id == ((Address)o).id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return "Address [id=" + id + ", street=" + street + ']';
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
new file mode 100644
index 0000000..c5a2cad
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -0,0 +1,707 @@
+/*
+ * 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.processors.query.h2.sql;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+
+import java.io.*;
+import java.sql.Date;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ * Executes one big query (and subqueries of the big query) to compare query results from h2 database instance and 
+ * mixed ignite caches (replicated and partitioned) which have the same data models and data content.
+ * 
+ * 
+ * <pre> 
+ *
+ *  -------------------------------------> rootOrderId (virtual) <--------------------------
+ *  |                                                                |                     |
+ *  |                                                                |                     |
+ *  |                                ---------------------           |                     |
+ *  |  ------------------            --part.ReplaceOrder--           |                     |
+ *  |  --part.CustOrder--            ---------------------           |                     |
+ *  |  ------------------            -  id  PK           -           |                     |
+ *  |  -  orderId  PK   - <--  <---> -  orderId          -           |                     |
+ *  -- -  rootOrderId   -   |        -  rootOrderId      - -----------                     |
+ *     -  origOrderId   -   |        -  refOrderId       -   // = origOrderId              |
+ *     -  date          -   |        -  date             -                                 |
+ *     -  alias         -   |        -  alias            -                                 |
+ *     -  archSeq       -   |        -  archSeq          -          -------------------    |
+ *     ------------------   |        ---------------------          ----repl.Exec------    |
+ *                          |                                       -------------------    |
+ *     -----------------    |                                       -  rootOrderId PK - ----
+ *     ---part.Cancel---    |                                       -  date           -
+ *     -----------------    |        ---------------------          -  execShares int -
+ *     -  id       PK  -    |        --part.OrderParams---          -  price      int -
+ *     -  refOrderId   - ---|        ---------------------          -  lastMkt    int -
+ *     -  date         -    |        -  id  PK           -          -------------------
+ *     -----------------    -------  - orderId           -
+ *                                   - date              -
+ *                                   - parentAlgo        -
+ *                                   ---------------------
+ *  </pre>
+ *
+ */
+public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
+    /** Root order count. */
+    private static final int ROOT_ORDER_CNT = 1000;
+
+    /** Dates count. */
+    private static final int DATES_CNT = 5;
+    
+    /** Full the big query. */
+    private String bigQry = getBigQry();
+
+    /**
+     * Extracts the big query from file.
+     *  
+     * @return Big query.
+     */
+    private String getBigQry() {
+        String res = "";
+
+        Reader isr = new InputStreamReader(getClass().getResourceAsStream("bigQuery.sql"));
+        
+        try(BufferedReader reader = new BufferedReader(isr)) {
+            for(String line; (line = reader.readLine()) != null; )
+                if (!line.startsWith("--")) // Skip commented lines.
+                    res += line + '\n';
+        }
+        catch (Throwable e) {
+            e.printStackTrace();
+            
+            fail();
+        }
+
+        return res;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void setIndexedTypes(CacheConfiguration<?, ?> cc, CacheMode mode) {
+        if (mode == CacheMode.PARTITIONED)
+            cc.setIndexedTypes(
+                Integer.class, CustOrder.class,
+                AffinityKey.class, ReplaceOrder.class,
+                AffinityKey.class, OrderParams.class,
+                AffinityKey.class, Cancel.class
+            );
+        else if (mode == CacheMode.REPLICATED)
+            cc.setIndexedTypes(
+                Integer.class, Exec.class
+            );
+        else
+            throw new IllegalStateException("mode: " + mode);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override protected void initCacheAndDbData() throws SQLException {
+        final AtomicInteger idGen = new AtomicInteger();
+
+        final Iterable<Integer> rootOrderIds = new ArrayList<Integer>(){{
+            for (int i = 0; i < ROOT_ORDER_CNT; i++)
+                add(idGen.incrementAndGet());
+        }};
+
+        final Date curDate = new Date(new java.util.Date().getTime());
+
+        final List<Date> dates = new ArrayList<Date>(){{
+            for (int i = 0; i < DATES_CNT; i++)
+                add(new Date(curDate.getTime() - i * 24 * 60 * 60 * 1000)); // Minus i days.
+        }};
+
+        final Iterable<CustOrder> orders = new ArrayList<CustOrder>(){{
+            for (int rootOrderId : rootOrderIds) {
+                // Generate 1 - 5 orders for 1 root order.
+                for (int i = 0; i < rootOrderId % 5; i++) {
+                    int orderId = idGen.incrementAndGet();
+                    
+                    CustOrder order = new CustOrder(orderId, rootOrderId, dates.get(orderId % dates.size()) , 
+                        orderId % 2 == 0 ? "CUSTOM" : "OTHER", orderId);
+
+                    add(order);
+
+                    pCache.put(order.orderId, order);
+
+                    insertInDb(order);
+                }                
+            }
+        }};
+
+        final Collection<OrderParams> params = new ArrayList<OrderParams>(){{
+            for (CustOrder o : orders) {
+                OrderParams op = new OrderParams(idGen.incrementAndGet(), o.orderId, o.date, 
+                    o.orderId % 2 == 0 ? "Algo 1" : "Algo 2");
+
+                add(op);
+
+                pCache.put(op.key(), op);
+
+                insertInDb(op);
+            }
+        }};
+        
+        final Collection<ReplaceOrder> replaces = new ArrayList<ReplaceOrder>(){{
+            for (CustOrder o : orders) {
+                if (o.orderId % 7 == 0) {
+                    ReplaceOrder replace = new ReplaceOrder(idGen.incrementAndGet(), o.orderId, o.rootOrderId, o.alias,
+                        new Date(o.date.getTime() + 12 * 60 * 60 * 1000), o.orderId); // Plus a half of day.
+
+                    add(replace);
+
+                    pCache.put(replace.key(), replace);
+
+                    insertInDb(replace);
+                }
+            }
+        }};
+
+        final Collection<Cancel> cancels = new ArrayList<Cancel>(){{
+            for (CustOrder o : orders) {
+                if (o.orderId % 9 == 0) {
+                    Cancel c = new Cancel(idGen.incrementAndGet(), o.orderId, 
+                        new Date(o.date.getTime() + 12 * 60 * 60 * 1000));// Plus a half of day.
+
+                    add(c);
+
+                    pCache.put(c.key(), c); 
+
+                    insertInDb(c);
+                }
+            }
+        }};
+
+        final Collection<Exec> execs = new ArrayList<Exec>(){{
+            for (int rootOrderId : rootOrderIds) {
+                int execShares = 10000 + rootOrderId;
+                int price = 1000 + rootOrderId;
+                int latsMkt = 3000 + rootOrderId;
+                
+                Exec exec = new Exec(rootOrderId, dates.get(rootOrderId % dates.size()), execShares, price, latsMkt);
+
+                add(exec);
+
+                rCache.put(exec.rootOrderId, exec);
+
+                insertInDb(exec);
+            }
+        }};
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    @Override protected void checkAllDataEquals() throws Exception {
+        compareQueryRes0("select _key, _val, date, orderId, rootOrderId, alias, archSeq, origOrderId " +
+            "from \"part\".CustOrder");
+        compareQueryRes0("select _key, _val, id, date, orderId, rootOrderId, alias, archSeq, refOrderId " +
+            "from \"part\".ReplaceOrder");
+        compareQueryRes0("select _key, _val, id, date, orderId, parentAlgo from \"part\".OrderParams\n");
+        compareQueryRes0("select _key, _val, id, date, refOrderId from \"part\".Cancel\n");
+        compareQueryRes0(rCache, "select _key, _val, date, rootOrderId, execShares, price, lastMkt from \"repl\".Exec\n");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testUnionAllOrders() throws Exception {
+        compareQueryRes0(
+            "   select  date, orderId, rootOrderId " +
+                "   from \"part\".CustOrder where alias='CUSTOM'");
+                
+        compareQueryRes0(
+                "   select  date, orderId, rootOrderId " +
+                "   from \"part\".ReplaceOrder where alias='CUSTOM'");
+        
+        compareQueryRes0(
+            "   select 10" +
+
+                "   union all" +
+
+                "   select  20");
+        
+        compareQueryRes0(
+            "   select  date, orderId, rootOrderId " +
+                "   from \"part\".CustOrder where alias='CUSTOM'" +
+
+                "   union all" +
+
+                "   select  date, orderId, rootOrderId " +
+                "   from \"part\".ReplaceOrder where alias='CUSTOM'");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBigQuery() throws Exception {
+        List<List<?>> res = compareQueryRes0(bigQry);
+        
+        assertTrue(!res.isEmpty()); // Ensure we set good testing data at database.
+    }
+    
+    /** {@inheritDoc} */
+    @Override protected void initializeH2Schema() throws SQLException {
+        Statement st = conn.createStatement();
+
+        st.execute("CREATE SCHEMA \"part\"");
+        st.execute("CREATE SCHEMA \"repl\"");
+
+        st.execute("create table \"part\".CustOrder" +
+            "  (" +
+            "  _key int not null," +
+            "  _val other not null," +
+            "  orderId int unique," +
+            "  rootOrderId int," +
+            "  origOrderId int," +
+            "  archSeq int," +
+            "  date Date, " +
+            "  alias varchar(255)" +
+            "  )");
+
+        st.execute("create table \"part\".ReplaceOrder" +
+            "  (" +
+            "  _key other not null," +
+            "  _val other not null," +
+            "  id int unique," +
+            "  orderId int ," +
+            "  rootOrderId int," +
+            "  refOrderId int," +
+            "  archSeq int," +
+            "  date Date, " +
+            "  alias varchar(255)" +
+            "  )");
+
+        st.execute("create table \"part\".OrderParams" +
+            "  (" +
+            "  _key other not null," +
+            "  _val other not null," +
+            "  id int unique," +
+            "  orderId int ," +
+            "  date Date, " +
+            "  parentAlgo varchar(255)" +
+            "  )");
+
+        st.execute("create table \"part\".Cancel" +
+            "  (" +
+            "  _key other not null," +
+            "  _val other not null," +
+            "  id int unique," +
+            "  date Date, " +
+            "  refOrderId int" +
+            "  )");
+
+        st.execute("create table \"repl\".Exec" +
+            "  (" +
+            "  _key int not null," +
+            "  _val other not null," +
+            "  rootOrderId int unique," +
+            "  date Date, " +
+            "  execShares int," +
+            "  price int," +
+            "  lastMkt int" +
+            "  )");
+        
+        conn.commit();
+    }
+
+    /**
+     * Insert {@link CustOrder} at h2 database.
+     *  
+     * @param o CustOrder.
+     */
+    private void insertInDb(CustOrder o) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"part\".CustOrder (_key, _val, orderId, rootOrderId, date, alias, archSeq, origOrderId) " +
+                "values(?, ?, ?, ?, ?, ?, ?, ?)")) {
+            int i = 0;
+            
+            st.setObject(++i, o.orderId);
+            st.setObject(++i, o);
+            st.setObject(++i, o.orderId);
+            st.setObject(++i, o.rootOrderId);
+            st.setObject(++i, o.date);
+            st.setObject(++i, o.alias);
+            st.setObject(++i, o.archSeq);
+            st.setObject(++i, o.origOrderId);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link ReplaceOrder} at h2 database.
+     *
+     * @param o ReplaceOrder.
+     */
+    private void insertInDb(ReplaceOrder o) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"part\".ReplaceOrder (_key, _val, id, orderId, rootOrderId, date, alias, archSeq, refOrderId) " +
+                "values(?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
+            int i = 0;
+            
+            st.setObject(++i, o.key());
+            st.setObject(++i, o);
+            st.setObject(++i, o.id);
+            st.setObject(++i, o.orderId);
+            st.setObject(++i, o.rootOrderId);
+            st.setObject(++i, o.date);
+            st.setObject(++i, o.alias);
+            st.setObject(++i, o.archSeq);
+            st.setObject(++i, o.refOrderId);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link OrderParams} at h2 database.
+     *
+     * @param o OrderParams.
+     */
+    private void insertInDb(OrderParams o) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"part\".OrderParams (_key, _val, id, date, orderId, parentAlgo) values(?, ?, ?, ?, ?, ?)")) {
+            int i = 0;
+            
+            st.setObject(++i, o.key());
+            st.setObject(++i, o);
+            st.setObject(++i, o.id);
+            st.setObject(++i, o.date);
+            st.setObject(++i, o.orderId);
+            st.setObject(++i, o.parentAlgo);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link Cancel} at h2 database.
+     *
+     * @param o Cancel.
+     */
+    private void insertInDb(Cancel o) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"part\".Cancel (_key, _val, id, date, refOrderId) values(?, ?, ?, ?, ?)")) {
+            int i = 0;
+            
+            st.setObject(++i, o.key());
+            st.setObject(++i, o);
+            st.setObject(++i, o.id);
+            st.setObject(++i, o.date);
+            st.setObject(++i, o.refOrderId);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Insert {@link Exec} at h2 database.
+     *
+     * @param o Execution.
+     */
+    private void insertInDb(Exec o) throws SQLException {
+        try(PreparedStatement st = conn.prepareStatement(
+            "insert into \"repl\".Exec (_key, _val, date, rootOrderId, execShares, price, lastMkt) " +
+                "values(?, ?, ?, ?, ?, ?, ?)")) {
+            int i = 0;
+            
+            st.setObject(++i, o.rootOrderId);
+            st.setObject(++i, o);
+            st.setObject(++i, o.date);
+            st.setObject(++i, o.rootOrderId);
+            st.setObject(++i, o.execShares);
+            st.setObject(++i, o.price);
+            st.setObject(++i, o.lastMkt);
+
+            st.executeUpdate();
+        }
+    }
+
+    /**
+     * Custom Order.
+     */
+    static class CustOrder implements Serializable {
+        /** Primary key. */
+        @QuerySqlField(index = true)
+        private int orderId;
+
+        /** Root order ID*/
+        @QuerySqlField
+        private int rootOrderId;
+
+        /** Orig order ID*/
+        @QuerySqlField
+        private int origOrderId;
+
+        /** Date */
+        @QuerySqlField
+        private Date date ;
+
+        /**  */
+        @QuerySqlField
+        private String alias = "CUSTOM";
+
+        /**  */
+        @QuerySqlField
+        private int archSeq = 11; // TODO: use it.
+
+        /**
+         * @param orderId Order id.
+         * @param rootOrderId Root order id.
+         * @param date Date.
+         * @param alias Alias.
+         * @param origOrderId Orig order id.
+         */
+        CustOrder(int orderId, int rootOrderId, Date date, String alias, int origOrderId) {
+            this.orderId = orderId;
+            this.rootOrderId = rootOrderId;
+            this.origOrderId = origOrderId;
+            this.date = date;
+            this.alias = alias;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof CustOrder && orderId == ((CustOrder)o).orderId;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return orderId;
+        }
+    }
+
+    /**
+     * Replace Order.
+     */
+    static class ReplaceOrder implements Serializable {
+        /** Primary key. */
+        @QuerySqlField(index = true)
+        private int id;
+        
+        /** Order id. */
+        @QuerySqlField(index = true)
+        private int orderId;
+
+        /** Root order ID*/
+        @QuerySqlField
+        private int rootOrderId;
+
+        /** Ref order ID*/
+        @QuerySqlField
+        private int refOrderId;
+
+        /** Date */
+        @QuerySqlField
+        private Date date ;
+
+        /**  */
+        @QuerySqlField
+        private String alias = "CUSTOM";
+
+        /**  */
+        @QuerySqlField
+        private int archSeq = 111; // TODO: use it.
+
+        /**
+         * @param id Id.
+         * @param orderId Order id.
+         * @param rootOrderId Root order id.
+         * @param alias Alias.
+         * @param date Date.
+         * @param refOrderId Reference order id.
+         */
+        ReplaceOrder(int id, int orderId, int rootOrderId, String alias, Date date, int refOrderId) {
+            this.id = id;
+            this.orderId = orderId;
+            this.rootOrderId = rootOrderId;
+            this.refOrderId = refOrderId;
+            this.date = date;
+            this.alias = alias;
+        }
+
+        /**
+         * @return Afinity key.
+         */
+        public AffinityKey<Integer> key() {
+            return new AffinityKey<>(id, orderId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof ReplaceOrder && id == ((ReplaceOrder)o).id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+    }
+
+    /**
+     * Order params.
+     */
+    static class OrderParams implements Serializable {
+        /** Primary key. */
+        @QuerySqlField(index = true)
+        private int id;
+
+        /** Order id. */
+        @QuerySqlField(index = true)
+        private int orderId;
+
+        /** Date */
+        @QuerySqlField
+        private Date date ;
+
+        /**  */
+        @QuerySqlField
+        private String parentAlgo = "CUSTOM_ALGO";
+
+        /**
+         * @param id Id.
+         * @param orderId Order id.
+         * @param date Date.
+         * @param parentAlgo Parent algo.
+         */
+        OrderParams(int id, int orderId, Date date, String parentAlgo) {
+            this.id = id;
+            this.orderId = orderId;
+            this.date = date;
+            this.parentAlgo = parentAlgo;
+        }
+
+        /**
+         * @return Afinity key.
+         */
+        public AffinityKey<Integer> key() {
+            return new AffinityKey<>(id, orderId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof OrderParams && id == ((OrderParams)o).id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+    }
+
+    /**
+     * Cancel Order.
+     */
+    static class Cancel implements Serializable {
+        /** Primary key. */
+        @QuerySqlField(index = true)
+        private int id;
+
+        /** Order id. */
+        @QuerySqlField(index = true)
+        private int refOrderId;
+
+        /** Date */
+        @QuerySqlField
+        private Date date;
+
+        /**
+         * @param id
+         * @param refOrderId Reference order id.
+         * @param date Date.
+         */
+        Cancel(int id, int refOrderId, Date date) {
+            this.id = id;
+            this.refOrderId = refOrderId;
+            this.date = date;
+        }
+
+        /**
+         * @return Afinity key.
+         */
+        public AffinityKey<Integer> key() {
+            return new AffinityKey<>(id, refOrderId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Cancel && id == ((Cancel)o).id;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return id;
+        }
+    }
+
+    /**
+     * Execute information about root query.
+     */
+    static class Exec implements Serializable {
+        /** Primary key. */
+        @QuerySqlField
+        private int rootOrderId;
+
+        /** Date */
+        @QuerySqlField
+        private Date date ;
+
+        /** */
+        @QuerySqlField
+        private int execShares;
+
+        /** */
+        @QuerySqlField
+        private int price;
+
+        /** */
+        @QuerySqlField
+        private int lastMkt;
+
+        /**
+         * @param rootOrderId Root order id.
+         * @param date Date.
+         * @param execShares Execute shares.
+         * @param price Price.
+         * @param lastMkt Last mkt.
+         */
+        Exec(int rootOrderId, Date date, int execShares, int price, int lastMkt) {
+            this.rootOrderId = rootOrderId;
+            this.date = date;
+            this.execShares = execShares;
+            this.price = price;
+            this.lastMkt = lastMkt;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return this == o || o instanceof Exec && rootOrderId == ((Exec)o).rootOrderId;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return rootOrderId;
+        }
+    }
+}

[03/50] [abbrv] incubator-ignite git commit: #ignite-180: Commit tests

Posted by sb...@apache.org.
#ignite-180: Commit tests


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

Branch: refs/heads/ignite-80
Commit: 01d51b6d1d75b25f922f8f0b5919ddcf2c2e777d
Parents: 8cc456c
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 12:57:23 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 12:57:23 2015 +0300

----------------------------------------------------------------------
 .../ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01d51b6d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index f63f477..7ae9553 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -67,6 +67,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
 
+        // TODO: IGNITE-80.
         //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
         //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
         //suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));

[33/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694


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

Branch: refs/heads/ignite-80
Commit: 9eb3fceb17d7ef0e11370f0de65ad641860a8b53
Parents: 32aa57c 3e6da9c
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 10:13:17 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 10:13:17 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  11 +
 .../java/org/apache/ignite/IgniteCluster.java   |   9 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |  46 +
 .../ignite/internal/ClusterMetricsSnapshot.java | 384 +++------
 .../apache/ignite/internal/IgniteKernal.java    |  30 +-
 .../cluster/ClusterStartNodeResultImpl.java     |  87 ++
 .../cluster/IgniteClusterAsyncImpl.java         |   5 +-
 .../internal/cluster/IgniteClusterImpl.java     |  37 +-
 .../cache/DynamicCacheChangeRequest.java        |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 130 +--
 .../ignite/internal/util/lang/GridFunc.java     |  33 +
 .../util/nodestart/IgniteNodeCallable.java      |  30 -
 .../util/nodestart/IgniteSshHelper.java         |   2 +-
 .../util/nodestart/StartNodeCallable.java       |  30 +
 .../messages/TcpDiscoveryAbstractMessage.java   |  24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |  24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  30 +-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |  22 -
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  44 +-
 .../TcpDiscoveryJoinRequestMessage.java         |  28 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |  28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  60 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |  28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |  25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |  14 -
 .../TcpDiscoveryStatusCheckMessage.java         |  30 +-
 ...teCacheConfigurationDefaultTemplateTest.java | 111 +++
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ---
 .../IgniteCacheConfigurationTemplateTest.java   |  86 +-
 .../ignite/testframework/junits/IgniteMock.java |   5 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +-
 .../processors/query/h2/sql/GridSqlElement.java |   8 -
 .../processors/query/h2/sql/GridSqlQuery.java   | 183 ++++
 .../query/h2/sql/GridSqlQueryParser.java        |  97 ++-
 .../query/h2/sql/GridSqlQuerySplitter.java      | 111 ++-
 .../processors/query/h2/sql/GridSqlSelect.java  | 209 ++---
 .../query/h2/sql/GridSqlSubquery.java           |   8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   | 134 +++
 .../h2/sql/AbstractH2CompareQueryTest.java      | 341 ++++++++
 .../query/h2/sql/BaseH2CompareQueryTest.java    | 823 ++++++++++++++++++
 .../query/h2/sql/GridQueryParsingTest.java      |  26 +-
 .../query/h2/sql/H2CompareBigQueryTest.java     | 707 +++++++++++++++
 .../query/h2/sql/IgniteVsH2QueryTest.java       | 860 -------------------
 .../IgniteCacheQuerySelfTestSuite.java          |   5 +-
 .../processors/query/h2/sql/bigQuery.sql        |  55 ++
 .../org/apache/ignite/IgniteSpringBean.java     |   7 +
 .../util/nodestart/IgniteNodeCallableImpl.java  | 308 -------
 .../util/nodestart/IgniteSshHelperImpl.java     |   4 +-
 .../util/nodestart/StartNodeCallableImpl.java   | 309 +++++++
 ...gniteProjectionStartStopRestartSelfTest.java | 261 +++---
 .../IgniteStartStopRestartTestSuite.java        |   1 +
 .../commands/start/VisorStartCommand.scala      |   4 +-
 59 files changed, 3636 insertions(+), 2472 deletions(-)
----------------------------------------------------------------------

[38/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-180


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

Branch: refs/heads/ignite-80
Commit: 963af2967f48e1914b790d46bbe0c4ae4771e31b
Parents: c8444ec 5fcb072
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Apr 9 11:56:20 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Apr 9 11:56:20 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheAffinityExample.java |   9 +-
 .../examples/datagrid/CacheApiExample.java      |   9 +-
 .../examples/datagrid/CacheAsyncApiExample.java |   9 +-
 .../datagrid/CacheContinuousQueryExample.java   |   8 +-
 .../datagrid/CacheDataStreamerExample.java      |   9 +-
 .../examples/datagrid/CacheEventsExample.java   |   9 +-
 .../examples/datagrid/CachePutGetExample.java   |  10 +-
 .../datagrid/CacheTransactionExample.java       |   8 +-
 .../hibernate/HibernateL2CacheExample.java      |   5 +-
 .../starschema/CacheStarSchemaExample.java      |  10 +-
 .../store/auto/CacheAutoStoreExample.java       |   8 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |   5 +-
 .../datagrid/store/auto/CacheConfig.java        |   4 +-
 .../store/dummy/CacheDummyStoreExample.java     |   5 +-
 .../hibernate/CacheHibernateStoreExample.java   |   5 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |   5 +-
 .../streaming/StreamVisitorExample.java         |   5 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  11 +
 .../java/org/apache/ignite/IgniteCluster.java   |   9 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |  46 +
 .../ignite/internal/ClusterMetricsSnapshot.java | 384 +++-----
 .../apache/ignite/internal/IgniteKernal.java    |  30 +-
 .../cluster/ClusterStartNodeResultImpl.java     |  87 ++
 .../cluster/IgniteClusterAsyncImpl.java         |   5 +-
 .../internal/cluster/IgniteClusterImpl.java     |  37 +-
 .../cache/DynamicCacheChangeRequest.java        |   2 +-
 .../processors/cache/GridCacheAdapter.java      |  57 +-
 .../processors/cache/GridCacheProcessor.java    | 130 +--
 .../cache/GridLoadCacheCloseablePredicate.java  |  30 +
 .../distributed/dht/GridDhtCacheAdapter.java    |  22 +-
 .../util/nodestart/IgniteNodeCallable.java      |  30 -
 .../util/nodestart/IgniteSshHelper.java         |   2 +-
 .../util/nodestart/StartNodeCallable.java       |  30 +
 .../messages/TcpDiscoveryAbstractMessage.java   |  24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |  24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  30 +-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |  22 -
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  44 +-
 .../TcpDiscoveryJoinRequestMessage.java         |  28 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |  28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  60 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |  28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |  25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |  14 -
 .../TcpDiscoveryStatusCheckMessage.java         |  30 +-
 ...teCacheConfigurationDefaultTemplateTest.java | 111 +++
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ---
 .../IgniteCacheConfigurationTemplateTest.java   |  86 +-
 .../ignite/testframework/junits/IgniteMock.java |   5 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +-
 .../h2/sql/AbstractH2CompareQueryTest.java      | 341 ++++++++
 .../query/h2/sql/BaseH2CompareQueryTest.java    | 823 +++++++++++++++++
 .../query/h2/sql/H2CompareBigQueryTest.java     | 707 +++++++++++++++
 .../query/h2/sql/IgniteVsH2QueryTest.java       | 875 -------------------
 .../IgniteCacheQuerySelfTestSuite.java          |   5 +-
 .../processors/query/h2/sql/bigQuery.sql        |  55 ++
 .../org/apache/ignite/IgniteSpringBean.java     |   7 +
 .../util/nodestart/IgniteNodeCallableImpl.java  | 308 -------
 .../util/nodestart/IgniteSshHelperImpl.java     |   4 +-
 .../util/nodestart/StartNodeCallableImpl.java   | 309 +++++++
 ...gniteProjectionStartStopRestartSelfTest.java | 261 +++---
 .../IgniteStartStopRestartTestSuite.java        |   1 +
 .../commands/start/VisorStartCommand.scala      |   4 +-
 70 files changed, 3149 insertions(+), 2397 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/963af296/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

[36/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 fixed compilation

Posted by sb...@apache.org.
# ignite-sprint-3 fixed compilation


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

Branch: refs/heads/ignite-80
Commit: bb0ce4b3567fa60a4c2097e4128ccaa0ef9e0a92
Parents: 6e84a3b
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 11:47:56 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 11:47:56 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/examples/datagrid/CacheTransactionExample.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb0ce4b3/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
index 67f6376..797543a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
@@ -56,7 +56,7 @@ public class CacheTransactionExample {
 
             cfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
 
-            try (IgniteCache<Integer, Account> cache = ignite.getOrCreateCache(cfg, new NearCacheConfiguration<>())) {
+            try (IgniteCache<Integer, Account> cache = ignite.getOrCreateCache(cfg, new NearCacheConfiguration<Integer, Account>())) {
                 // Initialize.
                 cache.put(1, new Account(1, 100));
                 cache.put(2, new Account(1, 200));

[10/50] [abbrv] incubator-ignite git commit: # IGNITE-685 NPE on node start if client discovery is used.

Posted by sb...@apache.org.
# IGNITE-685 NPE on node start if client discovery is used.


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

Branch: refs/heads/ignite-80
Commit: 654b4e98f2f618e4ffffad6486d13f883a1a5d7d
Parents: 0cf79e4
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 13:03:01 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 13:29:06 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/IgnitionEx.java  | 172 +++++++------------
 1 file changed, 65 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/654b4e98/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index fe81006..a4aea66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1675,23 +1675,32 @@ public class IgnitionEx {
          */
         @SuppressWarnings("unchecked")
         public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws IgniteCheckedException {
-            CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
+            List<CacheConfiguration> cacheCfgs = new ArrayList<>();
 
-            final boolean hasHadoop = IgniteComponentType.HADOOP.inClassPath();
+            boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi;
 
-            final boolean hasAtomics = cfg.getAtomicConfiguration() != null;
+            // Add marshaller and utility caches.
+            if (!clientDisco) {
+                cacheCfgs.add(marshallerSystemCache());
 
-            final boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi;
+                cacheCfgs.add(utilitySystemCache());
+            }
+
+            if (IgniteComponentType.HADOOP.inClassPath())
+                cacheCfgs.add(CU.hadoopSystemCache());
 
-            CacheConfiguration[] copies;
+            if (cfg.getAtomicConfiguration() != null && !clientDisco)
+                cacheCfgs.add(atomicsSystemCache(cfg.getAtomicConfiguration()));
 
-            if (cacheCfgs != null && cacheCfgs.length > 0) {
+            CacheConfiguration[] userCaches = cfg.getCacheConfiguration();
+
+            if (userCaches != null && userCaches.length > 0) {
                 if (!U.discoOrdered(cfg.getDiscoverySpi()) && !U.relaxDiscoveryOrdered())
                     throw new IgniteCheckedException("Discovery SPI implementation does not support node ordering and " +
                         "cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " +
                         "like GridTcpDiscoverySpi)");
 
-                for (CacheConfiguration ccfg : cacheCfgs) {
+                for (CacheConfiguration ccfg : userCaches) {
                     if (CU.isHadoopSystemCache(ccfg.getName()))
                         throw new IgniteCheckedException("Cache name cannot be \"" + CU.SYS_CACHE_HADOOP_MR +
                             "\" because it is reserved for internal purposes.");
@@ -1709,52 +1718,15 @@ public class IgnitionEx {
                             "\" because it is reserved for internal purposes.");
                 }
 
-                int addCacheCnt = 2; // Always add marshaller and utility caches.
-
-                if (hasHadoop)
-                    addCacheCnt++;
-
-                if (hasAtomics)
-                    addCacheCnt++;
-
-                copies = new CacheConfiguration[cacheCfgs.length + addCacheCnt];
-
-                int cloneIdx = 2;
-
-                if (hasHadoop)
-                    copies[cloneIdx++] = CU.hadoopSystemCache();
-
-                if (hasAtomics)
-                    copies[cloneIdx++] = atomicsSystemCache(cfg.getAtomicConfiguration(), clientDisco);
-
-                for (CacheConfiguration ccfg : cacheCfgs)
-                    copies[cloneIdx++] = new CacheConfiguration(ccfg);
-            }
-            else {
-                int cacheCnt = 2; // Always add marshaller and utility caches.
-
-                if (hasHadoop)
-                    cacheCnt++;
-
-                if (hasAtomics)
-                    cacheCnt++;
+                for (CacheConfiguration ccfg : userCaches) {
+                    if (ccfg == null)
+                        throw new NullPointerException("Cache configuration list must not contains null element");
 
-                copies = new CacheConfiguration[cacheCnt];
-
-                int cacheIdx = 2;
-
-                if (hasHadoop)
-                    copies[cacheIdx++] = CU.hadoopSystemCache();
-
-                if (hasAtomics)
-                    copies[cacheIdx] = atomicsSystemCache(cfg.getAtomicConfiguration(), clientDisco);
+                    cacheCfgs.add(ccfg);
+                }
             }
 
-            // Always add marshaller and utility caches.
-            copies[0] = marshallerSystemCache(clientDisco);
-            copies[1] = utilitySystemCache(clientDisco);
-
-            cfg.setCacheConfiguration(copies);
+            cfg.setCacheConfiguration(cacheCfgs.toArray(new CacheConfiguration[cacheCfgs.size()]));
         }
 
         /**
@@ -1899,78 +1871,64 @@ public class IgnitionEx {
          *
          * @return Marshaller system cache configuration.
          */
-        private static CacheConfiguration marshallerSystemCache(boolean client) {
-            if (!client) {
-                CacheConfiguration cache = new CacheConfiguration();
-
-                cache.setName(CU.MARSH_CACHE_NAME);
-                cache.setCacheMode(REPLICATED);
-                cache.setAtomicityMode(ATOMIC);
-                cache.setSwapEnabled(false);
-                cache.setRebalanceMode(SYNC);
-                cache.setWriteSynchronizationMode(FULL_SYNC);
-                cache.setAffinity(new RendezvousAffinityFunction(false, 20));
-                cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-                cache.setStartSize(300);
-
-                return cache;
-            }
-
-            return null;
+        private static CacheConfiguration marshallerSystemCache() {
+            CacheConfiguration cache = new CacheConfiguration();
+
+            cache.setName(CU.MARSH_CACHE_NAME);
+            cache.setCacheMode(REPLICATED);
+            cache.setAtomicityMode(ATOMIC);
+            cache.setSwapEnabled(false);
+            cache.setRebalanceMode(SYNC);
+            cache.setWriteSynchronizationMode(FULL_SYNC);
+            cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+            cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+            cache.setStartSize(300);
+
+            return cache;
         }
 
         /**
          * Creates utility system cache configuration.
          *
-         * @param client If {@code true} creates client-only cache configuration.
          * @return Utility system cache configuration.
          */
-        private static CacheConfiguration utilitySystemCache(boolean client) {
-            if (!client) {
-                CacheConfiguration cache = new CacheConfiguration();
-
-                cache.setName(CU.UTILITY_CACHE_NAME);
-                cache.setCacheMode(REPLICATED);
-                cache.setAtomicityMode(TRANSACTIONAL);
-                cache.setSwapEnabled(false);
-                cache.setRebalanceMode(SYNC);
-                cache.setWriteSynchronizationMode(FULL_SYNC);
-                cache.setAffinity(new RendezvousAffinityFunction(false, 100));
-                cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-
-                return cache;
-            }
-
-            return null;
+        private static CacheConfiguration utilitySystemCache() {
+            CacheConfiguration cache = new CacheConfiguration();
+
+            cache.setName(CU.UTILITY_CACHE_NAME);
+            cache.setCacheMode(REPLICATED);
+            cache.setAtomicityMode(TRANSACTIONAL);
+            cache.setSwapEnabled(false);
+            cache.setRebalanceMode(SYNC);
+            cache.setWriteSynchronizationMode(FULL_SYNC);
+            cache.setAffinity(new RendezvousAffinityFunction(false, 100));
+            cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+
+            return cache;
         }
 
         /**
          * Creates cache configuration for atomic data structures.
          *
          * @param cfg Atomic configuration.
-         * @param client If {@code true} creates client-only cache configuration.
          * @return Cache configuration for atomic data structures.
          */
-        private static CacheConfiguration atomicsSystemCache(AtomicConfiguration cfg, boolean client) {
-            if (!client) {
-                CacheConfiguration ccfg = new CacheConfiguration();
-
-                ccfg.setName(CU.ATOMICS_CACHE_NAME);
-                ccfg.setAtomicityMode(TRANSACTIONAL);
-                ccfg.setSwapEnabled(false);
-                ccfg.setRebalanceMode(SYNC);
-                ccfg.setWriteSynchronizationMode(FULL_SYNC);
-                ccfg.setCacheMode(cfg.getCacheMode());
-                ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
-                ccfg.setNearConfiguration(new NearCacheConfiguration());
-
-                if (cfg.getCacheMode() == PARTITIONED)
-                    ccfg.setBackups(cfg.getBackups());
-
-                return ccfg;
-            }
-
-            return null;
+        private static CacheConfiguration atomicsSystemCache(AtomicConfiguration cfg) {
+            CacheConfiguration ccfg = new CacheConfiguration();
+
+            ccfg.setName(CU.ATOMICS_CACHE_NAME);
+            ccfg.setAtomicityMode(TRANSACTIONAL);
+            ccfg.setSwapEnabled(false);
+            ccfg.setRebalanceMode(SYNC);
+            ccfg.setWriteSynchronizationMode(FULL_SYNC);
+            ccfg.setCacheMode(cfg.getCacheMode());
+            ccfg.setNodeFilter(CacheConfiguration.ALL_NODES);
+            ccfg.setNearConfiguration(new NearCacheConfiguration());
+
+            if (cfg.getCacheMode() == PARTITIONED)
+                ccfg.setBackups(cfg.getBackups());
+
+            return ccfg;
         }
 
         /**

[40/50] [abbrv] incubator-ignite git commit: #ignite-180: fix comments after review.

Posted by sb...@apache.org.
#ignite-180: fix comments after review.


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

Branch: refs/heads/ignite-80
Commit: 5720aedbb3fead0d7e37066684fb76b705291569
Parents: 8b2324f
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Apr 9 12:09:12 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Apr 9 12:09:12 2015 +0300

----------------------------------------------------------------------
 .../ignite/examples/datastructures/IgniteQueueExample.java   | 5 +++--
 .../ignite/examples/datastructures/IgniteSetExample.java     | 8 +++++---
 .../cache/datastructures/GridCacheQueueCleanupSelfTest.java  | 3 ++-
 .../GridCacheQueueMultiNodeConsistencySelfTest.java          | 3 ++-
 .../cache/datastructures/GridCacheSetAbstractSelfTest.java   | 1 -
 .../datastructures/IgniteDataStructureUniqueNameTest.java    | 3 ++-
 .../local/GridCacheLocalAtomicOffheapSetSelfTest.java        | 4 +++-
 .../local/GridCacheLocalAtomicQueueApiSelfTest.java          | 3 ++-
 .../local/GridCacheLocalAtomicSetSelfTest.java               | 3 ++-
 .../local/GridCacheLocalOffheapQueueApiSelfTest.java         | 4 +++-
 .../datastructures/local/GridCacheLocalQueueApiSelfTest.java | 3 ++-
 .../datastructures/local/GridCacheLocalSetSelfTest.java      | 3 ++-
 .../GridCachePartitionedAtomicOffheapQueueApiSelfTest.java   | 4 +++-
 ...PartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java | 4 +++-
 ...dCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java | 4 +++-
 .../GridCachePartitionedAtomicQueueApiSelfTest.java          | 3 ++-
 ...idCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java | 3 ++-
 ...artitionedAtomicQueueFailoverDataConsistencySelfTest.java | 3 ++-
 .../GridCachePartitionedAtomicQueueMultiNodeSelfTest.java    | 3 ++-
 ...GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java | 3 ++-
 .../GridCachePartitionedAtomicSetFailoverSelfTest.java       | 3 ++-
 .../GridCachePartitionedDataStructuresFailoverSelfTest.java  | 3 ++-
 .../GridCachePartitionedOffHeapValuesQueueApiSelfTest.java   | 4 +++-
 .../GridCachePartitionedOffHeapValuesSetSelfTest.java        | 4 +++-
 ...achePartitionedOffheapDataStructuresFailoverSelfTest.java | 4 +++-
 .../GridCachePartitionedOffheapSetFailoverSelfTest.java      | 4 +++-
 .../partitioned/GridCachePartitionedQueueApiSelfTest.java    | 3 ++-
 .../GridCachePartitionedQueueCreateMultiNodeSelfTest.java    | 3 ++-
 .../GridCachePartitionedQueueEntryMoveSelfTest.java          | 3 ++-
 ...CachePartitionedQueueFailoverDataConsistencySelfTest.java | 3 ++-
 .../GridCachePartitionedQueueJoinedNodeSelfTest.java         | 3 ++-
 .../GridCachePartitionedQueueMultiNodeSelfTest.java          | 3 ++-
 .../GridCachePartitionedQueueRotativeMultiNodeTest.java      | 3 ++-
 .../partitioned/GridCachePartitionedSetFailoverSelfTest.java | 3 ++-
 .../partitioned/GridCachePartitionedSetSelfTest.java         | 3 ++-
 .../GridCacheReplicatedDataStructuresFailoverSelfTest.java   | 3 ++-
 .../replicated/GridCacheReplicatedQueueApiSelfTest.java      | 3 ++-
 .../GridCacheReplicatedQueueMultiNodeSelfTest.java           | 3 ++-
 .../GridCacheReplicatedQueueRotativeMultiNodeTest.java       | 3 ++-
 .../replicated/GridCacheReplicatedSetSelfTest.java           | 3 ++-
 .../testsuites/IgniteCacheDataStructuresSelfTestSuite.java   | 2 +-
 41 files changed, 92 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
index fae9523..79067e6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
@@ -18,13 +18,14 @@
 package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.lang.*;
 
 import java.util.*;
 
+import static org.apache.ignite.cache.CacheMode.*;
+
 /**
  * Ignite cache distributed queue example. This example demonstrates {@code FIFO} unbounded
  * cache queue.
@@ -79,7 +80,7 @@ public class IgniteQueueExample {
     private static IgniteQueue<String> initializeQueue(Ignite ignite, String queueName) throws IgniteException {
         CollectionConfiguration colCfg = new CollectionConfiguration();
 
-        colCfg.setCacheMode(CacheMode.PARTITIONED);
+        colCfg.setCacheMode(PARTITIONED);
 
         // Initialize new FIFO queue.
         IgniteQueue<String> queue = ignite.queue(queueName, 0, colCfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
index 29f7f37..8d4fc89 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
@@ -18,13 +18,15 @@
 package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.examples.*;
 import org.apache.ignite.lang.*;
 
 import java.util.*;
 
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
 /**
  * Ignite cache distributed set example.
  * <p>
@@ -73,8 +75,8 @@ public class IgniteSetExample {
     private static IgniteSet<String> initializeSet(Ignite ignite, String setName) throws IgniteException {
         CollectionConfiguration setCfg = new CollectionConfiguration();
 
-        setCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
-        setCfg.setCacheMode(CacheMode.PARTITIONED);
+        setCfg.setAtomicityMode(TRANSACTIONAL);
+        setCfg.setCacheMode(PARTITIONED);
 
         // Initialize new set.
         IgniteSet<String> set = ignite.set(setName, setCfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index 8bf30fa..f25c0e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -32,6 +32,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -56,7 +57,7 @@ public class GridCacheQueueCleanupSelfTest extends IgniteCollectionAbstractTest
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/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 495bcef..2232493 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
@@ -27,6 +27,7 @@ import org.apache.ignite.resources.*;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeAbstractSelfTest.*;
 
@@ -69,7 +70,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 8da3234..fe5892e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import junit.framework.*;
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
index 1255153..5e66ccb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
@@ -29,6 +29,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -47,7 +48,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
index 394eaab..bffd80a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.local;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Set tests.
  */
 public class GridCacheLocalAtomicOffheapSetSelfTest extends GridCacheLocalAtomicSetSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
index 51c08a0..3cb4dab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.local;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Queue tests with local atomic cache.
@@ -27,7 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCacheLocalAtomicQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
index d149a06..688417f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -39,7 +40,7 @@ public class GridCacheLocalAtomicSetSelfTest extends GridCacheSetAbstractSelfTes
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
index c8e5bf7..441e89e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
@@ -18,12 +18,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.local;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Queue tests with local cache.
  */
 public class GridCacheLocalOffheapQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
index 837c94b..7b6e0d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCacheLocalQueueApiSelfTest extends GridCacheQueueApiSelfAbstrac
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
index b312a65..580d770 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -39,7 +40,7 @@ public class GridCacheLocalSetSelfTest extends GridCacheSetAbstractSelfTest {
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
index f571f60..84dabda 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Queue tests with partitioned atomic cache.
  */
 public class GridCachePartitionedAtomicOffheapQueueApiSelfTest extends GridCachePartitionedAtomicQueueApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
index 9c31319..f29a752 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
@@ -18,6 +18,8 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  *
  */
@@ -25,6 +27,6 @@ public class GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest
     extends GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
index 5efc2ed..8004dde 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Queue multi node test.
  */
 public class GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest extends GridCachePartitionedAtomicQueueMultiNodeSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
index 02fc8ad..01be8c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Queue tests with partitioned atomic cache.
@@ -27,7 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedAtomicQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
index 1b36a74..e2cebec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  *
@@ -28,7 +29,7 @@ public class GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest
     extends GridCachePartitionedQueueCreateMultiNodeSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
index 1772d5f..85aedf8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Queue failover test for atomic cache.
@@ -29,7 +30,7 @@ public class GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest exte
     GridCacheAbstractQueueFailoverDataConsistencySelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
index 914f7d2..cc4eb68 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Queue multi node test.
@@ -27,7 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedAtomicQueueMultiNodeSelfTest extends GridCachePartitionedQueueMultiNodeSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
index 7451e38..ed12d52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 import org.apache.ignite.cache.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Sequence multi node tests.
@@ -28,7 +29,7 @@ public class GridCachePartitionedAtomicQueueRotativeMultiNodeTest extends
     GridCachePartitionedQueueRotativeMultiNodeTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
index 771d685..f453aa8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Set failover tests.
@@ -28,7 +29,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 public class GridCachePartitionedAtomicSetFailoverSelfTest extends GridCacheSetFailoverAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
index fdb344d..519148e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -35,7 +36,7 @@ public class GridCachePartitionedDataStructuresFailoverSelfTest
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
index 1cffd46..f844bf3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
@@ -18,12 +18,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Queue tests with partitioned cache.
  */
 public class GridCachePartitionedOffHeapValuesQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_VALUES;
+        return OFFHEAP_VALUES;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
index 7c6041f..0c7f973 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Set tests with off-heap values cache memory mode.
  */
 public class GridCachePartitionedOffHeapValuesSetSelfTest extends GridCachePartitionedSetSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_VALUES;
+        return OFFHEAP_VALUES;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
index e729e96..9878693 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
@@ -19,13 +19,15 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Failover tests for cache data structures.
  */
 public class GridCachePartitionedOffheapDataStructuresFailoverSelfTest extends GridCachePartitionedDataStructuresFailoverSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
index 0b28dd8..bf1866f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.*;
 
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
 /**
  * Set failover tests.
  */
 public class GridCachePartitionedOffheapSetFailoverSelfTest extends GridCachePartitionedSetFailoverSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
index 41d8417..dd095a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueApiSelfTest extends GridCacheQueueApiSelfA
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 4bbbf8c..5b6627e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.*;
 
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheRebalanceMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
@@ -52,7 +53,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index 92b61f4..13363cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@ -33,6 +33,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -63,7 +64,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends IgniteCollection
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
index 495036e..4b809e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Queue failover test for transactional cache.
@@ -29,7 +30,7 @@ public class GridCachePartitionedQueueFailoverDataConsistencySelfTest extends
     GridCacheAbstractQueueFailoverDataConsistencySelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
index b3a575f..5681c01 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueJoinedNodeSelfTest extends GridCacheQueueJ
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
index bdf7f95..c336209 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueMultiNodeSelfTest extends GridCacheQueueMu
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
index 0807d46..3fbfda5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueRotativeMultiNodeTest extends GridCacheQue
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index 68659c1..2186afb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 
 /**
  * Set failover tests.
@@ -33,6 +34,6 @@ public class GridCachePartitionedSetFailoverSelfTest extends GridCacheSetFailove
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
index a76fec1..0eb989d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCachePartitionedSetSelfTest extends GridCacheSetAbstractSelfTes
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
index f2dbdcf..46e458b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -35,7 +36,7 @@ public class GridCacheReplicatedDataStructuresFailoverSelfTest
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
index 0a854cc..8933fbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedQueueApiSelfTest extends GridCacheQueueApiSelfAb
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.OFFHEAP_TIERED;
+        return OFFHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
index 5969bcd..ecaf704 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedQueueMultiNodeSelfTest extends GridCacheQueueMul
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
index d013c2f..07781f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedQueueRotativeMultiNodeTest extends GridCacheQueu
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
index 897660c..3473e32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedSetSelfTest extends GridCacheSetAbstractSelfTest
 
     /** {@inheritDoc} */
     @Override protected CacheMemoryMode collectionMemoryMode() {
-        return CacheMemoryMode.ONHEAP_TIERED;
+        return ONHEAP_TIERED;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index d17b3db..4c40e75 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -68,7 +68,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
         suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
 
-        // TODO: IGNITE-180.
+        // TODO: IGNITE-80.
         //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
         //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
         //suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));

[48/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-180' into ignite-sprint-3

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-180' into ignite-sprint-3


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

Branch: refs/heads/ignite-80
Commit: 887c1a8708bc5334ffb4dee3e1bf9d5f27ebdb3f
Parents: 245f467 5720aed
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Apr 9 14:27:58 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Apr 9 14:27:58 2015 +0300

----------------------------------------------------------------------
 .../datastructures/IgniteQueueExample.java      |  28 +--
 .../datastructures/IgniteSetExample.java        |  30 +--
 .../configuration/CacheConfiguration.java       |  20 +-
 .../configuration/CollectionConfiguration.java  | 114 +++++++++-
 .../processors/cache/GridCacheProcessor.java    |  26 ++-
 .../CacheDataStructuresCacheKey.java            |  62 ++++++
 .../CacheDataStructuresConfigurationKey.java    |   2 +-
 .../datastructures/DataStructuresProcessor.java | 222 +++++++++++++++++--
 ...actQueueFailoverDataConsistencySelfTest.java |   4 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  80 +++++++
 .../GridCacheQueueCleanupSelfTest.java          |  11 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  11 +-
 .../GridCacheSetAbstractSelfTest.java           |   5 +-
 .../IgniteCollectionAbstractTest.java           | 160 +++----------
 .../IgniteDataStructureUniqueNameTest.java      |  47 +---
 .../GridCacheLocalAtomicOffheapSetSelfTest.java |  32 +++
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |   6 +
 .../local/GridCacheLocalAtomicSetSelfTest.java  |   6 +
 .../GridCacheLocalOffheapQueueApiSelfTest.java  |  31 +++
 .../local/GridCacheLocalQueueApiSelfTest.java   |   6 +
 .../local/GridCacheLocalSetSelfTest.java        |   6 +
 ...artitionedAtomicOffheapQueueApiSelfTest.java |  32 +++
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |  32 +++
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java |  32 +++
 ...dCachePartitionedAtomicQueueApiSelfTest.java |   6 +
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |   6 +
 ...micQueueFailoverDataConsistencySelfTest.java |   6 +
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |   6 +
 ...itionedAtomicQueueRotativeMultiNodeTest.java |   6 +
 ...chePartitionedAtomicSetFailoverSelfTest.java |   6 +
 ...rtitionedDataStructuresFailoverSelfTest.java |   6 +
 ...artitionedOffHeapValuesQueueApiSelfTest.java |  31 +++
 ...achePartitionedOffHeapValuesSetSelfTest.java |  32 +++
 ...edOffheapDataStructuresFailoverSelfTest.java |  34 +++
 ...hePartitionedOffheapSetFailoverSelfTest.java |  32 +++
 .../GridCachePartitionedQueueApiSelfTest.java   |   6 +
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   6 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  10 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |   6 +
 ...CachePartitionedQueueJoinedNodeSelfTest.java |   6 +
 ...dCachePartitionedQueueMultiNodeSelfTest.java |   6 +
 ...hePartitionedQueueRotativeMultiNodeTest.java |   6 +
 ...GridCachePartitionedSetFailoverSelfTest.java |   6 +
 .../GridCachePartitionedSetSelfTest.java        |   6 +
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |   5 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |   6 +
 .../GridCacheReplicatedQueueApiSelfTest.java    |  11 +
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |   6 +
 ...cheReplicatedQueueRotativeMultiNodeTest.java |   6 +
 .../GridCacheReplicatedSetSelfTest.java         |   6 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |  10 +
 51 files changed, 1030 insertions(+), 254 deletions(-)
----------------------------------------------------------------------

[09/50] [abbrv] incubator-ignite git commit: # IGNITE-685 Fix issue found on the review.

Posted by sb...@apache.org.
# IGNITE-685 Fix issue found on the review.


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

Branch: refs/heads/ignite-80
Commit: fa552bc08f2835eaa9d7f91ef88e1ac43201a363
Parents: 654b4e9
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 8 13:26:16 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Apr 8 13:29:06 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/internal/IgnitionEx.java    | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa552bc0/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index a4aea66..c7dfd19 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1716,11 +1716,6 @@ public class IgnitionEx {
                     if (CU.isMarshallerCache(ccfg.getName()))
                         throw new IgniteCheckedException("Cache name cannot be \"" + CU.MARSH_CACHE_NAME +
                             "\" because it is reserved for internal purposes.");
-                }
-
-                for (CacheConfiguration ccfg : userCaches) {
-                    if (ccfg == null)
-                        throw new NullPointerException("Cache configuration list must not contains null element");
 
                     cacheCfgs.add(ccfg);
                 }

[04/50] [abbrv] incubator-ignite git commit: # IGNITE-700: Done.

Posted by sb...@apache.org.
# IGNITE-700: Done.


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

Branch: refs/heads/ignite-80
Commit: 21c8e893e2170ae7ab11761676ddb4f2dce912f9
Parents: 080376a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Apr 8 12:59:17 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Apr 8 12:59:17 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxManager.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21c8e893/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 12f57b4..13db6c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1263,7 +1263,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
 
             // 15. Update metrics.
             if (!tx.dht() && tx.local()) {
-                cctx.txMetrics().onTxCommit();
+                if (!tx.system())
+                    cctx.txMetrics().onTxCommit();
 
                 for (int cacheId : tx.activeCacheIds()) {
                     GridCacheContext cacheCtx = cctx.cacheContext(cacheId);
@@ -1337,7 +1338,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
 
             // 11. Update metrics.
             if (!tx.dht() && tx.local()) {
-                cctx.txMetrics().onTxRollback();
+                if (!tx.system())
+                    cctx.txMetrics().onTxRollback();
 
                 for (int cacheId : tx.activeCacheIds()) {
                     GridCacheContext cacheCtx = cctx.cacheContext(cacheId);

[07/50] [abbrv] incubator-ignite git commit: ignite-624 - fix for reduce invisible columns

Posted by sb...@apache.org.
ignite-624 - fix for reduce invisible columns


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

Branch: refs/heads/ignite-80
Commit: d9e2a648136b00cb688789a8216f0ae02c73bc93
Parents: bef34cd
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 13:12:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 13:12:23 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/util/lang/GridFunc.java   |  9 +++++++++
 .../query/h2/sql/GridSqlQuerySplitter.java           | 15 +++++++++++----
 .../processors/query/h2/sql/GridSqlSelect.java       |  9 ++++++++-
 .../processors/query/h2/sql/GridSqlUnion.java        |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 773b9ee..fee53ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5430,6 +5430,15 @@ public class GridFunc {
 
     /**
      * @param c Target collection.
+     * @param it Iterable to fetch.
+     * @return Modified target collection.
+     */
+    public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
+        return it == null ? c : addAll(c, it.iterator());
+    }
+
+    /**
+     * @param c Target collection.
      * @param it Iterator to fetch.
      * @return Modified target collection.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index b84084b..79c73f0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -83,7 +83,7 @@ public class GridSqlQuerySplitter {
 
         if (qry0 instanceof GridSqlSelect)
             srcQry = (GridSqlSelect)qry0;
-        else {
+        else { // Handle UNION.
             srcQry = new GridSqlSelect().from(new GridSqlSubquery(qry0));
 
             GridSqlSelect left = leftest(qry0);
@@ -124,11 +124,15 @@ public class GridSqlQuerySplitter {
 
         final String mergeTable = TABLE_FUNC_NAME + "()"; // table(0); TODO
 
+        // Create map and reduce queries.
         GridSqlSelect mapQry = srcQry.clone();
         GridSqlSelect rdcQry = new GridSqlSelect().from(new GridSqlFunction("PUBLIC", TABLE_FUNC_NAME)); // table(mergeTable)); TODO
 
         // Split all select expressions into map-reduce parts.
-        List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(), srcQry.select(false).iterator());
+        List<GridSqlElement> mapExps = F.addAll(
+            new ArrayList<GridSqlElement>(srcQry.allColumns()),
+            srcQry.select(false));
+
         GridSqlElement[] rdcExps = new GridSqlElement[srcQry.visibleColumns()];
 
         Set<String> colNames = new HashSet<>();
@@ -141,12 +145,15 @@ public class GridSqlQuerySplitter {
         // Fill select expressions.
         mapQry.clearSelect();
 
-        for (GridSqlElement exp : mapExps)
+        for (GridSqlElement exp : mapExps) // Add all map expressions as visible.
             mapQry.addSelectExpression(exp, true);
 
-        for (GridSqlElement rdcExp : rdcExps)
+        for (GridSqlElement rdcExp : rdcExps) // Add corresponding visible reduce columns.
             rdcQry.addSelectExpression(rdcExp, true);
 
+        for (int i = rdcExps.length; i < mapExps.size(); i++)  // Add all extra map columns as invisible reduce columns.
+            rdcQry.addSelectExpression(column(((GridSqlAlias)mapExps.get(i)).alias()), false);
+
         // -- GROUP BY
         if (srcQry.hasGroupBy()) {
             mapQry.clearGroups();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index 398ae10..dadba7c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -22,7 +22,7 @@ import org.h2.util.*;
 import java.util.*;
 
 /**
- *
+ * Plain SELECT query.
  */
 public class GridSqlSelect extends GridSqlQuery {
     /** */
@@ -54,6 +54,13 @@ public class GridSqlSelect extends GridSqlQuery {
         return select.size();
     }
 
+    /**
+     * @return Number of columns is select including invisible ones.
+     */
+    public int allColumns() {
+        return allExprs.size();
+    }
+
     /** {@inheritDoc} */
     @Override protected GridSqlElement expression(int col) {
         return allExprs.get(col);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9e2a648/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
index 90d9e41..dcc2c84 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java
@@ -23,7 +23,7 @@ import org.h2.util.*;
 import javax.cache.*;
 
 /**
- *
+ * Select query with UNION.
  */
 public class GridSqlUnion extends GridSqlQuery {
     /** */

[39/50] [abbrv] incubator-ignite git commit: #ignite-180: fix comments after review.

Posted by sb...@apache.org.
#ignite-180: fix comments after review.


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

Branch: refs/heads/ignite-80
Commit: 8b2324f11738b1f04d04b27aa5edee369e948d90
Parents: 963af29
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Apr 9 11:58:25 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Apr 9 11:58:25 2015 +0300

----------------------------------------------------------------------
 .../processors/datastructures/DataStructuresProcessor.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b2324f1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index c8e1d93..5a9693c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -54,7 +54,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
         new CacheDataStructuresConfigurationKey();
 
     /** */
-    public static final CacheDataStructuresCacheKey DATA_STRUCTURES_CACHE_KEY =
+    private static final CacheDataStructuresCacheKey DATA_STRUCTURES_CACHE_KEY =
         new CacheDataStructuresCacheKey();
 
     /** Initial capacity. */
@@ -1109,6 +1109,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
         @Nullable final CollectionConfiguration cfg)
         throws IgniteCheckedException {
         A.notNull(name, "name");
+
         String cacheName = null;
 
         if (cfg != null)

[32/50] [abbrv] incubator-ignite git commit: # ignite-sprint-3 correction for ignite-680

Posted by sb...@apache.org.
# ignite-sprint-3 correction for ignite-680


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

Branch: refs/heads/ignite-80
Commit: 3e6da9cda37c094167ec7bad604c3f9baf631fc6
Parents: 9d183c5
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 09:50:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 10:11:35 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  11 ++
 .../apache/ignite/internal/IgniteKernal.java    |  19 ++-
 .../cache/DynamicCacheChangeRequest.java        |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 119 +++++++++++--------
 ...teCacheConfigurationDefaultTemplateTest.java | 111 +++++++++++++++++
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ------------------
 .../IgniteCacheConfigurationTemplateTest.java   |  86 +++++++++++++-
 .../ignite/testframework/junits/IgniteMock.java |   5 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   7 ++
 10 files changed, 309 insertions(+), 167 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 6b49add..40c9bbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -217,6 +217,17 @@ public interface Ignite extends AutoCloseable {
     public <K, V> IgniteCache<K, V> createCache(CacheConfiguration<K, V> cacheCfg);
 
     /**
+     * Dynamically starts new cache using template configuration.
+     * <p>
+     * If local node is an affinity node, this method will return the instance of started cache.
+     * Otherwise, it will create a client cache on local node.
+     *
+     * @param cacheName Cache name.
+     * @return Instance of started cache.
+     */
+    public <K, V> IgniteCache<K, V> createCache(String cacheName);
+
+    /**
      * Gets existing cache with the given name or creates new one with the given configuration.
      *
      * @param cacheCfg Cache configuration to use.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 768bbd3..0db2ad6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2282,6 +2282,23 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
     }
 
     /** {@inheritDoc} */
+    @Override public <K, V> IgniteCache<K, V> createCache(String cacheName) {
+        guard();
+
+        try {
+            ctx.cache().createFromTemplate(cacheName).get();
+
+            return ctx.cache().publicJCache(cacheName);
+        }
+        catch (IgniteCheckedException e) {
+            throw CU.convertToCacheException(e);
+        }
+        finally {
+            unguard();
+        }
+    }
+
+    /** {@inheritDoc} */
     @Override public <K, V> IgniteCache<K, V> getOrCreateCache(CacheConfiguration<K, V> cacheCfg) {
         A.notNull(cacheCfg, "cacheCfg");
 
@@ -2409,7 +2426,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
         guard();
 
         try {
-            ctx.cache().dynamicStartCache(cacheName).get();
+            ctx.cache().getOrCreateFromTemplate(cacheName).get();
 
             return ctx.cache().publicJCache(cacheName);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index bd53cdb..c08a179 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -119,7 +119,7 @@ public class DynamicCacheChangeRequest implements Serializable {
      * @return {@code True} if this is a start request.
      */
     public boolean start() {
-        return startCfg != null;
+        return !template && startCfg != null;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 35cfd0c..f0db73e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1365,7 +1365,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     ) throws IgniteCheckedException {
         for (DynamicCacheChangeRequest req : reqs) {
             assert req.start() : req;
-            assert req.cacheType() != null : req.cacheType();
+            assert req.cacheType() != null : req;
 
             prepareCacheStart(
                 req.startCacheConfiguration(),
@@ -1711,81 +1711,102 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @param cacheName Cache name.
      * @return Future that will be completed when cache is deployed.
      */
-    public IgniteInternalFuture<?> dynamicStartCache(String cacheName) {
+    public IgniteInternalFuture<?> createFromTemplate(String cacheName) {
+        CacheConfiguration cfg = createConfigFromTemplate(cacheName);
+
+        return dynamicStartCache(cfg, cacheName, null, true);
+    }
+
+    /**
+     * Dynamically starts cache using template configuration.
+     *
+     * @param cacheName Cache name.
+     * @return Future that will be completed when cache is deployed.
+     */
+    public IgniteInternalFuture<?> getOrCreateFromTemplate(String cacheName) {
         try {
             if (publicJCache(cacheName, false, true) != null) // Cache with given name already started.
                 return new GridFinishedFuture<>();
 
-            CacheConfiguration cfgTemplate = null;
+            CacheConfiguration cfg = createConfigFromTemplate(cacheName);
 
-            CacheConfiguration dfltCacheCfg = null;
+            return dynamicStartCache(cfg, cacheName, null, false);
+        }
+        catch (IgniteCheckedException e) {
+            return new GridFinishedFuture<>(e);
+        }
+    }
 
-            List<CacheConfiguration> wildcardNameCfgs = null;
+    /**
+     * @param cacheName Cache name.
+     * @return Cache configuration.
+     */
+    private CacheConfiguration createConfigFromTemplate(String cacheName) {
+        CacheConfiguration cfgTemplate = null;
 
-            for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
-                assert desc.template();
+        CacheConfiguration dfltCacheCfg = null;
 
-                CacheConfiguration cfg = desc.cacheConfiguration();
+        List<CacheConfiguration> wildcardNameCfgs = null;
 
-                assert cfg != null;
+        for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
+            assert desc.template();
 
-                if (F.eq(cacheName, cfg.getName())) {
-                    cfgTemplate = cfg;
+            CacheConfiguration cfg = desc.cacheConfiguration();
 
-                    break;
-                }
+            assert cfg != null;
 
-                if (cfg.getName() != null ) {
-                    if (cfg.getName().endsWith("*")) {
-                        if (cfg.getName().length() > 1) {
-                            if (wildcardNameCfgs == null)
-                                wildcardNameCfgs = new ArrayList<>();
+            if (F.eq(cacheName, cfg.getName())) {
+                cfgTemplate = cfg;
 
-                            wildcardNameCfgs.add(cfg);
-                        }
-                        else
-                            dfltCacheCfg = cfg; // Template with name '*'.
+                break;
+            }
+
+            if (cfg.getName() != null ) {
+                if (cfg.getName().endsWith("*")) {
+                    if (cfg.getName().length() > 1) {
+                        if (wildcardNameCfgs == null)
+                            wildcardNameCfgs = new ArrayList<>();
+
+                        wildcardNameCfgs.add(cfg);
                     }
+                    else
+                        dfltCacheCfg = cfg; // Template with name '*'.
                 }
-                else if (dfltCacheCfg == null)
-                    dfltCacheCfg = cfg;
             }
+            else if (dfltCacheCfg == null)
+                dfltCacheCfg = cfg;
+        }
 
-            if (cfgTemplate == null && cacheName != null && wildcardNameCfgs != null) {
-                Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
-                    @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
-                        Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
-                        Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
+        if (cfgTemplate == null && cacheName != null && wildcardNameCfgs != null) {
+            Collections.sort(wildcardNameCfgs, new Comparator<CacheConfiguration>() {
+                @Override public int compare(CacheConfiguration cfg1, CacheConfiguration cfg2) {
+                    Integer len1 = cfg1.getName() != null ? cfg1.getName().length() : 0;
+                    Integer len2 = cfg2.getName() != null ? cfg2.getName().length() : 0;
 
-                        return len2.compareTo(len1);
-                    }
-                });
+                    return len2.compareTo(len1);
+                }
+            });
 
-                for (CacheConfiguration cfg : wildcardNameCfgs) {
-                    if (cacheName.startsWith(cfg.getName().substring(0, cfg.getName().length() - 1))) {
-                        cfgTemplate = cfg;
+            for (CacheConfiguration cfg : wildcardNameCfgs) {
+                if (cacheName.startsWith(cfg.getName().substring(0, cfg.getName().length() - 1))) {
+                    cfgTemplate = cfg;
 
-                        break;
-                    }
+                    break;
                 }
             }
+        }
 
-            if (cfgTemplate == null)
-                cfgTemplate = dfltCacheCfg;
+        if (cfgTemplate == null)
+            cfgTemplate = dfltCacheCfg;
 
-            if (cfgTemplate == null)
-                throw new IllegalArgumentException("Failed to start cache " +
-                    "(there is no matching template configuration) : " + cacheName);
+        if (cfgTemplate == null)
+            cfgTemplate = new CacheConfiguration();
 
-            CacheConfiguration cfg = new CacheConfiguration(cfgTemplate);
+        CacheConfiguration cfg = new CacheConfiguration(cfgTemplate);
 
-            cfg.setName(cacheName);
+        cfg.setName(cacheName);
 
-            return dynamicStartCache(cfg, cacheName, null, false);
-        }
-        catch (IgniteCheckedException e) {
-            return new GridFinishedFuture<>(e);
-        }
+        return cfg;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java
new file mode 100644
index 0000000..0aa9683
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationDefaultTemplateTest.java
@@ -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.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ *
+ */
+public class IgniteCacheConfigurationDefaultTemplateTest extends GridCommonAbstractTest {
+    /** */
+    private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+        ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+        CacheConfiguration templateCfg = new CacheConfiguration();
+
+        templateCfg.setName("org.apache.ignite.template*");
+        templateCfg.setBackups(3);
+
+        cfg.setCacheConfiguration(templateCfg);
+
+        return cfg;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        super.afterTest();
+
+        stopAllGrids();
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testDefaultTemplate() throws Exception {
+        Ignite ignite = startGrid(0);
+
+        checkDefaultTemplate(ignite, "org.apache.ignite");
+
+        checkDefaultTemplate(ignite, "org.apache.ignite.templat");
+
+        checkDefaultTemplate(ignite, null);
+
+        checkGetOrCreate(ignite, "org.apache.ignite.template", 3);
+
+        CacheConfiguration templateCfg = new CacheConfiguration();
+
+        templateCfg.setBackups(4);
+
+        ignite.addCacheConfiguration(templateCfg);
+
+        checkGetOrCreate(ignite, "org.apache.ignite2", 4);
+    }
+
+    /**
+     * @param ignite Ignite.
+     * @param cacheName Cache name.
+     */
+    private void checkDefaultTemplate(final Ignite ignite, final String cacheName) {
+        checkGetOrCreate(ignite, cacheName, 0);
+
+        IgniteCache cache = ignite.getOrCreateCache(cacheName);
+
+        assertNotNull(cache);
+
+        CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+        assertEquals(CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE, cfg.getAtomicityMode());
+    }
+
+    /**
+     * @param ignite Ignite.
+     * @param name Cache name.
+     * @param expBackups Expected number of backups.
+     */
+    private void checkGetOrCreate(Ignite ignite, String name, int expBackups) {
+        IgniteCache cache = ignite.getOrCreateCache(name);
+
+        assertNotNull(cache);
+
+        CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+        assertEquals(name, cfg.getName());
+        assertEquals(expBackups, cfg.getBackups());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
deleted file mode 100644
index 53780da..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateNotFoundTest.java
+++ /dev/null
@@ -1,114 +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.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.concurrent.*;
-
-/**
- *
- */
-public class IgniteCacheConfigurationTemplateNotFoundTest extends GridCommonAbstractTest {
-    /** */
-    private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
-
-        CacheConfiguration templateCfg = new CacheConfiguration();
-
-        templateCfg.setName("org.apache.ignite.template*");
-        templateCfg.setBackups(3);
-
-        cfg.setCacheConfiguration(templateCfg);
-
-        return cfg;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTest() throws Exception {
-        super.afterTest();
-
-        stopAllGrids();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTemplateNotFound() throws Exception {
-        Ignite ignite = startGrid(0);
-
-        checkTemplateNotFound(ignite, "org.apache.ignite");
-
-        checkTemplateNotFound(ignite, "org.apache.ignite.templat");
-
-        checkTemplateNotFound(ignite, null);
-
-        checkGetOrCreate(ignite, "org.apache.ignite.template", 3);
-
-        CacheConfiguration templateCfg = new CacheConfiguration();
-
-        templateCfg.setBackups(4);
-
-        ignite.addCacheConfiguration(templateCfg);
-
-        checkGetOrCreate(ignite, "org.apache.ignite", 4);
-
-        checkGetOrCreate(ignite, null, 4);
-    }
-
-    /**
-     * @param ignite Ignite.
-     * @param cacheName Cache name.
-     */
-    private void checkTemplateNotFound(final Ignite ignite, final String cacheName) {
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
-                ignite.getOrCreateCache(cacheName);
-
-                return null;
-            }
-        }, IllegalArgumentException.class, null);
-    }
-
-    /**
-     * @param ignite Ignite.
-     * @param name Cache name.
-     * @param expBackups Expected number of backups.
-     */
-    private void checkGetOrCreate(Ignite ignite, String name, int expBackups) {
-        IgniteCache cache = ignite.getOrCreateCache(name);
-
-        assertNotNull(cache);
-
-        CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
-
-        assertEquals(name, cfg.getName());
-        assertEquals(expBackups, cfg.getBackups());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
index d0ffab2..a030039 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -96,7 +97,61 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
-    public void testCreateFromTemplateConfiguration() throws Exception {
+    public void testCreateFromTemplate() throws Exception {
+        addTemplate = true;
+
+        Ignite ignite0 = startGrid(0);
+
+        checkCreate(ignite0, "org.apache.ignite.test.cache1", 4);
+        checkCreated(ignite0, "org.apache.ignite.test.cache1");
+
+        Ignite ignite1 = startGrid(1);
+
+        checkCreated(ignite1, "org.apache.ignite.test.cache1");
+
+        checkCreate(ignite1, "org.apache.ignite1", 3);
+        checkCreated(ignite1, "org.apache.ignite1");
+
+        checkCreated(ignite0, "org.apache.ignite1");
+
+        checkCreate(ignite0, "org.apache1", 2);
+        checkCreated(ignite0, "org.apache1");
+
+        checkCreated(ignite1, "org.apache1");
+
+        addTemplate = false;
+        clientMode = true;
+
+        Ignite ignite2 = startGrid(2);
+
+        assertNotNull(ignite2.cache("org.apache.ignite.test.cache1"));
+        assertNotNull(ignite2.cache("org.apache.ignite1"));
+        assertNotNull(ignite2.cache("org.apache1"));
+
+        CacheConfiguration template1 = new CacheConfiguration();
+
+        template1.setName(TEMPLATE3);
+        template1.setBackups(5);
+
+        ignite2.addCacheConfiguration(template1);
+
+        checkCreate(ignite0, "org.apache.ignite.test2.cache1", 5);
+
+        checkCreated(ignite0, "org.apache.ignite.test2.cache1");
+        checkCreated(ignite1, "org.apache.ignite.test2.cache1");
+        checkCreated(ignite2, "org.apache.ignite.test2.cache1");
+
+        Ignite ignite3 = startGrid(3);
+
+        checkCreate(ignite3, "org.apache.ignite.test2.cache2", 5);
+
+        checkNoTemplateCaches(4);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGetOrCreateFromTemplate() throws Exception {
         addTemplate = true;
 
         Ignite ignite0 = startGrid(0);
@@ -322,6 +377,35 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest
     }
 
     /**
+     * @param ignite Ignite.
+     * @param name Cache name.
+     * @param expBackups Expected number of backups.
+     */
+    private void checkCreate(final Ignite ignite, final String name, int expBackups) {
+        IgniteCache cache = ignite.createCache(name);
+
+        assertNotNull(cache);
+
+        CacheConfiguration cfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
+
+        assertEquals(name, cfg.getName());
+        assertEquals(expBackups, cfg.getBackups());
+    }
+
+    /**
+     * @param cacheName Cache name.
+     */
+    private void checkCreated(final Ignite ignite, final String cacheName) {
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite.createCache(cacheName);
+
+                return null;
+            }
+        }, CacheExistsException.class, null);
+    }
+
+    /**
      * @param nodes Nodes number.
      */
     private void checkNoTemplateCaches(int nodes) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index b575544..2451f59 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -202,6 +202,11 @@ public class IgniteMock implements Ignite {
     }
 
     /** {@inheritDoc} */
+    @Override public <K, V> IgniteCache<K, V> createCache(String cacheName) {
+        return null;
+    }
+
+    /** {@inheritDoc} */
     @Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
         // No-op.
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 649ce0f..01b45f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -411,7 +411,7 @@ public class IgniteCacheTestSuite extends TestSuite {
         suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
         suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
         suite.addTestSuite(IgniteCacheConfigurationTemplateTest.class);
-        suite.addTestSuite(IgniteCacheConfigurationTemplateNotFoundTest.class);
+        suite.addTestSuite(IgniteCacheConfigurationDefaultTemplateTest.class);
 
         suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e6da9cd/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index cd4fd73..3228210 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -283,6 +283,13 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea
     }
 
     /** {@inheritDoc} */
+    @Override public <K, V> IgniteCache<K, V> createCache(String cacheName) {
+        assert g != null;
+
+        return g.createCache(cacheName);
+    }
+
+    /** {@inheritDoc} */
     @Override public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) {
         assert g != null;

[46/50] [abbrv] incubator-ignite git commit: ignite-705: clear h2 objects after test and simple refactoring

Posted by sb...@apache.org.
ignite-705: clear h2 objects after test and simple refactoring


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

Branch: refs/heads/ignite-80
Commit: 59d937422562182da712baf85e2788f21ae923ee
Parents: 5fcb072
Author: Artem Shutak <as...@gridgain.com>
Authored: Thu Apr 9 13:54:12 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Thu Apr 9 13:54:12 2015 +0300

----------------------------------------------------------------------
 .../h2/sql/AbstractH2CompareQueryTest.java      | 13 ++++++-
 .../query/h2/sql/BaseH2CompareQueryTest.java    | 25 +++++++++----
 .../query/h2/sql/H2CompareBigQueryTest.java     | 38 +++-----------------
 3 files changed, 34 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59d93742/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
index c74493f..2caeab8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -119,7 +119,11 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
+
+        Statement st = conn.createStatement();
         
+        st.execute("DROP ALL OBJECTS");
+
         conn.close();
         
         stopAllGrids();
@@ -140,7 +144,14 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
      *
      * @throws SQLException If exception.
      */
-    protected abstract void initializeH2Schema() throws SQLException;
+    protected Statement initializeH2Schema() throws SQLException {
+        Statement st = conn.createStatement();
+
+        st.execute("CREATE SCHEMA \"part\"");
+        st.execute("CREATE SCHEMA \"repl\"");
+
+        return st;
+    }
 
     /**
      * Gets connection from a pool.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59d93742/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 eea834d..3cafab2 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
@@ -160,9 +160,9 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
     }
 
     /**
-     * *
      * @throws Exception
      */
+    // TODO: IGNITE-705
     public void testAllExamples() throws Exception {
 //        compareQueryRes0("select ? limit ? offset ?");
 
@@ -280,6 +280,18 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
 
         compareQueryRes0("select 'foo' as bar union select 'foo' as bar");
         compareQueryRes0("select 'foo' as bar union all select 'foo' as bar");
+
+//        compareQueryRes0("select count(*) as a from Person union select count(*) as a from Address");
+//        compareQueryRes0("select old, count(*) as a from Person group by old union select 1, count(*) as a from Address");
+//        compareQueryRes0("select name from Person MINUS select street from Address");
+//        compareQueryRes0("select name from Person EXCEPT select street from Address");
+//        compareQueryRes0("select name from Person INTERSECT select street from Address");
+//        compareQueryRes0("select name from Person UNION select street from Address limit 5");
+//        compareQueryRes0("select name from Person UNION select street from Address limit ?");
+//        compareQueryRes0("select name from Person UNION select street from Address limit ? offset ?");
+//        compareQueryRes0("(select name from Person limit 4) UNION (select street from Address limit 1) limit ? offset ?");
+//        compareQueryRes0("(select 2 a) union all (select 1) order by 1");
+//        compareQueryRes0("(select 2 a) union all (select 1) order by a desc nulls first limit ? offset ?");
     }
 
     /**
@@ -407,12 +419,9 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void initializeH2Schema() throws SQLException {
-        Statement st = conn.createStatement();
-
-        st.execute("CREATE SCHEMA \"part\"");
-        st.execute("CREATE SCHEMA \"repl\"");
-
+    @Override protected Statement initializeH2Schema() throws SQLException {
+        Statement st = super.initializeH2Schema();
+        
         st.execute("create table \"part\".ORGANIZATION" +
             "  (_key int not null," +
             "  _val other not null," +
@@ -453,6 +462,8 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
             "  street varchar(255))");
 
         conn.commit();
+        
+        return st;
     }
     
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59d93742/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
index c5a2cad..9cff4b5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -225,35 +225,6 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
     /**
      * @throws Exception If failed.
      */
-    public void testUnionAllOrders() throws Exception {
-        compareQueryRes0(
-            "   select  date, orderId, rootOrderId " +
-                "   from \"part\".CustOrder where alias='CUSTOM'");
-                
-        compareQueryRes0(
-                "   select  date, orderId, rootOrderId " +
-                "   from \"part\".ReplaceOrder where alias='CUSTOM'");
-        
-        compareQueryRes0(
-            "   select 10" +
-
-                "   union all" +
-
-                "   select  20");
-        
-        compareQueryRes0(
-            "   select  date, orderId, rootOrderId " +
-                "   from \"part\".CustOrder where alias='CUSTOM'" +
-
-                "   union all" +
-
-                "   select  date, orderId, rootOrderId " +
-                "   from \"part\".ReplaceOrder where alias='CUSTOM'");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testBigQuery() throws Exception {
         List<List<?>> res = compareQueryRes0(bigQry);
         
@@ -261,11 +232,8 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
     }
     
     /** {@inheritDoc} */
-    @Override protected void initializeH2Schema() throws SQLException {
-        Statement st = conn.createStatement();
-
-        st.execute("CREATE SCHEMA \"part\"");
-        st.execute("CREATE SCHEMA \"repl\"");
+    @Override protected Statement initializeH2Schema() throws SQLException {
+        Statement st = super.initializeH2Schema();
 
         st.execute("create table \"part\".CustOrder" +
             "  (" +
@@ -323,6 +291,8 @@ public class H2CompareBigQueryTest extends AbstractH2CompareQueryTest {
             "  )");
         
         conn.commit();
+        
+        return st;
     }
 
     /**

[14/50] [abbrv] incubator-ignite git commit: ignite-624 - minor

Posted by sb...@apache.org.
ignite-624 - minor


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

Branch: refs/heads/ignite-80
Commit: ab2fe77642294b9cfb432ed43ad41bf320503839
Parents: e0d88d3
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:28:24 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Apr 8 14:28:24 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/util/lang/GridFunc.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab2fe776/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index fee53ef..c7574f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5433,8 +5433,18 @@ public class GridFunc {
      * @param it Iterable to fetch.
      * @return Modified target collection.
      */
+    @SuppressWarnings("unchecked")
     public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
-        return it == null ? c : addAll(c, it.iterator());
+        if (it == null)
+            return c;
+
+        if (it instanceof Collection<?>) {
+            c.addAll((Collection<? extends T>)it);
+
+            return c;
+        }
+
+        return addAll(c, it.iterator());
     }
 
     /**

[49/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-80

Posted by sb...@apache.org.
# Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-80


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

Branch: refs/heads/ignite-80
Commit: 54eca281d6a409a0b8d34eb224e07e1d9ee1374c
Parents: cbfb982 887c1a8
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 9 15:30:20 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 9 15:30:20 2015 +0300

----------------------------------------------------------------------
 bin/ignite.bat                                  |   2 +-
 bin/ignite.sh                                   |   2 +-
 bin/include/service.sh                          |   8 +-
 config/hadoop/default-config.xml                |  15 +-
 .../examples/datagrid/CacheAffinityExample.java |   9 +-
 .../examples/datagrid/CacheApiExample.java      |   9 +-
 .../examples/datagrid/CacheAsyncApiExample.java |   9 +-
 .../datagrid/CacheContinuousQueryExample.java   |   8 +-
 .../datagrid/CacheDataStreamerExample.java      |   9 +-
 .../examples/datagrid/CacheEventsExample.java   |   9 +-
 .../examples/datagrid/CachePutGetExample.java   |  10 +-
 .../datagrid/CacheTransactionExample.java       |   8 +-
 .../hibernate/HibernateL2CacheExample.java      |   5 +-
 .../starschema/CacheStarSchemaExample.java      |  10 +-
 .../store/auto/CacheAutoStoreExample.java       |   8 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |   5 +-
 .../datagrid/store/auto/CacheConfig.java        |   4 +-
 .../store/dummy/CacheDummyStoreExample.java     |   5 +-
 .../hibernate/CacheHibernateStoreExample.java   |   5 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |   5 +-
 .../datastructures/IgniteQueueExample.java      |  28 +-
 .../datastructures/IgniteSetExample.java        |  30 +-
 .../streaming/StreamTransformerExample.java     |   3 +-
 .../streaming/StreamVisitorExample.java         |   5 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  26 +
 .../java/org/apache/ignite/IgniteCluster.java   |   9 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |  46 +
 .../configuration/CacheConfiguration.java       |  20 +-
 .../configuration/CollectionConfiguration.java  | 114 ++-
 .../ignite/internal/ClusterMetricsSnapshot.java | 388 +++------
 .../apache/ignite/internal/IgniteKernal.java    |  72 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 163 ++--
 .../cluster/ClusterStartNodeResultImpl.java     |  87 ++
 .../cluster/IgniteClusterAsyncImpl.java         |   5 +-
 .../internal/cluster/IgniteClusterImpl.java     |  37 +-
 .../internal/managers/GridManagerAdapter.java   |  34 +-
 .../cache/DynamicCacheChangeRequest.java        |  19 +-
 .../cache/DynamicCacheDescriptor.java           |  17 +-
 .../processors/cache/GridCacheAdapter.java      |  57 +-
 .../processors/cache/GridCacheIoManager.java    |  89 +-
 .../processors/cache/GridCacheMessage.java      |   7 +
 .../GridCachePartitionExchangeManager.java      | 136 ++-
 .../processors/cache/GridCacheProcessor.java    | 399 ++++++++-
 .../cache/GridLoadCacheCloseablePredicate.java  |  30 +
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   5 +
 .../dht/GridDhtAffinityAssignmentResponse.java  |   5 +
 .../distributed/dht/GridDhtCacheAdapter.java    |  22 +-
 .../distributed/dht/GridDhtLockFuture.java      |  10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  49 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../GridDhtPartitionsAbstractMessage.java       |  15 +-
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../CacheDataStructuresCacheKey.java            |  62 ++
 .../CacheDataStructuresConfigurationKey.java    |   2 +-
 .../datastructures/DataStructuresProcessor.java | 220 ++++-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |  48 +-
 .../ignite/internal/util/lang/GridFunc.java     |  33 +
 .../util/nodestart/IgniteNodeCallable.java      |  30 -
 .../util/nodestart/IgniteSshHelper.java         |   2 +-
 .../util/nodestart/StartNodeCallable.java       |  30 +
 .../ignite/internal/visor/cache/VisorCache.java |   2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  38 +-
 .../visor/cache/VisorCacheConfiguration.java    |  17 +-
 .../internal/visor/cache/VisorCacheMetrics.java |  53 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |  59 +-
 .../visor/cache/VisorCacheStopTask.java         |  69 ++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |  24 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  14 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  47 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  78 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   8 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |  24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |  24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  30 +-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |  22 -
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  44 +-
 .../TcpDiscoveryJoinRequestMessage.java         |  28 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |  28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  60 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |  28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |  25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |  14 -
 .../TcpDiscoveryStatusCheckMessage.java         |  30 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   4 +-
 .../resources/META-INF/classnames.properties    |  19 +-
 ...teCacheConfigurationDefaultTemplateTest.java | 111 +++
 .../IgniteCacheConfigurationTemplateTest.java   | 448 ++++++++++
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  23 +
 ...actQueueFailoverDataConsistencySelfTest.java |   4 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  80 ++
 .../GridCacheQueueCleanupSelfTest.java          |  11 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  11 +-
 .../GridCacheSetAbstractSelfTest.java           |   5 +-
 .../IgniteCollectionAbstractTest.java           | 160 +---
 .../IgniteDataStructureUniqueNameTest.java      |  47 +-
 .../GridCacheLocalAtomicOffheapSetSelfTest.java |  32 +
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |   6 +
 .../local/GridCacheLocalAtomicSetSelfTest.java  |   6 +
 .../GridCacheLocalOffheapQueueApiSelfTest.java  |  31 +
 .../local/GridCacheLocalQueueApiSelfTest.java   |   6 +
 .../local/GridCacheLocalSetSelfTest.java        |   6 +
 ...artitionedAtomicOffheapQueueApiSelfTest.java |  32 +
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |  32 +
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java |  32 +
 ...dCachePartitionedAtomicQueueApiSelfTest.java |   6 +
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |   6 +
 ...micQueueFailoverDataConsistencySelfTest.java |   6 +
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |   6 +
 ...itionedAtomicQueueRotativeMultiNodeTest.java |   6 +
 ...chePartitionedAtomicSetFailoverSelfTest.java |   6 +
 ...rtitionedDataStructuresFailoverSelfTest.java |   6 +
 ...artitionedOffHeapValuesQueueApiSelfTest.java |  31 +
 ...achePartitionedOffHeapValuesSetSelfTest.java |  32 +
 ...edOffheapDataStructuresFailoverSelfTest.java |  34 +
 ...hePartitionedOffheapSetFailoverSelfTest.java |  32 +
 .../GridCachePartitionedQueueApiSelfTest.java   |   6 +
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   6 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  10 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |   6 +
 ...CachePartitionedQueueJoinedNodeSelfTest.java |   6 +
 ...dCachePartitionedQueueMultiNodeSelfTest.java |   6 +
 ...hePartitionedQueueRotativeMultiNodeTest.java |   6 +
 ...GridCachePartitionedSetFailoverSelfTest.java |   6 +
 .../GridCachePartitionedSetSelfTest.java        |   6 +
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |   5 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |   6 +
 .../GridCacheReplicatedQueueApiSelfTest.java    |  11 +
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |   6 +
 ...cheReplicatedQueueRotativeMultiNodeTest.java |   6 +
 .../GridCacheReplicatedSetSelfTest.java         |   6 +
 .../IgniteCacheAtomicNodeJoinTest.java          |  44 +
 .../IgniteCacheNodeJoinAbstractTest.java        | 109 +++
 .../distributed/IgniteCacheTxNodeJoinTest.java  |  38 +
 ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +--
 ...ridCacheFifoBatchEvictionPolicySelfTest.java |   3 +-
 .../GridAbstractCommunicationSelfTest.java      |   3 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |   5 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   3 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   3 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   3 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   2 +-
 .../ignite/testframework/junits/IgniteMock.java |  15 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |   8 +
 .../IgniteCacheEvictionSelfTestSuite.java       |   1 +
 .../IgniteCacheFailoverTestSuite.java           |   4 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   5 +-
 .../processors/query/h2/sql/GridSqlElement.java |   8 -
 .../processors/query/h2/sql/GridSqlQuery.java   | 183 ++++
 .../query/h2/sql/GridSqlQueryParser.java        |  97 ++-
 .../query/h2/sql/GridSqlQuerySplitter.java      | 111 ++-
 .../processors/query/h2/sql/GridSqlSelect.java  | 209 ++---
 .../query/h2/sql/GridSqlSubquery.java           |   8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   | 134 +++
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../h2/sql/AbstractH2CompareQueryTest.java      | 352 ++++++++
 .../query/h2/sql/BaseH2CompareQueryTest.java    | 834 ++++++++++++++++++
 .../query/h2/sql/GridQueryParsingTest.java      |  26 +-
 .../query/h2/sql/H2CompareBigQueryTest.java     | 677 +++++++++++++++
 .../query/h2/sql/IgniteVsH2QueryTest.java       | 860 -------------------
 .../IgniteCacheQuerySelfTestSuite.java          |   5 +-
 .../processors/query/h2/sql/bigQuery.sql        |  55 ++
 .../org/apache/ignite/IgniteSpringBean.java     |  21 +
 .../util/nodestart/IgniteNodeCallableImpl.java  | 308 -------
 .../util/nodestart/IgniteSshHelperImpl.java     |   4 +-
 .../util/nodestart/StartNodeCallableImpl.java   | 309 +++++++
 ...gniteProjectionStartStopRestartSelfTest.java | 261 +++---
 .../IgniteStartStopRestartTestSuite.java        |   1 +
 .../commands/cache/VisorCacheClearCommand.scala |   3 +-
 .../commands/cache/VisorCacheCommand.scala      | 423 +++++----
 .../commands/cache/VisorCacheStopCommand.scala  | 145 ++++
 .../commands/start/VisorStartCommand.scala      |   4 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  12 +-
 parent/pom.xml                                  |   2 +-
 pom.xml                                         |   2 +
 184 files changed, 6851 insertions(+), 3358 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index f7e19d9,c7dfd19..a4093dc
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@@ -1675,15 -1675,26 +1675,26 @@@ public class IgnitionEx 
           */
          @SuppressWarnings("unchecked")
          public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws IgniteCheckedException {
-             CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
+             List<CacheConfiguration> cacheCfgs = new ArrayList<>();
  
-             final boolean hasHadoop = IgniteComponentType.HADOOP.inClassPath();
+             boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi;
  
-             final boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi;
+             // Add marshaller and utility caches.
+             if (!clientDisco) {
+                 cacheCfgs.add(marshallerSystemCache());
  
-             CacheConfiguration[] copies;
+                 cacheCfgs.add(utilitySystemCache());
+             }
+ 
+             if (IgniteComponentType.HADOOP.inClassPath())
+                 cacheCfgs.add(CU.hadoopSystemCache());
+ 
 -            if (cfg.getAtomicConfiguration() != null && !clientDisco)
++            if (!clientDisco)
+                 cacheCfgs.add(atomicsSystemCache(cfg.getAtomicConfiguration()));
+ 
+             CacheConfiguration[] userCaches = cfg.getCacheConfiguration();
  
-             if (cacheCfgs != null && cacheCfgs.length > 0) {
+             if (userCaches != null && userCaches.length > 0) {
                  if (!U.discoOrdered(cfg.getDiscoverySpi()) && !U.relaxDiscoveryOrdered())
                      throw new IgniteCheckedException("Discovery SPI implementation does not support node ordering and " +
                          "cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 3b20372,5a9693c..21e11fd
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@@ -88,8 -94,11 +94,11 @@@ public final class DataStructuresProces
      private final AtomicConfiguration atomicCfg;
  
      /** */
 -    private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache;
 +    private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> dsInfoView;
  
+     /** */
+     private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache;
+ 
      /**
       * @param ctx Context.
       */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 497b6b0,4c40e75..1cf2db6
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@@ -59,12 -61,19 +61,16 @@@ public class IgniteCacheDataStructuresS
          suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class));
+         suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesQueueApiSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class));
+         suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
 -        suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
 -
 -        // TODO: IGNITE-80.
 -        //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
 -        //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
 -        //suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
 +        suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
 +        suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
++        suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class));
+         suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesSetSelfTest.class));
          suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class));
          suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class));
          suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------