Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-9942 d47b66a21 -> e2cbd2178
# GG-9942 Fixed near cache configuration. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2cbd217 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2cbd217 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2cbd217 Branch: refs/heads/ignite-gg-9942 Commit: e2cbd2178a9a4b7a4db171386fda0143b0a025ef Parents: d47b66a Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 2 11:38:54 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 2 11:38:54 2015 +0700 ---------------------------------------------------------------------- .../cache/VisorCacheNearConfiguration.java | 11 ++- .../resources/META-INF/classnames.properties | 79 ++++++-------------- 2 files changed, 29 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2cbd217/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java index 2a5e781..a968f4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java @@ -53,9 +53,14 @@ public class VisorCacheNearConfiguration implements Serializable { VisorCacheNearConfiguration cfg = new VisorCacheNearConfiguration(); cfg.nearEnabled = GridCacheUtils.isNearEnabled(ccfg); -// cfg.nearStartSize = ccfg.getNearStartSize(); TODO IGNTIE-45 -// cfg.nearEvictPlc = compactClass(ccfg.getNearEvictionPolicy()); -// cfg.nearEvictMaxSize = evictionPolicyMaxSize(ccfg.getNearEvictionPolicy()); + + if (cfg.nearEnabled) { + NearCacheConfiguration nccfg = ccfg.getNearConfiguration(); + + cfg.nearStartSize = nccfg.getNearStartSize(); + cfg.nearEvictPlc = compactClass(nccfg.getNearEvictionPolicy()); + cfg.nearEvictMaxSize = evictionPolicyMaxSize(nccfg.getNearEvictionPolicy()); + } return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2cbd217/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index ccc6aae..55c1f9d 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -25,8 +25,9 @@ org.apache.ignite.IgniteState org.apache.ignite.cache.CacheAtomicUpdateTimeoutException org.apache.ignite.cache.CacheAtomicWriteOrderMode org.apache.ignite.cache.CacheAtomicityMode -org.apache.ignite.internal.processors.cache.CacheDistributionMode +org.apache.ignite.cache.CacheEntryEventSerializableFilter org.apache.ignite.cache.CacheEntryProcessor +org.apache.ignite.cache.CacheExistsException org.apache.ignite.cache.CacheInterceptor org.apache.ignite.cache.CacheInterceptorAdapter org.apache.ignite.cache.CacheMemoryMode @@ -34,6 +35,9 @@ org.apache.ignite.cache.CacheMode org.apache.ignite.cache.CachePartialUpdateException org.apache.ignite.cache.CachePeekMode org.apache.ignite.cache.CacheRebalanceMode +org.apache.ignite.cache.CacheServerNotFoundException +org.apache.ignite.cache.CacheTypeFieldMetadata +org.apache.ignite.cache.CacheTypeMetadata org.apache.ignite.cache.CacheWriteSynchronizationMode org.apache.ignite.cache.affinity.AffinityFunction org.apache.ignite.cache.affinity.AffinityKey @@ -213,10 +217,10 @@ org.apache.ignite.internal.cluster.ClusterGroupAdapter$AttributeFilter org.apache.ignite.internal.cluster.ClusterGroupAdapter$CachesFilter org.apache.ignite.internal.cluster.ClusterGroupAdapter$DaemonFilter org.apache.ignite.internal.cluster.ClusterGroupAdapter$OthersFilter -org.apache.ignite.internal.cluster.ClusterGroupAdapter$StreamersFilter org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException org.apache.ignite.internal.cluster.ClusterNodeLocalMapImpl org.apache.ignite.internal.cluster.ClusterTopologyCheckedException +org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException org.apache.ignite.internal.cluster.IgniteClusterAsyncImpl org.apache.ignite.internal.cluster.IgniteClusterImpl org.apache.ignite.internal.cluster.IgniteClusterImpl$1 @@ -252,9 +256,9 @@ org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager$1 org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion org.apache.ignite.internal.processors.affinity.GridAffinityAssignment org.apache.ignite.internal.processors.affinity.GridAffinityMessage -org.apache.ignite.internal.processors.affinity.GridAffinityProcessor$2 org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException +org.apache.ignite.internal.processors.cache.CacheDistributionMode org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection org.apache.ignite.internal.processors.cache.CacheEntryPredicate org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter @@ -263,8 +267,6 @@ org.apache.ignite.internal.processors.cache.CacheEntryPredicateHasValue org.apache.ignite.internal.processors.cache.CacheEntryPredicateNoValue org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate org.apache.ignite.internal.processors.cache.CacheEvictionEntry -org.apache.ignite.internal.processors.cache.CacheFlag -org.apache.ignite.internal.processors.cache.CacheFlagException org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult org.apache.ignite.internal.processors.cache.CacheInvokeEntry$Operation org.apache.ignite.internal.processors.cache.CacheInvokeResult @@ -319,7 +321,6 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdatePutAndGetTime org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdatePutTimeStatClosure org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdateRemoveTimeStatClosure org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdateTimeStatClosure -org.apache.ignite.internal.processors.cache.GridCacheAtomicVersionComparator org.apache.ignite.internal.processors.cache.GridCacheAttributes org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$1 org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$2 @@ -334,8 +335,7 @@ org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Set0 org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$ValueIterator org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Values org.apache.ignite.internal.processors.cache.GridCacheContext -org.apache.ignite.internal.processors.cache.GridCacheContext$2 -org.apache.ignite.internal.processors.cache.GridCacheContext$5 +org.apache.ignite.internal.processors.cache.GridCacheContext$4 org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$1 org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$2 @@ -404,6 +404,7 @@ org.apache.ignite.internal.processors.cache.GridCacheSwapManager$5 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$6 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$7 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$IteratorWrapper +org.apache.ignite.internal.processors.cache.GridCacheTryPutFailedException org.apache.ignite.internal.processors.cache.GridCacheUtilityKey org.apache.ignite.internal.processors.cache.GridCacheUtils$10 org.apache.ignite.internal.processors.cache.GridCacheUtils$11 @@ -435,8 +436,6 @@ org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1 org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StatefulValue org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StoreOperation org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$ValueStatus -org.apache.ignite.internal.processors.cache.GridPartitionLockKey -org.apache.ignite.cache.CacheExistsException org.apache.ignite.internal.processors.cache.IgniteCacheProxy org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2 @@ -483,9 +482,10 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException -org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$3 +org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$4 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$2 +org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState @@ -520,7 +520,8 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1 -org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1$1 +org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$2 +org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$2$1 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$10 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$11 @@ -656,7 +657,6 @@ org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManag org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$4 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$5 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$6 -org.apache.ignite.internal.processors.cache.query.GridCacheQueriesImpl org.apache.ignite.internal.processors.cache.query.GridCacheQueriesProxy org.apache.ignite.internal.processors.cache.query.GridCacheQueryAdapter$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$1 @@ -695,6 +695,7 @@ org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEvent +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$2 org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$DeployableObject @@ -766,9 +767,9 @@ org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry org.apache.ignite.internal.processors.cache.version.GridCacheVersion org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$1 -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$2 -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$IgniteCacheObjectImpl +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectByteArrayImpl +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectImpl +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage org.apache.ignite.internal.processors.clock.GridClockDeltaVersion org.apache.ignite.internal.processors.closure.GridClosurePolicy @@ -1008,21 +1009,6 @@ org.apache.ignite.internal.processors.service.GridServiceProxy org.apache.ignite.internal.processors.service.GridServiceProxy$ServiceProxyCallable org.apache.ignite.internal.processors.service.ServiceContextImpl org.apache.ignite.internal.processors.service.ServiceDescriptorImpl -org.apache.ignite.internal.processors.streamer.GridStreamerAttributes -org.apache.ignite.internal.processors.streamer.GridStreamerCancelRequest -org.apache.ignite.internal.processors.streamer.GridStreamerExecutionBatch -org.apache.ignite.internal.processors.streamer.GridStreamerExecutionRequest -org.apache.ignite.internal.processors.streamer.GridStreamerResponse -org.apache.ignite.internal.processors.streamer.GridStreamerRouteFailedException -org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl -org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$3 -org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$StreamerPda -org.apache.ignite.internal.processors.streamer.task.GridStreamerBroadcastTask -org.apache.ignite.internal.processors.streamer.task.GridStreamerBroadcastTask$StreamerBroadcastJob -org.apache.ignite.internal.processors.streamer.task.GridStreamerQueryTask -org.apache.ignite.internal.processors.streamer.task.GridStreamerQueryTask$QueryJob -org.apache.ignite.internal.processors.streamer.task.GridStreamerReduceTask -org.apache.ignite.internal.processors.streamer.task.GridStreamerReduceTask$ReduceJob org.apache.ignite.internal.processors.task.GridTaskProcessor$1 org.apache.ignite.internal.processors.task.GridTaskThreadContextKey org.apache.ignite.internal.processors.task.GridTaskWorker$3 @@ -1420,7 +1406,6 @@ org.apache.ignite.internal.visor.event.VisorGridDiscoveryEvent org.apache.ignite.internal.visor.event.VisorGridEvent org.apache.ignite.internal.visor.event.VisorGridEventsLost org.apache.ignite.internal.visor.event.VisorGridJobEvent -org.apache.ignite.internal.visor.event.VisorGridSecuritySessionEvent org.apache.ignite.internal.visor.event.VisorGridTaskEvent org.apache.ignite.internal.visor.file.VisorFileBlock org.apache.ignite.internal.visor.file.VisorFileBlockTask @@ -1501,14 +1486,6 @@ org.apache.ignite.internal.visor.query.VisorQueryTask org.apache.ignite.internal.visor.query.VisorQueryTask$VisorFutureResultSetHolder org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryArg org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryJob -org.apache.ignite.internal.visor.streamer.VisorStreamer -org.apache.ignite.internal.visor.streamer.VisorStreamerConfiguration -org.apache.ignite.internal.visor.streamer.VisorStreamerMetrics -org.apache.ignite.internal.visor.streamer.VisorStreamerMetricsResetTask -org.apache.ignite.internal.visor.streamer.VisorStreamerMetricsResetTask$VisorStreamerMetricsResetJob -org.apache.ignite.internal.visor.streamer.VisorStreamerResetTask -org.apache.ignite.internal.visor.streamer.VisorStreamerResetTask$VisorStreamerResetJob -org.apache.ignite.internal.visor.streamer.VisorStreamerStageMetrics org.apache.ignite.internal.visor.util.VisorEventMapper org.apache.ignite.internal.visor.util.VisorTaskUtils$4 org.apache.ignite.lang.IgniteBiClosure @@ -1530,6 +1507,7 @@ org.apache.ignite.lifecycle.LifecycleEventType org.apache.ignite.marshaller.jdk.JdkMarshallerDummySerializable org.apache.ignite.marshaller.optimized.OptimizedFieldType org.apache.ignite.messaging.MessagingListenActor +org.apache.ignite.plugin.CachePluginConfiguration org.apache.ignite.plugin.PluginNotFoundException org.apache.ignite.plugin.PluginValidationException org.apache.ignite.plugin.extensions.communication.Message @@ -1600,15 +1578,9 @@ org.apache.ignite.startup.cmdline.AboutDialog org.apache.ignite.startup.cmdline.AboutDialog$1 org.apache.ignite.stream.StreamReceiver org.apache.ignite.stream.StreamTransformer -org.apache.ignite.streamer.index.StreamerIndexPolicy -org.apache.ignite.streamer.index.StreamerIndexProviderAdapter$1 -org.apache.ignite.streamer.index.StreamerIndexProviderAdapter$2 -org.apache.ignite.streamer.window.StreamerBoundedSizeBatchWindow$Batch -org.apache.ignite.streamer.window.StreamerBoundedSizeBatchWindow$QueueHolder -org.apache.ignite.streamer.window.StreamerBoundedSizeWindowAdapter$WindowHolder -org.apache.ignite.streamer.window.StreamerBoundedTimeBatchWindow$Batch -org.apache.ignite.streamer.window.StreamerBoundedTimeBatchWindow$WindowHolder -org.apache.ignite.streamer.window.StreamerBoundedTimeWindow$WindowHolder +org.apache.ignite.stream.StreamTransformer$1 +org.apache.ignite.stream.StreamVisitor +org.apache.ignite.stream.StreamVisitor$1 org.apache.ignite.transactions.TransactionConcurrency org.apache.ignite.transactions.TransactionHeuristicException org.apache.ignite.transactions.TransactionIsolation @@ -1617,12 +1589,3 @@ org.apache.ignite.transactions.TransactionOptimisticException org.apache.ignite.transactions.TransactionRollbackException org.apache.ignite.transactions.TransactionState org.apache.ignite.transactions.TransactionTimeoutException -org.jdk8.backport.ConcurrentHashMap8 -org.jdk8.backport.ConcurrentHashMap8$KeySetView -org.jdk8.backport.ConcurrentHashMap8$Segment -org.jdk8.backport.ConcurrentLinkedHashMap$QueuePolicy -org.jdk8.backport.ConcurrentLinkedHashMap$Segment -org.jdk8.backport.ConcurrentLinkedHashMap$WriteThroughEntry -org.jdk8.backport.LongAdder8 -org.jdk8.backport.Striped64_8 -org.jdk8.backport.ThreadLocalRandom8
