#IGNITE-106: merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85201796 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85201796 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85201796 Branch: refs/heads/ignite-54-55 Commit: 852017969b7bbbefa49af3c5ba7f2622e78d28a8 Parents: 30f562a 9f04e64 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Feb 3 18:44:39 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Feb 3 18:44:39 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 4 + assembly/release-base.xml | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 0 bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 0 bin/include/functions.sh | 2 +- .../examples/datagrid/CacheEventsExample.java | 2 +- .../datagrid/CachePopularNumbersExample.java | 4 +- .../datastructures/CacheAtomicLongExample.java | 8 +- .../store/CacheStoreLoadDataExample.java | 2 +- .../examples/ScalarCacheAffinityExample1.scala | 2 +- .../examples/ScalarCacheAffinityExample2.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 6 +- ipc/shmem/configure | 24 +- ipc/shmem/configure.ac | 2 +- ipc/shmem/readme.txt | 2 +- .../impl/GridRouterCommandLineStartup.java | 13 +- .../org/apache/ignite/cluster/ClusterGroup.java | 27 +- .../ignite/internal/ClusterGroupAdapter.java | 57 +++- .../ignite/internal/IgniteClusterAsyncImpl.java | 14 +- .../org/apache/ignite/internal/IgnitionEx.java | 81 +++-- .../processors/cache/GridCacheAdapter.java | 12 +- .../GridCacheContinuousQueryAdapter.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 2 +- .../GridProjectionForCachesSelfTest.java | 54 ++- modules/geospatial/licenses/apache-2.0.txt | 202 ++++++++++++ .../geospatial/licenses/jts-lgpl-license.txt | 165 ++++++++++ modules/geospatial/pom.xml | 59 ++++ modules/geospatial/readme.txt | 33 ++ .../query/h2/opt/GridH2SpatialIndex.java | 326 +++++++++++++++++++ .../query/h2/GridH2IndexingGeoSelfTest.java | 248 ++++++++++++++ .../testsuites/GeoSpatialIndexingTestSuite.java | 39 +++ ...idHadoopDefaultMapReducePlannerSelfTest.java | 12 +- modules/indexing/licenses/jts-lgpl-license.txt | 165 ---------- modules/indexing/pom.xml | 6 - .../processors/query/h2/IgniteH2Indexing.java | 38 ++- .../query/h2/opt/GridH2SpatialIndex.java | 326 ------------------- .../query/h2/GridH2IndexingGeoSelfTest.java | 248 -------------- .../IgniteH2IndexingSpiTestSuite.java | 3 - .../commands/cache/VisorCacheClearCommand.scala | 2 +- .../cache/VisorCacheCompactCommand.scala | 2 +- .../commands/cache/VisorCacheScanCommand.scala | 4 +- .../commands/cache/VisorCacheSwapCommand.scala | 2 +- pom.xml | 29 +- 48 files changed, 1381 insertions(+), 864 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java index 24e039d,0cc05f2..5156a1b --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java @@@ -80,7 -81,7 +80,7 @@@ public class CacheEventsExample // Subscribe to specified cache events on all nodes that have cache running. // Cache events are explicitly enabled in examples/config/example-cache.xml file. - ignite.events(ignite.cluster().forCache(CACHE_NAME)).remoteListen(locLsnr, rmtLsnr, - g.events(g.cluster().forCacheNodes(CACHE_NAME)).remoteListen(locLsnr, rmtLsnr, ++ ignite.events(ignite.cluster().forCacheNodes(CACHE_NAME)).remoteListen(locLsnr, rmtLsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_READ, EVT_CACHE_OBJECT_REMOVED); // Generate cache events. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java index 96a21c7,d2f019c..b65aa30 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java @@@ -65,12 -65,12 +65,12 @@@ public class CachePopularNumbersExampl System.out.println(">>> Cache popular numbers example started."); // Clean up caches on all nodes before run. - g.cache(CACHE_NAME).globalClearAll(0); + ignite.jcache(CACHE_NAME).clear(); - ClusterGroup grp = ignite.cluster().forCache(CACHE_NAME); - ClusterGroup prj = g.cluster().forCacheNodes(CACHE_NAME); ++ ClusterGroup prj = ignite.cluster().forCacheNodes(CACHE_NAME); - if (grp.nodes().isEmpty()) { + if (prj.nodes().isEmpty()) { - System.out.println("Grid does not have cache configured: " + CACHE_NAME); + System.out.println("Ignite does not have cache configured: " + CACHE_NAME); return; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java index 8511696,cdac189..9af0a43 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java @@@ -60,10 -60,10 +60,10 @@@ public final class CacheAtomicLongExamp System.out.println(); System.out.println("Atomic long initial value : " + atomicLong.get() + '.'); - // Try increment atomic long from all cluster nodes. - // Note that this node is also part of the cluster. - ignite.compute(ignite.cluster().forCache(CACHE_NAME)).call(new IgniteCallable<Object>() { - @Override public Object call() throws Exception { + // Try increment atomic long from all grid nodes. + // Note that this node is also part of the grid. - g.compute(g.cluster().forCacheNodes(CACHE_NAME)).call(new IgniteCallable<Object>() { ++ ignite.compute(ignite.cluster().forCacheNodes(CACHE_NAME)).call(new IgniteCallable<Object>() { + @Override public Object call() throws Exception { for (int i = 0; i < RETRIES; i++) System.out.println("AtomicLong value has been incremented: " + atomicLong.incrementAndGet()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java index f3aab21,6355945..d571c3c --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java @@@ -58,7 -59,7 +58,7 @@@ public class CacheStoreLoadDataExample long start = System.currentTimeMillis(); // Start loading cache on all caching nodes. - ignite.compute(ignite.cluster().forCache(null)).broadcast(new IgniteCallable<Object>() { - g.compute(g.cluster().forCacheNodes(null)).broadcast(new IgniteCallable<Object>() { ++ ignite.compute(ignite.cluster().forCacheNodes(null)).broadcast(new IgniteCallable<Object>() { @Override public Object call() throws Exception { // Load cache from persistent store. cache.loadCache(null, 0, ENTRY_COUNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85201796/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala ---------------------------------------------------------------------- diff --cc examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala index 8ba7f6f,3629b26..af82e14 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala @@@ -58,10 -58,10 +58,10 @@@ object ScalarCachePopularNumbersExampl println() println(">>> Cache popular numbers example started.") - val grp = ignite$.cluster().forCache(CACHE_NAME) - val prj = grid$.cluster().forCacheNodes(CACHE_NAME) ++ val prj = ignite$.cluster().forCacheNodes(CACHE_NAME) - if (grp.nodes().isEmpty) + if (prj.nodes().isEmpty) - println("Grid does not have cache configured: " + CACHE_NAME); + println("Ignite does not have cache configured: " + CACHE_NAME); else { val popularNumbersQryTimer = new Timer("numbers-query-worker") @@@ -75,7 -75,7 +75,7 @@@ query(POPULAR_NUMBERS_CNT) // Clean up caches on all nodes after run. - ignite$.cluster().forCache(CACHE_NAME).bcastRun(() => ignite$.cache(CACHE_NAME).clearAll(), null) - grid$.cluster().forCacheNodes(CACHE_NAME).bcastRun(() => grid$.cache(CACHE_NAME).clearAll(), null) ++ ignite$.cluster().forCacheNodes(CACHE_NAME).bcastRun(() => ignite$.cache(CACHE_NAME).clearAll(), null) } finally { popularNumbersQryTimer.cancel()
