Merge with master - WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d068fb75 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d068fb75 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d068fb75 Branch: refs/heads/ignite-3477 Commit: d068fb757e21121cb14ced3e688337e3c5be1621 Parents: 8483e8f Author: Ilya Lantukh <[email protected]> Authored: Thu Dec 22 14:52:42 2016 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Thu Dec 22 14:52:42 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 16 - .../communication/GridIoMessageFactory.java | 12 +- .../pagemem/backup/BackupFinishedMessage.java | 2 +- .../GridCachePartitionExchangeManager.java | 17 +- .../processors/cache/GridCacheProcessor.java | 15 +- .../cache/GridCacheSharedTtlCleanupManager.java | 5 +- .../dht/GridClientPartitionTopology.java | 17 +- .../dht/GridDhtPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 - ...idNearAtomicAbstractSingleUpdateRequest.java | 12 + .../GridNearAtomicAbstractUpdateRequest.java | 2 + ...GridNearAtomicSingleUpdateFilterRequest.java | 2 + .../GridNearAtomicSingleUpdateRequest.java | 2 + .../dht/preloader/GridDhtPartitionMap2.java | 4 + .../GridDhtPartitionsExchangeFuture.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 3 - .../utils/PlatformConfigurationUtils.java | 39 - .../ignite/internal/util/nio/GridNioServer.java | 17 - .../spi/swapspace/file/FileSwapSpaceSpi.java | 1947 ------------------ 20 files changed, 63 insertions(+), 2063 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index cb19875..d72d041 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -521,22 +521,6 @@ public final class IgniteSystemProperties { public static final String IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD = "IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD"; /** - * When set to {@code true} fields are written by BinaryMarshaller in sorted order. Otherwise - * the natural order is used. - * <p> - * @deprecated Should be removed in Apache Ignite 2.0. - */ - @Deprecated - public static final String IGNITE_BINARY_SORT_OBJECT_FIELDS = "IGNITE_BINARY_SORT_OBJECT_FIELDS"; - - /** - * Whether Ignite can access unaligned memory addresses. - * <p> - * Defaults to {@code} false, meaning that unaligned access will be performed only on x86 architecture. - */ - public static final String IGNITE_MEMORY_UNALIGNED_ACCESS = "IGNITE_MEMORY_UNALIGNED_ACCESS"; - - /** * Enforces singleton. */ private IgniteSystemProperties() { http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 63d84c4..4599fd7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -172,6 +172,11 @@ public class GridIoMessageFactory implements MessageFactory { Message msg = null; switch (type) { + case -45: + msg = new BackupFinishedMessage(); + + break; + case -44: msg = new TcpCommunicationSpi.HandshakeMessage2(); @@ -222,11 +227,6 @@ public class GridIoMessageFactory implements MessageFactory { break; - case -27: - msg = new BackupFinishedMessage(); - - break; - case -26: msg = new TxLockList(); @@ -832,13 +832,11 @@ public class GridIoMessageFactory implements MessageFactory { break; - // [-3..119] [124..127] [-36..-44]- this case 125: msg = new TcpCommunicationSpi.HandshakeMessage2(); break; - // [-3..119] [124-125] - this case 126: msg = new IgniteIoTestMessage(); http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/pagemem/backup/BackupFinishedMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/backup/BackupFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/backup/BackupFinishedMessage.java index 2eb57a9..708a73d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/backup/BackupFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/backup/BackupFinishedMessage.java @@ -118,7 +118,7 @@ public class BackupFinishedMessage implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -27; + return -45; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 40035c0..27bc542 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -30,9 +30,11 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.NavigableMap; +import java.util.Queue; import java.util.TreeMap; import java.util.UUID; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.LinkedBlockingDeque; @@ -96,6 +98,7 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; +import org.jsr166.ConcurrentLinkedDeque8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.IgniteSystemProperties.IGNITE_PRELOAD_RESEND_TIMEOUT; @@ -804,13 +807,13 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (!cacheCtx.isLocal() && cacheCtx.started()) { GridDhtPartitionFullMap locMap = cacheCtx.topology().partitionMap(true); - m.addFullPartitionsMap(cacheCtx.cacheId(), locMap); + m.addFullPartitionsMap(cacheCtx.cacheId(), locMap, null); } } // It is important that client topologies be added after contexts. for (GridClientPartitionTopology top : cctx.exchange().clientTopologies()) - m.addFullPartitionsMap(top.cacheId(), top.partitionMap(true)); + m.addFullPartitionsMap(top.cacheId(), top.partitionMap(true), null); if (log.isDebugEnabled()) log.debug("Sending all partitions [nodeIds=" + U.nodeIds(nodes) + ", msg=" + m + ']'); @@ -887,7 +890,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana locMap = new GridDhtPartitionFullMap(locMap.nodeId(), locMap.nodeOrder(), locMap.updateSequence(), - locMap); + locMap, + true); } addFullPartitionsMap(m, @@ -973,14 +977,14 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (!cacheCtx.isLocal()) { GridDhtPartitionMap2 locMap = cacheCtx.topology().localPartitionMap(); - m.addLocalPartitionMap(cacheCtx.cacheId(), locMap); + m.addLocalPartitionMap(cacheCtx.cacheId(), locMap, null); } } for (GridClientPartitionTopology top : clientTops.values()) { GridDhtPartitionMap2 locMap = top.localPartitionMap(); - m.addLocalPartitionMap(top.cacheId(), locMap); + m.addLocalPartitionMap(top.cacheId(), locMap, null); } if (log.isDebugEnabled()) @@ -1025,9 +1029,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (!cacheCtx.isLocal()) { GridDhtPartitionMap2 locMap = cacheCtx.topology().localPartitionMap(); - if (targetNode.version().compareTo(GridDhtPartitionMap2.SINCE) < 0) - locMap = new GridDhtPartitionMap(locMap.nodeId(), locMap.updateSequence(), locMap.map()); - addPartitionMap(m, dupData, compress, http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 881d257..0119afa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2475,7 +2475,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { List<DynamicCacheChangeRequest> reqs = new ArrayList<>(cacheNames.size()); for (String cacheName : cacheNames) { - DynamicCacheChangeRequest t = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId()); + DynamicCacheChangeRequest t = new DynamicCacheChangeRequest(UUID.randomUUID(), cacheName, ctx.localNodeId()); t.stop(true); @@ -3700,7 +3700,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { ) throws IgniteCheckedException { DynamicCacheDescriptor desc = registeredCaches.get(maskNull(cacheName)); - DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId()); + DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(UUID.randomUUID(), cacheName, ctx.localNodeId()); req.failIfExists(failIfExists); @@ -3744,7 +3744,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg); - initialize(false, cfg, cacheObjCtx); + initialize(cfg, cacheObjCtx); req.startCacheConfiguration(cfg); } @@ -3768,15 +3768,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { req.startCacheConfiguration(ccfg); } - // Fail cache with swap enabled creation on grid without swap space SPI. - if (ccfg.isSwapEnabled()) - for (ClusterNode n : ctx.discovery().allNodes()) - if (!GridCacheUtils.clientNode(n) && !GridCacheUtils.isSwapEnabled(n)) { - throw new IgniteCheckedException("Failed to start cache " + - cacheName + " with swap enabled: Remote Node with ID " + n.id().toString().toUpperCase() + - " has not swap SPI configured"); - } - if (nearCfg != null) req.nearCacheConfiguration(nearCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java index d7d2cad..eda21d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java @@ -117,8 +117,9 @@ public class GridCacheSharedTtlCleanupManager extends GridCacheSharedManagerAdap boolean expiredRemains = false; for (GridCacheTtlManager mgr : mgrs) { - if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT)) - expiredRemains = true; + // TODO +// if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT)) +// expiredRemains = true; if (isCancelled()) return; http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java index 88cd16b..d2f81d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java @@ -925,12 +925,23 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology { } /** {@inheritDoc} */ - @Override public Map<Integer, T2<Long, Long>> updateCounters() { + @Override public Map<Integer, T2<Long, Long>> updateCounters(boolean skipZeros) { lock.readLock().lock(); try { - return new HashMap<>(cntrMap); - } + if (skipZeros) { + Map<Integer, T2<Long, Long>> res = U.newHashMap(cntrMap.size()); + + for (Map.Entry<Integer, T2<Long, Long>> e : cntrMap.entrySet()) { + if (!e.getValue().get1().equals(ZERO) || !e.getValue().get2().equals(ZERO)) + res.put(e.getKey(), e.getValue()); + } + + return res; + } + else + return new HashMap<>(cntrMap); +} finally { lock.readLock().unlock(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java index 79358e8..5918da8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java @@ -264,7 +264,7 @@ public interface GridDhtPartitionTopology { * @param skipZeros If {@code true} then filters out zero counters. * @return Partition update counters. */ - public Map<Integer, Long> updateCounters(boolean skipZeros); + public Map<Integer, T2<Long, Long>> updateCounters(boolean skipZeros); /** * @param part Partition to own. http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 5bda0bf..47a8103 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -450,7 +450,7 @@ import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDh locPart.own(); - updateLocal(p, loc.id(), locPart.state(), updateSeq); + updateLocal(p, locPart.state(), updateSeq); } } } @@ -1469,7 +1469,7 @@ import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDh boolean marked = plc == PartitionLossPolicy.IGNORE ? locPart.own() : locPart.markLost(); if (marked) - updateLocal(locPart.id(), cctx.localNodeId(), locPart.state(), updSeq); + updateLocal(locPart.id(), locPart.state(), updSeq); changed |= marked; } @@ -1534,7 +1534,7 @@ import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDh boolean marked = locPart.own(); if (marked) - updateLocal(locPart.id(), cctx.localNodeId(), locPart.state(), updSeq); + updateLocal(locPart.id(), locPart.state(), updSeq); } for (UUID nodeId : nodeIds) { http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index b04dc30..fa847b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -488,11 +488,9 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter oldVal = cached.innerGet( null, tx, - /*swap*/true, /*readThrough*/false, /*metrics*/false, /*event*/false, - /*tmp*/false, /*subjectId*/tx.subjectId(), /*transformClo*/null, /*taskName*/null, http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java index 61deeee..c3cceae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java @@ -65,6 +65,8 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear /** Return value flag. */ private static final int RET_VAL_FLAG_MASK = 0x40; + private static final int RECOVERY_FLAG_MASK = 0x80; + /** Target node ID. */ @GridDirectTransient protected UUID nodeId; @@ -139,6 +141,7 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear int taskNameHash, boolean skipStore, boolean keepBinary, + boolean recovery, boolean clientReq, boolean addDepInfo ) { @@ -161,6 +164,7 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear skipStore(skipStore); keepBinary(keepBinary); clientRequest(clientReq); + recovery(recovery); } /** {@inheritDoc} */ @@ -374,6 +378,14 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear setFlag(val, HAS_PRIMARY_FLAG_MASK); } + @Override public boolean recovery() { + return isFlag(RECOVERY_FLAG_MASK); + } + + public void recovery(boolean val) { + setFlag(val, RECOVERY_FLAG_MASK); + } + /** {@inheritDoc} */ @Nullable @Override public CacheEntryPredicate[] filter() { return NO_FILTER; http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java index bee2ecd..ca3cc5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java @@ -128,6 +128,8 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheMessa */ public abstract boolean hasPrimary(); + public abstract boolean recovery(); + /** * @param res Response. * @return {@code True} if current response was {@code null}. http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java index e0c24b2..39b6ab2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java @@ -90,6 +90,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl int taskNameHash, boolean skipStore, boolean keepBinary, + boolean recovery, boolean clientReq, boolean addDepInfo ) { @@ -108,6 +109,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl taskNameHash, skipStore, keepBinary, + recovery, clientReq, addDepInfo ); http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index c3e9fbe..18b6118 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -102,6 +102,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin int taskNameHash, boolean skipStore, boolean keepBinary, + boolean recovery, boolean clientReq, boolean addDepInfo ) { @@ -120,6 +121,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin taskNameHash, skipStore, keepBinary, + recovery, clientReq, addDepInfo ); http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java index 2b369ca..9837f69 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java @@ -30,6 +30,7 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING; @@ -40,6 +41,9 @@ public class GridDhtPartitionMap2 implements Comparable<GridDhtPartitionMap2>, E /** */ private static final long serialVersionUID = 0L; + /** Used since. */ + public static final IgniteProductVersion SINCE = IgniteProductVersion.fromString("1.5.0"); + /** Node ID. */ protected UUID nodeId; http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index d2b893f..89ce0cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -1383,7 +1383,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT if (updateSingleMap) { try { - updatePartitionSingleMap(msg); + updatePartitionSingleMap(node, msg); } finally { synchronized (mux) { @@ -1400,7 +1400,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT if (allReceived) { awaitSingleMapUpdates(); - onAllReceived(false); + onAllReceived(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 95fa006..25ef401 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -2454,9 +2454,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig final GridCacheOperation op = lockOnly ? NOOP : rmv ? DELETE : entryProcessor != null ? TRANSFORM : old != null ? UPDATE : CREATE; - final GridCacheOperation op = lockOnly ? NOOP : rmv ? DELETE : - entryProcessor != null ? TRANSFORM : old != null ? UPDATE : CREATE; - if (old != null && hasFilters && !filter(entry.context(), cacheKey, old, filter)) { ret.set(cacheCtx, old, false, keepBinary); http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index d668009..04676c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -64,7 +64,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; @@ -590,27 +589,6 @@ public class PlatformConfigurationUtils { cfg.setTransactionConfiguration(tx); } - - byte swapType = in.readByte(); - - switch (swapType) { - case SWAP_TYP_FILE: { - FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); - - swap.setBaseDirectory(in.readString()); - swap.setMaximumSparsity(in.readFloat()); - swap.setMaxWriteQueueSize(in.readInt()); - swap.setReadStripesNumber(in.readInt()); - swap.setWriteBufferSize(in.readInt()); - - cfg.setSwapSpaceSpi(swap); - - break; - } - - default: - assert swapType == SWAP_TYP_NONE; - } } /** @@ -999,23 +977,6 @@ public class PlatformConfigurationUtils { else w.writeBoolean(false); - SwapSpaceSpi swap = cfg.getSwapSpaceSpi(); - - if (swap instanceof FileSwapSpaceSpiMBean) { - w.writeByte(SWAP_TYP_FILE); - - FileSwapSpaceSpiMBean fileSwap = (FileSwapSpaceSpiMBean)swap; - - w.writeString(fileSwap.getBaseDirectory()); - w.writeFloat(fileSwap.getMaximumSparsity()); - w.writeInt(fileSwap.getMaxWriteQueueSize()); - w.writeInt(fileSwap.getReadStripesNumber()); - w.writeInt(fileSwap.getWriteBufferSize()); - } - else { - w.writeByte(SWAP_TYP_NONE); - } - w.writeString(cfg.getIgniteHome()); w.writeLong(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getInit()); http://git-wip-us.apache.org/repos/asf/ignite/blob/d068fb75/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 82225bc..bc1f173 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -667,13 +667,6 @@ public class GridNioServer<T> { } /** - * @return Sessions. - */ - public Collection<? extends GridNioSession> sessions() { - return sessions; - } - - /** * @param ses Session. * @param op Operation. * @return Future for operation. @@ -3247,16 +3240,6 @@ public class GridNioServer<T> { } /** - * @param srvName Logical server name for threads identification. - * @return This for chaining. - */ - public Builder<T> serverName(@Nullable String srvName) { - this.srvName = srvName; - - return this; - } - - /** * @param selectorSpins Defines how many non-blocking {@code selector.selectNow()} should be made before * falling into {@code selector.select(long)} in NIO server. Long value. Default is {@code 0}. * Can be set to {@code Long.MAX_VALUE} so selector threads will never block.
