ignite-1085: merging
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98d6c268 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98d6c268 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98d6c268 Branch: refs/heads/ignite-1085 Commit: 98d6c26811c5f9efe4b8ce4d40e9b9fab5d82fff Parents: 7510aff bee6f68 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Jul 9 17:52:13 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Jul 9 17:52:13 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 ++ .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 +++ .../apache/ignite/internal/IgniteKernal.java | 32 +-- .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheProcessor.java | 118 ++++------- .../cache/GridCacheSharedContext.java | 15 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../datastructures/DataStructuresProcessor.java | 39 +++- .../GridCacheCountDownLatchImpl.java | 15 +- .../visor/cache/VisorCacheConfiguration.java | 11 - ...cheStoreSessionListenerAbstractSelfTest.java | 1 - .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- .../IgniteCacheConfigurationTemplateTest.java | 26 +-- .../cache/IgniteDynamicCacheStartSelfTest.java | 16 +- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../IgniteClientDataStructuresAbstractTest.java | 109 +++++++--- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 ++++++- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +++-- .../GridTmLookupLifecycleAwareSelfTest.java | 29 ++- modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ modules/kafka/pom.xml | 11 - .../util/spring/IgniteSpringHelperImpl.java | 10 +- .../IgniteExcludeInConfigurationTest.java | 5 +- .../org/apache/ignite/spring/sprint-exclude.xml | 19 ++ .../commands/cache/VisorCacheCommand.scala | 2 - .../visor/commands/open/VisorOpenCommand.scala | 2 +- .../config/benchmark-put-indexed-val.properties | 64 ++++++ modules/yardstick/config/ignite-base-config.xml | 23 +++ .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++ .../ignite/yardstick/cache/model/Person1.java | 55 +++++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++ 49 files changed, 1168 insertions(+), 376 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98d6c268/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 0f883c1,de1eac2..4072655 --- 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 @@@ -1916,9 -1918,7 +1915,7 @@@ public class GridCacheProcessor extend ) { checkEmptyTransactions(); - assert ccfg != null || nearCfg != null; - - DynamicCacheDescriptor desc = registeredCaches.get(maskNull(cacheName)); + DynamicCacheDescriptor desc = registeredCaches.get(U.maskNull(cacheName)); DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId()); @@@ -2561,12 -2556,17 +2554,17 @@@ if (log.isDebugEnabled()) log.debug("Getting cache for name: " + name); - IgniteCache<K, V> jcache = (IgniteCache<K, V>)jCacheProxies.get(U.maskNull(name)); - String masked = maskNull(name); ++ String masked = U.maskNull(name); - if (jcache == null) - jcache = startJCache(name, true); + IgniteCacheProxy<?, ?> cache = jCacheProxies.get(masked); - return jcache == null ? null : ((IgniteCacheProxy<K, V>)jcache).internalProxy(); + if (cache == null) { + dynamicStartCache(null, name, null, false, true).get(); + + cache = jCacheProxies.get(masked); + } + + return cache == null ? null : (IgniteInternalCache<K, V>)cache.internalProxy(); } /**
