ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject incubator-ignite git commit: ignite-sql-tests - fix query request serializability
Date Thu, 12 Feb 2015 14:01:17 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sql-tests 458de6175 -> 5fb28ffaf


ignite-sql-tests - fix query request serializability


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

Branch: refs/heads/ignite-sql-tests
Commit: 5fb28ffaf648218f160cd6e0ddd998e5f3de1d4c
Parents: 458de61
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Thu Feb 12 16:55:47 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Thu Feb 12 16:55:47 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/query/GridCacheTwoStepQuery.java    | 2 +-
 .../processors/query/h2/twostep/messages/GridQueryRequest.java    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fb28ffa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index b1cb080..585d78e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -75,7 +75,7 @@ public class GridCacheTwoStepQuery implements Serializable {
      * @return Map queries.
      */
     public Collection<GridCacheSqlQuery> mapQueries() {
-        return mapQrys.values();
+        return new ArrayList<>(mapQrys.values()); // Copy to make it Serializable.
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fb28ffa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
index d5796cf..6c70ddc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
@@ -49,6 +49,9 @@ public class GridQueryRequest implements Serializable {
     public GridQueryRequest(long reqId, int pageSize, Collection<GridCacheSqlQuery>
qrys) {
         this.reqId = reqId;
         this.pageSize = pageSize;
+
+        assert qrys instanceof Serializable;
+
         this.qrys = qrys;
     }
 


Mime
View raw message