#ignite-45: merge sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd8b1805 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd8b1805 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd8b1805 Branch: refs/heads/ignite-45 Commit: bd8b1805c71bd7e7252e8846cae7d819c22be8a4 Parents: 385114d 38fadda Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Mar 20 18:44:56 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Mar 20 18:44:56 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 6 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheContext.java | 13 +- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 23 +- .../GridCachePartitionExchangeManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 3 + .../processors/clock/GridClockServer.java | 2 +- .../clock/GridClockSyncProcessor.java | 2 +- .../internal/processors/igfs/IgfsServer.java | 4 +- .../processors/igfs/IgfsServerManager.java | 4 +- .../timeout/GridTimeoutProcessor.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 14 +- .../optimized/OptimizedClassDescriptor.java | 268 ++++++++++++------- .../optimized/OptimizedObjectInputStream.java | 93 ++++--- .../optimized/OptimizedObjectOutputStream.java | 64 ++--- .../IgniteCacheExpiryPolicyAbstractTest.java | 65 ++++- ...ridCacheContinuousQueryAbstractSelfTest.java | 29 +- ...arshallerSerialPersistentFieldsSelfTest.java | 110 ++++++++ .../IgniteMarshallerSelfTestSuite.java | 1 + .../HadoopExternalCommunication.java | 4 +- 21 files changed, 493 insertions(+), 220 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 1ca4410,338b09b..d1358a0 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@@ -74,6 -75,22 +78,22 @@@ public abstract class IgniteCacheExpiry storeMap.clear(); } + + /** {@inheritDoc} */ + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); + - if (nearCache && gridName.equals(getTestGridName(0))) - cfg.setDistributionMode(NEAR_PARTITIONED); ++ if (nearCache) ++ cfg.setNearConfiguration(new NearCacheConfiguration()); + + cfg.setExpiryPolicyFactory(factory); + + if (disableEagerTtl) + cfg.setEagerTtl(false); + + return cfg; + } + /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd8b1805/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ----------------------------------------------------------------------
