Added support for distributed join flag in Visor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f4563ce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f4563ce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f4563ce Branch: refs/heads/ignite-3553 Commit: 5f4563cea930a8320593918d879554e6aba1abf7 Parents: f96b568 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jul 27 21:52:59 2016 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Jul 27 21:52:59 2016 +0700 ---------------------------------------------------------------------- .../internal/visor/query/VisorQueryArgV2.java | 49 ++++++++++++++++++++ .../internal/visor/query/VisorQueryJob.java | 1 + 2 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5f4563ce/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java new file mode 100644 index 0000000..8ed3976 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java @@ -0,0 +1,49 @@ +/* + * 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; + +/** + * Arguments for {@link VisorQueryTask}. + */ +public class VisorQueryArgV2 extends VisorQueryArg { + /** */ + private static final long serialVersionUID = 0L; + + /** Distributed joins enabled flag. */ + private final boolean distributedJoins; + + /** + * @param cacheName Cache name for query. + * @param qryTxt Query text. + * @param distributedJoins If {@code true} then distributed joins enabled. + * @param loc Flag whether to execute query locally. + * @param pageSize Result batch size. + */ + public VisorQueryArgV2(String cacheName, String qryTxt, boolean distributedJoins, boolean loc, int pageSize) { + super(cacheName, qryTxt, loc, pageSize); + + this.distributedJoins = distributedJoins; + } + + /** + * @return Distributed joins enabled flag. + */ + public boolean distributedJoins() { + return distributedJoins; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/5f4563ce/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java index 0f2f82e..5d0a82e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java @@ -139,6 +139,7 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryTxt()); qry.setPageSize(arg.pageSize()); qry.setLocal(arg.local()); + qry.setDistributedJoins(arg instanceof VisorQueryArgV2 && ((VisorQueryArgV2)arg).distributedJoins()); long start = U.currentTimeMillis();
