Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 56393200C0C for ; Mon, 30 Jan 2017 14:54:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 54C05160B4D; Mon, 30 Jan 2017 13:54:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0C16C160B41 for ; Mon, 30 Jan 2017 14:54:10 +0100 (CET) Received: (qmail 79833 invoked by uid 500); 30 Jan 2017 13:54:10 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 79824 invoked by uid 99); 30 Jan 2017 13:54:09 -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; Mon, 30 Jan 2017 13:54:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B467FDFCC2; Mon, 30 Jan 2017 13:54:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <46a2b0ec5bc442dea3b6bf2fa095bca2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-4436 Added tests. Date: Mon, 30 Jan 2017 13:54:09 +0000 (UTC) archived-at: Mon, 30 Jan 2017 13:54:12 -0000 Repository: ignite Updated Branches: refs/heads/ignite-4436-2 2416432e7 -> fd94b0ac9 IGNITE-4436 Added tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd94b0ac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd94b0ac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd94b0ac Branch: refs/heads/ignite-4436-2 Commit: fd94b0ac9b3bc6871968cf678d84d75c41b4845b Parents: 2416432 Author: AKuznetsov Authored: Mon Jan 30 20:54:00 2017 +0700 Committer: AKuznetsov Committed: Mon Jan 30 20:54:00 2017 +0700 ---------------------------------------------------------------------- .../cache/GridCacheCrossCacheQuerySelfTest.java | 55 ++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd94b0ac/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 4da31ab..a28e670 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -60,9 +60,13 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** */ private Ignite ignite; - /***/ + /** + * Utility class with custom SQL functions. + */ public static class TestSQLFunctions { /** + * Sleep function to simulate long running queries. + * * @param x Time to sleep. * @return Return specified argument. */ @@ -264,17 +268,60 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { } }, 1); - Thread.sleep(100); + Thread.sleep(1000); GridQueryIndexing idx = ((IgniteKernal)ignite).context().query().indexing(); - Collection queries = idx.runningQueries(50); + Collection queries = idx.runningQueries(500); assertEquals(1, queries.size()); fut.get(); - queries = idx.runningQueries(50); + queries = idx.runningQueries(500); + + assertEquals(0, queries.size()); + } + + /** + * Test collecting info about running. + * + * @throws Exception If failed. + */ + public void testCancelingQueries() throws Exception { + IgniteInternalFuture fut = multithreadedAsync(new Runnable() { + @Override public void run() { + try { + SqlFieldsQuery qry = new SqlFieldsQuery("select productId, sleep(500) from FactPurchase limit 100"); + + ignite.cache("partitioned").query(qry).getAll(); + } + catch (Throwable e) { + e.printStackTrace(); + } + } + }, 1); + + Thread.sleep(1000); + + GridQueryIndexing idx = ((IgniteKernal)ignite).context().query().indexing(); + + Collection queries = idx.runningQueries(500); + + assertEquals(1, queries.size()); + + for (GridQuery query : queries) + idx.cancelQueries(Collections.singleton(query.id())); + + Thread.sleep(2000); // Give cluster some time to cancel query and cleanup resources. + + queries = idx.runningQueries(500); + + assertEquals(0, queries.size()); + + fut.get(); + + queries = idx.runningQueries(500); assertEquals(0, queries.size()); }