ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [49/50] [abbrv] incubator-ignite git commit: IGNITE-471 - Marshalling fixes
Date Sun, 15 Mar 2015 05:06:11 GMT
IGNITE-471 - Marshalling fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0aeef707
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0aeef707
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0aeef707

Branch: refs/heads/ignite-471
Commit: 0aeef707712b1ee2633f809e4e8e6327911945bb
Parents: 2f1b482
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sat Mar 14 17:36:15 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sat Mar 14 17:36:15 2015 -0700

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java   |  3 ++-
 .../processors/cache/query/GridCacheQueryManager.java | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0aeef707/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9b1cc57..f05b3ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -6070,7 +6070,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
                     ttl = 0;
             }
 
-            GridCacheRawVersionedEntry e = new GridCacheRawVersionedEntry(ctx.toCacheKeyObject(key),
+            GridCacheRawVersionedEntry e = new GridCacheRawVersionedEntry(
+                key,
                 ctx.toCacheObject(val),
                 ttl,
                 0,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0aeef707/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index e300309..4d06bca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -588,15 +588,15 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
 
         T2<String, List<Object>> resKey = null;
 
-        if (qry.type() == SQL_FIELDS) {
-            if (qry.clause() == null) {
-                assert !loc;
+        if (qry.clause() == null) {
+            assert !loc;
 
-                throw new IgniteCheckedException("Received next page request after iterator
was removed. " +
-                    "Consider increasing maximum number of stored iterators (see " +
-                    "GridCacheConfiguration.getMaximumQueryIteratorCount() configuration
property).");
-            }
+            throw new IgniteCheckedException("Received next page request after iterator was
removed. " +
+                "Consider increasing maximum number of stored iterators (see " +
+                "GridCacheConfiguration.getMaximumQueryIteratorCount() configuration property).");
+        }
 
+        if (qry.type() == SQL_FIELDS) {
             if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_EXECUTED)) {
                 cctx.gridEvents().record(new CacheQueryExecutedEvent<>(
                     cctx.localNode(),


Mime
View raw message