Merge branch 'ignite-745' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71efd274 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71efd274 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71efd274 Branch: refs/heads/ignite-389 Commit: 71efd274bf97648247a64031a7f2002c9daf8be6 Parents: ba6d055 f8169a9 Author: agura <ag...@gridgain.com> Authored: Wed Jun 3 02:13:17 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Wed Jun 3 02:13:17 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/query/QueryMetrics.java | 6 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../processors/query/GridQueryProcessor.java | 305 ++++++++++++------- .../cache/GridCacheQueryMetricsSelfTest.java | 84 ++++- 4 files changed, 276 insertions(+), 131 deletions(-) ----------------------------------------------------------------------
