Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5 c9f729178 -> ead66e7ed
# GG-9621 WIP. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1497cbe0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1497cbe0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1497cbe0 Branch: refs/heads/ignite-sprint-5 Commit: 1497cbe053fe849f2091355f97ba3f4596c719cd Parents: 59b11b4 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 14 18:11:24 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 14 18:11:24 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java | 6 +++--- .../internal/visor/cache/VisorCacheMetrics.java | 19 +++++++++++-------- .../cache/VisorCacheMetricsCollectorTask.java | 10 ++++++---- .../cache/VisorCacheStoreConfiguration.java | 5 ++--- 5 files changed, 23 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1497cbe0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java index 8c880a7..7de2c2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java @@ -230,7 +230,7 @@ public class VisorCache implements Serializable { cache.partitions = ca.affinity().partitions(); cache.primaryPartitions = pps; cache.backupPartitions = bps; - cache.metrics = VisorCacheMetrics.from(ignite, ca); + cache.metrics = VisorCacheMetrics.from(ignite, ca.name()); cache.partitionsMap = partsMap; return cache; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1497cbe0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java index ef12424..c8913c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java @@ -45,17 +45,17 @@ public class VisorCacheConfigurationCollectorJob /** {@inheritDoc} */ @Override protected Map<IgniteUuid, VisorCacheConfiguration> run(Collection<IgniteUuid> arg) { - Collection<GridCacheAdapter<?, ?>> caches = ignite.context().cache().internalCaches(); + Collection<IgniteCacheProxy<?, ?>> caches = ignite.context().cache().jcaches(); boolean all = arg == null || arg.isEmpty(); Map<IgniteUuid, VisorCacheConfiguration> res = U.newHashMap(caches.size()); - for (GridCacheAdapter<?, ?> cache : caches) { + for (IgniteCacheProxy<?, ?> cache : caches) { IgniteUuid deploymentId = cache.context().dynamicDeploymentId(); if (all || arg.contains(deploymentId)) - res.put(deploymentId, config(cache.configuration())); + res.put(deploymentId, config(cache.getConfiguration(CacheConfiguration.class))); } return res; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1497cbe0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java index b0a1eb2..65a7f1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.visor.cache; +import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -173,19 +174,21 @@ public class VisorCacheMetrics implements Serializable { /** * @param ignite Ignite. - * @param c Cache. + * @param cacheName Cache name. * @return Data transfer object for given cache metrics. */ - public static VisorCacheMetrics from(IgniteEx ignite, GridCache c) { + public static VisorCacheMetrics from(IgniteEx ignite, String cacheName) { VisorCacheMetrics cm = new VisorCacheMetrics(); - CacheMetrics m = c.metrics(); - GridCacheProcessor cacheProcessor = ignite.context().cache(); - cm.name = c.name(); - cm.mode = cacheProcessor.cacheMode(c.name()); - cm.sys = cacheProcessor.systemCache(c.name()); + IgniteCache<Object, Object> c = cacheProcessor.jcache(cacheName); + + cm.name = cacheName; + cm.mode = cacheProcessor.cacheMode(cacheName); + cm.sys = cacheProcessor.systemCache(cacheName); + + CacheMetrics m = c.metrics(); cm.size = m.getSize(); cm.keySize = m.getKeySize(); @@ -216,7 +219,7 @@ public class VisorCacheMetrics implements Serializable { cm.commitsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAverageTxCommitTime()); cm.rollbacksPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAverageTxRollbackTime()); - cm.qryMetrics = VisorCacheQueryMetrics.from(c.queries().metrics()); + cm.qryMetrics = VisorCacheQueryMetrics.from(c.queryMetrics()); cm.dhtEvictQueueCurrSize = m.getDhtEvictQueueCurrentSize(); cm.txThreadMapSize = m.getTxThreadMapSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1497cbe0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java index 8fd42a0..23263c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java @@ -99,17 +99,19 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT GridCacheProcessor cacheProcessor = ignite.context().cache(); - Collection<GridCacheAdapter<?, ?>> caches = cacheProcessor.internalCaches(); + Collection<IgniteCacheProxy<?, ?>> caches = cacheProcessor.jcaches(); Collection<VisorCacheMetrics> res = new ArrayList<>(caches.size()); boolean allCaches = cacheNames.isEmpty(); - for (GridCacheAdapter ca : caches) { + for (IgniteCacheProxy ca : caches) { if (ca.context().started()) { - VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, ca); + String cacheName = ca.getName(); - if ((allCaches || cacheNames.contains(ca.name())) && (showSysCaches || !cm.system())) + VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, cacheName); + + if ((allCaches || cacheNames.contains(cacheName)) && (showSysCaches || !cm.system())) res.add(cm); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1497cbe0/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java index a4a2235..cacf528 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.visor.cache; -import org.apache.ignite.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cache.store.jdbc.*; import org.apache.ignite.configuration.*; @@ -72,10 +71,10 @@ public class VisorCacheStoreConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for cache store configuration properties. */ - public static VisorCacheStoreConfiguration from(Ignite ignite, CacheConfiguration ccfg) { + public static VisorCacheStoreConfiguration from(IgniteEx ignite, CacheConfiguration ccfg) { VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration(); - GridCacheAdapter<Object, Object> c = ((IgniteKernal)ignite).internalCache(ccfg.getName()); + IgniteCacheProxy<Object, Object> c = ignite.context().cache().jcache(ccfg.getName()); CacheStore store = c != null && c.context().started() ? c.context().store().configuredStore() : null;
