Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B48D817DF1 for ; Thu, 2 Apr 2015 07:56:06 +0000 (UTC) Received: (qmail 49589 invoked by uid 500); 2 Apr 2015 07:56:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 49557 invoked by uid 500); 2 Apr 2015 07:56:06 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 49548 invoked by uid 99); 2 Apr 2015 07:56:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2015 07:56:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 02 Apr 2015 07:56:05 +0000 Received: (qmail 49278 invoked by uid 99); 2 Apr 2015 07:55:45 -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, 02 Apr 2015 07:55:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1093FE0987; Thu, 2 Apr 2015 07:55:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: 10002 review Date: Thu, 2 Apr 2015 07:55:45 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10002 acb5d2b4c -> 162bdac1c 10002 review Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/162bdac1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/162bdac1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/162bdac1 Branch: refs/heads/ignite-gg-10002 Commit: 162bdac1c1407cf870fb6b18ba3bb7440b1a300c Parents: acb5d2b Author: Yakov Zhdanov Authored: Thu Apr 2 10:55:24 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Apr 2 10:55:24 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 8 ++++++-- .../query/h2/twostep/messages/GridQueryNextPageResponse.java | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/162bdac1/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 4e30f41..048a0c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -124,7 +124,10 @@ public class GridQueryProcessor extends GridProcessorAdapter { desc.name(valCls != null ? typeName(valCls) : meta.getValueType()); desc.valueClass(valCls != null ? valCls : Object.class); - desc.keyClass(meta.getKeyType() == null ? Object.class : U.classForName(meta.getKeyType(), Object.class)); + desc.keyClass( + meta.getKeyType() == null ? + Object.class : + U.classForName(meta.getKeyType(), Object.class)); TypeId typeId; @@ -1448,7 +1451,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { else { int isKeyProp0 = isKeyProp; - if (isKeyProp0 == 0) { // Key is allowed to be a non-portable object here. + if (isKeyProp0 == 0) { + // Key is allowed to be a non-portable object here. // We check key before value consistently with ClassProperty. if (ctx.cacheObjects().isPortableObject(key) && ctx.cacheObjects().hasField(key, propName)) isKeyProp = isKeyProp0 = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/162bdac1/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index 22f9cb4..b7b6f4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.query.h2.twostep.messages; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.extensions.communication.*; @@ -46,6 +47,7 @@ public class GridQueryNextPageResponse implements Message { private byte[] rows; /** */ + @GridDirectTransient private transient Object plainRows; /**