ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [14/50] [abbrv] incubator-ignite git commit: 10002 review
Date Fri, 03 Apr 2015 22:46:06 GMT
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-674
Commit: 162bdac1c1407cf870fb6b18ba3bb7440b1a300c
Parents: acb5d2b
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Apr 2 10:55:24 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
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;
 
     /**


Mime
View raw message