#ignite-758: fix compilation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a8b095 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a8b095 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a8b095 Branch: refs/heads/ignite-737 Commit: 17a8b09581d7fd4827e6f4a78a3675716019128a Parents: ea8d4ad Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 17:57:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 17:57:17 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/query/QueryMetrics.java | 2 +- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +- .../ignite/internal/processors/cache/query/CacheQueries.java | 8 -------- .../internal/processors/cache/query/CacheQueriesImpl.java | 5 ----- .../ignite/internal/visor/cache/VisorCacheMetrics.java | 2 +- 5 files changed, 3 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a8b095/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java index d178fe0..e66b32d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetrics.java @@ -22,7 +22,7 @@ import org.apache.ignite.internal.processors.cache.query.*; /** * Cache query metrics used to obtain statistics on query. You can get metrics for * particular query via {@link CacheQuery#metrics()} method or accumulated metrics - * for all queries via {@link CacheQueries#metrics()}. + * for all queries via {@link GridCacheQueryManager#metrics()}. */ public interface QueryMetrics { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a8b095/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index e05094b..00e1b29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -532,7 +532,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V CacheOperationContext prev = gate.enter(prjCtx); try { - return delegate.queries().metrics(); + return delegate.context().queries().metrics(); } finally { gate.leave(prev); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a8b095/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java index 9736e34..f5a31ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.cache.query; -import org.apache.ignite.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; @@ -56,13 +55,6 @@ public interface CacheQueries<K, V> { public CacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter); /** - * Accumulated metrics for all queries executed for this cache. - * - * @return Cache query metrics. - */ - public QueryMetrics metrics(); - - /** * Creates SQL fields query which will include results metadata if needed. * * @param qry SQL query. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a8b095/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java index f82f69a..7e66afa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java @@ -114,11 +114,6 @@ public class CacheQueriesImpl<K, V> implements CacheQueries<K, V> { } /** {@inheritDoc} */ - @Override public QueryMetrics metrics() { - return ctx.queries().metrics(); - } - - /** {@inheritDoc} */ @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { assert qry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a8b095/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 c7b92dc..c05b9e0 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 @@ -216,7 +216,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.context().queries().metrics()); cm.dhtEvictQueueCurrSize = m.getDhtEvictQueueCurrentSize(); cm.txThreadMapSize = m.getTxThreadMapSize();
