Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B878717C38 for ; Thu, 16 Apr 2015 09:50:51 +0000 (UTC) Received: (qmail 81871 invoked by uid 500); 16 Apr 2015 09:50:51 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 81840 invoked by uid 500); 16 Apr 2015 09:50:51 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 81831 invoked by uid 99); 16 Apr 2015 09:50:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 09:50:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 16 Apr 2015 09:50:26 +0000 Received: (qmail 81285 invoked by uid 99); 16 Apr 2015 09:50:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 09:50:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6B46E1082; Thu, 16 Apr 2015 09:50:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Apr 2015 09:50:27 -0000 Message-Id: In-Reply-To: <2ac9246fa5da4f5ba49fed2bbcbbbaad@git.apache.org> References: <2ac9246fa5da4f5ba49fed2bbcbbbaad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/37] incubator-ignite git commit: #ignite-738: GridCacheQueryMetricsSelfTest uses new query Api. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-738: GridCacheQueryMetricsSelfTest uses new query Api. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd82d191 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd82d191 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd82d191 Branch: refs/heads/ignite-218 Commit: fd82d19158039843949bcd1f2b0a5418358983b4 Parents: dcf2835 Author: ivasilinets Authored: Mon Apr 13 17:09:22 2015 +0300 Committer: ivasilinets Committed: Mon Apr 13 17:09:22 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheQueryMetricsSelfTest.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd82d191/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java index 45d605c..3bd9777 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; @@ -82,15 +83,13 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testAccumulativeMetrics() throws Exception { - GridCacheAdapter cache = ((IgniteKernal)grid(0)).internalCache(); + IgniteCache cache = grid(0).cache(null); - CacheQuery> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") - .projection(grid(0).cluster()); + SqlQuery qry = new SqlQuery(Integer.class, "_val >= 0"); - // Execute query. - qry.execute().get(); + cache.query(qry).getAll(); - QueryMetrics m = cache.queries().metrics(); + QueryMetrics m = cache.queryMetrics(); assert m != null; @@ -103,9 +102,9 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { assertTrue(m.minimumTime() >= 0); // Execute again with the same parameters. - qry.execute().get(); + cache.query(qry).getAll(); - m = cache.queries().metrics(); + m = cache.queryMetrics(); assert m != null;