You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/07 11:17:10 UTC
[25/50] [abbrv] ignite git commit: Reverting.
Reverting.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34a3adad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34a3adad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34a3adad
Branch: refs/heads/ignite-2649
Commit: 34a3adad670c836cf6bcaff40c9c08f82af06227
Parents: d599f54
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 12:03:32 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 12:03:32 2016 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheSqlQuery.java | 7 ++-----
.../processors/query/h2/IgniteH2Indexing.java | 15 ++++-----------
.../query/h2/twostep/GridReduceQueryExecutor.java | 2 +-
3 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/34a3adad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index bd10bac..0733827 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -133,10 +132,9 @@ public class GridCacheSqlQuery implements Message {
/**
* @param m Marshaller.
- * @param kernalCtx kernal context.
* @throws IgniteCheckedException If failed.
*/
- public void marshallParams(Marshaller m, final GridKernalContext kernalCtx) throws IgniteCheckedException {
+ public void marshallParams(Marshaller m) throws IgniteCheckedException {
if (paramsBytes != null)
return;
@@ -147,7 +145,6 @@ public class GridCacheSqlQuery implements Message {
/**
* @param m Marshaller.
- * @param ctx kernal context.
* @throws IgniteCheckedException If failed.
*/
public void unmarshallParams(Marshaller m, GridKernalContext ctx) throws IgniteCheckedException {
@@ -156,7 +153,7 @@ public class GridCacheSqlQuery implements Message {
assert paramsBytes != null;
- params = MarshallerUtils.unmarshal(ctx.gridName(), m, paramsBytes, U.resolveClassLoader(ctx.config()));
+ params = m.unmarshal(paramsBytes, U.resolveClassLoader(ctx.config()));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/34a3adad/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 0066368..7f0e230 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -76,7 +76,6 @@ import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.spi.IgniteSpiCloseableIterator;
@@ -1536,19 +1535,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
protected JavaObjectSerializer h2Serializer() {
return new JavaObjectSerializer() {
@Override public byte[] serialize(Object obj) throws Exception {
- if (ctx != null)
- return MarshallerUtils.marshal(ctx, obj);
- else
- return marshaller.marshal(obj);
+ return marshaller.marshal(obj);
}
@Override public Object deserialize(byte[] bytes) throws Exception {
- if (ctx != null) {
- return MarshallerUtils.unmarshal(ctx.gridName(), marshaller, bytes,
- U.resolveClassLoader(ctx.config()));
- }
- else
- return marshaller.unmarshal(bytes, null);
+ ClassLoader clsLdr = ctx != null ? U.resolveClassLoader(ctx.config()) : null;
+
+ return marshaller.unmarshal(bytes, clsLdr);
}
};
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34a3adad/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 1fa3368..47ab083 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
@@ -564,7 +564,7 @@ public class GridReduceQueryExecutor {
Marshaller m = ctx.config().getMarshaller();
for (GridCacheSqlQuery mapQry : mapQrys)
- mapQry.marshallParams(m, ctx);
+ mapQry.marshallParams(m);
}
boolean retry = false;