IGNITE-51 - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec2bc0a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec2bc0a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec2bc0a5 Branch: refs/heads/ignite-82 Commit: ec2bc0a51e00a69585eaf91022365ad70e9b2120 Parents: 71c7a69 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sun Feb 8 19:02:23 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sun Feb 8 19:02:23 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridKernalContextImpl.java | 6 ++++++ .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- .../ignite/internal/processors/cache/GridCacheContext.java | 2 ++ .../ignite/internal/processors/cache/GridCacheProcessor.java | 5 +++++ .../apache/ignite/loadtests/hashmap/GridCacheTestContext.java | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec2bc0a5/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index bef67f8..e249b8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -35,6 +35,7 @@ import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.dr.*; import org.apache.ignite.internal.processors.cache.dr.os.*; +import org.apache.ignite.internal.processors.cache.serialization.*; import org.apache.ignite.internal.processors.clock.*; import org.apache.ignite.internal.processors.closure.*; import org.apache.ignite.internal.processors.continuous.*; @@ -50,6 +51,7 @@ import org.apache.ignite.internal.processors.offheap.*; import org.apache.ignite.internal.processors.plugin.*; import org.apache.ignite.internal.processors.port.*; import org.apache.ignite.internal.processors.portable.*; +import org.apache.ignite.internal.processors.portable.os.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.processors.resource.*; import org.apache.ignite.internal.processors.rest.*; @@ -800,6 +802,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable if (cls.equals(GridCacheDrManager.class)) return (T)new GridOsCacheDrManager(); + else if (cls.equals(GridPortableProcessor.class)) + return (T)new GridOsPortableProcessor(this); + else if (cls.equals(IgniteCacheSerializationManager.class)) + return (T)new IgniteCacheOsSerializationManager(); throw new IgniteException("Unsupported component type: " + cls); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec2bc0a5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index c24235b..953ea2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -739,13 +739,13 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit startProcessor(ctx, createComponent(GridLicenseProcessor.class, ctx), attrs); startProcessor(ctx, new GridAffinityProcessor(ctx), attrs); startProcessor(ctx, createComponent(GridSegmentationProcessor.class, ctx), attrs); + startProcessor(ctx, createComponent(GridPortableProcessor.class, ctx), attrs); startProcessor(ctx, new GridQueryProcessor(ctx), attrs); startProcessor(ctx, new GridCacheProcessor(ctx), attrs); startProcessor(ctx, new GridTaskSessionProcessor(ctx), attrs); startProcessor(ctx, new GridJobProcessor(ctx), attrs); startProcessor(ctx, new GridTaskProcessor(ctx), attrs); startProcessor(ctx, (GridProcessor)SCHEDULE.createOptional(ctx), attrs); - startProcessor(ctx, createComponent(GridPortableProcessor.class, ctx), attrs); startProcessor(ctx, new GridRestProcessor(ctx), attrs); startProcessor(ctx, new GridDataLoaderProcessor(ctx), attrs); startProcessor(ctx, new GridStreamProcessor(ctx), attrs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec2bc0a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 5370a30..21e572d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -240,6 +240,7 @@ public class GridCacheContext<K, V> implements Externalizable { CacheDataStructuresManager<K, V> dataStructuresMgr, GridCacheTtlManager<K, V> ttlMgr, GridCacheDrManager<K, V> drMgr, + IgniteCacheSerializationManager<K, V> serMgr, CacheJtaManagerAdapter<K, V> jtaMgr) { assert ctx != null; assert sharedCtx != null; @@ -273,6 +274,7 @@ public class GridCacheContext<K, V> implements Externalizable { this.dataStructuresMgr = add(dataStructuresMgr); this.ttlMgr = add(ttlMgr); this.drMgr = add(drMgr); + this.serMgr = add(serMgr); this.jtaMgr = add(jtaMgr); log = ctx.log(getClass()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec2bc0a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git 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 index 968cc4c..53427d5 100644 --- 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 @@ -39,6 +39,7 @@ import org.apache.ignite.internal.processors.cache.local.*; import org.apache.ignite.internal.processors.cache.local.atomic.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.query.continuous.*; +import org.apache.ignite.internal.processors.cache.serialization.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; @@ -630,6 +631,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager(); GridCacheTtlManager ttlMgr = new GridCacheTtlManager(); GridCacheDrManager drMgr = ctx.createComponent(GridCacheDrManager.class); + IgniteCacheSerializationManager serMgr = ctx.createComponent(IgniteCacheSerializationManager.class); GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx, sesHolders, cfgStore, cfg); @@ -652,6 +654,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { dataStructuresMgr, ttlMgr, drMgr, + serMgr, jta); GridCacheAdapter cache = null; @@ -769,6 +772,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { evictMgr = new GridCacheEvictionManager(); evtMgr = new GridCacheEventManager(); drMgr = ctx.createComponent(GridCacheDrManager.class); + serMgr = ctx.createComponent(IgniteCacheSerializationManager.class); cacheCtx = new GridCacheContext( ctx, @@ -789,6 +793,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { dataStructuresMgr, ttlMgr, drMgr, + serMgr, jta); GridDhtCacheAdapter dht = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec2bc0a5/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java index 966dd6b..b99a901 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java @@ -68,6 +68,7 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { new CacheDataStructuresManager<K, V>(), new GridCacheTtlManager<K, V>(), new GridOsCacheDrManager<K, V>(), + new IgniteCacheOsSerializationManager<K, V>(), new CacheNoopJtaManager<K, V>()); } }
