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 DB8FB200C16 for ; Thu, 9 Feb 2017 11:05:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DA649160B4C; Thu, 9 Feb 2017 10:05:26 +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 E4C69160B74 for ; Thu, 9 Feb 2017 11:05:25 +0100 (CET) Received: (qmail 32926 invoked by uid 500); 9 Feb 2017 10:05:25 -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 32591 invoked by uid 99); 9 Feb 2017 10:05:24 -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, 09 Feb 2017 10:05:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7725E08AC; Thu, 9 Feb 2017 10:05:24 +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 Date: Thu, 09 Feb 2017 10:05:34 -0000 Message-Id: In-Reply-To: <235bb0f7fa534f008841c52d23e5e786@git.apache.org> References: <235bb0f7fa534f008841c52d23e5e786@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/12] ignite git commit: IGNITE-4436 Minor changes. archived-at: Thu, 09 Feb 2017 10:05:27 -0000 IGNITE-4436 Minor changes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6de0391f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6de0391f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6de0391f Branch: refs/heads/ignite-4436-2 Commit: 6de0391fed0a219f235faa1d1721f7d47e674e14 Parents: dbc6e44 Author: Alexey Kuznetsov Authored: Thu Feb 9 17:02:11 2017 +0700 Committer: Alexey Kuznetsov Committed: Thu Feb 9 17:02:11 2017 +0700 ---------------------------------------------------------------------- .../visor/query/VisorCancelQueriesTask.java | 3 + .../query/VisorCollectCurrentQueriesTask.java | 88 ------------------- .../query/VisorCollectRunningQueriesTask.java | 91 ++++++++++++++++++++ 3 files changed, 94 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6de0391f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java index b40a082..7b3c33c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java @@ -51,6 +51,9 @@ public class VisorCancelQueriesTask extends VisorMultiNodeTask>, Void> { + /** */ + private static final long serialVersionUID = 0L; + /** * Create job with specified argument. * http://git-wip-us.apache.org/repos/asf/ignite/blob/6de0391f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java deleted file mode 100644 index 621b2bb..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.visor.query; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import org.apache.ignite.IgniteException; -import org.apache.ignite.compute.ComputeJobResult; -import org.apache.ignite.internal.processors.query.GridRunningQueryInfo; -import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.visor.VisorJob; -import org.apache.ignite.internal.visor.VisorMultiNodeTask; -import org.jetbrains.annotations.Nullable; - -/** - * Task to collect currently running queries. - */ -@GridInternal -public class VisorCollectCurrentQueriesTask extends VisorMultiNodeTask>, Collection> { - /** */ - private static final long serialVersionUID = 0L; - - /** {@inheritDoc} */ - @Override protected VisorCollectCurrentQueriesJob job(Long arg) { - return new VisorCollectCurrentQueriesJob(arg, debug); - } - - /** {@inheritDoc} */ - @Nullable @Override protected Map> reduce0(List results) throws IgniteException { - Map> map = new HashMap<>(); - - for (ComputeJobResult res : results) - if (res.getException() != null) { - Collection queries = res.getData(); - - map.put(res.getNode().id(), queries); - } - - return map; - } - - /** - * Job to collect currently running queries from node. - */ - private static class VisorCollectCurrentQueriesJob extends VisorJob> { - /** - * Create job with specified argument. - * - * @param arg Job argument. - * @param debug Flag indicating whether debug information should be printed into node log. - */ - protected VisorCollectCurrentQueriesJob(@Nullable Long arg, boolean debug) { - super(arg, debug); - } - - /** {@inheritDoc} */ - @Override protected Collection run(@Nullable Long duration) throws IgniteException { - Collection queries = ignite.context().query().runningQueries(duration); - - Collection res = new ArrayList<>(queries.size()); - - for (GridRunningQueryInfo qry : queries) - res.add(new VisorRunningQuery(qry.id(), qry.query(), qry.queryType(), qry.cache(), qry.startTime(), - qry.cancelable(), qry.local())); - - return res; - } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/6de0391f/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java new file mode 100644 index 0000000..fbc8a25 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java @@ -0,0 +1,91 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.visor.query; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.IgniteException; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.processors.query.GridRunningQueryInfo; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.visor.VisorJob; +import org.apache.ignite.internal.visor.VisorMultiNodeTask; +import org.jetbrains.annotations.Nullable; + +/** + * Task to collect currently running queries. + */ +@GridInternal +public class VisorCollectRunningQueriesTask extends VisorMultiNodeTask>, Collection> { + /** */ + private static final long serialVersionUID = 0L; + + /** {@inheritDoc} */ + @Override protected VisorCollectRunningQueriesJob job(Long arg) { + return new VisorCollectRunningQueriesJob(arg, debug); + } + + /** {@inheritDoc} */ + @Nullable @Override protected Map> reduce0(List results) throws IgniteException { + Map> map = new HashMap<>(); + + for (ComputeJobResult res : results) + if (res.getException() != null) { + Collection queries = res.getData(); + + map.put(res.getNode().id(), queries); + } + + return map; + } + + /** + * Job to collect currently running queries from node. + */ + private static class VisorCollectRunningQueriesJob extends VisorJob> { + /** */ + private static final long serialVersionUID = 0L; + + /** + * Create job with specified argument. + * + * @param arg Job argument. + * @param debug Flag indicating whether debug information should be printed into node log. + */ + protected VisorCollectRunningQueriesJob(@Nullable Long arg, boolean debug) { + super(arg, debug); + } + + /** {@inheritDoc} */ + @Override protected Collection run(@Nullable Long duration) throws IgniteException { + Collection queries = ignite.context().query().runningQueries(duration); + + Collection res = new ArrayList<>(queries.size()); + + for (GridRunningQueryInfo qry : queries) + res.add(new VisorRunningQuery(qry.id(), qry.query(), qry.queryType(), qry.cache(), qry.startTime(), + qry.cancelable(), qry.local())); + + return res; + } + } +}