Cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acf0705e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acf0705e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acf0705e Branch: refs/heads/ignite-2649 Commit: acf0705e1cf656cdfddffe1e8ddecbcf4f44ed35 Parents: a7f99d9 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Aug 24 16:23:10 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Aug 24 16:23:10 2016 +0300 ---------------------------------------------------------------------- .../connection/GridClientNioTcpConnection.java | 3 +- .../processors/cache/GridCacheProcessor.java | 8 ++--- .../cache/query/GridCacheLocalQueryFuture.java | 12 +++---- .../cache/query/GridCacheQueryRequest.java | 9 ++--- .../closure/GridClosureProcessor.java | 6 ++-- .../rest/protocols/tcp/GridTcpRestParser.java | 3 +- .../ignite/marshaller/MarshallerUtils.java | 36 +++----------------- 7 files changed, 25 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java index 579d185..093cf1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java @@ -540,8 +540,7 @@ public class GridClientNioTcpConnection extends GridClientConnection { GridClientMessage res0 = res; if (res instanceof GridRouterResponse) { - res0 = MarshallerUtils.unmarshal(marsh, ((GridRouterResponse)res).body(), - ses.gridName()); + res0 = marsh.unmarshal(((GridRouterResponse)res).body()); res0.requestId(res.requestId()); res0.clientId(res.clientId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index e6ba3ef..3cc33b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -106,7 +106,6 @@ import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.lang.IgniteOutClosureX; import org.apache.ignite.internal.util.tostring.GridToStringInclude; -import org.apache.ignite.internal.util.typedef.CIX1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; @@ -3398,8 +3397,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (ldr == null) ldr = val.getCacheStoreFactory().getClass().getClassLoader(); - MarshallerUtils.clone(marshaller, val.getCacheStoreFactory(), - U.resolveClassLoader(ldr, ctx.config()), ctx.gridName()); + MarshallerUtils.marshalUnmarshal(ctx.gridName(), marshaller, val.getCacheStoreFactory(), + U.resolveClassLoader(ldr, ctx.config())); } catch (IgniteCheckedException e) { throw new IgniteCheckedException("Failed to validate cache configuration. " + @@ -3408,7 +3407,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { } try { - return MarshallerUtils.clone(marshaller, val, U.resolveClassLoader(ctx.config()), ctx.gridName()); + return MarshallerUtils.marshalUnmarshal(ctx.gridName(), marshaller, val, + U.resolveClassLoader(ctx.config())); } catch (IgniteCheckedException e) { throw new IgniteCheckedException("Failed to validate cache configuration " + http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java index d524d70..7f33220 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java @@ -113,13 +113,13 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap Marshaller marsh = cctx.marshaller(); - IgniteReducer<Object, Object> rdc = qry.reducer() != null - ? MarshallerUtils.clone(marsh, qry.reducer(), U.resolveClassLoader(cctx.gridConfig()), cctx.gridName()) - : null; + IgniteReducer<Object, Object> rdc = qry.reducer() != null ? + MarshallerUtils.marshalUnmarshal(cctx.gridName(), marsh, qry.reducer(), + U.resolveClassLoader(cctx.gridConfig())) : null; - IgniteClosure<Object, Object> trans = qry.transform() != null - ? MarshallerUtils.clone(marsh, qry.transform(), U.resolveClassLoader(cctx.gridConfig()), cctx.gridName()) - : null; + IgniteClosure<Object, Object> trans = qry.transform() != null ? + MarshallerUtils.marshalUnmarshal(cctx.gridName(), marsh, qry.transform(), + U.resolveClassLoader(cctx.gridConfig())) : null; return new GridCacheQueryInfo( true, http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index b5a6fe2..d4de268 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -350,10 +350,11 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache void beforeLocalExecution(GridCacheContext ctx) throws IgniteCheckedException { Marshaller marsh = ctx.marshaller(); - rdc = rdc != null ? MarshallerUtils.clone(marsh, rdc, - U.resolveClassLoader(ctx.gridConfig()), ctx.gridName()) : null; - trans = trans != null ? MarshallerUtils.clone(marsh, trans, - U.resolveClassLoader(ctx.gridConfig()), ctx.gridName()) : null; + rdc = rdc != null ? MarshallerUtils.marshalUnmarshal(ctx.gridName(), marsh, rdc, + U.resolveClassLoader(ctx.gridConfig())) : null; + + trans = trans != null ? MarshallerUtils.marshalUnmarshal(ctx.gridName(), marsh, trans, + U.resolveClassLoader(ctx.gridConfig())) : null; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index 30f99a5..a330986 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -1151,10 +1151,12 @@ public class GridClosureProcessor extends GridProcessorAdapter { if (c.job == closure) c.job = MarshallerUtils.unmarshal(marsh, closureBytes, U.resolveClassLoader(ctx.config()), ctx.gridName()); else - c.job = MarshallerUtils.clone(marsh, c.job, U.resolveClassLoader(ctx.config()), ctx.gridName()); + c.job = MarshallerUtils.marshalUnmarshal(ctx.gridName(), marsh, c.job, + U.resolveClassLoader(ctx.config())); } else - job = MarshallerUtils.clone(marsh, job, U.resolveClassLoader(ctx.config()), ctx.gridName()); + job = MarshallerUtils.marshalUnmarshal(ctx.gridName(), marsh, job, + U.resolveClassLoader(ctx.config())); } else hadLocNode = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java index d7873a2..8c14305 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -520,8 +520,7 @@ public class GridTcpRestParser implements GridNioParser { else { GridClientMarshaller marsh = marshaller(ses); - msg = MarshallerUtils.unmarshal(marsh, state.buffer().toByteArray(), - ses.gridName()); + msg = marsh.unmarshal(state.buffer().toByteArray()); msg.requestId(state.header().reqId()); msg.clientId(state.header().clientId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/acf0705e/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java index ce143ff..c1dc373 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java @@ -21,10 +21,8 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.LocalGridName; -import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; import org.jetbrains.annotations.Nullable; -import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -180,16 +178,16 @@ public final class MarshallerUtils { /** * Marshal and unmarshal object. * + * @param <T> Target type. + * @param gridName Grid name. * @param marshaller Marshaller. * @param obj Object to clone. * @param clsLdr Class loader. - * @param gridName Grid name. - * @param <T> Target type. * @return Deserialized value. * @throws IgniteCheckedException If fail. */ - public static <T> T clone(final Marshaller marshaller, T obj, @Nullable ClassLoader clsLdr, - final String gridName) throws IgniteCheckedException { + public static <T> T marshalUnmarshal(final String gridName, final Marshaller marshaller, T obj, + @Nullable ClassLoader clsLdr) throws IgniteCheckedException { final LocalGridName gridNameTl = gridName(); final String gridNameStr = gridNameTl.getGridName(); @@ -205,32 +203,6 @@ public final class MarshallerUtils { } /** - * Unmarshal object and set grid name thread local. - * - * @param gridMarshaller Grid marshaller. - * @param bytes Binary data. - * @param gridName Grid name. - * @param <T> Target type. - * @return Deserialized value. - * @throws IOException If fail. - */ - public static <T> T unmarshal(GridClientMarshaller gridMarshaller, byte[] bytes, - String gridName) throws IOException { - final LocalGridName gridNameTl = gridName(); - - final String gridNameStr = gridNameTl.getGridName(); - final boolean init = gridNameTl.isSet(); - - try { - gridNameTl.setGridName(true, gridName); - - return gridMarshaller.unmarshal(bytes); - } finally { - gridNameTl.setGridName(init, gridNameStr); - } - } - - /** * @return Grid name thread local. */ private static LocalGridName gridName() {
