Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/115c7125 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/115c7125 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/115c7125 Branch: refs/heads/ignite-45 Commit: 115c7125ad287d6374af8b0e4dbc667d4e8c52b6 Parents: bd9a635 95537b5 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Fri Mar 20 20:59:34 2015 -0700 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Fri Mar 20 20:59:34 2015 -0700 ---------------------------------------------------------------------- .../datagrid/CachePopularNumbersExample.java | 2 +- .../examples/datagrid/CacheQueryExample.java | 31 +++-- .../ScalarCachePopularNumbersExample.scala | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 20 ++- .../java/org/apache/ignite/IgniteCache.java | 30 +---- .../apache/ignite/cache/CacheTypeMetadata.java | 6 + .../ignite/cache/query/ContinuousQuery.java | 68 ++++------ .../org/apache/ignite/cache/query/Query.java | 39 ++++-- .../apache/ignite/cache/query/ScanQuery.java | 28 +++- .../org/apache/ignite/cache/query/SpiQuery.java | 17 ++- .../ignite/cache/query/SqlFieldsQuery.java | 24 ++-- .../org/apache/ignite/cache/query/SqlQuery.java | 21 ++- .../apache/ignite/cache/query/TextQuery.java | 35 ++--- .../configuration/NearCacheConfiguration.java | 23 ---- .../apache/ignite/internal/IgniteKernal.java | 60 +++++++-- .../processors/cache/GridCacheProcessor.java | 51 +++++--- .../processors/cache/IgniteCacheProxy.java | 127 +++---------------- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 20 +++ .../continuous/CacheContinuousQueryManager.java | 4 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../query/GridQueryCacheObjectsIterator.java | 70 ++++++++++ .../processors/query/GridQueryIndexing.java | 20 ++- .../processors/query/GridQueryProcessor.java | 62 +++++---- .../ignite/internal/util/IgniteUtils.java | 16 +++ .../internal/util/future/IgniteFutureImpl.java | 5 - .../org/apache/ignite/lang/IgniteFuture.java | 31 ++++- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../GridProjectionForCachesSelfTest.java | 15 +-- .../discovery/GridDiscoveryManagerSelfTest.java | 8 +- .../cache/GridCacheClearLocallySelfTest.java | 6 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 125 ++++++++++-------- .../GridCacheClientModesAbstractSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 8 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 10 +- .../GridContinuousOperationsLoadTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 12 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 12 +- .../processors/query/h2/IgniteH2Indexing.java | 32 +++-- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 6 +- .../GridCacheQueryIndexDisabledSelfTest.java | 16 +-- .../cache/GridCacheQuerySimpleBenchmark.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 36 +++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 87 ++++++------- ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 4 +- .../IgniteCacheAtomicFieldsQuerySelfTest.java | 2 +- .../IgniteCachePartitionedQuerySelfTest.java | 8 +- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../IgniteCacheReplicatedQuerySelfTest.java | 16 +-- .../local/IgniteCacheLocalQuerySelfTest.java | 7 +- .../ignite/scalar/pimps/ScalarCachePimp.scala | 4 +- .../processors/schedule/ScheduleFutureImpl.java | 11 -- .../org/apache/ignite/IgniteSpringBean.java | 18 ++- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- 57 files changed, 707 insertions(+), 581 deletions(-) ----------------------------------------------------------------------
