ignite-sprint-6: merge from ignite-545
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/455b96fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/455b96fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/455b96fc Branch: refs/heads/ignite-484-1 Commit: 455b96fc1791c9ec48372890d782513c58c1acd6 Parents: 593d862 Author: Denis Magda <dma...@gridgain.com> Authored: Wed Jun 10 17:23:56 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Jun 10 17:23:56 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/KeyCacheObjectImpl.java | 11 +- .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../java/org/jsr166/ConcurrentHashMap8.java | 5431 ++++++++---------- .../java/org/jsr166/ConcurrentLinkedDeque8.java | 586 +- .../src/main/java/org/jsr166/LongAdder8.java | 35 +- .../core/src/main/java/org/jsr166/README.txt | 11 + .../src/main/java/org/jsr166/Striped64_8.java | 22 +- .../java/org/jsr166/ThreadLocalRandom8.java | 19 +- .../src/main/java/org/jsr166/package-info.java | 12 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +- 10 files changed, 2742 insertions(+), 3389 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455b96fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java index 61ca882..e5fa891 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.*; /** * */ -public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheObject, Comparable<KeyCacheObjectImpl> { +public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheObject { /** */ private static final long serialVersionUID = 0L; @@ -46,15 +46,6 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb } /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public int compareTo(KeyCacheObjectImpl other) { - assert val instanceof Comparable : val; - assert other.val instanceof Comparable : val; - - return ((Comparable)val).compareTo(other.val); - } - - /** {@inheritDoc} */ @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { if (valBytes == null) valBytes = ctx.processor().marshal(ctx, val); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455b96fc/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java index 50e9ab9..dc9d025 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java @@ -160,7 +160,7 @@ public class DataStreamerCacheUpdaters { /** * Batched updater. Updates cache using batch operations thus is dead lock prone. */ - private static class BatchedSorted<K, V> implements StreamReceiver<K, V>, InternalUpdater { + private static class BatchedSorted<K, V> implements StreamReceiver<K, V> { /** */ private static final long serialVersionUID = 0L;
