You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/26 13:12:45 UTC
[17/17] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42c7da96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42c7da96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42c7da96
Branch: refs/heads/ignite-1232
Commit: 42c7da966c51d61e53b0c9b8a1dc2998f061da83
Parents: 2b26504
Author: sboikov <sb...@gridgain.com>
Authored: Fri Feb 26 15:12:15 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Feb 26 15:12:15 2016 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheQueryMarshallable.java | 4 +++-
.../processors/query/h2/twostep/messages/GridQueryRequest.java | 5 +++--
.../processors/query/h2/twostep/GridMapQueryExecutor.java | 2 +-
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../processors/query/h2/twostep/msg/GridH2QueryRequest.java | 5 +++--
5 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/42c7da96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMarshallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMarshallable.java
index 03ffc4f..d87936a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMarshallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMarshallable.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.query;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.marshaller.Marshaller;
/**
@@ -30,6 +31,7 @@ public interface GridCacheQueryMarshallable {
/**
* @param m Marshaller.
+ * @param ctx Context.
*/
- public void unmarshall(Marshaller m);
+ public void unmarshall(Marshaller m, GridKernalContext ctx);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/42c7da96/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
index a127697..f7de86c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
@@ -182,12 +183,12 @@ public class GridQueryRequest implements Message, GridCacheQueryMarshallable {
}
/** {@inheritDoc} */
- @Override public void unmarshall(Marshaller m) {
+ @Override public void unmarshall(Marshaller m, GridKernalContext ctx) {
if (F.isEmpty(qrys))
return;
for (GridCacheSqlQuery qry : qrys)
- qry.unmarshall(m);
+ qry.unmarshall(m, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/42c7da96/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index b45d962..e9e55a8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -176,7 +176,7 @@ public class GridMapQueryExecutor {
try {
if (msg instanceof GridCacheQueryMarshallable)
- ((GridCacheQueryMarshallable)msg).unmarshall(ctx.config().getMarshaller());
+ ((GridCacheQueryMarshallable)msg).unmarshall(ctx.config().getMarshaller(), ctx);
GridMapQueryExecutor.this.onMessage(nodeId, msg);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/42c7da96/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 6da1ef2..63f70b8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -194,7 +194,7 @@ public class GridReduceQueryExecutor {
try {
if (msg instanceof GridCacheQueryMarshallable)
- ((GridCacheQueryMarshallable)msg).unmarshall(ctx.config().getMarshaller());
+ ((GridCacheQueryMarshallable)msg).unmarshall(ctx.config().getMarshaller(), ctx);
GridReduceQueryExecutor.this.onMessage(nodeId, msg);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/42c7da96/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index 921d101..e8d97b3 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
@@ -228,12 +229,12 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable {
}
/** {@inheritDoc} */
- @Override public void unmarshall(Marshaller m) {
+ @Override public void unmarshall(Marshaller m, GridKernalContext ctx) {
if (F.isEmpty(qrys))
return;
for (GridCacheSqlQuery qry : qrys)
- qry.unmarshall(m);
+ qry.unmarshall(m, ctx);
}
/** {@inheritDoc} */