You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2017/01/30 14:21:10 UTC
[32/32] ignite git commit: IGNITE-4621 Hang on broadcast when
BinaryUtils.FIELDS_SORTED_ORDER == true
IGNITE-4621 Hang on broadcast when BinaryUtils.FIELDS_SORTED_ORDER == true
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7bd81645
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7bd81645
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7bd81645
Branch: refs/heads/ignite-4621
Commit: 7bd81645602aa1979f704e154d8223d00bbd3c39
Parents: 83ad094
Author: Anton Vinogradov <av...@apache.org>
Authored: Mon Jan 30 17:18:03 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Jan 30 17:18:03 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/binary/BinaryContext.java | 3 +++
.../java/org/apache/ignite/internal/binary/BinaryTreeMap.java | 6 +++++-
modules/core/src/main/resources/META-INF/classnames.properties | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7bd81645/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 4030ef0..7b21dfb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -190,6 +190,9 @@ public class BinaryContext {
sysClss.add(GridClosureProcessor.C4V2.class.getName());
sysClss.add(GridClosureProcessor.C4MLAV2.class.getName());
+ // BinaryUtils.FIELDS_SORTED_ORDER support, since it uses TreeMap at BinaryMetadata.
+ sysClss.add(BinaryTreeMap.class.getName());
+
if (BinaryUtils.wrapTrees()) {
sysClss.add(TreeMap.class.getName());
sysClss.add(TreeSet.class.getName());
http://git-wip-us.apache.org/repos/asf/ignite/blob/7bd81645/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java
index 6a7cf9b..3dae8ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.binary;
+import java.io.Serializable;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryRawWriter;
@@ -32,7 +33,10 @@ import java.util.TreeMap;
/**
* Binary {@link TreeMap} wrapper.
*/
-public class BinaryTreeMap implements Binarylizable {
+public class BinaryTreeMap implements Binarylizable, Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
/** Original map. */
private TreeMap map;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7bd81645/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 8a6dc66..39a7f3f 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -241,6 +241,7 @@ org.apache.ignite.internal.binary.BinaryObjectOffheapImpl
org.apache.ignite.internal.binary.BinaryReaderExImpl$Flag
org.apache.ignite.internal.binary.BinarySchema
org.apache.ignite.internal.binary.BinarySchema$Confirmation
+org.apache.ignite.internal.binary.BinaryTreeMap
org.apache.ignite.internal.binary.BinaryWriteMode
org.apache.ignite.internal.binary.builder.BinaryLazyMap$1$1$1
org.apache.ignite.internal.client.GridClientAuthenticationException
@@ -376,9 +377,9 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$12
org.apache.ignite.internal.processors.cache.GridCacheAdapter$13
org.apache.ignite.internal.processors.cache.GridCacheAdapter$14
org.apache.ignite.internal.processors.cache.GridCacheAdapter$15
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$16$1
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$16
org.apache.ignite.internal.processors.cache.GridCacheAdapter$17
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$18
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$18$1
org.apache.ignite.internal.processors.cache.GridCacheAdapter$2
org.apache.ignite.internal.processors.cache.GridCacheAdapter$26$1
org.apache.ignite.internal.processors.cache.GridCacheAdapter$28