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/f505e209 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f505e209 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f505e209 Branch: refs/heads/ignite-1.9 Commit: f505e2095ce509d738b06e9442556e793fa05ab5 Parents: 6667f3b Author: Anton Vinogradov <[email protected]> Authored: Mon Jan 30 17:18:03 2017 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Feb 1 14:31:59 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/binary/BinaryContext.java | 3 + .../ignite/internal/binary/BinaryTreeMap.java | 6 +- .../resources/META-INF/classnames.properties | 62 +++++++++++++++----- 3 files changed, 54 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f505e209/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 2237c27..1ad2a0f 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 @@ -191,6 +191,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/f505e209/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/f505e209/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..df605da 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 @@ -294,12 +295,17 @@ org.apache.ignite.internal.jdbc2.JdbcDatabaseMetadata$UpdateMetadataTask org.apache.ignite.internal.jdbc2.JdbcQueryTask org.apache.ignite.internal.jdbc2.JdbcQueryTask$1 org.apache.ignite.internal.jdbc2.JdbcQueryTask$QueryResult +org.apache.ignite.internal.jdbc2.JdbcQueryTaskV2 +org.apache.ignite.internal.jdbc2.JdbcQueryTaskV2$1 +org.apache.ignite.internal.jdbc2.JdbcQueryTaskV2$QueryResult +org.apache.ignite.internal.jdbc2.JdbcSqlFieldsQuery org.apache.ignite.internal.managers.GridManagerAdapter$1$1 org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager$CheckpointSet org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest org.apache.ignite.internal.managers.communication.GridIoManager$ConcurrentHashMap0 org.apache.ignite.internal.managers.communication.GridIoMessage org.apache.ignite.internal.managers.communication.GridIoUserMessage +org.apache.ignite.internal.managers.communication.IgniteIoTestMessage org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean org.apache.ignite.internal.managers.deployment.GridDeploymentPerVersionStore$2 org.apache.ignite.internal.managers.deployment.GridDeploymentRequest @@ -376,9 +382,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 @@ -387,20 +393,20 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$3 org.apache.ignite.internal.processors.cache.GridCacheAdapter$30 org.apache.ignite.internal.processors.cache.GridCacheAdapter$32 org.apache.ignite.internal.processors.cache.GridCacheAdapter$4 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$48 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$49 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$50 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$51 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$52 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$53 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$54 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$55 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$57 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$58 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$58$1 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$59 org.apache.ignite.internal.processors.cache.GridCacheAdapter$6 org.apache.ignite.internal.processors.cache.GridCacheAdapter$60 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$61 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$62 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$63 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$64 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$65 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$66 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$67 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$69 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$70 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$70$1 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$71 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$72 org.apache.ignite.internal.processors.cache.GridCacheAdapter$9 org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOp$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOp$1$1 @@ -1111,6 +1117,12 @@ org.apache.ignite.internal.processors.hadoop.HadoopJobStatus org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlan org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo org.apache.ignite.internal.processors.hadoop.HadoopTaskType +org.apache.ignite.internal.processors.hadoop.message.HadoopMessage +org.apache.ignite.internal.processors.hadoop.shuffle.HadoopDirectShuffleMessage +org.apache.ignite.internal.processors.hadoop.shuffle.HadoopShuffleAck +org.apache.ignite.internal.processors.hadoop.shuffle.HadoopShuffleFinishRequest +org.apache.ignite.internal.processors.hadoop.shuffle.HadoopShuffleFinishResponse +org.apache.ignite.internal.processors.hadoop.shuffle.HadoopShuffleMessage org.apache.ignite.internal.processors.igfs.IgfsAckMessage org.apache.ignite.internal.processors.igfs.IgfsAttributes org.apache.ignite.internal.processors.igfs.IgfsBlockKey @@ -1208,6 +1220,7 @@ org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessor org.apache.ignite.internal.processors.platform.cache.PlatformCachePartialUpdateException org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinity$1 org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction +org.apache.ignite.internal.processors.platform.cache.expiry.PlatformExpiryPolicyFactory org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryImpl @@ -1244,6 +1257,9 @@ org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetCacheStore$9 org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetConfigurationClosure org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetService org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetServiceImpl +org.apache.ignite.internal.processors.platform.entityframework.PlatformDotNetEntityFrameworkCacheExtension$CleanupCompletionListener +org.apache.ignite.internal.processors.platform.entityframework.PlatformDotNetEntityFrameworkCacheExtension$RemoveOldEntriesRunnable +org.apache.ignite.internal.processors.platform.entityframework.PlatformDotNetEntityFrameworkIncreaseVersionProcessor org.apache.ignite.internal.processors.platform.events.PlatformEventFilterListenerImpl org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter org.apache.ignite.internal.processors.platform.messaging.PlatformMessageFilterImpl @@ -1266,6 +1282,7 @@ org.apache.ignite.internal.processors.query.GridQueryProcessor$6 org.apache.ignite.internal.processors.query.GridQueryProcessor$7 org.apache.ignite.internal.processors.query.GridQueryProcessor$8 org.apache.ignite.internal.processors.query.GridQueryProcessor$IndexType +org.apache.ignite.internal.processors.query.IgniteSQLException org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest @@ -1331,6 +1348,9 @@ org.apache.ignite.internal.processors.rest.handlers.datastructures.DataStructure org.apache.ignite.internal.processors.rest.handlers.query.CacheQueryFieldsMetaResult org.apache.ignite.internal.processors.rest.handlers.query.CacheQueryResult org.apache.ignite.internal.processors.rest.handlers.query.QueryCommandHandler$QueryCursorIterator +org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler$1 +org.apache.ignite.internal.processors.rest.handlers.redis.exception.GridRedisGenericException +org.apache.ignite.internal.processors.rest.handlers.redis.exception.GridRedisTypeException org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler$2 org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler$ExeCallable org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRequest @@ -1342,6 +1362,9 @@ org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpMemcachedNioList org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpMemcachedNioListener$2 org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestNioListener$1 org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestNioListener$1$1 +org.apache.ignite.internal.processors.rest.protocols.tcp.redis.GridRedisCommand +org.apache.ignite.internal.processors.rest.protocols.tcp.redis.GridRedisMessage +org.apache.ignite.internal.processors.rest.protocols.tcp.redis.GridRedisNioListener$1 org.apache.ignite.internal.processors.rest.request.RestQueryRequest$QueryType org.apache.ignite.internal.processors.service.GridServiceAssignments org.apache.ignite.internal.processors.service.GridServiceAssignmentsKey @@ -1586,10 +1609,14 @@ org.apache.ignite.internal.util.lang.IgniteReducer2X org.apache.ignite.internal.util.lang.IgniteReducer3 org.apache.ignite.internal.util.lang.IgniteReducer3X org.apache.ignite.internal.util.lang.IgniteReducerX +org.apache.ignite.internal.util.lang.IgniteSingletonIterator org.apache.ignite.internal.util.nio.GridNioEmbeddedFuture$1 org.apache.ignite.internal.util.nio.GridNioException org.apache.ignite.internal.util.nio.GridNioMessageTracker org.apache.ignite.internal.util.nio.GridNioServer$NioOperation +org.apache.ignite.internal.util.nio.GridNioServer$RandomBalancer +org.apache.ignite.internal.util.nio.GridNioServer$ReadWriteSizeBasedBalancer +org.apache.ignite.internal.util.nio.GridNioServer$SizeBasedBalancer org.apache.ignite.internal.util.nio.GridNioSessionMetaKey org.apache.ignite.internal.util.nio.ssl.GridNioSslHandler org.apache.ignite.internal.util.offheap.GridOffHeapEvent @@ -1864,12 +1891,15 @@ org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointData org.apache.ignite.spi.collision.jobstealing.JobStealingRequest org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi$PriorityGridCollisionJobContextComparator org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$1 +org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$10 +org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$11 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosure org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosure$1 -org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$8 -org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$9 +org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosureNew +org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosureNew$1 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeClosure org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeMessage +org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeMessage2 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeTimeoutException org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$NodeIdMessage org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$RecoveryLastReceivedMessage
