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:26 UTC
[41/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/132283f4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/132283f4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/132283f4
Branch: refs/heads/ignite-2649
Commit: 132283f4c9cb617adcdbd3e56aa70f673019fc41
Parents: 51d5f03
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 13:46:04 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 13:46:04 2016 +0300
----------------------------------------------------------------------
.../query/jdbc/GridCacheQueryJdbcTask.java | 3 +--
.../ignite/marshaller/MarshallerUtils.java | 26 --------------------
.../TcpDiscoveryMulticastIpFinder.java | 6 ++---
3 files changed, 3 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/132283f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 688ab27..5b973da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -52,7 +52,6 @@ import org.apache.ignite.internal.util.typedef.CAX;
import org.apache.ignite.internal.util.typedef.F;
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.marshaller.jdk.JdkMarshaller;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
@@ -84,7 +83,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
try {
assert arg != null;
- Map<String, Object> args = MarshallerUtils.unmarshal(ignite.name(), MARSHALLER, arg, null);
+ Map<String, Object> args = MARSHALLER.unmarshal(arg, null);
boolean first = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/132283f4/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 0688fdb..d730589 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,12 +17,8 @@
package org.apache.ignite.marshaller;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.util.IgniteUtils;
import org.jetbrains.annotations.Nullable;
-import java.io.InputStream;
-
/**
* Utility marshaller methods.
*/
@@ -42,28 +38,6 @@ public class MarshallerUtils {
}
/**
- * Unmarshal object and set grid name thread local.
- *
- * @param name Grid name.
- * @param marsh Marshaller.
- * @param arr Binary data.
- * @param ldr Class loader.
- * @return Deserialized object.
- * @throws IgniteCheckedException If failed.
- */
- public static <T> T unmarshal(String name, Marshaller marsh, byte[] arr, @Nullable ClassLoader ldr)
- throws IgniteCheckedException {
- String oldName = IgniteUtils.setCurrentIgniteName(name);
-
- try {
- return marsh.unmarshal(arr, ldr);
- }
- finally {
- IgniteUtils.restoreCurrentIgniteName(oldName);
- }
- }
-
- /**
* Private constructor.
*/
private MarshallerUtils() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/132283f4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index ff3d4fb..3ccd185 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -40,7 +40,6 @@ import org.apache.ignite.internal.util.typedef.internal.LT;
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.marshaller.jdk.JdkMarshaller;
import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.spi.IgniteSpiConfiguration;
@@ -701,7 +700,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
private AddressResponse(Collection<InetSocketAddress> addrs, final String gridName) throws IgniteCheckedException {
this.addrs = addrs;
- byte[] addrsData = MarshallerUtils.withNodeName(marsh, gridName).marshal(addrs);
+ byte[] addrsData = marsh.marshal(addrs);
data = new byte[U.IGNITE_HEADER.length + addrsData.length];
@@ -723,8 +722,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
this.data = data;
- addrs = MarshallerUtils.unmarshal(gridName, marsh,
- Arrays.copyOfRange(data, U.IGNITE_HEADER.length, data.length), null);
+ addrs = marsh.unmarshal(Arrays.copyOfRange(data, U.IGNITE_HEADER.length, data.length), null);
}
/**