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:23 UTC
[38/50] [abbrv] ignite git commit: WIP
WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bed68ed1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bed68ed1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bed68ed1
Branch: refs/heads/ignite-2649
Commit: bed68ed1c0d5cb0fa085cb8782eba1a87a68ce2d
Parents: 56b159a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 13:06:58 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 13:06:58 2016 +0300
----------------------------------------------------------------------
.../internal/GridEventConsumeHandler.java | 31 ++++++++++----------
.../internal/GridMessageListenHandler.java | 14 ++++-----
.../checkpoint/GridCheckpointManager.java | 11 +++----
3 files changed, 24 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bed68ed1/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 243d5f2..19bf1a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -50,7 +50,7 @@ import org.apache.ignite.internal.util.typedef.T3;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.marshaller.MarshallerUtils;
+import org.apache.ignite.marshaller.Marshaller;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.events.EventType.EVTS_ALL;
@@ -219,7 +219,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
if (cctx.deploymentEnabled() &&
ctx.discovery().cacheNode(node, cacheName)) {
- wrapper.p2pMarshal(ctx);
+ wrapper.p2pMarshal(ctx.config().getMarshaller());
wrapper.cacheName = cacheName;
@@ -338,7 +338,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
}
try {
- wrapper.p2pUnmarshal(ctx, U.resolveClassLoader(ldr, ctx.config()));
+ wrapper.p2pUnmarshal(ctx.config().getMarshaller(), U.resolveClassLoader(ldr, ctx.config()));
}
catch (IgniteCheckedException e) {
U.error(ctx.log(getClass()), "Failed to unmarshal event.", e);
@@ -370,7 +370,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
depInfo = new GridDeploymentInfoBean(dep);
- filterBytes = MarshallerUtils.marshal(ctx, filter);
+ filterBytes = ctx.config().getMarshaller().marshal(filter);
}
}
@@ -387,8 +387,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
if (dep == null)
throw new IgniteDeploymentCheckedException("Failed to obtain deployment for class: " + clsName);
- filter = MarshallerUtils.unmarshal(ctx.gridName(), ctx.config().getMarshaller(), filterBytes,
- U.resolveClassLoader(dep.classLoader(), ctx.config()));
+ filter = ctx.config().getMarshaller().unmarshal(filterBytes, U.resolveClassLoader(dep.classLoader(), ctx.config()));
}
}
@@ -485,27 +484,27 @@ class GridEventConsumeHandler implements GridContinuousHandler {
}
/**
- * @param ctx Kernal context.
- * @throws IgniteCheckedException
+ * @param marsh Marshaller.
+ * @throws IgniteCheckedException In case of error.
*/
- void p2pMarshal(final GridKernalContext ctx) throws IgniteCheckedException {
- assert ctx.config().getMarshaller() != null;
+ void p2pMarshal(Marshaller marsh) throws IgniteCheckedException {
+ assert marsh != null;
- bytes = MarshallerUtils.marshal(ctx, evt);
+ bytes = marsh.marshal(evt);
}
/**
- * @param ctx Kernal context.
+ * @param marsh Marshaller.
* @param ldr Class loader.
- * @throws IgniteCheckedException
+ * @throws IgniteCheckedException In case of error.
*/
- void p2pUnmarshal(final GridKernalContext ctx, @Nullable ClassLoader ldr) throws IgniteCheckedException {
- assert ctx.config().getMarshaller() != null;
+ void p2pUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException {
+ assert marsh != null;
assert evt == null;
assert bytes != null;
- evt = MarshallerUtils.unmarshal(ctx.gridName(), ctx.config().getMarshaller(), bytes, ldr);
+ evt = marsh.unmarshal(bytes, ldr);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/bed68ed1/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
index 3d1f399..0ac6877 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
@@ -35,7 +35,6 @@ import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.marshaller.MarshallerUtils;
import org.jetbrains.annotations.Nullable;
/**
@@ -160,9 +159,9 @@ public class GridMessageListenHandler implements GridContinuousHandler {
assert ctx.config().isPeerClassLoadingEnabled();
if (topic != null)
- topicBytes = MarshallerUtils.marshal(ctx, topic);
+ topicBytes = ctx.config().getMarshaller().marshal(topic);
- predBytes = MarshallerUtils.marshal(ctx, pred);
+ predBytes = ctx.config().getMarshaller().marshal(pred);
// Deploy only listener, as it is very likely to be of some user class.
GridPeerDeployAware pda = U.peerDeployAware(pred);
@@ -193,13 +192,10 @@ public class GridMessageListenHandler implements GridContinuousHandler {
ClassLoader ldr = dep.classLoader();
- if (topicBytes != null) {
- topic = MarshallerUtils.unmarshal(ctx.gridName(), ctx.config().getMarshaller(), topicBytes,
- U.resolveClassLoader(ldr, ctx.config()));
- }
+ if (topicBytes != null)
+ topic = ctx.config().getMarshaller().unmarshal(topicBytes, U.resolveClassLoader(ldr, ctx.config()));
- pred = MarshallerUtils.unmarshal(ctx.gridName(), ctx.config().getMarshaller(), predBytes,
- U.resolveClassLoader(ldr, ctx.config()));
+ pred = ctx.config().getMarshaller().unmarshal(predBytes, U.resolveClassLoader(ldr, ctx.config()));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/bed68ed1/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
index f2fd64f..6b95dad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
@@ -44,7 +44,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.checkpoint.CheckpointListener;
import org.apache.ignite.spi.checkpoint.CheckpointSpi;
@@ -174,7 +173,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> {
try {
switch (scope) {
case GLOBAL_SCOPE: {
- byte[] data = state == null ? null : MarshallerUtils.marshal(ctx, state);
+ byte[] data = state == null ? null : marsh.marshal(state);
saved = getSpi(ses.getCheckpointSpi()).saveCheckpoint(key, data, timeout, override);
@@ -205,7 +204,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> {
timeout = ses.getEndTime() - now;
// Save it first to avoid getting null value on another node.
- byte[] data = state == null ? null : MarshallerUtils.marshal(ctx, state);
+ byte[] data = state == null ? null : marsh.marshal(state);
Set<String> keys = keyMap.get(ses.getId());
@@ -338,10 +337,8 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> {
Serializable state = null;
// Always deserialize with task/session class loader.
- if (data != null) {
- state = MarshallerUtils.unmarshal(ctx.gridName(), marsh, data,
- U.resolveClassLoader(ses.getClassLoader(), ctx.config()));
- }
+ if (data != null)
+ state = marsh.unmarshal(data, U.resolveClassLoader(ses.getClassLoader(), ctx.config()));
record(EVT_CHECKPOINT_LOADED, key);