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 C2F92200C3A for ; Thu, 16 Mar 2017 14:36:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C1EDF160B8B; Thu, 16 Mar 2017 13:36:43 +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 A7EF9160B96 for ; Thu, 16 Mar 2017 14:36:42 +0100 (CET) Received: (qmail 68439 invoked by uid 500); 16 Mar 2017 13:36:41 -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 68176 invoked by uid 99); 16 Mar 2017 13:36:41 -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 Mar 2017 13:36:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AEC9F3209; Thu, 16 Mar 2017 13:36:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Thu, 16 Mar 2017 13:36:48 -0000 Message-Id: In-Reply-To: <0819740f6be04cbabd6790c0b847624f@git.apache.org> References: <0819740f6be04cbabd6790c0b847624f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/13] ignite git commit: Implemented support for enforce join order flag. (cherry picked from commit a7f77d4) archived-at: Thu, 16 Mar 2017 13:36:43 -0000 Implemented support for enforce join order flag. (cherry picked from commit a7f77d4) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57362479 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57362479 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57362479 Branch: refs/heads/master Commit: 573624796b171b2420b87657598198f40a91f6bb Parents: 9fcb3e7 Author: Alexey Kuznetsov Authored: Wed Mar 1 22:09:40 2017 +0700 Committer: Alexey Kuznetsov Committed: Thu Mar 2 10:07:25 2017 +0700 ---------------------------------------------------------------------- .../internal/visor/query/VisorQueryArgV3.java | 51 ++++++++++++++++++++ .../internal/visor/query/VisorQueryJob.java | 6 +-- .../resources/META-INF/classnames.properties | 1 + 3 files changed, 55 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/57362479/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java new file mode 100644 index 0000000..f32c00a --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java @@ -0,0 +1,51 @@ +/* + * 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 VisorQueryArgV3 extends VisorQueryArgV2 { + /** */ + private static final long serialVersionUID = 0L; + + /** Enforce join order flag. */ + private final boolean enforceJoinOrder; + + /** + * @param cacheName Cache name for query. + * @param qryTxt Query text. + * @param distributedJoins If {@code true} then distributed joins enabled. + * @param enforceJoinOrder If {@code true} then enforce join order. + * @param loc Flag whether to execute query locally. + * @param pageSize Result batch size. + */ + public VisorQueryArgV3(String cacheName, String qryTxt, + boolean distributedJoins, boolean enforceJoinOrder, boolean loc, int pageSize) { + super(cacheName, qryTxt, distributedJoins, loc, pageSize); + + this.enforceJoinOrder = enforceJoinOrder; + } + + /** + * @return Enforce join order flag. + */ + public boolean enforceJoinOrder() { + return enforceJoinOrder; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/57362479/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 c66b2dd..1ac90ad 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 @@ -131,9 +131,8 @@ public class VisorQueryJob extends VisorJob