Repository: ignite Updated Branches: refs/heads/ignite-3479 4e7f19ede -> e0196b003
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java index 0b507a3..db575f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java @@ -47,7 +47,7 @@ import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor; import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; import org.apache.ignite.internal.processors.cluster.ClusterProcessor; @@ -441,7 +441,7 @@ public class StandaloneGridKernalContext implements GridKernalContext { } /** {@inheritDoc} */ - @Override public CacheCoordinatorsSharedManager coordinators() { + @Override public CacheCoordinatorsProcessor coordinators() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java index a076e5c..3fc0962 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.tree; import org.apache.ignite.internal.pagemem.PageUtils; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter; import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow; import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree; @@ -60,7 +60,7 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow> i if (storeMvccVersion()) { assert row.mvccCoordinatorVersion() > 0 : row; - assert row.mvccCounter() != CacheCoordinatorsSharedManager.COUNTER_NA : row; + assert row.mvccCounter() != CacheCoordinatorsProcessor.COUNTER_NA : row; PageUtils.putLong(pageAddr, off, row.mvccCoordinatorVersion()); off += 8; @@ -123,7 +123,7 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow> i long mvcCntr = rowIo.getMvccUpdateCounter(srcPageAddr, srcIdx); assert mvccTopVer > 0 : mvccTopVer; - assert mvcCntr != CacheCoordinatorsSharedManager.COUNTER_NA; + assert mvcCntr != CacheCoordinatorsProcessor.COUNTER_NA; PageUtils.putLong(dstPageAddr, off, mvccTopVer); off += 8; http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java index a3a8416..a4eac3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.tree; import org.apache.ignite.internal.pagemem.PageUtils; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter; import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow; import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree; @@ -62,7 +62,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow> imp long mvccUpdateCntr = row.mvccCounter(); assert mvccCrdVer > 0 : mvccCrdVer; - assert mvccUpdateCntr != CacheCoordinatorsSharedManager.COUNTER_NA; + assert mvccUpdateCntr != CacheCoordinatorsProcessor.COUNTER_NA; PageUtils.putLong(pageAddr, off, mvccCrdVer); off += 8; @@ -98,7 +98,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow> imp long mvccUpdateCntr = ((RowLinkIO)srcIo).getMvccUpdateCounter(srcPageAddr, srcIdx); assert mvccUpdateTopVer >=0 : mvccUpdateCntr; - assert mvccUpdateCntr != CacheCoordinatorsSharedManager.COUNTER_NA; + assert mvccUpdateCntr != CacheCoordinatorsProcessor.COUNTER_NA; PageUtils.putLong(dstPageAddr, off, mvccUpdateTopVer); off += 8; http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java index 7345106..767c996 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java @@ -21,7 +21,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.pagemem.PageUtils; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter; import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow; @@ -167,7 +167,7 @@ public class CacheDataTree extends BPlusTree<CacheSearchRow, CacheDataRow> { long mvccCntr = io.getMvccUpdateCounter(pageAddr, idx); - assert row.mvccCounter() != CacheCoordinatorsSharedManager.COUNTER_NA; + assert row.mvccCounter() != CacheCoordinatorsProcessor.COUNTER_NA; cmp = Long.compare(row.mvccCounter(), mvccCntr); http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java index 62a07b1..fc9d15d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.tree; import org.apache.ignite.internal.pagemem.PageUtils; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions; /** @@ -59,6 +59,6 @@ public final class CacheIdAwareDataInnerIO extends AbstractDataInnerIO { /** {@inheritDoc} */ @Override public long getMvccUpdateCounter(long pageAddr, int idx) { - return CacheCoordinatorsSharedManager.COUNTER_NA; + return CacheCoordinatorsProcessor.COUNTER_NA; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java index e22a2a0..b328924 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.tree; import org.apache.ignite.internal.pagemem.PageUtils; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions; /** @@ -59,6 +59,6 @@ public final class CacheIdAwareDataLeafIO extends AbstractDataLeafIO { /** {@inheritDoc} */ @Override public long getMvccUpdateCounter(long pageAddr, int idx) { - return CacheCoordinatorsSharedManager.COUNTER_NA; + return CacheCoordinatorsProcessor.COUNTER_NA; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java index b334e3d..0d424b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.cache.tree; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions; import org.apache.ignite.internal.util.typedef.internal.CU; @@ -59,6 +59,6 @@ public final class DataInnerIO extends AbstractDataInnerIO { /** {@inheritDoc} */ @Override public long getMvccUpdateCounter(long pageAddr, int idx) { - return CacheCoordinatorsSharedManager.COUNTER_NA; + return CacheCoordinatorsProcessor.COUNTER_NA; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java index 28460f8..ff51bc2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.cache.tree; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions; import org.apache.ignite.internal.util.typedef.internal.CU; @@ -59,6 +59,6 @@ public final class DataLeafIO extends AbstractDataLeafIO { /** {@inheritDoc} */ @Override public long getMvccUpdateCounter(long pageAddr, int idx) { - return CacheCoordinatorsSharedManager.COUNTER_NA; + return CacheCoordinatorsProcessor.COUNTER_NA; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java index 09dc739..50f1475 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.tree; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.KeyCacheObject; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; /** @@ -46,7 +46,7 @@ public class MvccDataRow extends DataRow { super(grp, hash, link, part, rowData); assert crdVer > 0 : crdVer; - assert mvccCntr != CacheCoordinatorsSharedManager.COUNTER_NA; + assert mvccCntr != CacheCoordinatorsProcessor.COUNTER_NA; this.crdVer = crdVer; this.mvccCntr = mvccCntr; http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java index 8eb667c..5bdc495 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.tree; import org.apache.ignite.internal.processors.cache.KeyCacheObject; -import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow; import org.apache.ignite.internal.util.typedef.internal.S; @@ -83,7 +83,7 @@ public class SearchRow implements CacheSearchRow { /** {@inheritDoc} */ @Override public long mvccCounter() { - return CacheCoordinatorsSharedManager.COUNTER_NA; + return CacheCoordinatorsProcessor.COUNTER_NA; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/e0196b00/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java index 2f1a0d6..03c514f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java @@ -2280,7 +2280,7 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest { */ private void verifyCoordinatorInternalState() throws Exception { for (Ignite node : G.allGrids()) { - final CacheCoordinatorsSharedManager crd = ((IgniteKernal)node).context().cache().context().coordinators(); + final CacheCoordinatorsProcessor crd = ((IgniteKernal)node).context().cache().context().coordinators(); Map activeTxs = GridTestUtils.getFieldValue(crd, "activeTxs"); @@ -2304,7 +2304,7 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkActiveQueriesCleanup(Ignite node) throws Exception { - final CacheCoordinatorsSharedManager crd = ((IgniteKernal)node).context().cache().context().coordinators(); + final CacheCoordinatorsProcessor crd = ((IgniteKernal)node).context().cache().context().coordinators(); assertTrue("Active queries not empty", GridTestUtils.waitForCondition( new GridAbsPredicate() {
