Repository: ignite Updated Branches: refs/heads/ignite-3443 da7c312ae -> 0e149bdb0
IGNITE-3443 WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e149bdb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e149bdb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e149bdb Branch: refs/heads/ignite-3443 Commit: 0e149bdb0a7fc272713bad74d4467b8a70de000b Parents: da7c312 Author: AKuznetsov <[email protected]> Authored: Thu Oct 20 00:21:44 2016 +0700 Committer: AKuznetsov <[email protected]> Committed: Thu Oct 20 00:21:44 2016 +0700 ---------------------------------------------------------------------- .../query/GridCacheQueryDetailsMetricsAdapter.java | 12 +----------- .../cache/VisorCacheQueryMetricsCollectorTask.java | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0e149bdb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java index a501640..a0cf51f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java @@ -70,21 +70,11 @@ public class GridCacheQueryDetailsMetricsAdapter implements QueryDetailsMetrics, * @param qry Textual query representation. * @return Hash code. */ - public static Integer queryHashCode(GridCacheQueryType qryType, String qry) { + public static int queryHashCode(GridCacheQueryType qryType, String qry) { return 31 * qryType.hashCode() + qry.hashCode(); } /** - * Calculate hash code for query metrics. - * - * @param m Metrics. - * @return Hash code. - */ - public static Integer queryHashCode(QueryDetailsMetrics m) { - return queryHashCode(m.getQueryType(), m.getQuery()); - } - - /** * Required by {@link Externalizable}. */ public GridCacheQueryDetailsMetricsAdapter() { http://git-wip-us.apache.org/repos/asf/ignite/blob/0e149bdb/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java index e50d99e..9d0b64e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java @@ -96,7 +96,7 @@ public class VisorCacheQueryMetricsCollectorTask extends VisorMultiNodeTask<Long if (!metrics.isEmpty()) { for (QueryDetailsMetrics m : metrics) { if (m.getLastStartTime() > since) { - Integer qryHashCode = GridCacheQueryDetailsMetricsAdapter.queryHashCode(m); + Integer qryHashCode = m.hashCode(); GridCacheQueryDetailsMetricsAdapter aggMetrics = res.get(qryHashCode);
