IGNITE-2099: Removed collection types which are no longer used.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75d5874c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75d5874c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75d5874c Branch: refs/heads/ignite-2099 Commit: 75d5874cb89722152de009c1581831bf6b2bc0e4 Parents: 5c41396 Author: vozerov-gridgain <[email protected]> Authored: Wed Dec 9 13:05:07 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Dec 9 13:05:07 2015 +0300 ---------------------------------------------------------------------- .../portable/GridPortableMarshaller.java | 18 ------ .../internal/portable/PortableContext.java | 59 +++++++++----------- .../ignite/internal/portable/PortableUtils.java | 38 ------------- .../portable/builder/PortableBuilderReader.java | 3 - .../builder/PortableBuilderSerializer.java | 8 +-- 5 files changed, 28 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java index 5244da8..a9df27d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java @@ -167,30 +167,12 @@ public class GridPortableMarshaller { public static final byte LINKED_HASH_SET = 4; /** */ - public static final byte TREE_SET = 5; - - /** */ - public static final byte CONC_SKIP_LIST_SET = 6; - - /** */ - public static final byte CONC_LINKED_QUEUE = 7; - - /** */ public static final byte HASH_MAP = 1; /** */ public static final byte LINKED_HASH_MAP = 2; /** */ - public static final byte TREE_MAP = 3; - - /** */ - public static final byte CONC_HASH_MAP = 4; - - /** */ - public static final byte PROPERTIES_MAP = 5; - - /** */ public static final int OBJECT_TYPE_ID = -1; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index 7449863..1f129cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -17,6 +17,33 @@ package org.apache.ignite.internal.portable; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.binary.BinaryIdMapper; +import org.apache.ignite.binary.BinaryInvalidTypeException; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinarySerializer; +import org.apache.ignite.binary.BinaryType; +import org.apache.ignite.binary.BinaryTypeConfiguration; +import org.apache.ignite.cache.CacheKeyConfiguration; +import org.apache.ignite.cache.affinity.AffinityKeyMapped; +import org.apache.ignite.configuration.BinaryConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl; +import org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey; +import org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.lang.GridMapEntry; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + import java.io.Externalizable; import java.io.File; import java.io.IOException; @@ -41,43 +68,11 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.Map; -import java.util.Properties; import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentSkipListSet; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.binary.BinaryIdMapper; -import org.apache.ignite.binary.BinaryInvalidTypeException; -import org.apache.ignite.binary.BinaryObjectException; -import org.apache.ignite.binary.BinarySerializer; -import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.binary.BinaryTypeConfiguration; -import org.apache.ignite.cache.CacheKeyConfiguration; -import org.apache.ignite.cache.affinity.AffinityKeyMapped; -import org.apache.ignite.configuration.BinaryConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.IgnitionEx; -import org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl; -import org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey; -import org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.internal.util.lang.GridMapEntry; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.T2; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.marshaller.MarshallerContext; -import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; -import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Portable context. http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java index 42d9d85..62d2e9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java @@ -49,13 +49,11 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentSkipListSet; import static java.nio.charset.StandardCharsets.UTF_8; @@ -68,9 +66,6 @@ import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR; import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR_ARR; import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLASS; import static org.apache.ignite.internal.portable.GridPortableMarshaller.COL; -import static org.apache.ignite.internal.portable.GridPortableMarshaller.CONC_HASH_MAP; -import static org.apache.ignite.internal.portable.GridPortableMarshaller.CONC_LINKED_QUEUE; -import static org.apache.ignite.internal.portable.GridPortableMarshaller.CONC_SKIP_LIST_SET; import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE; import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE_ARR; import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL; @@ -99,7 +94,6 @@ import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJECT_ import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR; import static org.apache.ignite.internal.portable.GridPortableMarshaller.OPTM_MARSH; import static org.apache.ignite.internal.portable.GridPortableMarshaller.PORTABLE_OBJ; -import static org.apache.ignite.internal.portable.GridPortableMarshaller.PROPERTIES_MAP; import static org.apache.ignite.internal.portable.GridPortableMarshaller.PROTO_VER; import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT; import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT_ARR; @@ -107,8 +101,6 @@ import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING; import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING_ARR; import static org.apache.ignite.internal.portable.GridPortableMarshaller.TIMESTAMP; import static org.apache.ignite.internal.portable.GridPortableMarshaller.TIMESTAMP_ARR; -import static org.apache.ignite.internal.portable.GridPortableMarshaller.TREE_MAP; -import static org.apache.ignite.internal.portable.GridPortableMarshaller.TREE_SET; import static org.apache.ignite.internal.portable.GridPortableMarshaller.UNREGISTERED_TYPE_ID; import static org.apache.ignite.internal.portable.GridPortableMarshaller.USER_COL; import static org.apache.ignite.internal.portable.GridPortableMarshaller.USER_SET; @@ -1800,21 +1792,6 @@ public class PortableUtils { break; - case TREE_SET: - col = new TreeSet<>(); - - break; - - case CONC_SKIP_LIST_SET: - col = new ConcurrentSkipListSet<>(); - - break; - - case CONC_LINKED_QUEUE: - col = new ConcurrentLinkedQueue<>(); - - break; - case USER_SET: col = U.newHashSet(size); @@ -1872,26 +1849,11 @@ public class PortableUtils { break; - case TREE_MAP: - map = new TreeMap<>(); - - break; - - case CONC_HASH_MAP: - map = new ConcurrentHashMap<>(size); - - break; - case USER_COL: map = U.newHashMap(size); break; - case PROPERTIES_MAP: - map = new Properties(); - - break; - default: throw new BinaryObjectException("Invalid map type: " + mapType); } http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java index cf27da4..1e6ef91 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java @@ -732,9 +732,6 @@ public class PortableBuilderReader implements PortablePositionReadable { case GridPortableMarshaller.HASH_SET: case GridPortableMarshaller.LINKED_HASH_SET: - case GridPortableMarshaller.TREE_SET: - case GridPortableMarshaller.CONC_SKIP_LIST_SET: - return new PortableLazySet(this, size); } throw new BinaryObjectException("Unknown collection type: " + colType); http://git-wip-us.apache.org/repos/asf/ignite/blob/75d5874c/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java index 52f84c6..ee35ab2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java @@ -118,13 +118,7 @@ class PortableBuilderSerializer { writer.writeByte(GridPortableMarshaller.COL); writer.writeInt(c.size()); - byte colType; - - if (c instanceof GridConcurrentSkipListSet) - colType = GridPortableMarshaller.CONC_SKIP_LIST_SET; - else - colType = writer.context().collectionType(c.getClass()); - + byte colType = writer.context().collectionType(c.getClass()); writer.writeByte(colType);
