Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-54-55
Conflicts:
examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/66aa02b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/66aa02b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/66aa02b5
Branch: refs/heads/ignite-57
Commit: 66aa02b51d5f12fd59bdf859c8b41da7b98a59ac
Parents: cb8a334 7cba60f
Author: sevdokimov <[email protected]>
Authored: Tue Feb 3 16:45:58 2015 +0300
Committer: sevdokimov <[email protected]>
Committed: Tue Feb 3 16:45:58 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheEventsExample.java | 2 +-
.../datagrid/CachePopularNumbersExample.java | 2 +-
.../datastructures/CacheAtomicLongExample.java | 2 +-
.../store/CacheStoreLoadDataExample.java | 2 +-
.../examples/ScalarCacheAffinityExample1.scala | 2 +-
.../examples/ScalarCacheAffinityExample2.scala | 2 +-
.../ScalarCachePopularNumbersExample.scala | 4 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 27 +-
.../ignite/internal/ClusterGroupAdapter.java | 57 +++-
.../ignite/internal/IgniteClusterAsyncImpl.java | 14 +-
.../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 | 1 +
34 files changed, 1278 insertions(+), 791 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/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 2772427,d2f019c..947ff5e
---
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,9 -65,9 +65,9 @@@ 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);
+ g.cache(CACHE_NAME).clear(0);
- ClusterGroup prj = g.cluster().forCache(CACHE_NAME);
+ ClusterGroup prj = g.cluster().forCacheNodes(CACHE_NAME);
if (prj.nodes().isEmpty()) {
System.out.println("Grid does not have cache configured: " +
CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/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 d5da02f,3629b26..daf015c
---
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
@@@ -75,7 -75,7 +75,7 @@@ object ScalarCachePopularNumbersExampl
query(POPULAR_NUMBERS_CNT)
// Clean up caches on all nodes after run.
- grid$.cluster().forCache(CACHE_NAME).bcastRun(() =>
grid$.cache(CACHE_NAME).clear(), null)
- grid$.cluster().forCacheNodes(CACHE_NAME).bcastRun(() =>
grid$.cache(CACHE_NAME).clearAll(), null)
++ grid$.cluster().forCacheNodes(CACHE_NAME).bcastRun(() =>
grid$.cache(CACHE_NAME).clear(), null)
}
finally {
popularNumbersQryTimer.cancel()
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66aa02b5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 4904e28,393a3fc..b974c47
---
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
@@@ -1295,10 -1292,10 +1295,10 @@@ public abstract class GridCacheAdapter<
}
/** {@inheritDoc} */
- @Override public void globalClearAll(long timeout) throws
IgniteCheckedException {
+ @Override public void clear(long timeout) throws IgniteCheckedException {
try {
// Send job to remote nodes only.
- Collection<ClusterNode> nodes =
ctx.grid().forCache(name()).forRemotes().nodes();
+ Collection<ClusterNode> nodes =
ctx.grid().forCacheNodes(name()).forRemotes().nodes();
IgniteInternalFuture<Object> fut = null;
