ignite-745 Query metrics do not updated for SQL queries
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd814cf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd814cf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd814cf1 Branch: refs/heads/ignite-218 Commit: cd814cf104ece086a50ad78b415a86d60435c110 Parents: 8796bc5 Author: agura <ag...@gridgain.com> Authored: Tue May 12 20:18:34 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Tue May 12 20:18:34 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/query/GridQueryProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd814cf1/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index c701558..e552293 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -606,7 +606,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (typeDesc == null || !typeDesc.registered()) throw new CacheException("Failed to find SQL table for type: " + type); - final GridCloseableIterator<IgniteBiTuple<K,V>> i = idx.query(space, sqlQry, F.asList(params), + final GridCloseableIterator<IgniteBiTuple<K, V>> i = idx.query(space, sqlQry, F.asList(params), typeDesc, idx.backupFilter()); if (ctx.event().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { @@ -625,7 +625,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { null)); } - return new ClIter<Cache.Entry<K,V>>() { + return new ClIter<Cache.Entry<K, V>>() { @Override public void close() throws Exception { i.close(); } @@ -634,8 +634,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { return i.hasNext(); } - @Override public Cache.Entry<K,V> next() { - IgniteBiTuple<K,V> t = i.next(); + @Override public Cache.Entry<K, V> next() { + IgniteBiTuple<K, V> t = i.next(); return new CacheEntryImpl<>(t.getKey(), t.getValue()); } @@ -1376,7 +1376,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { throw (IgniteCheckedException)err; } finally { - GridCacheQueryMetricsAdapter metrics = (GridCacheQueryMetricsAdapter)cctx.cache().queries().metrics(); + GridCacheQueryMetricsAdapter metrics = (GridCacheQueryMetricsAdapter)cctx.queries().metrics(); onExecuted(cctx, metrics, res, err, start, U.currentTimeMillis() - start, log); }
