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 96851200CF3 for ; Mon, 14 Aug 2017 12:30:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 95391164D13; Mon, 14 Aug 2017 10:30:16 +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 9D47F164D30 for ; Mon, 14 Aug 2017 12:30:14 +0200 (CEST) Received: (qmail 24769 invoked by uid 500); 14 Aug 2017 10:30:13 -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 24288 invoked by uid 99); 14 Aug 2017 10:30:13 -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, 14 Aug 2017 10:30:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 29CC5F5ED7; Mon, 14 Aug 2017 10:30:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 14 Aug 2017 10:30:38 -0000 Message-Id: <26793cd47e3f446fb38e2296992f32d7@git.apache.org> In-Reply-To: <9565beb2bfe747d0a08f9060e77a1f92@git.apache.org> References: <9565beb2bfe747d0a08f9060e77a1f92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/50] ignite git commit: Implemented "onQueryRequest" handling. archived-at: Mon, 14 Aug 2017 10:30:16 -0000 Implemented "onQueryRequest" handling. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9960dff Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9960dff Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9960dff Branch: refs/heads/ignite-5991-6019 Commit: f9960dff9d0e51b5a9b32473e5970d5d6b06a6a6 Parents: ccdd179 Author: devozerov Authored: Mon Aug 14 10:50:25 2017 +0300 Committer: devozerov Committed: Mon Aug 14 10:50:25 2017 +0300 ---------------------------------------------------------------------- .../query/h2/twostep/GridMapQueryExecutor.java | 37 ++++++++++++-------- .../h2/twostep/lazy/MapQueryLazyWorker.java | 11 +++++- 2 files changed, 32 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f9960dff/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java index 6b11a47..0fd9b75 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java @@ -539,21 +539,21 @@ public class GridMapQueryExecutor { */ // TODO: IGNITE-5991: Correct thread. private void onQueryRequest0( - ClusterNode node, - long reqId, - int segmentId, - String schemaName, - Collection qrys, - List cacheIds, - AffinityTopologyVersion topVer, - Map partsMap, - int[] parts, - int pageSize, - DistributedJoinMode distributedJoinMode, - boolean enforceJoinOrder, - boolean replicated, - int timeout, - Object[] params, + final ClusterNode node, + final long reqId, + final int segmentId, + final String schemaName, + final Collection qrys, + final List cacheIds, + final AffinityTopologyVersion topVer, + final Map partsMap, + final int[] parts, + final int pageSize, + final DistributedJoinMode distributedJoinMode, + final boolean enforceJoinOrder, + final boolean replicated, + final int timeout, + final Object[] params, boolean lazy ) { if (lazy && MapQueryLazyWorker.currentWorker() == null) { @@ -561,6 +561,13 @@ public class GridMapQueryExecutor { MapQueryLazyWorkerKey key = new MapQueryLazyWorkerKey(node.id(), reqId, segmentId); MapQueryLazyWorker worker = new MapQueryLazyWorker(ctx.igniteInstanceName(), key, log); + worker.submit(new Runnable() { + @Override public void run() { + onQueryRequest0(node, reqId, segmentId, schemaName, qrys, cacheIds, topVer, partsMap, parts, + pageSize, distributedJoinMode, enforceJoinOrder, replicated, timeout, params, true); + } + }); + if (busyLock.enterBusy()) { try { MapQueryLazyWorker oldWorker = lazyWorkers.put(key, worker); http://git-wip-us.apache.org/repos/asf/ignite/blob/f9960dff/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/lazy/MapQueryLazyWorker.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/lazy/MapQueryLazyWorker.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/lazy/MapQueryLazyWorker.java index 172e1ce..3d68831 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/lazy/MapQueryLazyWorker.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/lazy/MapQueryLazyWorker.java @@ -69,6 +69,15 @@ public class MapQueryLazyWorker extends GridWorker { } /** + * Submit task to worker. + * + * @param task Task to be executed. + */ + public void submit(Runnable task) { + tasks.add(task); + } + + /** * @return Worker key. */ public MapQueryLazyWorkerKey key() { @@ -79,7 +88,7 @@ public class MapQueryLazyWorker extends GridWorker { * Stop the worker. */ public void stop() { - tasks.add(new StopTask()); + submit(new StopTask()); } /**