Merge branches 'ignite-564' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-564
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e2704d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e2704d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e2704d6 Branch: refs/heads/ignite-639 Commit: 5e2704d609e17ba317e96719724f30ae5009f8f1 Parents: e69ef35 5b806d8 Author: Andrey Novikov <anovi...@gridgain.com> Authored: Mon Apr 6 08:51:54 2015 +0700 Committer: Andrey Novikov <anovi...@gridgain.com> Committed: Mon Apr 6 08:51:54 2015 +0700 ---------------------------------------------------------------------- .gitignore | 2 +- examples/schema-import/bin/db-init.sql | 17 ++ .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../streaming/numbers/StreamRandomNumbers.java | 2 +- modules/core/pom.xml | 38 +-- .../configuration/CacheConfiguration.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 11 +- .../ignite/events/CacheQueryReadEvent.java | 11 +- .../ignite/internal/GridCachePluginContext.java | 6 + .../internal/cluster/ClusterGroupAdapter.java | 3 +- .../cache/CacheEvictableEntryImpl.java | 11 +- .../processors/cache/CacheProjection.java | 36 --- .../processors/cache/GridCacheAdapter.java | 257 +------------------ .../cache/GridCacheDeploymentManager.java | 7 +- .../processors/cache/GridCacheEntryEx.java | 55 +--- .../processors/cache/GridCacheMapEntry.java | 236 +---------------- .../processors/cache/GridCachePeekMode.java | 81 ------ .../processors/cache/GridCacheProcessor.java | 64 +++-- .../cache/GridCacheProjectionImpl.java | 11 - .../processors/cache/GridCacheProxyImpl.java | 24 -- .../processors/cache/GridCacheUtils.java | 11 - .../distributed/dht/GridDhtCacheAdapter.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 29 +-- .../dht/colocated/GridDhtColocatedCache.java | 30 +-- .../distributed/near/GridNearCacheAdapter.java | 72 +----- .../distributed/near/GridNearTxRemote.java | 11 +- .../cache/local/GridLocalCacheEntry.java | 1 - .../cache/query/GridCacheQueryManager.java | 18 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../processors/plugin/CachePluginManager.java | 51 +++- .../processors/query/GridQueryProcessor.java | 4 +- .../processors/task/GridTaskProcessor.java | 9 +- .../cache/VisorCacheDefaultConfiguration.java | 10 - .../ignite/plugin/CachePluginContext.java | 11 + .../ignite/plugin/CachePluginProvider.java | 4 +- .../org/apache/ignite/plugin/PluginContext.java | 9 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 + .../communication/tcp/TcpCommunicationSpi.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 - .../resources/META-INF/classnames.properties | 1 - .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 40 +-- ...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +- .../dht/GridCacheDhtEvictionSelfTest.java | 24 +- .../dht/GridCacheDhtMappingSelfTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 + .../near/GridCacheNearMultiNodeSelfTest.java | 103 +++----- .../near/GridCacheNearOneNodeSelfTest.java | 33 +-- .../near/GridCacheNearReadersSelfTest.java | 154 +++++------ .../GridCacheReplicatedPreloadSelfTest.java | 11 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- .../processors/igfs/IgfsProcessorSelfTest.java | 3 +- .../processors/igfs/IgfsSizeSelfTest.java | 46 +--- .../ignite/messaging/GridMessagingSelfTest.java | 50 ++++ .../junits/common/GridCommonAbstractTest.java | 42 +++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 + .../query/h2/twostep/GridMapQueryExecutor.java | 4 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +- .../commands/cache/VisorCacheCommand.scala | 3 +- parent/pom.xml | 1 - scripts/git-apply-patch.sh | 94 +++++++ scripts/git-format-patch.sh | 87 +++++++ scripts/git-patch-functions.sh | 171 ++++++++++++ scripts/git-patch-prop.sh | 24 ++ 65 files changed, 917 insertions(+), 1195 deletions(-) ----------------------------------------------------------------------
