Merge branches 'ignite-884' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-884
Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3fa3a541 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3fa3a541 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3fa3a541 Branch: refs/heads/ignite-884 Commit: 3fa3a5410c097e1611a80ec610ddb98a6549b78c Parents: d41af24 d1a2150 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Jun 16 16:19:26 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Jun 16 16:19:26 2015 -0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 +- .../apache/ignite/cache/query/ScanQuery.java | 20 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +++++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 ++++++ .../configuration/CacheConfiguration.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../discovery/GridDiscoveryManager.java | 9 +- .../processors/cache/GridCacheProcessor.java | 34 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../processors/query/GridQueryProcessor.java | 102 ++-- .../util/spring/IgniteSpringHelper.java | 10 + .../SpringApplicationContextResource.java | 4 +- .../apache/ignite/resources/SpringResource.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 28 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 498 +++++++++++++------ .../ignite/spi/discovery/tcp/ServerImpl.java | 221 ++++---- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 +++ .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../apache/ignite/internal/GridSelfTest.java | 12 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../cache/CacheClientStoreSelfTest.java | 228 +++++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 ------------ .../GridCacheAbstractFailoverSelfTest.java | 2 + ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCacheVersionMultinodeTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheClientNodeConcurrentStart.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 189 ++++++- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +- ...CacheClientWriteBehindStoreAbstractTest.java | 104 ++++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 ++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 ++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../junits/common/GridCommonAbstractTest.java | 11 +- .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 ++ .../testsuites/IgniteCacheTestSuite4.java | 6 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + modules/hibernate/pom.xml | 14 + .../hibernate/CacheHibernateBlobStore.java | 87 +--- .../CacheHibernateBlobStoreFactory.java | 235 +++++++++ .../hibernate/src/test/config/factory-cache.xml | 59 +++ .../src/test/config/factory-cache1.xml | 61 +++ .../config/factory-incorrect-store-cache.xml | 56 +++ .../CacheHibernateStoreFactorySelfTest.java | 273 ++++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + .../CacheAbstractQueryMetricsSelfTest.java | 205 ++++++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 ++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 ++ .../cache/GridCacheQueryMetricsSelfTest.java | 206 -------- .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- modules/spring/pom.xml | 7 + .../GridResourceSpringBeanInjector.java | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 17 + .../src/test/config/incorrect-store-cache.xml | 57 +++ modules/spring/src/test/config/node.xml | 43 ++ modules/spring/src/test/config/node1.xml | 45 ++ .../test/config/pojo-incorrect-store-cache.xml | 56 +++ modules/spring/src/test/config/store-cache.xml | 59 +++ modules/spring/src/test/config/store-cache1.xml | 62 +++ .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 172 +++++++ .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 193 +++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + 72 files changed, 3632 insertions(+), 1084 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa3a541/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index f806be7,2f7f22c..8b78d12 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@@ -1080,12 -1072,9 +1080,14 @@@ public class GridCacheProcessor extend { assert cfg != null; + prepare(cfg, cfg.getCacheStoreFactory(), false); + - CacheStore cfgStore = cfg.getCacheStoreFactory() != null ? cfg.getCacheStoreFactory().create() : null; + CacheStartContext startCtx = startCtxs.remove(maskNull(cfg.getName())); + + if (startCtx == null) + startCtx = new CacheStartContext(ctx, cfg); + + CacheStore cfgStore = startCtx.store(); validate(ctx.config(), cfg, cacheType, cfgStore);