Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-560
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a05157b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a05157b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a05157b3 Branch: refs/heads/ignite-560 Commit: a05157b3bdf8fe3aa720b67fdbd5bcab0c488f82 Parents: edaca38 dd944bf Author: sboikov <sboi...@gridgain.com> Authored: Mon Apr 6 09:46:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Apr 6 09:46:18 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/bin/db-init.sql | 17 ++ .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 11 +- .../ignite/events/CacheQueryReadEvent.java | 11 +- .../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/GridCacheProcessor.java | 133 +++++++++++----- .../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/query/GridQueryProcessor.java | 4 +- .../processors/task/GridTaskProcessor.java | 24 ++- .../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--- .../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++ .../IgniteCacheSystemTransactionsSelfTest.java | 3 +- ...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 | 34 ++-- scripts/git-format-patch.sh | 35 ++-- scripts/git-patch-functions.sh | 51 +++++- scripts/git-patch-prop.sh | 10 +- 43 files changed, 804 insertions(+), 299 deletions(-) ----------------------------------------------------------------------
