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:28 UTC
[43/50] [abbrv] ignite git commit: Finalization.
Finalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e6ec8ef
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e6ec8ef
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e6ec8ef
Branch: refs/heads/ignite-2649
Commit: 4e6ec8ef5998861ea9eb9bbbaeb34610c356aa14
Parents: 86988d2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 13:57:59 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 13:57:59 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 4 ++--
.../ignite/internal/processors/igfs/IgfsPaths.java | 2 +-
.../apache/ignite/marshaller/MarshallerUtils.java | 15 +++++++++++++++
.../checkpoint/sharedfs/SharedFsCheckpointSpi.java | 8 ++++----
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 +++----
.../apache/ignite/stream/socket/SocketStreamer.java | 2 +-
6 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e6ec8ef/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 927545e..76a3f21 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
@@ -186,7 +186,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
private IdentityHashMap<CacheStore, ThreadLocal> sesHolders = new IdentityHashMap<>();
/** Must use JDK marshaller since it is used by discovery to fire custom events. */
- private Marshaller marshaller = new JdkMarshaller();
+ private final Marshaller marshaller;
/** Count down latch for caches. */
private final CountDownLatch cacheStartedLatch = new CountDownLatch(1);
@@ -207,7 +207,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
jCacheProxies = new ConcurrentHashMap<>();
stopSeq = new LinkedList<>();
- MarshallerUtils.withNodeName(marshaller, ctx.gridName());
+ marshaller = MarshallerUtils.jdkMarshaller(ctx.gridName());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e6ec8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
index da0a347..6993b0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
@@ -78,7 +78,7 @@ public class IgfsPaths implements Externalizable {
else {
ByteArrayOutputStream out = new ByteArrayOutputStream();
- MarshallerUtils.withNodeName(new JdkMarshaller(), igfsCtx.kernalContext().gridName()).marshal(payload, out);
+ MarshallerUtils.jdkMarshaller(igfsCtx.kernalContext().gridName()).marshal(payload, out);
payloadBytes = out.toByteArray();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e6ec8ef/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 d730589..93226e8 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
@@ -17,6 +17,7 @@
package org.apache.ignite.marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.jetbrains.annotations.Nullable;
/**
@@ -38,6 +39,20 @@ public class MarshallerUtils {
}
/**
+ * Create JDK marshaller with provided node name.
+ *
+ * @param nodeName Node name.
+ * @return JDK marshaller.
+ */
+ public static JdkMarshaller jdkMarshaller(@Nullable String nodeName) {
+ JdkMarshaller marsh = new JdkMarshaller();
+
+ withNodeName(new JdkMarshaller(), nodeName);
+
+ return marsh;
+ }
+
+ /**
* Private constructor.
*/
private MarshallerUtils() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e6ec8ef/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index efb5b99..092c864 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -215,10 +215,10 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
this.gridName = gridName;
- marsh = ignite.configuration().getMarshaller() instanceof BinaryMarshaller ? new JdkMarshaller() :
- ignite.configuration().getMarshaller();
-
- MarshallerUtils.withNodeName(marsh, ignite.name());
+ if (ignite.configuration().getMarshaller() instanceof BinaryMarshaller)
+ marsh = MarshallerUtils.jdkMarshaller(ignite.name());
+ else
+ marsh = ignite.configuration().getMarshaller();
folder = getNextSharedPath();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e6ec8ef/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 1b37412..d9560c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1378,7 +1378,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
IgniteCheckedException err = null;
try {
- MarshallerUtils.withNodeName(marshaller(), ignite.name()).marshal(msg, out);
+ marshaller().marshal(msg, out);
}
catch (IgniteCheckedException e) {
err = e;
@@ -1462,7 +1462,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
try {
sock.setSoTimeout((int)timeout);
- T res = MarshallerUtils.withNodeName(marshaller(), ignite.name()).unmarshal(in == null ?
+ T res = marshaller().unmarshal(in == null ?
sock.getInputStream() : in, U.resolveClassLoader(ignite.configuration()));
return res;
@@ -1710,8 +1710,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
for (Map.Entry<Integer, byte[]> entry : data.entrySet()) {
try {
- Serializable compData =
- MarshallerUtils.withNodeName(marshaller(), ignite.name()).unmarshal(entry.getValue(), clsLdr);
+ Serializable compData = marshaller().unmarshal(entry.getValue(), clsLdr);
data0.put(entry.getKey(), compData);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e6ec8ef/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
index fd2b037..b239198 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java
@@ -225,7 +225,7 @@ public class SocketStreamer<T, K, V> extends StreamAdapter<T, K, V> {
* @param gridName Grid name.
*/
private DefaultConverter(@Nullable String gridName) {
- marsh = MarshallerUtils.withNodeName(new JdkMarshaller(), gridName);
+ marsh = MarshallerUtils.jdkMarshaller(gridName);
}
/** {@inheritDoc} */