Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3a03442 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3a03442 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3a03442 Branch: refs/heads/ignite-639 Commit: c3a03442f4b0fa81076a452671284d36181f9213 Parents: 4c99d6c dd944bf Author: sboikov <sboi...@gridgain.com> Authored: Mon Apr 6 10:34:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Apr 6 10:34:52 2015 +0300 ---------------------------------------------------------------------- .gitignore | 2 +- examples/schema-import/bin/db-init.sql | 17 ++ .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 11 +- .../ignite/events/CacheQueryReadEvent.java | 11 +- .../ignite/internal/GridCachePluginContext.java | 6 + .../apache/ignite/internal/IgniteKernal.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 3 +- .../internal/processors/cache/CacheType.java | 77 ++++++++ .../cache/DynamicCacheChangeRequest.java | 17 ++ .../cache/DynamicCacheDescriptor.java | 15 +- .../processors/cache/GridCacheAdapter.java | 6 +- .../processors/cache/GridCacheContext.java | 26 ++- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------ .../cache/GridCacheSharedContext.java | 4 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../near/GridNearTransactionalCache.java | 2 +- .../cache/query/GridCacheQueryManager.java | 18 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 19 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 8 +- .../processors/plugin/CachePluginManager.java | 51 +++-- .../processors/query/GridQueryProcessor.java | 4 +- .../processors/task/GridTaskProcessor.java | 24 ++- .../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 - .../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++-- .../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++ .../IgniteCacheSystemTransactionsSelfTest.java | 3 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 + .../near/GridCacheNearReadersSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- .../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++ .../processors/igfs/IgsfStartCacheTest.java | 115 ----------- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../ignite/messaging/GridMessagingSelfTest.java | 50 +++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +- 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 +++ 56 files changed, 1214 insertions(+), 307 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
