You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/07/07 11:34:34 UTC
[1/5] ignite git commit: IGNITE-5520 - Fixed
IgniteChangeGlobalStateFailoverTest
Repository: ignite
Updated Branches:
refs/heads/ignite-2.1.2-grpId [created] 89e745464
IGNITE-5520 - Fixed IgniteChangeGlobalStateFailoverTest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85d8c657
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85d8c657
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85d8c657
Branch: refs/heads/ignite-2.1.2-grpId
Commit: 85d8c6572d78c7d6796906d92b566e2fa5b116be
Parents: ab52671
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Fri Jul 7 13:13:55 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 7 13:15:26 2017 +0300
----------------------------------------------------------------------
.../IgniteChangeGlobalStateFailOverTest.java | 56 +++++++++++++-------
1 file changed, 37 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/85d8c657/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
index 92d1f21..02a21f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
@@ -21,11 +21,11 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.util.typedef.internal.U;
import static java.lang.Thread.sleep;
import static org.apache.ignite.testframework.GridTestUtils.runAsync;
@@ -144,8 +144,6 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
* @throws Exception If failed.
*/
public void testActivateDeActivateOnJoiningNode() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-5520");
-
final Ignite igB1 = backUp(0);
final Ignite igB2 = backUp(1);
final Ignite igB3 = backUp(2);
@@ -162,14 +160,17 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
final AtomicBoolean stop = new AtomicBoolean();
- final AtomicBoolean canAct = new AtomicBoolean(true);
final AtomicInteger seqIdx = new AtomicInteger(backUpNodes());
+ final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
+
try {
final IgniteInternalFuture<Void> af = runAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
while (!stop.get()) {
- if (canAct.get()) {
+ rwLock.readLock().lock();
+
+ try {
Ignite ig = randomBackUp(false);
long start = System.currentTimeMillis();
@@ -182,13 +183,12 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
for (Ignite ign : allBackUpNodes())
assertTrue(ign.active());
-
- canAct.set(false);
}
- else
- U.sleep(100);
-
+ finally {
+ rwLock.readLock().unlock();
+ }
}
+
return null;
}
});
@@ -196,7 +196,9 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
final IgniteInternalFuture<Void> df = runAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
while (!stop.get()) {
- if (!canAct.get()) {
+ rwLock.writeLock().lock();
+
+ try {
Ignite ig = randomBackUp(false);
long start = System.currentTimeMillis();
@@ -209,20 +211,28 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
for (Ignite ign : allBackUpNodes())
assertTrue(!ign.active());
-
- canAct.set(true);
}
- else
- U.sleep(100);
+ finally {
+ rwLock.writeLock().unlock();
+ }
}
+
return null;
}
});
IgniteInternalFuture<Void> jf1 = runAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
- while (!stop.get())
- startBackUp(seqIdx.incrementAndGet());
+ while (!stop.get()) {
+ rwLock.readLock().lock();
+
+ try {
+ startBackUp(seqIdx.incrementAndGet());
+ }
+ finally {
+ rwLock.readLock().unlock();
+ }
+ }
return null;
}
@@ -230,8 +240,16 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
IgniteInternalFuture<Void> jf2 = runAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
- while (!stop.get())
- startBackUp(seqIdx.incrementAndGet());
+ while (!stop.get()) {
+ rwLock.readLock().lock();
+
+ try {
+ startBackUp(seqIdx.incrementAndGet());
+ }
+ finally {
+ rwLock.readLock().unlock();
+ }
+ }
return null;
}
[3/5] ignite git commit: Rename cacheId -> grpId.
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/NoOpPageStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/NoOpPageStoreManager.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/NoOpPageStoreManager.java
index 665bb56..8fc2bdb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/NoOpPageStoreManager.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/NoOpPageStoreManager.java
@@ -74,7 +74,7 @@ public class NoOpPageStoreManager implements IgnitePageStoreManager {
}
/** {@inheritDoc} */
- @Override public void read(int cacheId, long pageId, ByteBuffer pageBuf) throws IgniteCheckedException {
+ @Override public void read(int grpId, long pageId, ByteBuffer pageBuf) throws IgniteCheckedException {
}
@@ -84,35 +84,35 @@ public class NoOpPageStoreManager implements IgnitePageStoreManager {
}
/** {@inheritDoc} */
- @Override public void readHeader(int cacheId, int partId, ByteBuffer buf) throws IgniteCheckedException {
+ @Override public void readHeader(int grpId, int partId, ByteBuffer buf) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void write(int cacheId, long pageId, ByteBuffer pageBuf, int tag) throws IgniteCheckedException {
+ @Override public void write(int grpId, long pageId, ByteBuffer pageBuf, int tag) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void sync(int cacheId, int partId) throws IgniteCheckedException {
+ @Override public void sync(int grpId, int partId) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void ensure(int cacheId, int partId) throws IgniteCheckedException {
+ @Override public void ensure(int grpId, int partId) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public long pageOffset(int cacheId, long pageId) throws IgniteCheckedException {
+ @Override public long pageOffset(int grpId, long pageId) throws IgniteCheckedException {
return 0;
}
/** {@inheritDoc} */
- @Override public long allocatePage(int cacheId, int partId, byte flags) throws IgniteCheckedException {
+ @Override public long allocatePage(int grpId, int partId, byte flags) throws IgniteCheckedException {
long root = PageIdUtils.pageId(partId, flags, 0);
- FullPageId fullId = new FullPageId(root, cacheId);
+ FullPageId fullId = new FullPageId(root, grpId);
AtomicInteger allocator = allocators.get(fullId);
@@ -123,10 +123,10 @@ public class NoOpPageStoreManager implements IgnitePageStoreManager {
}
/** {@inheritDoc} */
- @Override public int pages(int cacheId, int partId) throws IgniteCheckedException {
+ @Override public int pages(int grpId, int partId) throws IgniteCheckedException {
long root = PageIdUtils.pageId(partId, (byte)0, 0);
- FullPageId fullId = new FullPageId(root, cacheId);
+ FullPageId fullId = new FullPageId(root, grpId);
AtomicInteger allocator = allocators.get(fullId);
@@ -137,7 +137,7 @@ public class NoOpPageStoreManager implements IgnitePageStoreManager {
}
/** {@inheritDoc} */
- @Override public long metaPageId(int cacheId) {
+ @Override public long metaPageId(int grpId) {
return 1;
}
[2/5] ignite git commit: Rename ActionData -> CacheActionData.
Posted by sb...@apache.org.
Rename ActionData -> CacheActionData.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f589628f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f589628f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f589628f
Branch: refs/heads/ignite-2.1.2-grpId
Commit: f589628f4846f14efc8e702b61856cc90a3d0dc7
Parents: 85d8c65
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jul 7 13:52:38 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jul 7 13:52:38 2017 +0300
----------------------------------------------------------------------
.../cache/CacheAffinitySharedManager.java | 10 +++---
.../processors/cache/ClusterCachesInfo.java | 2 +-
.../processors/cache/ExchangeActions.java | 34 ++++++++++----------
.../processors/cache/GridCacheProcessor.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 2 +-
5 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 8d08c3f..548d795 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -701,7 +701,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
}
});
- for (ExchangeActions.ActionData action : exchActions.cacheStartRequests()) {
+ for (ExchangeActions.CacheActionData action : exchActions.cacheStartRequests()) {
DynamicCacheDescriptor cacheDesc = action.descriptor();
DynamicCacheChangeRequest req = action.request();
@@ -768,7 +768,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
Set<Integer> gprs = new HashSet<>();
- for (ExchangeActions.ActionData action : exchActions.cacheStartRequests()) {
+ for (ExchangeActions.CacheActionData action : exchActions.cacheStartRequests()) {
Integer grpId = action.descriptor().groupId();
if (gprs.add(grpId)) {
@@ -786,7 +786,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
}
}
- for (ExchangeActions.ActionData action : exchActions.cacheStopRequests())
+ for (ExchangeActions.CacheActionData action : exchActions.cacheStopRequests())
cctx.cache().blockGateway(action.request().cacheName(), true, action.request().restart());
for (ExchangeActions.CacheGroupActionData action : exchActions.cacheGroupsToStop()) {
@@ -2308,10 +2308,10 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
assert old == null : old;
}
- for (ExchangeActions.ActionData req : exchActions.cacheStopRequests())
+ for (ExchangeActions.CacheActionData req : exchActions.cacheStopRequests())
registeredCaches.remove(req.descriptor().cacheId());
- for (ExchangeActions.ActionData req : exchActions.cacheStartRequests())
+ for (ExchangeActions.CacheActionData req : exchActions.cacheStartRequests())
registeredCaches.put(req.descriptor().cacheId(), req.descriptor());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 5aca8c9..738e4ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -624,7 +624,7 @@ class ClusterCachesInfo {
// If all caches in group will be destroyed it is not necessary to destroy single cache
// because group will be stopped anyway.
if (req.destroy()) {
- for (ExchangeActions.ActionData action : exchangeActions.cacheStopRequests()) {
+ for (ExchangeActions.CacheActionData action : exchangeActions.cacheStopRequests()) {
if (action.descriptor().groupId() == grpDesc.groupId())
action.request().destroy(false);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
index e9ece5a..1cc6438 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
@@ -41,13 +41,13 @@ public class ExchangeActions {
private List<CacheGroupActionData> cacheGrpsToStop;
/** */
- private Map<String, ActionData> cachesToStart;
+ private Map<String, CacheActionData> cachesToStart;
/** */
- private Map<String, ActionData> cachesToStop;
+ private Map<String, CacheActionData> cachesToStop;
/** */
- private Map<String, ActionData> cachesToResetLostParts;
+ private Map<String, CacheActionData> cachesToResetLostParts;
/** */
private StateChangeRequest stateChangeReq;
@@ -60,7 +60,7 @@ public class ExchangeActions {
Boolean destroy = null;
// Check that caches associated with that group will be all stopped only or all destroyed.
- for (ExchangeActions.ActionData action : cacheStopRequests()) {
+ for (CacheActionData action : cacheStopRequests()) {
if (action.descriptor().groupId() == grpId) {
if (destroy == null)
destroy = action.request().destroy();
@@ -89,15 +89,15 @@ public class ExchangeActions {
/**
* @return New caches start requests.
*/
- public Collection<ActionData> cacheStartRequests() {
- return cachesToStart != null ? cachesToStart.values() : Collections.<ActionData>emptyList();
+ public Collection<CacheActionData> cacheStartRequests() {
+ return cachesToStart != null ? cachesToStart.values() : Collections.<CacheActionData>emptyList();
}
/**
* @return Stop cache requests.
*/
- Collection<ActionData> cacheStopRequests() {
- return cachesToStop != null ? cachesToStop.values() : Collections.<ActionData>emptyList();
+ Collection<CacheActionData> cacheStopRequests() {
+ return cachesToStop != null ? cachesToStop.values() : Collections.<CacheActionData>emptyList();
}
/**
@@ -114,7 +114,7 @@ public class ExchangeActions {
*/
public boolean systemCachesStarting() {
if (cachesToStart != null) {
- for (ActionData data : cachesToStart.values()) {
+ for (CacheActionData data : cachesToStart.values()) {
if (CU.isSystemCache(data.request().cacheName()))
return true;
}
@@ -127,9 +127,9 @@ public class ExchangeActions {
* @param map Actions map.
* @param ctx Context.
*/
- private void completeRequestFutures(Map<String, ActionData> map, GridCacheSharedContext ctx) {
+ private void completeRequestFutures(Map<String, CacheActionData> map, GridCacheSharedContext ctx) {
if (map != null) {
- for (ActionData req : map.values())
+ for (CacheActionData req : map.values())
ctx.cache().completeCacheStartFuture(req.req, true, null);
}
}
@@ -159,7 +159,7 @@ public class ExchangeActions {
*/
public boolean cacheStopped(int cacheId) {
if (cachesToStop != null) {
- for (ActionData cache : cachesToStop.values()) {
+ for (CacheActionData cache : cachesToStop.values()) {
if (cache.desc.cacheId() == cacheId)
return true;
}
@@ -174,7 +174,7 @@ public class ExchangeActions {
*/
public boolean cacheStarted(int cacheId) {
if (cachesToStart != null) {
- for (ActionData cache : cachesToStart.values()) {
+ for (CacheActionData cache : cachesToStart.values()) {
if (cache.desc.cacheId() == cacheId)
return true;
}
@@ -217,7 +217,7 @@ public class ExchangeActions {
* @param desc Cache descriptor.
* @return Actions map.
*/
- private Map<String, ActionData> add(Map<String, ActionData> map,
+ private Map<String, CacheActionData> add(Map<String, CacheActionData> map,
DynamicCacheChangeRequest req,
DynamicCacheDescriptor desc) {
assert req != null;
@@ -226,7 +226,7 @@ public class ExchangeActions {
if (map == null)
map = new HashMap<>();
- ActionData old = map.put(req.cacheName(), new ActionData(req, desc));
+ CacheActionData old = map.put(req.cacheName(), new CacheActionData(req, desc));
assert old == null : old;
@@ -347,7 +347,7 @@ public class ExchangeActions {
/**
*
*/
- public static class ActionData {
+ public static class CacheActionData {
/** */
private final DynamicCacheChangeRequest req;
@@ -358,7 +358,7 @@ public class ExchangeActions {
* @param req Request.
* @param desc Cache descriptor.
*/
- ActionData(DynamicCacheChangeRequest req, DynamicCacheDescriptor desc) {
+ CacheActionData(DynamicCacheChangeRequest req, DynamicCacheDescriptor desc) {
assert req != null;
assert desc != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/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 321e6dd..0a69d72 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
@@ -2126,7 +2126,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
}
- for (ExchangeActions.ActionData action : exchActions.cacheStopRequests()) {
+ for (ExchangeActions.CacheActionData action : exchActions.cacheStopRequests()) {
stopGateway(action.request());
sharedCtx.database().checkpointReadLock();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/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 2151101..97fcb12 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
@@ -767,7 +767,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (cctx.database().persistenceEnabled() && !cctx.kernalContext().clientNode()) {
List<DynamicCacheDescriptor> startDescs = new ArrayList<>();
- for (ExchangeActions.ActionData startReq : exchActions.cacheStartRequests())
+ for (ExchangeActions.CacheActionData startReq : exchActions.cacheStartRequests())
startDescs.add(startReq.descriptor());
cctx.database().readCheckpointAndRestoreMemory(startDescs);
[5/5] ignite git commit: Rename cacheId -> grpId.
Posted by sb...@apache.org.
Rename cacheId -> grpId.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89e74546
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89e74546
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89e74546
Branch: refs/heads/ignite-2.1.2-grpId
Commit: 89e74546414c0867d18590f86568469033e2797f
Parents: f589628
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jul 7 14:34:22 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jul 7 14:34:22 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/pagemem/FullPageId.java | 32 ++++-----
.../ignite/internal/pagemem/PageSupport.java | 36 +++++-----
.../pagemem/store/IgnitePageStoreManager.java | 40 +++++------
.../delta/DataPageInsertFragmentRecord.java | 6 +-
.../wal/record/delta/DataPageInsertRecord.java | 6 +-
.../wal/record/delta/DataPageRemoveRecord.java | 6 +-
.../delta/DataPageSetFreeListPageRecord.java | 6 +-
.../wal/record/delta/DataPageUpdateRecord.java | 6 +-
.../wal/record/delta/FixCountRecord.java | 6 +-
.../record/delta/FixLeftmostChildRecord.java | 6 +-
.../pagemem/wal/record/delta/FixRemoveId.java | 6 +-
.../wal/record/delta/InitNewPageRecord.java | 6 +-
.../wal/record/delta/InnerReplaceRecord.java | 6 +-
.../pagemem/wal/record/delta/InsertRecord.java | 6 +-
.../pagemem/wal/record/delta/MergeRecord.java | 6 +-
.../wal/record/delta/MetaPageAddRootRecord.java | 6 +-
.../wal/record/delta/MetaPageCutRootRecord.java | 6 +-
.../wal/record/delta/MetaPageInitRecord.java | 6 +-
.../delta/MetaPageInitRootInlineRecord.java | 6 +-
.../record/delta/MetaPageInitRootRecord.java | 4 +-
.../delta/MetaPageUpdateLastAllocatedIndex.java | 4 +-
...aPageUpdateLastSuccessfulFullSnapshotId.java | 4 +-
.../MetaPageUpdateLastSuccessfulSnapshotId.java | 4 +-
.../delta/MetaPageUpdateNextSnapshotId.java | 4 +-
.../MetaPageUpdatePartitionDataRecord.java | 6 +-
.../wal/record/delta/NewRootInitRecord.java | 6 +-
.../wal/record/delta/PageDeltaRecord.java | 14 ++--
.../delta/PageListMetaResetCountRecord.java | 6 +-
.../record/delta/PagesListAddPageRecord.java | 6 +-
.../delta/PagesListInitNewPageRecord.java | 6 +-
.../record/delta/PagesListRemovePageRecord.java | 2 +-
.../record/delta/PagesListSetNextRecord.java | 6 +-
.../delta/PagesListSetPreviousRecord.java | 6 +-
.../record/delta/PartitionDestroyRecord.java | 20 +++---
.../record/delta/PartitionMetaStateRecord.java | 16 ++---
.../pagemem/wal/record/delta/RecycleRecord.java | 6 +-
.../pagemem/wal/record/delta/RemoveRecord.java | 6 +-
.../pagemem/wal/record/delta/ReplaceRecord.java | 6 +-
.../record/delta/SplitExistingPageRecord.java | 6 +-
.../record/delta/SplitForwardPageRecord.java | 6 +-
.../record/delta/TrackingPageDeltaRecord.java | 6 +-
.../cache/persistence/DataStructure.java | 46 ++++++------
.../GridCacheDatabaseSharedManager.java | 38 +++++-----
.../persistence/GridCacheOffheapManager.java | 4 +-
.../cache/persistence/MetadataStorage.java | 2 +-
.../persistence/file/FilePageStoreManager.java | 34 ++++-----
.../persistence/freelist/FreeListImpl.java | 6 +-
.../cache/persistence/freelist/PagesList.java | 36 +++++-----
.../persistence/pagemem/FullPageIdTable.java | 54 +++++++-------
.../cache/persistence/pagemem/PageMemoryEx.java | 4 +-
.../persistence/pagemem/PageMemoryImpl.java | 72 +++++++++----------
.../cache/persistence/tree/BPlusTree.java | 16 ++---
.../wal/serializer/RecordV1Serializer.java | 76 ++++++++++----------
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 52 +++++++-------
...gnitePdsRecoveryAfterFileCorruptionTest.java | 24 +++----
...ckpointSimulationWithRealCpDisabledTest.java | 74 +++++++++----------
.../db/file/IgnitePdsEvictionTest.java | 16 ++---
.../db/wal/IgniteWalRecoveryTest.java | 10 +--
.../pagemem/NoOpPageStoreManager.java | 22 +++---
59 files changed, 470 insertions(+), 470 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/FullPageId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/FullPageId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/FullPageId.java
index 20677ea..00f52c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/FullPageId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/FullPageId.java
@@ -56,28 +56,28 @@ public class FullPageId {
private final long effectivePageId;
/** */
- private final int cacheId;
+ private final int grpId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @return Hash code.
*/
- public static int hashCode(int cacheId, long pageId) {
+ public static int hashCode(int grpId, long pageId) {
long effectiveId = PageIdUtils.effectivePageId(pageId);
- return U.hash(hashCode0(cacheId, effectiveId));
+ return U.hash(hashCode0(grpId, effectiveId));
}
/**
* Will not clear link bits.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param effectivePageId Effective page ID.
* @return Hash code.
*/
- private static int hashCode0(int cacheId, long effectivePageId) {
- return (int)(mix64(effectivePageId) ^ mix32(cacheId));
+ private static int hashCode0(int grpId, long effectivePageId) {
+ return (int)(mix64(effectivePageId) ^ mix32(grpId));
}
/**
@@ -107,11 +107,11 @@ public class FullPageId {
}
/**
* @param pageId Page ID.
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
*/
- public FullPageId(long pageId, int cacheId) {
+ public FullPageId(long pageId, int grpId) {
this.pageId = pageId;
- this.cacheId = cacheId;
+ this.grpId = grpId;
effectivePageId = PageIdUtils.effectivePageId(pageId);
}
@@ -124,10 +124,10 @@ public class FullPageId {
}
/**
- * @return Cache ID.
+ * @return Cache group ID.
*/
- public int cacheId() {
- return cacheId;
+ public int groupId() {
+ return grpId;
}
/** {@inheritDoc} */
@@ -140,18 +140,18 @@ public class FullPageId {
FullPageId that = (FullPageId)o;
- return effectivePageId == that.effectivePageId && cacheId == that.cacheId;
+ return effectivePageId == that.effectivePageId && grpId == that.grpId;
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return hashCode0(cacheId, effectivePageId);
+ return hashCode0(grpId, effectivePageId);
}
/** {@inheritDoc} */
@Override public String toString() {
return new SB("FullPageId [pageId=").appendHex(pageId)
.a(", effectivePageId=").appendHex(effectivePageId)
- .a(", cacheId=").a(cacheId).a(']').toString();
+ .a(", grpId=").a(grpId).a(']').toString();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java
index f4b2d96..ed2311f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java
@@ -28,87 +28,87 @@ public interface PageSupport {
* released by calling {@link #releasePage(int, long, long)}. This method will allocate page with given ID if it doesn't
* exist.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @return Page pointer.
* @throws IgniteCheckedException If failed.
*/
- public long acquirePage(int cacheId, long pageId) throws IgniteCheckedException;
+ public long acquirePage(int grpId, long pageId) throws IgniteCheckedException;
/**
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID to release.
* @param page Page pointer.
*/
- public void releasePage(int cacheId, long pageId, long page);
+ public void releasePage(int grpId, long pageId, long page);
/**
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
* @return Pointer for reading the page.
*/
- public long readLock(int cacheId, long pageId, long page);
+ public long readLock(int grpId, long pageId, long page);
/**
* Obtains read lock without checking page tag.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
* @return Pointer for reading the page.
*/
- public long readLockForce(int cacheId, long pageId, long page);
+ public long readLockForce(int grpId, long pageId, long page);
/**
* Releases locked page.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
*/
- public void readUnlock(int cacheId, long pageId, long page);
+ public void readUnlock(int grpId, long pageId, long page);
/**
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
* @return Address of a buffer with contents of the given page or
* {@code 0L} if attempt to take the write lock failed.
*/
- public long writeLock(int cacheId, long pageId, long page);
+ public long writeLock(int grpId, long pageId, long page);
/**
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
* @return Address of a buffer with contents of the given page or
* {@code 0L} if attempt to take the write lock failed.
*/
- public long tryWriteLock(int cacheId, long pageId, long page);
+ public long tryWriteLock(int grpId, long pageId, long page);
/**
* Releases locked page.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
* @param walPlc {@code True} if page should be recorded to WAL, {@code false} if the page must not
* be recorded and {@code null} for the default behavior.
* @param dirtyFlag Determines whether the page was modified since the last checkpoint.
*/
- public void writeUnlock(int cacheId, long pageId, long page, Boolean walPlc,
+ public void writeUnlock(int grpId, long pageId, long page, Boolean walPlc,
boolean dirtyFlag);
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param page Page pointer.
* @return {@code True} if the page is dirty.
*/
- public boolean isDirty(int cacheId, long pageId, long page);
+ public boolean isDirty(int grpId, long pageId, long page);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
index fa6e9e4..a1b766f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
@@ -49,8 +49,8 @@ public interface IgnitePageStoreManager extends GridCacheSharedManager, IgniteCh
* @param cacheData Cache data of the cache being started.
* @throws IgniteCheckedException If failed to handle cache start callback.
*/
- public void initializeForCache(CacheGroupDescriptor grpDesc,
- StoredCacheData cacheData) throws IgniteCheckedException;
+ public void initializeForCache(CacheGroupDescriptor grpDesc, StoredCacheData cacheData)
+ throws IgniteCheckedException;
/**
* Callback called when a cache is stopping. After this callback is invoked, no data associated with
@@ -84,12 +84,12 @@ public interface IgnitePageStoreManager extends GridCacheSharedManager, IgniteCh
/**
* Reads a page for the given cache ID. Cache ID may be {@code 0} if the page is a meta page.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId PageID to read.
* @param pageBuf Page buffer to write to.
* @throws IgniteCheckedException If failed to read the page.
*/
- public void read(int cacheId, long pageId, ByteBuffer pageBuf) throws IgniteCheckedException;
+ public void read(int grpId, long pageId, ByteBuffer pageBuf) throws IgniteCheckedException;
/**
* Checks if partition store exists.
@@ -104,77 +104,77 @@ public interface IgnitePageStoreManager extends GridCacheSharedManager, IgniteCh
/**
* Reads a header of a page store.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID.
* @param buf Buffer to write to.
* @throws IgniteCheckedException If failed.
*/
- public void readHeader(int cacheId, int partId, ByteBuffer buf) throws IgniteCheckedException;
+ public void readHeader(int grpId, int partId, ByteBuffer buf) throws IgniteCheckedException;
/**
* Writes the page for the given cache ID. Cache ID may be {@code 0} if the page is a meta page.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param pageBuf Page buffer to write.
* @throws IgniteCheckedException If failed to write page.
*/
- public void write(int cacheId, long pageId, ByteBuffer pageBuf, int tag) throws IgniteCheckedException;
+ public void write(int grpId, long pageId, ByteBuffer pageBuf, int tag) throws IgniteCheckedException;
/**
* Gets page offset within the page store file.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @return Page offset.
* @throws IgniteCheckedException If failed.
*/
- public long pageOffset(int cacheId, long pageId) throws IgniteCheckedException;
+ public long pageOffset(int grpId, long pageId) throws IgniteCheckedException;
/**
* Makes sure that all previous writes to the store has been written to disk.
*
- * @param cacheId Cache ID to sync.
+ * @param grpId Cache group ID to sync.
* @param partId Partition ID to sync.
* @throws IgniteCheckedException If IO error occurred while running sync.
*/
- public void sync(int cacheId, int partId) throws IgniteCheckedException;
+ public void sync(int grpId, int partId) throws IgniteCheckedException;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID.
* @throws IgniteCheckedException If failed.
*/
- public void ensure(int cacheId, int partId) throws IgniteCheckedException;
+ public void ensure(int grpId, int partId) throws IgniteCheckedException;
/**
* Allocates a page for the given page space.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID. Used only if {@code flags} is equal to {@link PageMemory#FLAG_DATA}.
* @param flags Page allocation flags.
* @return Allocated page ID.
* @throws IgniteCheckedException If IO exception occurred while allocating a page ID.
*/
- public long allocatePage(int cacheId, int partId, byte flags) throws IgniteCheckedException;
+ public long allocatePage(int grpId, int partId, byte flags) throws IgniteCheckedException;
/**
* Gets total number of allocated pages for the given space.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID.
* @return Number of allocated pages.
* @throws IgniteCheckedException If failed.
*/
- public int pages(int cacheId, int partId) throws IgniteCheckedException;
+ public int pages(int grpId, int partId) throws IgniteCheckedException;
/**
* Gets meta page ID for specified cache.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @return Meta page ID.
*/
- public long metaPageId(int cacheId);
+ public long metaPageId(int grpId);
/**
* @return Saved cache configurations.
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
index 042fbe4..3b2ced1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
@@ -32,18 +32,18 @@ public class DataPageInsertFragmentRecord extends PageDeltaRecord {
private final byte[] payload;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param payload Fragment payload.
* @param lastLink Link to the last entry fragment.
*/
public DataPageInsertFragmentRecord(
- final int cacheId,
+ final int grpId,
final long pageId,
final byte[] payload,
final long lastLink
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
this.lastLink = lastLink;
this.payload = payload;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
index 17425fe..e480cc8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
@@ -29,16 +29,16 @@ public class DataPageInsertRecord extends PageDeltaRecord {
private byte[] payload;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param payload Remainder of the record.
*/
public DataPageInsertRecord(
- int cacheId,
+ int grpId,
long pageId,
byte[] payload
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
this.payload = payload;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
index 3aabe08..b80600c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
@@ -30,12 +30,12 @@ public class DataPageRemoveRecord extends PageDeltaRecord {
private int itemId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param itemId Item ID.
*/
- public DataPageRemoveRecord(int cacheId, long pageId, int itemId) {
- super(cacheId, pageId);
+ public DataPageRemoveRecord(int grpId, long pageId, int itemId) {
+ super(grpId, pageId);
this.itemId = itemId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
index 82281de..a7fd31f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
@@ -31,12 +31,12 @@ public class DataPageSetFreeListPageRecord extends PageDeltaRecord {
private long freeListPage;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param freeListPage Free list page ID.
*/
- public DataPageSetFreeListPageRecord(int cacheId, long pageId, long freeListPage) {
- super(cacheId, pageId);
+ public DataPageSetFreeListPageRecord(int grpId, long pageId, long freeListPage) {
+ super(grpId, pageId);
this.freeListPage = freeListPage;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
index d4e2811..6207f41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
@@ -32,18 +32,18 @@ public class DataPageUpdateRecord extends PageDeltaRecord {
private byte[] payload;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param itemId Item ID.
* @param payload Record data.
*/
public DataPageUpdateRecord(
- int cacheId,
+ int grpId,
long pageId,
int itemId,
byte[] payload
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
this.payload = payload;
this.itemId = itemId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
index 3ab1c4a..80e06ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
@@ -30,11 +30,11 @@ public class FixCountRecord extends PageDeltaRecord {
private int cnt;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
*/
- public FixCountRecord(int cacheId, long pageId, int cnt) {
- super(cacheId, pageId);
+ public FixCountRecord(int grpId, long pageId, int cnt) {
+ super(grpId, pageId);
this.cnt = cnt;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
index 15ee7dd..a34e8e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
@@ -30,12 +30,12 @@ public class FixLeftmostChildRecord extends PageDeltaRecord {
private long rightId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param rightId Right ID.
*/
- public FixLeftmostChildRecord(int cacheId, long pageId, long rightId) {
- super(cacheId, pageId);
+ public FixLeftmostChildRecord(int grpId, long pageId, long rightId) {
+ super(grpId, pageId);
this.rightId = rightId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
index b6ea410..1ec845d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
@@ -30,12 +30,12 @@ public class FixRemoveId extends PageDeltaRecord {
private long rmvId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param rmvId Remove ID.
*/
- public FixRemoveId(int cacheId, long pageId, long rmvId) {
- super(cacheId, pageId);
+ public FixRemoveId(int grpId, long pageId, long rmvId) {
+ super(grpId, pageId);
this.rmvId = rmvId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
index f883e06..15bd2da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
@@ -39,14 +39,14 @@ public class InitNewPageRecord extends PageDeltaRecord {
protected long newPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param ioType IO type.
* @param ioVer IO version.
* @param newPageId New page ID.
*/
- public InitNewPageRecord(int cacheId, long pageId, int ioType, int ioVer, long newPageId) {
- super(cacheId, pageId);
+ public InitNewPageRecord(int grpId, long pageId, int ioType, int ioVer, long newPageId) {
+ super(grpId, pageId);
this.ioType = ioType;
this.ioVer = ioVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InnerReplaceRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InnerReplaceRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InnerReplaceRecord.java
index 35d23c1..6e6879d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InnerReplaceRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InnerReplaceRecord.java
@@ -38,14 +38,14 @@ public class InnerReplaceRecord<L> extends PageDeltaRecord {
private long rmvId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param dstIdx Destination index.
* @param srcPageId Source page ID.
* @param srcIdx Source index.
*/
- public InnerReplaceRecord(int cacheId, long pageId, int dstIdx, long srcPageId, int srcIdx, long rmvId) {
- super(cacheId, pageId);
+ public InnerReplaceRecord(int grpId, long pageId, int dstIdx, long srcPageId, int srcIdx, long rmvId) {
+ super(grpId, pageId);
this.dstIdx = dstIdx;
this.srcPageId = srcPageId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
index d0e66a3..f6ebe87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
@@ -42,7 +42,7 @@ public class InsertRecord<L> extends PageDeltaRecord {
private BPlusIO<L> io;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param io IO.
* @param idx Index.
@@ -50,14 +50,14 @@ public class InsertRecord<L> extends PageDeltaRecord {
* @param rightId Right ID.
*/
public InsertRecord(
- int cacheId,
+ int grpId,
long pageId,
BPlusIO<L> io,
int idx,
byte[] rowBytes,
long rightId
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
this.io = io;
this.idx = idx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
index 84770d5..2d481d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
@@ -44,15 +44,15 @@ public class MergeRecord<L> extends PageDeltaRecord {
private boolean emptyBranch;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param prntId Parent ID.
* @param prntIdx Index in parent page.
* @param rightId Right ID.
* @param emptyBranch We are merging empty branch.
*/
- public MergeRecord(int cacheId, long pageId, long prntId, int prntIdx, long rightId, boolean emptyBranch) {
- super(cacheId, pageId);
+ public MergeRecord(int grpId, long pageId, long prntId, int prntIdx, long rightId, boolean emptyBranch) {
+ super(grpId, pageId);
this.prntId = prntId;
this.rightId = rightId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
index 1f1e976..ce9e06b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
@@ -29,12 +29,12 @@ public class MetaPageAddRootRecord extends PageDeltaRecord {
private long rootId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache ID.
* @param pageId Page ID.
* @param rootId Root ID.
*/
- public MetaPageAddRootRecord(int cacheId, long pageId, long rootId) {
- super(cacheId, pageId);
+ public MetaPageAddRootRecord(int grpId, long pageId, long rootId) {
+ super(grpId, pageId);
this.rootId = rootId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
index 3fc42a1..1e93ab9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
@@ -26,11 +26,11 @@ import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMeta
*/
public class MetaPageCutRootRecord extends PageDeltaRecord {
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
*/
- public MetaPageCutRootRecord(int cacheId, long pageId) {
- super(cacheId, pageId);
+ public MetaPageCutRootRecord(int grpId, long pageId) {
+ super(grpId, pageId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
index 692b8f1..b1e701a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
@@ -36,14 +36,14 @@ public class MetaPageInitRecord extends InitNewPageRecord {
private int ioType;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param ioType IO type.
* @param treeRoot Tree root.
* @param reuseListRoot Reuse list root.
*/
- public MetaPageInitRecord(int cacheId, long pageId, int ioType, int ioVer, long treeRoot, long reuseListRoot) {
- super(cacheId, pageId, ioType, ioVer, pageId);
+ public MetaPageInitRecord(int grpId, long pageId, int ioType, int ioVer, long treeRoot, long reuseListRoot) {
+ super(grpId, pageId, ioType, ioVer, pageId);
assert ioType == PageIO.T_META || ioType == PageIO.T_PART_META;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
index 7eb8426..2b82444 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
@@ -30,13 +30,13 @@ public class MetaPageInitRootInlineRecord extends MetaPageInitRootRecord {
private final int inlineSize;
/**
- * @param cacheId
+ * @param grpId Cache group ID.
* @param pageId Meta page ID.
* @param rootId
* @param inlineSize Inline size.
*/
- public MetaPageInitRootInlineRecord(int cacheId, long pageId, long rootId, int inlineSize) {
- super(cacheId, pageId, rootId);
+ public MetaPageInitRootInlineRecord(int grpId, long pageId, long rootId, int inlineSize) {
+ super(grpId, pageId, rootId);
this.inlineSize = inlineSize;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
index 0eb61b5..ebdf3d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
@@ -31,8 +31,8 @@ public class MetaPageInitRootRecord extends PageDeltaRecord {
/**
* @param pageId Meta page ID.
*/
- public MetaPageInitRootRecord(int cacheId, long pageId, long rootId) {
- super(cacheId, pageId);
+ public MetaPageInitRootRecord(int grpId, long pageId, long rootId) {
+ super(grpId, pageId);
assert pageId != rootId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
index 548735e..60aebde 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
@@ -32,8 +32,8 @@ public class MetaPageUpdateLastAllocatedIndex extends PageDeltaRecord {
/**
* @param pageId Meta page ID.
*/
- public MetaPageUpdateLastAllocatedIndex(int cacheId, long pageId, int lastAllocatedIdx) {
- super(cacheId, pageId);
+ public MetaPageUpdateLastAllocatedIndex(int grpId, long pageId, int lastAllocatedIdx) {
+ super(grpId, pageId);
this.lastAllocatedIdx = lastAllocatedIdx;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
index 34be353..03f945f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
@@ -31,8 +31,8 @@ public class MetaPageUpdateLastSuccessfulFullSnapshotId extends PageDeltaRecord
/**
* @param pageId Meta page ID.
*/
- public MetaPageUpdateLastSuccessfulFullSnapshotId(int cacheId, long pageId, long lastSuccessfulFullSnapshotId) {
- super(cacheId, pageId);
+ public MetaPageUpdateLastSuccessfulFullSnapshotId(int grpId, long pageId, long lastSuccessfulFullSnapshotId) {
+ super(grpId, pageId);
this.lastSuccessfulFullSnapshotId = lastSuccessfulFullSnapshotId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
index 7fca5dc..07798bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
@@ -34,8 +34,8 @@ public class MetaPageUpdateLastSuccessfulSnapshotId extends PageDeltaRecord {
* @param pageId Meta page ID.
* @param snapshotTag
*/
- public MetaPageUpdateLastSuccessfulSnapshotId(int cacheId, long pageId, long lastSuccessfulSnapshotId, long snapshotTag) {
- super(cacheId, pageId);
+ public MetaPageUpdateLastSuccessfulSnapshotId(int grpId, long pageId, long lastSuccessfulSnapshotId, long snapshotTag) {
+ super(grpId, pageId);
this.lastSuccessfulSnapshotId = lastSuccessfulSnapshotId;
this.lastSuccessfulSnapshotTag = snapshotTag;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
index 0cd72ec..e2d1267 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
@@ -31,8 +31,8 @@ public class MetaPageUpdateNextSnapshotId extends PageDeltaRecord {
/**
* @param pageId Meta page ID.
*/
- public MetaPageUpdateNextSnapshotId(int cacheId, long pageId, long nextSnapshotId) {
- super(cacheId, pageId);
+ public MetaPageUpdateNextSnapshotId(int grpId, long pageId, long nextSnapshotId) {
+ super(grpId, pageId);
this.nextSnapshotId = nextSnapshotId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
index 15d1a0c..f85f468 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
@@ -45,12 +45,12 @@ public class MetaPageUpdatePartitionDataRecord extends PageDeltaRecord {
private long cntrsPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param allocatedIdxCandidate Page Allocated index candidate
*/
public MetaPageUpdatePartitionDataRecord(
- int cacheId,
+ int grpId,
long pageId,
long updateCntr,
long globalRmvId,
@@ -58,7 +58,7 @@ public class MetaPageUpdatePartitionDataRecord extends PageDeltaRecord {
long cntrsPageId, byte state,
int allocatedIdxCandidate
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
this.updateCntr = updateCntr;
this.globalRmvId = globalRmvId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
index bdfdef5..f39f91c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
@@ -41,7 +41,7 @@ public class NewRootInitRecord<L> extends PageDeltaRecord {
private long rightChildId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param io IO.
* @param leftChildId Left child ID.
@@ -49,7 +49,7 @@ public class NewRootInitRecord<L> extends PageDeltaRecord {
* @param rightChildId Right child ID.
*/
public NewRootInitRecord(
- int cacheId,
+ int grpId,
long pageId,
long newRootId,
BPlusInnerIO<L> io,
@@ -57,7 +57,7 @@ public class NewRootInitRecord<L> extends PageDeltaRecord {
byte[] rowBytes,
long rightChildId
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
assert io != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageDeltaRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageDeltaRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageDeltaRecord.java
index ca52bd2..260c2c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageDeltaRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageDeltaRecord.java
@@ -29,18 +29,18 @@ import org.apache.ignite.internal.util.typedef.internal.U;
*/
public abstract class PageDeltaRecord extends WALRecord {
/** */
- private int cacheId;
+ private int grpId;
/** */
@GridToStringExclude
private long pageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
*/
- protected PageDeltaRecord(int cacheId, long pageId) {
- this.cacheId = cacheId;
+ protected PageDeltaRecord(int grpId, long pageId) {
+ this.grpId = grpId;
this.pageId = pageId;
}
@@ -52,10 +52,10 @@ public abstract class PageDeltaRecord extends WALRecord {
}
/**
- * @return Cache ID.
+ * @return Cache group ID.
*/
- public int cacheId() {
- return cacheId;
+ public int groupId() {
+ return grpId;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
index 4756c9a..9c12380 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
@@ -26,11 +26,11 @@ import org.apache.ignite.internal.processors.cache.persistence.freelist.io.Pages
*/
public class PageListMetaResetCountRecord extends PageDeltaRecord {
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
*/
- public PageListMetaResetCountRecord(int cacheId, long pageId) {
- super(cacheId, pageId);
+ public PageListMetaResetCountRecord(int grpId, long pageId) {
+ super(grpId, pageId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
index 2577ec3..6c7fc71 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
@@ -33,12 +33,12 @@ public class PagesListAddPageRecord extends PageDeltaRecord {
private final long dataPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param dataPageId Data page ID to add.
*/
- public PagesListAddPageRecord(int cacheId, long pageId, long dataPageId) {
- super(cacheId, pageId);
+ public PagesListAddPageRecord(int grpId, long pageId, long dataPageId) {
+ super(grpId, pageId);
this.dataPageId = dataPageId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
index 673d33c..ee83b8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
@@ -38,13 +38,13 @@ public class PagesListInitNewPageRecord extends InitNewPageRecord {
private final long addDataPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param prevPageId Previous page ID.
* @param addDataPageId Optional page ID to add.
*/
public PagesListInitNewPageRecord(
- int cacheId,
+ int grpId,
long pageId,
int ioType,
int ioVer,
@@ -52,7 +52,7 @@ public class PagesListInitNewPageRecord extends InitNewPageRecord {
long prevPageId,
long addDataPageId
) {
- super(cacheId, pageId, ioType, ioVer, newPageId);
+ super(grpId, pageId, ioType, ioVer, newPageId);
this.prevPageId = prevPageId;
this.addDataPageId = addDataPageId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
index 2341129..8f2cd72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
@@ -69,6 +69,6 @@ public class PagesListRemovePageRecord extends PageDeltaRecord {
return S.toString(PagesListRemovePageRecord.class, this,
"rmvdPageId", U.hexLong(rmvdPageId),
"pageId", U.hexLong(pageId()),
- "cacheId", cacheId());
+ "grpId", groupId());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
index 30600e1..f46ac8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
@@ -29,12 +29,12 @@ public class PagesListSetNextRecord extends PageDeltaRecord {
private final long nextPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param nextPageId Next page ID.
*/
- public PagesListSetNextRecord(int cacheId, long pageId, long nextPageId) {
- super(cacheId, pageId);
+ public PagesListSetNextRecord(int grpId, long pageId, long nextPageId) {
+ super(grpId, pageId);
this.nextPageId = nextPageId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
index 590643e..cc27077 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
@@ -29,12 +29,12 @@ public class PagesListSetPreviousRecord extends PageDeltaRecord {
private final long prevPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param prevPageId Previous page ID.
*/
- public PagesListSetPreviousRecord(int cacheId, long pageId, long prevPageId) {
- super(cacheId, pageId);
+ public PagesListSetPreviousRecord(int grpId, long pageId, long prevPageId) {
+ super(grpId, pageId);
this.prevPageId = prevPageId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionDestroyRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionDestroyRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionDestroyRecord.java
index c3b8200..834dc58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionDestroyRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionDestroyRecord.java
@@ -24,17 +24,17 @@ import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
*/
public class PartitionDestroyRecord extends WALRecord {
/** */
- private int cacheId;
+ private int grpId;
/** */
private int partId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID.
*/
- public PartitionDestroyRecord(int cacheId, int partId) {
- this.cacheId = cacheId;
+ public PartitionDestroyRecord(int grpId, int partId) {
+ this.grpId = grpId;
this.partId = partId;
}
@@ -44,17 +44,17 @@ public class PartitionDestroyRecord extends WALRecord {
}
/**
- * @return Cache ID.
+ * @return Cache group ID.
*/
- public int cacheId() {
- return cacheId;
+ public int groupId() {
+ return grpId;
}
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
*/
- public void cacheId(int cacheId) {
- this.cacheId = cacheId;
+ public void groupId(int grpId) {
+ this.grpId = grpId;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionMetaStateRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionMetaStateRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionMetaStateRecord.java
index 95e1a56..8ab794c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionMetaStateRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PartitionMetaStateRecord.java
@@ -27,8 +27,8 @@ public class PartitionMetaStateRecord extends WALRecord {
/** State. */
private final byte state;
- /** Cache id. */
- private final int cacheId;
+ /** Cache group ID. */
+ private final int grpId;
/** Partition id. */
private final int partId;
@@ -37,11 +37,11 @@ public class PartitionMetaStateRecord extends WALRecord {
private final long updateCounter;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param state Page ID.
*/
- public PartitionMetaStateRecord(int cacheId, int partId, GridDhtPartitionState state, long updateCounter) {
- this.cacheId = cacheId;
+ public PartitionMetaStateRecord(int grpId, int partId, GridDhtPartitionState state, long updateCounter) {
+ this.grpId = grpId;
this.partId = partId;
this.state = (byte)state.ordinal();
this.updateCounter = updateCounter;
@@ -60,10 +60,10 @@ public class PartitionMetaStateRecord extends WALRecord {
}
/**
- * @return Cache ID.
+ * @return Cache group ID.
*/
- public int cacheId() {
- return cacheId;
+ public int groupId() {
+ return grpId;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
index 92ea88e..b505e4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
@@ -29,12 +29,12 @@ public class RecycleRecord extends PageDeltaRecord {
private long newPageId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param newPageId New page ID.
*/
- public RecycleRecord(int cacheId, long pageId, long newPageId) {
- super(cacheId, pageId);
+ public RecycleRecord(int grpId, long pageId, long newPageId) {
+ super(grpId, pageId);
this.newPageId = newPageId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
index ac5d442..53f9cb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
@@ -34,13 +34,13 @@ public class RemoveRecord extends PageDeltaRecord {
private int cnt;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param idx Index.
* @param cnt Count.
*/
- public RemoveRecord(int cacheId, long pageId, int idx, int cnt) {
- super(cacheId, pageId);
+ public RemoveRecord(int grpId, long pageId, int idx, int cnt) {
+ super(grpId, pageId);
this.idx = idx;
this.cnt = cnt;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
index 2f504ad..2fbc0dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
@@ -35,14 +35,14 @@ public class ReplaceRecord<L> extends PageDeltaRecord {
private int idx;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param io IO.
* @param rowBytes Row bytes.
* @param idx Index.
*/
- public ReplaceRecord(int cacheId, long pageId, BPlusIO<L> io, byte[] rowBytes, int idx) {
- super(cacheId, pageId);
+ public ReplaceRecord(int grpId, long pageId, BPlusIO<L> io, byte[] rowBytes, int idx) {
+ super(grpId, pageId);
this.io = io;
this.rowBytes = rowBytes;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
index 5cb3023..87638a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
@@ -37,13 +37,13 @@ public class SplitExistingPageRecord extends PageDeltaRecord {
private long fwdId;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @param mid Bisection index.
* @param fwdId New forward page ID.
*/
- public SplitExistingPageRecord(int cacheId, long pageId, int mid, long fwdId) {
- super(cacheId, pageId);
+ public SplitExistingPageRecord(int grpId, long pageId, int mid, long fwdId) {
+ super(grpId, pageId);
this.mid = mid;
this.fwdId = fwdId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java
index 39f2669..7f855f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java
@@ -45,7 +45,7 @@ public class SplitForwardPageRecord extends PageDeltaRecord {
private int cnt;
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Real forward page ID.
* @param fwdId Virtual forward page ID.
* @param ioType IO Type.
@@ -55,7 +55,7 @@ public class SplitForwardPageRecord extends PageDeltaRecord {
* @param cnt Initial elements count in the page being split.
*/
public SplitForwardPageRecord(
- int cacheId,
+ int grpId,
long pageId,
long fwdId,
int ioType,
@@ -64,7 +64,7 @@ public class SplitForwardPageRecord extends PageDeltaRecord {
int mid,
int cnt
) {
- super(cacheId, pageId);
+ super(grpId, pageId);
this.fwdId = fwdId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
index 05e96ff..3d88e8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
@@ -35,13 +35,13 @@ public class TrackingPageDeltaRecord extends PageDeltaRecord {
private final long lastSuccessfulSnapshotId;
/**
- * @param cacheId Cache id.
+ * @param grpId Cache group id.
* @param pageId Page id.
* @param nextSnapshotId
* @param lastSuccessfulSnapshotId
*/
- public TrackingPageDeltaRecord(int cacheId, long pageId, long pageIdToMark, long nextSnapshotId, long lastSuccessfulSnapshotId) {
- super(cacheId, pageId);
+ public TrackingPageDeltaRecord(int grpId, long pageId, long pageIdToMark, long nextSnapshotId, long lastSuccessfulSnapshotId) {
+ super(grpId, pageId);
this.pageIdToMark = pageIdToMark;
this.nextSnapshotId = nextSnapshotId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
index b2a8f36..9161d69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
@@ -45,7 +45,7 @@ public abstract class DataStructure implements PageLockListener {
public static Random rnd;
/** */
- protected final int cacheId;
+ protected final int grpId;
/** */
protected final PageMemory pageMem;
@@ -57,7 +57,7 @@ public abstract class DataStructure implements PageLockListener {
protected ReuseList reuseList;
/**
- * @param cacheId Cache ID.
+ * @param cacheId Cache group ID.
* @param pageMem Page memory.
* @param wal Write ahead log manager.
*/
@@ -68,16 +68,16 @@ public abstract class DataStructure implements PageLockListener {
) {
assert pageMem != null;
- this.cacheId = cacheId;
+ this.grpId = cacheId;
this.pageMem = pageMem;
this.wal = wal;
}
/**
- * @return Cache ID.
+ * @return Cache group ID.
*/
- public final int getCacheId() {
- return cacheId;
+ public final int groupId() {
+ return grpId;
}
/**
@@ -114,7 +114,7 @@ public abstract class DataStructure implements PageLockListener {
* @throws IgniteCheckedException If failed.
*/
protected long allocatePageNoReuse() throws IgniteCheckedException {
- return pageMem.allocatePage(cacheId, PageIdAllocator.INDEX_PARTITION, FLAG_IDX);
+ return pageMem.allocatePage(grpId, PageIdAllocator.INDEX_PARTITION, FLAG_IDX);
}
/**
@@ -126,7 +126,7 @@ public abstract class DataStructure implements PageLockListener {
assert PageIdUtils.flag(pageId) == FLAG_IDX && PageIdUtils.partId(pageId) == INDEX_PARTITION ||
PageIdUtils.flag(pageId) == FLAG_DATA && PageIdUtils.partId(pageId) <= MAX_PARTITION_ID : U.hexLong(pageId);
- return pageMem.acquirePage(cacheId, pageId);
+ return pageMem.acquirePage(grpId, pageId);
}
/**
@@ -134,7 +134,7 @@ public abstract class DataStructure implements PageLockListener {
* @param page Page pointer.
*/
protected final void releasePage(long pageId, long page) {
- pageMem.releasePage(cacheId, pageId, page);
+ pageMem.releasePage(grpId, pageId, page);
}
/**
@@ -143,7 +143,7 @@ public abstract class DataStructure implements PageLockListener {
* @return Page address or {@code 0} if failed to lock due to recycling.
*/
protected final long tryWriteLock(long pageId, long page) {
- return PageHandler.writeLock(pageMem, cacheId, pageId, page, this, true);
+ return PageHandler.writeLock(pageMem, grpId, pageId, page, this, true);
}
/**
@@ -152,7 +152,7 @@ public abstract class DataStructure implements PageLockListener {
* @return Page address.
*/
protected final long writeLock(long pageId, long page) {
- return PageHandler.writeLock(pageMem, cacheId, pageId, page, this, false);
+ return PageHandler.writeLock(pageMem, grpId, pageId, page, this, false);
}
/**
@@ -174,7 +174,7 @@ public abstract class DataStructure implements PageLockListener {
* @return Page address.
*/
protected final long readLock(long pageId, long page) {
- return PageHandler.readLock(pageMem, cacheId, pageId, page, this);
+ return PageHandler.readLock(pageMem, grpId, pageId, page, this);
}
/**
@@ -183,7 +183,7 @@ public abstract class DataStructure implements PageLockListener {
* @param pageAddr Page address.
*/
protected final void readUnlock(long pageId, long page, long pageAddr) {
- PageHandler.readUnlock(pageMem, cacheId, pageId, page, pageAddr, this);
+ PageHandler.readUnlock(pageMem, grpId, pageId, page, pageAddr, this);
}
/**
@@ -194,7 +194,7 @@ public abstract class DataStructure implements PageLockListener {
* @param dirty Dirty flag.
*/
protected final void writeUnlock(long pageId, long page, long pageAddr, Boolean walPlc, boolean dirty) {
- PageHandler.writeUnlock(pageMem, cacheId, pageId, page, pageAddr, this, walPlc, dirty);
+ PageHandler.writeUnlock(pageMem, grpId, pageId, page, pageAddr, this, walPlc, dirty);
}
/**
@@ -204,7 +204,7 @@ public abstract class DataStructure implements PageLockListener {
* @return {@code true} If we need to make a delta WAL record for the change in this page.
*/
protected final boolean needWalDeltaRecord(long pageId, long page, Boolean walPlc) {
- return PageHandler.isWalDeltaRecordNeeded(pageMem, cacheId, pageId, page, wal, walPlc);
+ return PageHandler.isWalDeltaRecordNeeded(pageMem, grpId, pageId, page, wal, walPlc);
}
/**
@@ -220,7 +220,7 @@ public abstract class DataStructure implements PageLockListener {
PageHandler<?, R> h,
int intArg,
R lockFailed) throws IgniteCheckedException {
- return PageHandler.writePage(pageMem, cacheId, pageId, this, h, null, null, null, null, intArg, lockFailed);
+ return PageHandler.writePage(pageMem, grpId, pageId, this, h, null, null, null, null, intArg, lockFailed);
}
/**
@@ -238,7 +238,7 @@ public abstract class DataStructure implements PageLockListener {
X arg,
int intArg,
R lockFailed) throws IgniteCheckedException {
- return PageHandler.writePage(pageMem, cacheId, pageId, this, h, null, null, null, arg, intArg, lockFailed);
+ return PageHandler.writePage(pageMem, grpId, pageId, this, h, null, null, null, arg, intArg, lockFailed);
}
/**
@@ -258,7 +258,7 @@ public abstract class DataStructure implements PageLockListener {
X arg,
int intArg,
R lockFailed) throws IgniteCheckedException {
- return PageHandler.writePage(pageMem, cacheId, pageId, page, this, h, null, null, null, arg, intArg, lockFailed);
+ return PageHandler.writePage(pageMem, grpId, pageId, page, this, h, null, null, null, arg, intArg, lockFailed);
}
/**
@@ -278,7 +278,7 @@ public abstract class DataStructure implements PageLockListener {
X arg,
int intArg,
R lockFailed) throws IgniteCheckedException {
- return PageHandler.writePage(pageMem, cacheId, pageId, this, h, init, wal, null, arg, intArg, lockFailed);
+ return PageHandler.writePage(pageMem, grpId, pageId, this, h, init, wal, null, arg, intArg, lockFailed);
}
/**
@@ -296,7 +296,7 @@ public abstract class DataStructure implements PageLockListener {
X arg,
int intArg,
R lockFailed) throws IgniteCheckedException {
- return PageHandler.readPage(pageMem, cacheId, pageId, this, h, arg, intArg, lockFailed);
+ return PageHandler.readPage(pageMem, grpId, pageId, this, h, arg, intArg, lockFailed);
}
/**
@@ -316,7 +316,7 @@ public abstract class DataStructure implements PageLockListener {
X arg,
int intArg,
R lockFailed) throws IgniteCheckedException {
- return PageHandler.readPage(pageMem, cacheId, pageId, page, this, h, arg, intArg, lockFailed);
+ return PageHandler.readPage(pageMem, grpId, pageId, page, this, h, arg, intArg, lockFailed);
}
/**
@@ -325,7 +325,7 @@ public abstract class DataStructure implements PageLockListener {
* @throws IgniteCheckedException if failed.
*/
protected final void init(long pageId, PageIO init) throws IgniteCheckedException {
- PageHandler.initPage(pageMem, cacheId, pageId, init, wal, this);
+ PageHandler.initPage(pageMem, grpId, pageId, init, wal, this);
}
/**
@@ -346,7 +346,7 @@ public abstract class DataStructure implements PageLockListener {
PageIO.setPageId(pageAddr, rotated);
if (needWalDeltaRecord(pageId, page, walPlc))
- wal.log(new RecycleRecord(cacheId, pageId, rotated));
+ wal.log(new RecycleRecord(grpId, pageId, rotated));
return rotated;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index 4af4daf..71dfb96 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -622,7 +622,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
Integer tag
) throws IgniteCheckedException {
// First of all, write page to disk.
- storeMgr.write(fullId.cacheId(), fullId.pageId(), pageBuf, tag);
+ storeMgr.write(fullId.groupId(), fullId.pageId(), pageBuf, tag);
// Only after write we can write page into snapshot.
snapshotMgr.flushDirtyPageHandler(fullId, pageBuf, tag);
@@ -1335,25 +1335,25 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
// Here we do not require tag check because we may be applying memory changes after
// several repetitive restarts and the same pages may have changed several times.
- int cacheId = pageRec.fullPageId().cacheId();
+ int grpId = pageRec.fullPageId().groupId();
long pageId = pageRec.fullPageId().pageId();
- PageMemoryEx pageMem = getPageMemoryForCacheGroup(cacheId);
+ PageMemoryEx pageMem = getPageMemoryForCacheGroup(grpId);
- long page = pageMem.acquirePage(cacheId, pageId, true);
+ long page = pageMem.acquirePage(grpId, pageId, true);
try {
- long pageAddr = pageMem.writeLock(cacheId, pageId, page);
+ long pageAddr = pageMem.writeLock(grpId, pageId, page);
try {
PageUtils.putBytes(pageAddr, 0, pageRec.pageData());
}
finally {
- pageMem.writeUnlock(cacheId, pageId, page, null, true, true);
+ pageMem.writeUnlock(grpId, pageId, page, null, true, true);
}
}
finally {
- pageMem.releasePage(cacheId, pageId, page);
+ pageMem.releasePage(grpId, pageId, page);
}
applied++;
@@ -1365,14 +1365,14 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
if (apply) {
PartitionDestroyRecord destroyRec = (PartitionDestroyRecord)rec;
- final int cId = destroyRec.cacheId();
+ final int gId = destroyRec.groupId();
final int pId = destroyRec.partitionId();
- PageMemoryEx pageMem = getPageMemoryForCacheGroup(cId);
+ PageMemoryEx pageMem = getPageMemoryForCacheGroup(gId);
pageMem.clearAsync(new P3<Integer, Long, Integer>() {
@Override public boolean apply(Integer cacheId, Long pageId, Integer tag) {
- return cacheId == cId && PageIdUtils.partId(pageId) == pId;
+ return cacheId == gId && PageIdUtils.partId(pageId) == pId;
}
}, true).get();
}
@@ -1383,27 +1383,27 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
if (apply && rec instanceof PageDeltaRecord) {
PageDeltaRecord r = (PageDeltaRecord)rec;
- int cacheId = r.cacheId();
+ int grpId = r.groupId();
long pageId = r.pageId();
- PageMemoryEx pageMem = getPageMemoryForCacheGroup(cacheId);
+ PageMemoryEx pageMem = getPageMemoryForCacheGroup(grpId);
// Here we do not require tag check because we may be applying memory changes after
// several repetitive restarts and the same pages may have changed several times.
- long page = pageMem.acquirePage(cacheId, pageId, true);
+ long page = pageMem.acquirePage(grpId, pageId, true);
try {
- long pageAddr = pageMem.writeLock(cacheId, pageId, page);
+ long pageAddr = pageMem.writeLock(grpId, pageId, page);
try {
r.applyDelta(pageMem, pageAddr);
}
finally {
- pageMem.writeUnlock(cacheId, pageId, page, null, true, true);
+ pageMem.writeUnlock(grpId, pageId, page, null, true, true);
}
}
finally {
- pageMem.releasePage(cacheId, pageId, page);
+ pageMem.releasePage(grpId, pageId, page);
}
applied++;
@@ -1492,7 +1492,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
case PART_META_UPDATE_STATE:
PartitionMetaStateRecord metaStateRecord = (PartitionMetaStateRecord)rec;
- partStates.put(new T2<>(metaStateRecord.cacheId(), metaStateRecord.partitionId()),
+ partStates.put(new T2<>(metaStateRecord.groupId(), metaStateRecord.partitionId()),
new T2<>((int)metaStateRecord.state(), metaStateRecord.updateCounter()));
break;
@@ -1685,7 +1685,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
if (tag != null) {
tmpWriteBuf.rewind();
- PageStore store = storeMgr.writeInternal(fullId.cacheId(), fullId.pageId(), tmpWriteBuf, tag);
+ PageStore store = storeMgr.writeInternal(fullId.groupId(), fullId.pageId(), tmpWriteBuf, tag);
tmpWriteBuf.rewind();
@@ -2325,7 +2325,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
snapshotMgr.beforePageWrite(fullId);
- int grpId = fullId.cacheId();
+ int grpId = fullId.groupId();
CacheGroupContext grp = context().cache().cacheGroup(grpId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 4d30eb4..bd902fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -888,7 +888,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
reuseRoot.pageId().pageId(),
reuseRoot.isAllocated()) {
@Override protected long allocatePageNoReuse() throws IgniteCheckedException {
- return pageMem.allocatePage(cacheId, partId, PageIdAllocator.FLAG_DATA);
+ return pageMem.allocatePage(grpId, partId, PageIdAllocator.FLAG_DATA);
}
};
@@ -904,7 +904,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
treeRoot.pageId().pageId(),
treeRoot.isAllocated()) {
@Override protected long allocatePageNoReuse() throws IgniteCheckedException {
- return pageMem.allocatePage(cacheId, partId, PageIdAllocator.FLAG_DATA);
+ return pageMem.allocatePage(grpId, partId, PageIdAllocator.FLAG_DATA);
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MetadataStorage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MetadataStorage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MetadataStorage.java
index 806afb8..743f3b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MetadataStorage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MetadataStorage.java
@@ -186,7 +186,7 @@ public class MetadataStorage implements MetaStore {
/** {@inheritDoc} */
@Override protected long allocatePageNoReuse() throws IgniteCheckedException {
- return pageMem.allocatePage(getCacheId(), allocPartId, allocSpace);
+ return pageMem.allocatePage(groupId(), allocPartId, allocSpace);
}
/** {@inheritDoc} */
[4/5] ignite git commit: Rename cacheId -> grpId.
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index 28bf6e4..8d09a9f 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
@@ -269,8 +269,8 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
}
/** {@inheritDoc} */
- @Override public void read(int cacheId, long pageId, ByteBuffer pageBuf) throws IgniteCheckedException {
- read(cacheId, pageId, pageBuf, false);
+ @Override public void read(int grpId, long pageId, ByteBuffer pageBuf) throws IgniteCheckedException {
+ read(grpId, pageId, pageBuf, false);
}
/**
@@ -296,20 +296,20 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
}
/** {@inheritDoc} */
- @Override public void readHeader(int cacheId, int partId, ByteBuffer buf) throws IgniteCheckedException {
- PageStore store = getStore(cacheId, partId);
+ @Override public void readHeader(int grpId, int partId, ByteBuffer buf) throws IgniteCheckedException {
+ PageStore store = getStore(grpId, partId);
store.readHeader(buf);
}
/** {@inheritDoc} */
- @Override public void write(int cacheId, long pageId, ByteBuffer pageBuf,int tag) throws IgniteCheckedException {
- writeInternal(cacheId, pageId, pageBuf, tag);
+ @Override public void write(int grpId, long pageId, ByteBuffer pageBuf, int tag) throws IgniteCheckedException {
+ writeInternal(grpId, pageId, pageBuf, tag);
}
/** {@inheritDoc} */
- @Override public long pageOffset(int cacheId, long pageId) throws IgniteCheckedException {
- PageStore store = getStore(cacheId, PageIdUtils.partId(pageId));
+ @Override public long pageOffset(int grpId, long pageId) throws IgniteCheckedException {
+ PageStore store = getStore(grpId, PageIdUtils.partId(pageId));
return store.pageOffset(pageId);
}
@@ -445,20 +445,20 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
}
/** {@inheritDoc} */
- @Override public void sync(int cacheId, int partId) throws IgniteCheckedException {
- getStore(cacheId, partId).sync();
+ @Override public void sync(int grpId, int partId) throws IgniteCheckedException {
+ getStore(grpId, partId).sync();
}
/** {@inheritDoc} */
- @Override public void ensure(int cacheId, int partId) throws IgniteCheckedException {
- getStore(cacheId, partId).ensure();
+ @Override public void ensure(int grpId, int partId) throws IgniteCheckedException {
+ getStore(grpId, partId).ensure();
}
/** {@inheritDoc} */
- @Override public long allocatePage(int cacheId, int partId, byte flags) throws IgniteCheckedException {
+ @Override public long allocatePage(int grpId, int partId, byte flags) throws IgniteCheckedException {
assert partId <= PageIdAllocator.MAX_PARTITION_ID || partId == PageIdAllocator.INDEX_PARTITION;
- PageStore store = getStore(cacheId, partId);
+ PageStore store = getStore(grpId, partId);
long pageIdx = store.allocatePage();
@@ -466,13 +466,13 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
}
/** {@inheritDoc} */
- @Override public long metaPageId(final int cacheId) {
+ @Override public long metaPageId(final int grpId) {
return metaPageId;
}
/** {@inheritDoc} */
- @Override public int pages(int cacheId, int partId) throws IgniteCheckedException {
- PageStore store = getStore(cacheId, partId);
+ @Override public int pages(int grpId, int partId) throws IgniteCheckedException {
+ PageStore store = getStore(grpId, partId);
return store.pages();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java
index 844bc02..e99a5ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java
@@ -203,7 +203,7 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList {
PageUtils.getBytes(pageAddr, data.offset(), payload, 0, rowSize);
wal.log(new DataPageInsertRecord(
- cacheId,
+ grpId,
pageId,
payload));
}
@@ -246,7 +246,7 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList {
PageUtils.getBytes(pageAddr, data.offset(), payload, 0, payloadSize);
- wal.log(new DataPageInsertFragmentRecord(cacheId, pageId, payload, lastLink));
+ wal.log(new DataPageInsertFragmentRecord(grpId, pageId, payload, lastLink));
}
return written + payloadSize;
@@ -448,7 +448,7 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList {
assert part <= PageIdAllocator.MAX_PARTITION_ID;
assert part != PageIdAllocator.INDEX_PARTITION;
- return pageMem.allocatePage(cacheId, part, PageIdAllocator.FLAG_DATA);
+ return pageMem.allocatePage(grpId, part, PageIdAllocator.FLAG_DATA);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index eb5df6b..39a6865 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -333,7 +333,7 @@ public abstract class PagesList extends DataStructure {
io.resetCount(pageAddr);
if (needWalDeltaRecord(pageId, page, null))
- wal.log(new PageListMetaResetCountRecord(cacheId, pageId));
+ wal.log(new PageListMetaResetCountRecord(grpId, pageId));
nextPageId = io.getNextMetaPageId(pageAddr);
}
@@ -682,13 +682,13 @@ public abstract class PagesList extends DataStructure {
incrementBucketSize(bucket);
if (needWalDeltaRecord(pageId, page, null))
- wal.log(new PagesListAddPageRecord(cacheId, pageId, dataId));
+ wal.log(new PagesListAddPageRecord(grpId, pageId, dataId));
DataPageIO dataIO = DataPageIO.VERSIONS.forPage(dataAddr);
dataIO.setFreeListPageId(dataAddr, pageId);
if (needWalDeltaRecord(dataId, dataPage, null))
- wal.log(new DataPageSetFreeListPageRecord(cacheId, dataId, pageId));
+ wal.log(new DataPageSetFreeListPageRecord(grpId, dataId, pageId));
}
return true;
@@ -728,11 +728,11 @@ public abstract class PagesList extends DataStructure {
setupNextPage(io, pageId, pageAddr, newDataId, dataAddr);
if (needWalDeltaRecord(pageId, page, null))
- wal.log(new PagesListSetNextRecord(cacheId, pageId, newDataId));
+ wal.log(new PagesListSetNextRecord(grpId, pageId, newDataId));
if (needWalDeltaRecord(dataId, data, null))
wal.log(new PagesListInitNewPageRecord(
- cacheId,
+ grpId,
dataId,
io.getType(),
io.getVersion(),
@@ -761,13 +761,13 @@ public abstract class PagesList extends DataStructure {
setupNextPage(io, pageId, pageAddr, nextId, nextPageAddr);
if (needWalDeltaRecord(pageId, page, null))
- wal.log(new PagesListSetNextRecord(cacheId, pageId, nextId));
+ wal.log(new PagesListSetNextRecord(grpId, pageId, nextId));
int idx = io.addPage(nextPageAddr, dataId, pageSize());
if (needWalDeltaRecord(nextId, nextPage, nextWalPlc))
wal.log(new PagesListInitNewPageRecord(
- cacheId,
+ grpId,
nextId,
io.getType(),
io.getVersion(),
@@ -781,7 +781,7 @@ public abstract class PagesList extends DataStructure {
dataIO.setFreeListPageId(dataAddr, nextId);
if (needWalDeltaRecord(dataId, data, null))
- wal.log(new DataPageSetFreeListPageRecord(cacheId, dataId, nextId));
+ wal.log(new DataPageSetFreeListPageRecord(grpId, dataId, nextId));
incrementBucketSize(bucket);
@@ -853,12 +853,12 @@ public abstract class PagesList extends DataStructure {
setupNextPage(io, prevId, prevAddr, nextId, nextPageAddr);
if (needWalDeltaRecord(prevId, prevPage, walPlc))
- wal.log(new PagesListSetNextRecord(cacheId, prevId, nextId));
+ wal.log(new PagesListSetNextRecord(grpId, prevId, nextId));
// Here we should never write full page, because it is known to be new.
if (needWalDeltaRecord(nextId, nextPage, FALSE))
wal.log(new PagesListInitNewPageRecord(
- cacheId,
+ grpId,
nextId,
io.getType(),
io.getVersion(),
@@ -887,7 +887,7 @@ public abstract class PagesList extends DataStructure {
else {
// TODO: use single WAL record for bag?
if (needWalDeltaRecord(prevId, prevPage, walPlc))
- wal.log(new PagesListAddPageRecord(cacheId, prevId, nextId));
+ wal.log(new PagesListAddPageRecord(grpId, prevId, nextId));
incrementBucketSize(bucket);
}
@@ -1035,7 +1035,7 @@ public abstract class PagesList extends DataStructure {
decrementBucketSize(bucket);
if (needWalDeltaRecord(tailId, tailPage, null))
- wal.log(new PagesListRemovePageRecord(cacheId, tailId, pageId));
+ wal.log(new PagesListRemovePageRecord(grpId, tailId, pageId));
dirty = true;
@@ -1085,7 +1085,7 @@ public abstract class PagesList extends DataStructure {
initIo.initNewPage(tailAddr, dataPageId, pageSize());
if (needWalDeltaRecord(tailId, tailPage, null)) {
- wal.log(new InitNewPageRecord(cacheId, tailId, initIo.getType(),
+ wal.log(new InitNewPageRecord(grpId, tailId, initIo.getType(),
initIo.getVersion(), dataPageId));
}
}
@@ -1163,13 +1163,13 @@ public abstract class PagesList extends DataStructure {
decrementBucketSize(bucket);
if (needWalDeltaRecord(pageId, page, null))
- wal.log(new PagesListRemovePageRecord(cacheId, pageId, dataId));
+ wal.log(new PagesListRemovePageRecord(grpId, pageId, dataId));
// Reset free list page ID.
dataIO.setFreeListPageId(dataAddr, 0L);
if (needWalDeltaRecord(dataId, dataPage, null))
- wal.log(new DataPageSetFreeListPageRecord(cacheId, dataId, 0L));
+ wal.log(new DataPageSetFreeListPageRecord(grpId, dataId, 0L));
if (!io.isEmpty(pageAddr))
return true; // In optimistic case we still have something in the page and can leave it as is.
@@ -1343,7 +1343,7 @@ public abstract class PagesList extends DataStructure {
nextIO.setPreviousId(nextAddr, 0);
if (needWalDeltaRecord(nextId, nextPage, null))
- wal.log(new PagesListSetPreviousRecord(cacheId, nextId, 0L));
+ wal.log(new PagesListSetPreviousRecord(grpId, nextId, 0L));
}
else // Do a fair merge: link previous and next to each other.
fairMerge(prevId, pageId, nextId, nextPage, nextAddr);
@@ -1384,12 +1384,12 @@ public abstract class PagesList extends DataStructure {
prevIO.setNextId(prevAddr, nextId);
if (needWalDeltaRecord(prevId, prevPage, null))
- wal.log(new PagesListSetNextRecord(cacheId, prevId, nextId));
+ wal.log(new PagesListSetNextRecord(grpId, prevId, nextId));
nextIO.setPreviousId(nextAddr, prevId);
if (needWalDeltaRecord(nextId, nextPage, null))
- wal.log(new PagesListSetPreviousRecord(cacheId, nextId, prevId));
+ wal.log(new PagesListSetPreviousRecord(grpId, nextId, prevId));
}
finally {
writeUnlock(prevId, prevPage, prevAddr, true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
index 78d83b3..19d26ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTable.java
@@ -45,13 +45,13 @@ public class FullPageIdTable {
private static final long EMPTY_PAGE_ID = EMPTY_FULL_PAGE_ID.pageId();
/** */
- private static final int EMPTY_CACHE_ID = EMPTY_FULL_PAGE_ID.cacheId();
+ private static final int EMPTY_CACHE_GRP_ID = EMPTY_FULL_PAGE_ID.groupId();
/** */
private static final long REMOVED_PAGE_ID = 0x8000000000000000L;
/** */
- private static final int REMOVED_CACHE_ID = 0;
+ private static final int REMOVED_CACHE_GRP_ID = 0;
/** */
private static final int EQUAL = 0;
@@ -178,13 +178,13 @@ public class FullPageIdTable {
/**
* Removes key-value association for the given key.
*
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
*/
- public void remove(int cacheId, long pageId, int tag) {
- assert assertKey(cacheId, pageId);
+ public void remove(int grpId, long pageId, int tag) {
+ assert assertKey(grpId, pageId);
- int index = removeKey(cacheId, pageId, tag);
+ int index = removeKey(grpId, pageId, tag);
if (index >= 0)
setValueAt(index, 0);
@@ -225,18 +225,18 @@ public class FullPageIdTable {
public long clearAt(int idx, GridPredicate3<Integer, Long, Integer> pred, long absent) {
long base = entryBase(idx);
- int cacheId = GridUnsafe.getInt(base);
+ int grpId = GridUnsafe.getInt(base);
int tag = GridUnsafe.getInt(base + 4);
long pageId = GridUnsafe.getLong(base + 8);
- if ((pageId == REMOVED_PAGE_ID && cacheId == REMOVED_CACHE_ID)
- || (pageId == EMPTY_PAGE_ID && cacheId == EMPTY_CACHE_ID))
+ if ((pageId == REMOVED_PAGE_ID && grpId == REMOVED_CACHE_GRP_ID)
+ || (pageId == EMPTY_PAGE_ID && grpId == EMPTY_CACHE_GRP_ID))
return absent;
- if (pred.apply(cacheId, pageId, tag)) {
+ if (pred.apply(grpId, pageId, tag)) {
long res = valueAt(idx);
- setKeyAt(idx, REMOVED_CACHE_ID, REMOVED_PAGE_ID);
+ setKeyAt(idx, REMOVED_CACHE_GRP_ID, REMOVED_PAGE_ID);
setValueAt(idx, 0);
return res;
@@ -367,7 +367,7 @@ public class FullPageIdTable {
while (++step <= maxSteps);
if (foundIndex != -1) {
- setKeyAt(foundIndex, REMOVED_CACHE_ID, REMOVED_PAGE_ID);
+ setKeyAt(foundIndex, REMOVED_CACHE_GRP_ID, REMOVED_PAGE_ID);
decrementSize();
}
@@ -382,17 +382,17 @@ public class FullPageIdTable {
private int testKeyAt(int index, int testCacheId, long testPageId, int testTag) {
long base = entryBase(index);
- int cacheId = GridUnsafe.getInt(base);
+ int grpId = GridUnsafe.getInt(base);
int tag = GridUnsafe.getInt(base + 4);
long pageId = GridUnsafe.getLong(base + 8);
- if (pageId == REMOVED_PAGE_ID && cacheId == REMOVED_CACHE_ID)
+ if (pageId == REMOVED_PAGE_ID && grpId == REMOVED_CACHE_GRP_ID)
return REMOVED;
- else if (pageId == testPageId && cacheId == testCacheId && tag >= testTag)
+ else if (pageId == testPageId && grpId == testCacheId && tag >= testTag)
return EQUAL;
- else if (pageId == testPageId && cacheId == testCacheId && tag < testTag)
+ else if (pageId == testPageId && grpId == testCacheId && tag < testTag)
return OUTDATED;
- else if (pageId == EMPTY_PAGE_ID && cacheId == EMPTY_CACHE_ID)
+ else if (pageId == EMPTY_PAGE_ID && grpId == EMPTY_CACHE_GRP_ID)
return EMPTY;
else
return NOT_EQUAL;
@@ -405,34 +405,34 @@ public class FullPageIdTable {
private boolean isValuePresentAt(final int idx) {
long base = entryBase(idx);
- int cacheId = GridUnsafe.getInt(base);
+ int grpId = GridUnsafe.getInt(base);
long pageId = GridUnsafe.getLong(base + 8);
- return !((pageId == REMOVED_PAGE_ID && cacheId == REMOVED_CACHE_ID)
- || (pageId == EMPTY_PAGE_ID && cacheId == EMPTY_CACHE_ID));
+ return !((pageId == REMOVED_PAGE_ID && grpId == REMOVED_CACHE_GRP_ID)
+ || (pageId == EMPTY_PAGE_ID && grpId == EMPTY_CACHE_GRP_ID));
}
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @return {@code True} if checks succeeded.
*/
- private boolean assertKey(int cacheId, long pageId) {
- assert cacheId != EMPTY_CACHE_ID && PageIdUtils.isEffectivePageId(pageId):
- "cacheId=" + cacheId + ", pageId=" + U.hexLong(pageId);
+ private boolean assertKey(int grpId, long pageId) {
+ assert grpId != EMPTY_CACHE_GRP_ID && PageIdUtils.isEffectivePageId(pageId):
+ "grpId=" + grpId + ", pageId=" + U.hexLong(pageId);
return true;
}
/**
* @param index Entry index.
- * @param cacheId Cache ID to write.
+ * @param grpId Cache group ID to write.
* @param pageId Page ID to write.
*/
- private void setKeyAt(int index, int cacheId, long pageId) {
+ private void setKeyAt(int index, int grpId, long pageId) {
long base = entryBase(index);
- GridUnsafe.putInt(base, cacheId);
+ GridUnsafe.putInt(base, grpId);
GridUnsafe.putLong(base + 8, pageId);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
index 3246f21..7c63d41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryEx.java
@@ -77,13 +77,13 @@ public interface PageMemoryEx extends PageMemory {
* @see #acquirePage(int, long)
* Will not read page from file if it is not present in memory
*
- * @param cacheId Cache id.
+ * @param grpId Cache group ID.
* @param pageId Page id.
* @param restore Get page for restore
* @throws IgniteCheckedException If failed.
* @return Page.
*/
- public long acquirePage(int cacheId, long pageId, boolean restore) throws IgniteCheckedException;
+ public long acquirePage(int grpId, long pageId, boolean restore) throws IgniteCheckedException;
/**
* Heuristic method which allows a thread to check if it safe to start memory struture modifications
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
index 6bb5c33..ab6619d 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
@@ -714,7 +714,7 @@ public class PageMemoryImpl implements PageMemoryEx {
if (curPage != null
&& deltaRecord.pageId() == fullId.pageId()
- && deltaRecord.cacheId() == fullId.cacheId()) {
+ && deltaRecord.groupId() == fullId.groupId()) {
assert tmpAddr != null;
deltaRecord.applyDelta(this, tmpAddr);
@@ -727,8 +727,8 @@ public class PageMemoryImpl implements PageMemoryEx {
if (restored == null)
throw new AssertionError(String.format(
- "Page is broken. Can't restore it from WAL. (cacheId = %d, pageId = %X).",
- fullId.cacheId(), fullId.pageId()
+ "Page is broken. Can't restore it from WAL. (grpId = %d, pageId = %X).",
+ fullId.groupId(), fullId.pageId()
));
long pageAddr = writeLockPage(absPtr, fullId, false);
@@ -796,7 +796,7 @@ public class PageMemoryImpl implements PageMemoryEx {
@Override public Integer getForCheckpoint(FullPageId fullId, ByteBuffer tmpBuf, CheckpointMetricsTracker tracker) {
assert tmpBuf.remaining() == pageSize();
- Segment seg = segment(fullId.cacheId(), fullId.pageId());
+ Segment seg = segment(fullId.groupId(), fullId.pageId());
long absPtr = 0;
@@ -807,10 +807,10 @@ public class PageMemoryImpl implements PageMemoryEx {
seg.readLock().lock();
try {
- tag = seg.partTag(fullId.cacheId(), PageIdUtils.partId(fullId.pageId()));
+ tag = seg.partTag(fullId.groupId(), PageIdUtils.partId(fullId.pageId()));
relPtr = seg.loadedPages.get(
- fullId.cacheId(),
+ fullId.groupId(),
PageIdUtils.effectivePageId(fullId.pageId()),
tag,
INVALID_REL_PTR,
@@ -839,10 +839,10 @@ public class PageMemoryImpl implements PageMemoryEx {
try {
// Double-check.
relPtr = seg.loadedPages.get(
- fullId.cacheId(),
+ fullId.groupId(),
PageIdUtils.effectivePageId(fullId.pageId()),
seg.partTag(
- fullId.cacheId(),
+ fullId.groupId(),
PageIdUtils.partId(fullId.pageId())
),
INVALID_REL_PTR,
@@ -855,7 +855,7 @@ public class PageMemoryImpl implements PageMemoryEx {
if (relPtr == OUTDATED_REL_PTR) {
relPtr = refreshOutdatedPage(
seg,
- fullId.cacheId(),
+ fullId.groupId(),
PageIdUtils.effectivePageId(fullId.pageId()),
true
);
@@ -1245,7 +1245,7 @@ public class PageMemoryImpl implements PageMemoryEx {
* @return {@code True} if it was added to the checkpoint list.
*/
boolean isInCheckpoint(FullPageId pageId) {
- Segment seg = segment(pageId.cacheId(), pageId.pageId());
+ Segment seg = segment(pageId.groupId(), pageId.pageId());
Collection<FullPageId> pages0 = seg.segCheckpointPages;
@@ -1256,7 +1256,7 @@ public class PageMemoryImpl implements PageMemoryEx {
* @param fullPageId Page ID to clear.
*/
void clearCheckpoint(FullPageId fullPageId) {
- Segment seg = segment(fullPageId.cacheId(), fullPageId.pageId());
+ Segment seg = segment(fullPageId.groupId(), fullPageId.pageId());
Collection<FullPageId> pages0 = seg.segCheckpointPages;
@@ -1300,14 +1300,14 @@ public class PageMemoryImpl implements PageMemoryEx {
if (dirty) {
if (!wasDirty || forceAdd) {
- boolean added = segment(pageId.cacheId(), pageId.pageId()).dirtyPages.add(pageId);
+ boolean added = segment(pageId.groupId(), pageId.pageId()).dirtyPages.add(pageId);
if (added)
memMetrics.incrementDirtyPages();
}
}
else {
- boolean rmv = segment(pageId.cacheId(), pageId.pageId()).dirtyPages.remove(pageId);
+ boolean rmv = segment(pageId.groupId(), pageId.pageId()).dirtyPages.remove(pageId);
if (rmv)
memMetrics.decrementDirtyPages();
@@ -1330,12 +1330,12 @@ public class PageMemoryImpl implements PageMemoryEx {
}
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param pageId Page ID.
* @return Segment.
*/
- private Segment segment(int cacheId, long pageId) {
- int idx = segmentIndex(cacheId, pageId, segments.length);
+ private Segment segment(int grpId, long pageId) {
+ int idx = segmentIndex(grpId, pageId, segments.length);
return segments[idx];
}
@@ -1344,11 +1344,11 @@ public class PageMemoryImpl implements PageMemoryEx {
* @param pageId Page ID.
* @return Segment index.
*/
- public static int segmentIndex(int cacheId, long pageId, int segments) {
+ public static int segmentIndex(int grpId, long pageId, int segments) {
pageId = PageIdUtils.effectivePageId(pageId);
// Take a prime number larger than total number of partitions.
- int hash = U.hash(pageId * 65537 + cacheId);
+ int hash = U.hash(pageId * 65537 + grpId);
return U.safeAbs(hash) % segments;
}
@@ -1645,7 +1645,7 @@ public class PageMemoryImpl implements PageMemoryEx {
assert writeLock().isHeldByCurrentThread();
// Do not evict cache meta pages.
- if (fullPageId.pageId() == storeMgr.metaPageId(fullPageId.cacheId()))
+ if (fullPageId.pageId() == storeMgr.metaPageId(fullPageId.groupId()))
return false;
if (PageHeader.isAcquired(absPtr))
@@ -1662,7 +1662,7 @@ public class PageMemoryImpl implements PageMemoryEx {
fullPageId,
wrapPointer(absPtr + PAGE_OVERHEAD, pageSize()),
partTag(
- fullPageId.cacheId(),
+ fullPageId.groupId(),
PageIdUtils.partId(fullPageId.pageId())
)
);
@@ -1743,10 +1743,10 @@ public class PageMemoryImpl implements PageMemoryEx {
assert fullId.equals(nearest.fullId()) : "Invalid page mapping [tableId=" + nearest.fullId() +
", actual=" + fullId + ", nearest=" + nearest;
- boolean outdated = partTag < partTag(fullId.cacheId(), PageIdUtils.partId(fullId.pageId()));
+ boolean outdated = partTag < partTag(fullId.groupId(), PageIdUtils.partId(fullId.pageId()));
if (outdated)
- return refreshOutdatedPage(this, fullId.cacheId(), fullId.pageId(), true);
+ return refreshOutdatedPage(this, fullId.groupId(), fullId.pageId(), true);
boolean pinned = PageHeader.isAcquired(absPageAddr);
@@ -1797,10 +1797,10 @@ public class PageMemoryImpl implements PageMemoryEx {
}
loadedPages.remove(
- fullPageId.cacheId(),
+ fullPageId.groupId(),
PageIdUtils.effectivePageId(fullPageId.pageId()),
partTag(
- fullPageId.cacheId(),
+ fullPageId.groupId(),
PageIdUtils.partId(fullPageId.pageId())
)
);
@@ -1834,8 +1834,8 @@ public class PageMemoryImpl implements PageMemoryEx {
FullPageId fullId = PageHeader.fullPageId(absPageAddr);
- if (partTag < partTag(fullId.cacheId(), PageIdUtils.partId(fullId.pageId())))
- return refreshOutdatedPage(this, fullId.cacheId(), fullId.pageId(), true);
+ if (partTag < partTag(fullId.groupId(), PageIdUtils.partId(fullId.pageId())))
+ return refreshOutdatedPage(this, fullId.groupId(), fullId.pageId(), true);
boolean pinned = PageHeader.isAcquired(absPageAddr);
@@ -1851,10 +1851,10 @@ public class PageMemoryImpl implements PageMemoryEx {
if (prepareEvict(fullPageId, absEvictAddr)) {
loadedPages.remove(
- fullPageId.cacheId(),
+ fullPageId.groupId(),
PageIdUtils.effectivePageId(fullPageId.pageId()),
partTag(
- fullPageId.cacheId(),
+ fullPageId.groupId(),
PageIdUtils.partId(fullPageId.pageId())
)
);
@@ -1888,14 +1888,14 @@ public class PageMemoryImpl implements PageMemoryEx {
}
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID.
* @return Partition tag.
*/
- private int partTag(int cacheId, int partId) {
+ private int partTag(int grpId, int partId) {
assert getReadHoldCount() > 0 || getWriteHoldCount() > 0;
- Integer tag = partTagMap.get(new T2<>(cacheId, partId));
+ Integer tag = partTagMap.get(new T2<>(grpId, partId));
if (tag == null)
return 1;
@@ -1904,14 +1904,14 @@ public class PageMemoryImpl implements PageMemoryEx {
}
/**
- * @param cacheId Cache ID.
+ * @param grpId Cache group ID.
* @param partId Partition ID.
* @return New partition tag.
*/
- private int incrementPartTag(int cacheId, int partId) {
+ private int incrementPartTag(int grpId, int partId) {
assert getWriteHoldCount() > 0;
- T2<Integer, Integer> t = new T2<>(cacheId, partId);
+ T2<Integer, Integer> t = new T2<>(grpId, partId);
Integer tag = partTagMap.get(t);
@@ -1921,7 +1921,7 @@ public class PageMemoryImpl implements PageMemoryEx {
return 2;
}
else if (tag == Integer.MAX_VALUE) {
- U.warn(log, "Partition tag overflow [cacheId=" + cacheId + ", partId=" + partId + "]");
+ U.warn(log, "Partition tag overflow [grpId=" + grpId + ", partId=" + partId + "]");
partTagMap.put(t, 0);
@@ -2224,7 +2224,7 @@ public class PageMemoryImpl implements PageMemoryEx {
private static void fullPageId(final long absPtr, final FullPageId fullPageId) {
pageId(absPtr, fullPageId.pageId());
- pageCacheId(absPtr, fullPageId.cacheId());
+ pageCacheId(absPtr, fullPageId.groupId());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
index 74d251a..c73b4c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
@@ -377,7 +377,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
byte[] newRowBytes = io.store(pageAddr, idx, newRow, null, needWal);
if (needWal)
- wal.log(new ReplaceRecord<>(cacheId, pageId, io, newRowBytes, idx));
+ wal.log(new ReplaceRecord<>(grpId, pageId, io, newRowBytes, idx));
return FOUND;
}
@@ -2200,7 +2200,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
io.splitExistingPage(pageAddr, mid, fwdId);
if (needWalDeltaRecord(pageId, page, null))
- wal.log(new SplitExistingPageRecord(cacheId, pageId, mid, fwdId));
+ wal.log(new SplitExistingPageRecord(grpId, pageId, mid, fwdId));
return res;
}
@@ -2685,7 +2685,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
byte[] rowBytes = io.insert(pageAddr, idx, row, null, rightId, needWal);
if (needWal)
- wal.log(new InsertRecord<>(cacheId, pageId, io, idx, rowBytes, rightId));
+ wal.log(new InsertRecord<>(grpId, pageId, io, idx, rowBytes, rightId));
}
/**
@@ -2728,7 +2728,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
inner(io).setLeft(fwdPageAddr, 0, rightId);
if (needWalDeltaRecord(fwdId, fwdPage, fwdPageWalPlc)) // Rare case, we can afford separate WAL record to avoid complexity.
- wal.log(new FixLeftmostChildRecord(cacheId, fwdId, rightId));
+ wal.log(new FixLeftmostChildRecord(grpId, fwdId, rightId));
}
}
else // Insert into newly allocated forward page.
@@ -2744,7 +2744,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
io.setCount(pageAddr, cnt - 1);
if (needWalDeltaRecord(pageId, page, null)) // Rare case, we can afford separate WAL record to avoid complexity.
- wal.log(new FixCountRecord(cacheId, pageId, cnt - 1));
+ wal.log(new FixCountRecord(grpId, pageId, cnt - 1));
}
if (!hadFwd && lvl == getRootLevel()) { // We are splitting root.
@@ -2775,7 +2775,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
needWal);
if (needWal)
- wal.log(new NewRootInitRecord<>(cacheId, newRootId, newRootId,
+ wal.log(new NewRootInitRecord<>(grpId, newRootId, newRootId,
inner(io), pageId, moveUpRowBytes, fwdId));
}
finally {
@@ -3656,7 +3656,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
io.remove(pageAddr, idx, cnt);
if (needWalDeltaRecord(pageId, page, walPlc))
- wal.log(new RemoveRecord(cacheId, pageId, idx, cnt));
+ wal.log(new RemoveRecord(grpId, pageId, idx, cnt));
}
/**
@@ -3909,7 +3909,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
leaf.io.setRemoveId(leaf.buf, rmvId);
if (needWalDeltaRecord(leaf.pageId, leaf.page, leaf.walPlc))
- wal.log(new FixRemoveId(cacheId, leaf.pageId, rmvId));
+ wal.log(new FixRemoveId(grpId, leaf.pageId, rmvId));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordV1Serializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordV1Serializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordV1Serializer.java
index 0a7b3dd..663fe0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordV1Serializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordV1Serializer.java
@@ -166,7 +166,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGE_RECORD:
PageSnapshot snap = (PageSnapshot)record;
- buf.putInt(snap.fullPageId().cacheId());
+ buf.putInt(snap.fullPageId().groupId());
buf.putLong(snap.fullPageId().pageId());
buf.put(snap.pageData());
@@ -182,7 +182,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PARTITION_DESTROY:
PartitionDestroyRecord partDestroy = (PartitionDestroyRecord)record;
- buf.putInt(partDestroy.cacheId());
+ buf.putInt(partDestroy.groupId());
buf.putInt(partDestroy.partitionId());
break;
@@ -190,7 +190,7 @@ public class RecordV1Serializer implements RecordSerializer {
case META_PAGE_INIT:
MetaPageInitRecord updRootsRec = (MetaPageInitRecord)record;
- buf.putInt(updRootsRec.cacheId());
+ buf.putInt(updRootsRec.groupId());
buf.putLong(updRootsRec.pageId());
buf.putShort((short)updRootsRec.ioType());
@@ -203,7 +203,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PARTITION_META_PAGE_UPDATE_COUNTERS:
MetaPageUpdatePartitionDataRecord partDataRec = (MetaPageUpdatePartitionDataRecord)record;
- buf.putInt(partDataRec.cacheId());
+ buf.putInt(partDataRec.groupId());
buf.putLong(partDataRec.pageId());
buf.putLong(partDataRec.updateCounter());
@@ -261,7 +261,7 @@ public class RecordV1Serializer implements RecordSerializer {
case DATA_PAGE_INSERT_RECORD:
DataPageInsertRecord diRec = (DataPageInsertRecord)record;
- buf.putInt(diRec.cacheId());
+ buf.putInt(diRec.groupId());
buf.putLong(diRec.pageId());
buf.putShort((short)diRec.payload().length);
@@ -273,7 +273,7 @@ public class RecordV1Serializer implements RecordSerializer {
case DATA_PAGE_UPDATE_RECORD:
DataPageUpdateRecord uRec = (DataPageUpdateRecord)record;
- buf.putInt(uRec.cacheId());
+ buf.putInt(uRec.groupId());
buf.putLong(uRec.pageId());
buf.putInt(uRec.itemId());
@@ -286,7 +286,7 @@ public class RecordV1Serializer implements RecordSerializer {
case DATA_PAGE_INSERT_FRAGMENT_RECORD:
final DataPageInsertFragmentRecord difRec = (DataPageInsertFragmentRecord)record;
- buf.putInt(difRec.cacheId());
+ buf.putInt(difRec.groupId());
buf.putLong(difRec.pageId());
buf.putLong(difRec.lastLink());
@@ -298,7 +298,7 @@ public class RecordV1Serializer implements RecordSerializer {
case DATA_PAGE_REMOVE_RECORD:
DataPageRemoveRecord drRec = (DataPageRemoveRecord)record;
- buf.putInt(drRec.cacheId());
+ buf.putInt(drRec.groupId());
buf.putLong(drRec.pageId());
buf.put((byte)drRec.itemId());
@@ -308,7 +308,7 @@ public class RecordV1Serializer implements RecordSerializer {
case DATA_PAGE_SET_FREE_LIST_PAGE:
DataPageSetFreeListPageRecord freeListRec = (DataPageSetFreeListPageRecord)record;
- buf.putInt(freeListRec.cacheId());
+ buf.putInt(freeListRec.groupId());
buf.putLong(freeListRec.pageId());
buf.putLong(freeListRec.freeListPage());
@@ -318,7 +318,7 @@ public class RecordV1Serializer implements RecordSerializer {
case INIT_NEW_PAGE_RECORD:
InitNewPageRecord inpRec = (InitNewPageRecord)record;
- buf.putInt(inpRec.cacheId());
+ buf.putInt(inpRec.groupId());
buf.putLong(inpRec.pageId());
buf.putShort((short)inpRec.ioType());
@@ -330,7 +330,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_META_PAGE_INIT_ROOT:
MetaPageInitRootRecord imRec = (MetaPageInitRootRecord)record;
- buf.putInt(imRec.cacheId());
+ buf.putInt(imRec.groupId());
buf.putLong(imRec.pageId());
buf.putLong(imRec.rootId());
@@ -340,7 +340,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_META_PAGE_INIT_ROOT2:
MetaPageInitRootInlineRecord imRec2 = (MetaPageInitRootInlineRecord)record;
- buf.putInt(imRec2.cacheId());
+ buf.putInt(imRec2.groupId());
buf.putLong(imRec2.pageId());
buf.putLong(imRec2.rootId());
@@ -351,7 +351,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_META_PAGE_ADD_ROOT:
MetaPageAddRootRecord arRec = (MetaPageAddRootRecord)record;
- buf.putInt(arRec.cacheId());
+ buf.putInt(arRec.groupId());
buf.putLong(arRec.pageId());
buf.putLong(arRec.rootId());
@@ -361,7 +361,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_META_PAGE_CUT_ROOT:
MetaPageCutRootRecord crRec = (MetaPageCutRootRecord)record;
- buf.putInt(crRec.cacheId());
+ buf.putInt(crRec.groupId());
buf.putLong(crRec.pageId());
break;
@@ -369,7 +369,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_INIT_NEW_ROOT:
NewRootInitRecord<?> riRec = (NewRootInitRecord<?>)record;
- buf.putInt(riRec.cacheId());
+ buf.putInt(riRec.groupId());
buf.putLong(riRec.pageId());
buf.putLong(riRec.rootId());
@@ -385,7 +385,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_PAGE_RECYCLE:
RecycleRecord recRec = (RecycleRecord)record;
- buf.putInt(recRec.cacheId());
+ buf.putInt(recRec.groupId());
buf.putLong(recRec.pageId());
buf.putLong(recRec.newPageId());
@@ -395,7 +395,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_PAGE_INSERT:
InsertRecord<?> inRec = (InsertRecord<?>)record;
- buf.putInt(inRec.cacheId());
+ buf.putInt(inRec.groupId());
buf.putLong(inRec.pageId());
buf.putShort((short)inRec.io().getType());
@@ -410,7 +410,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_FIX_LEFTMOST_CHILD:
FixLeftmostChildRecord flRec = (FixLeftmostChildRecord)record;
- buf.putInt(flRec.cacheId());
+ buf.putInt(flRec.groupId());
buf.putLong(flRec.pageId());
buf.putLong(flRec.rightId());
@@ -420,7 +420,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_FIX_COUNT:
FixCountRecord fcRec = (FixCountRecord)record;
- buf.putInt(fcRec.cacheId());
+ buf.putInt(fcRec.groupId());
buf.putLong(fcRec.pageId());
buf.putShort((short)fcRec.count());
@@ -430,7 +430,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_PAGE_REPLACE:
ReplaceRecord<?> rRec = (ReplaceRecord<?>)record;
- buf.putInt(rRec.cacheId());
+ buf.putInt(rRec.groupId());
buf.putLong(rRec.pageId());
buf.putShort((short)rRec.io().getType());
@@ -444,7 +444,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_PAGE_REMOVE:
RemoveRecord rmRec = (RemoveRecord)record;
- buf.putInt(rmRec.cacheId());
+ buf.putInt(rmRec.groupId());
buf.putLong(rmRec.pageId());
buf.putShort((short)rmRec.index());
@@ -455,7 +455,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_PAGE_INNER_REPLACE:
InnerReplaceRecord<?> irRec = (InnerReplaceRecord<?>)record;
- buf.putInt(irRec.cacheId());
+ buf.putInt(irRec.groupId());
buf.putLong(irRec.pageId());
buf.putShort((short)irRec.destinationIndex());
@@ -468,7 +468,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_FORWARD_PAGE_SPLIT:
SplitForwardPageRecord sfRec = (SplitForwardPageRecord)record;
- buf.putInt(sfRec.cacheId());
+ buf.putInt(sfRec.groupId());
buf.putLong(sfRec.pageId());
buf.putLong(sfRec.forwardId());
@@ -483,7 +483,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_EXISTING_PAGE_SPLIT:
SplitExistingPageRecord seRec = (SplitExistingPageRecord)record;
- buf.putInt(seRec.cacheId());
+ buf.putInt(seRec.groupId());
buf.putLong(seRec.pageId());
buf.putShort((short)seRec.middleIndex());
@@ -494,7 +494,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_PAGE_MERGE:
MergeRecord<?> mRec = (MergeRecord<?>)record;
- buf.putInt(mRec.cacheId());
+ buf.putInt(mRec.groupId());
buf.putLong(mRec.pageId());
buf.putLong(mRec.parentId());
@@ -507,7 +507,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGES_LIST_SET_NEXT:
PagesListSetNextRecord plNextRec = (PagesListSetNextRecord)record;
- buf.putInt(plNextRec.cacheId());
+ buf.putInt(plNextRec.groupId());
buf.putLong(plNextRec.pageId());
buf.putLong(plNextRec.nextPageId());
@@ -517,7 +517,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGES_LIST_SET_PREVIOUS:
PagesListSetPreviousRecord plPrevRec = (PagesListSetPreviousRecord)record;
- buf.putInt(plPrevRec.cacheId());
+ buf.putInt(plPrevRec.groupId());
buf.putLong(plPrevRec.pageId());
buf.putLong(plPrevRec.previousPageId());
@@ -527,7 +527,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGES_LIST_INIT_NEW_PAGE:
PagesListInitNewPageRecord plNewRec = (PagesListInitNewPageRecord)record;
- buf.putInt(plNewRec.cacheId());
+ buf.putInt(plNewRec.groupId());
buf.putLong(plNewRec.pageId());
buf.putInt(plNewRec.ioType());
buf.putInt(plNewRec.ioVersion());
@@ -541,7 +541,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGES_LIST_ADD_PAGE:
PagesListAddPageRecord plAddRec = (PagesListAddPageRecord)record;
- buf.putInt(plAddRec.cacheId());
+ buf.putInt(plAddRec.groupId());
buf.putLong(plAddRec.pageId());
buf.putLong(plAddRec.dataPageId());
@@ -551,7 +551,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGES_LIST_REMOVE_PAGE:
PagesListRemovePageRecord plRmvRec = (PagesListRemovePageRecord)record;
- buf.putInt(plRmvRec.cacheId());
+ buf.putInt(plRmvRec.groupId());
buf.putLong(plRmvRec.pageId());
buf.putLong(plRmvRec.removedPageId());
@@ -561,7 +561,7 @@ public class RecordV1Serializer implements RecordSerializer {
case BTREE_FIX_REMOVE_ID:
FixRemoveId frRec = (FixRemoveId)record;
- buf.putInt(frRec.cacheId());
+ buf.putInt(frRec.groupId());
buf.putLong(frRec.pageId());
buf.putLong(frRec.removeId());
@@ -571,7 +571,7 @@ public class RecordV1Serializer implements RecordSerializer {
case TRACKING_PAGE_DELTA:
TrackingPageDeltaRecord tpDelta = (TrackingPageDeltaRecord)record;
- buf.putInt(tpDelta.cacheId());
+ buf.putInt(tpDelta.groupId());
buf.putLong(tpDelta.pageId());
buf.putLong(tpDelta.pageIdToMark());
@@ -583,7 +583,7 @@ public class RecordV1Serializer implements RecordSerializer {
case META_PAGE_UPDATE_NEXT_SNAPSHOT_ID:
MetaPageUpdateNextSnapshotId mpUpdateNextSnapshotId = (MetaPageUpdateNextSnapshotId)record;
- buf.putInt(mpUpdateNextSnapshotId.cacheId());
+ buf.putInt(mpUpdateNextSnapshotId.groupId());
buf.putLong(mpUpdateNextSnapshotId.pageId());
buf.putLong(mpUpdateNextSnapshotId.nextSnapshotId());
@@ -594,7 +594,7 @@ public class RecordV1Serializer implements RecordSerializer {
MetaPageUpdateLastSuccessfulFullSnapshotId mpUpdateLastSuccFullSnapshotId =
(MetaPageUpdateLastSuccessfulFullSnapshotId)record;
- buf.putInt(mpUpdateLastSuccFullSnapshotId.cacheId());
+ buf.putInt(mpUpdateLastSuccFullSnapshotId.groupId());
buf.putLong(mpUpdateLastSuccFullSnapshotId.pageId());
buf.putLong(mpUpdateLastSuccFullSnapshotId.lastSuccessfulFullSnapshotId());
@@ -605,7 +605,7 @@ public class RecordV1Serializer implements RecordSerializer {
MetaPageUpdateLastSuccessfulSnapshotId mpUpdateLastSuccSnapshotId =
(MetaPageUpdateLastSuccessfulSnapshotId)record;
- buf.putInt(mpUpdateLastSuccSnapshotId.cacheId());
+ buf.putInt(mpUpdateLastSuccSnapshotId.groupId());
buf.putLong(mpUpdateLastSuccSnapshotId.pageId());
buf.putLong(mpUpdateLastSuccSnapshotId.lastSuccessfulSnapshotId());
@@ -617,7 +617,7 @@ public class RecordV1Serializer implements RecordSerializer {
MetaPageUpdateLastAllocatedIndex mpUpdateLastAllocatedIdx =
(MetaPageUpdateLastAllocatedIndex) record;
- buf.putInt(mpUpdateLastAllocatedIdx.cacheId());
+ buf.putInt(mpUpdateLastAllocatedIdx.groupId());
buf.putLong(mpUpdateLastAllocatedIdx.pageId());
buf.putInt(mpUpdateLastAllocatedIdx.lastAllocatedIndex());
@@ -627,7 +627,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PART_META_UPDATE_STATE:
PartitionMetaStateRecord partMetaStateRecord = (PartitionMetaStateRecord) record;
- buf.putInt(partMetaStateRecord.cacheId());
+ buf.putInt(partMetaStateRecord.groupId());
buf.putInt(partMetaStateRecord.partitionId());
@@ -640,7 +640,7 @@ public class RecordV1Serializer implements RecordSerializer {
case PAGE_LIST_META_RESET_COUNT_RECORD:
PageListMetaResetCountRecord pageListMetaResetCntRecord = (PageListMetaResetCountRecord) record;
- buf.putInt(pageListMetaResetCntRecord.cacheId());
+ buf.putInt(pageListMetaResetCntRecord.groupId());
buf.putLong(pageListMetaResetCntRecord.pageId());
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
index 02c521e..5bef372 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
@@ -64,10 +64,10 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
FullPageId fullId1 = allocatePage(mem);
FullPageId fullId2 = allocatePage(mem);
- long page1 = mem.acquirePage(fullId1.cacheId(), fullId1.pageId());
+ long page1 = mem.acquirePage(fullId1.groupId(), fullId1.pageId());
try {
- long page2 = mem.acquirePage(fullId2.cacheId(), fullId2.pageId());
+ long page2 = mem.acquirePage(fullId2.groupId(), fullId2.pageId());
info("Allocated pages [page1Id=" + fullId1.pageId() + ", page1=" + page1 +
", page2Id=" + fullId2.pageId() + ", page2=" + page2 + ']');
@@ -84,11 +84,11 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
readPage(mem, fullId2.pageId(), page2, 2);
}
finally {
- mem.releasePage(fullId2.cacheId(), fullId2.pageId(), page2);
+ mem.releasePage(fullId2.groupId(), fullId2.pageId(), page2);
}
}
finally {
- mem.releasePage(fullId1.cacheId(), fullId1.pageId(), page1);
+ mem.releasePage(fullId1.groupId(), fullId1.pageId(), page1);
}
}
finally {
@@ -139,7 +139,7 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
pages.add(fullId);
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
if (i % 64 == 0)
@@ -148,14 +148,14 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
writePage(mem, fullId.pageId(), page, i + 1);
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
for (int i = 0; i < pagesCnt; i++) {
FullPageId fullId = pages.get(i);
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
if (i % 64 == 0)
@@ -164,7 +164,7 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
readPage(mem, fullId.pageId(), page, i + 1);
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
@@ -190,7 +190,7 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
handles.add(allocatePage(mem));
for (FullPageId fullId : handles)
- mem.freePage(fullId.cacheId(), fullId.pageId());
+ mem.freePage(fullId.groupId(), fullId.pageId());
for (int i = 0; i < pages; i++)
assertFalse(handles.add(allocatePage(mem)));
@@ -219,9 +219,9 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
// Check that initial pages are accessible.
for (FullPageId id : old) {
- long pageApsPtr = mem.acquirePage(id.cacheId(), id.pageId());
+ long pageApsPtr = mem.acquirePage(id.groupId(), id.pageId());
try {
- long pageAddr = mem.writeLock(id.cacheId(), id.pageId(), pageApsPtr);
+ long pageAddr = mem.writeLock(id.groupId(), id.pageId(), pageApsPtr);
assertNotNull(pageAddr);
@@ -230,47 +230,47 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
PageIO.setPageId(pageAddr, updId);
- updated.add(new FullPageId(updId, id.cacheId()));
+ updated.add(new FullPageId(updId, id.groupId()));
}
finally {
- mem.writeUnlock(id.cacheId(), id.pageId(), pageApsPtr, null, true);
+ mem.writeUnlock(id.groupId(), id.pageId(), pageApsPtr, null, true);
}
}
finally {
- mem.releasePage(id.cacheId(), id.pageId(), pageApsPtr);
+ mem.releasePage(id.groupId(), id.pageId(), pageApsPtr);
}
}
// Check that updated pages are inaccessible using old IDs.
for (FullPageId id : old) {
- long pageApsPtr = mem.acquirePage(id.cacheId(), id.pageId());
+ long pageApsPtr = mem.acquirePage(id.groupId(), id.pageId());
try {
- long pageAddr = mem.writeLock(id.cacheId(), id.pageId(), pageApsPtr);
+ long pageAddr = mem.writeLock(id.groupId(), id.pageId(), pageApsPtr);
if (pageAddr != 0L) {
- mem.writeUnlock(id.cacheId(), id.pageId(), pageApsPtr, null, false);
+ mem.writeUnlock(id.groupId(), id.pageId(), pageApsPtr, null, false);
fail("Was able to acquire page write lock.");
}
- mem.readLock(id.cacheId(), id.pageId(), pageApsPtr);
+ mem.readLock(id.groupId(), id.pageId(), pageApsPtr);
if (pageAddr != 0) {
- mem.readUnlock(id.cacheId(), id.pageId(), pageApsPtr);
+ mem.readUnlock(id.groupId(), id.pageId(), pageApsPtr);
fail("Was able to acquire page read lock.");
}
}
finally {
- mem.releasePage(id.cacheId(), id.pageId(), pageApsPtr);
+ mem.releasePage(id.groupId(), id.pageId(), pageApsPtr);
}
}
// Check that updated pages are accessible using new IDs.
for (FullPageId id : updated) {
- long pageApsPtr = mem.acquirePage(id.cacheId(), id.pageId());
+ long pageApsPtr = mem.acquirePage(id.groupId(), id.pageId());
try {
- long pageAddr = mem.writeLock(id.cacheId(), id.pageId(), pageApsPtr);
+ long pageAddr = mem.writeLock(id.groupId(), id.pageId(), pageApsPtr);
assertNotSame(0L, pageAddr);
@@ -278,10 +278,10 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
assertEquals(id.pageId(), PageIO.getPageId(pageAddr));
}
finally {
- mem.writeUnlock(id.cacheId(), id.pageId(), pageApsPtr, null, false);
+ mem.writeUnlock(id.groupId(), id.pageId(), pageApsPtr, null, false);
}
- pageAddr = mem.readLock(id.cacheId(), id.pageId(), pageApsPtr);
+ pageAddr = mem.readLock(id.groupId(), id.pageId(), pageApsPtr);
assertNotSame(0L, pageAddr);
@@ -289,11 +289,11 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
assertEquals(id.pageId(), PageIO.getPageId(pageAddr));
}
finally {
- mem.readUnlock(id.cacheId(), id.pageId(), pageApsPtr);
+ mem.readUnlock(id.groupId(), id.pageId(), pageApsPtr);
}
}
finally {
- mem.releasePage(id.cacheId(), id.pageId(), pageApsPtr);
+ mem.releasePage(id.groupId(), id.pageId(), pageApsPtr);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
index 6847482..1e845f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
@@ -214,18 +214,18 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
PageMemory mem = shared.database().memoryPolicy(null).pageMemory();
for (FullPageId fullId : pages) {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- long pageAddr = mem.readLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.readLock(fullId.groupId(), fullId.pageId(), page);
for (int j = PageIO.COMMON_HEADER_END; j < mem.pageSize(); j += 4)
assertEquals(j + (int)fullId.pageId(), PageUtils.getInt(pageAddr, j));
- mem.readUnlock(fullId.cacheId(), fullId.pageId(), page);
+ mem.readUnlock(fullId.groupId(), fullId.pageId(), page);
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
@@ -253,10 +253,10 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
for (int i = 0; i < totalPages; i++) {
FullPageId fullId = pages[i];
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- long pageAddr = mem.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.writeLock(fullId.groupId(), fullId.pageId(), page);
PageIO.setPageId(pageAddr, fullId.pageId());
@@ -265,11 +265,11 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
PageUtils.putInt(pageAddr, j, j + (int)fullId.pageId());
}
finally {
- mem.writeUnlock(fullId.cacheId(), fullId.pageId(), page, null, true);
+ mem.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, true);
}
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
@@ -341,17 +341,17 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
wal.fsync(wal.log(new CheckpointRecord(null)));
for (FullPageId fullId : pages) {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
assertFalse("Page has a temp heap copy after the last checkpoint: [cacheId=" +
- fullId.cacheId() + ", pageId=" + fullId.pageId() + "]", mem.hasTempCopy(page));
+ fullId.groupId() + ", pageId=" + fullId.pageId() + "]", mem.hasTempCopy(page));
assertFalse("Page is dirty after the last checkpoint: [cacheId=" +
- fullId.cacheId() + ", pageId=" + fullId.pageId() + "]", mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ fullId.groupId() + ", pageId=" + fullId.pageId() + "]", mem.isDirty(fullId.groupId(), fullId.pageId(), page));
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
index e70c56e..297e69f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
@@ -228,9 +228,9 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
// Check getForInitialWrite methods.
for (FullPageId fullId : initWrites) {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- long pageAddr = mem.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.writeLock(fullId.groupId(), fullId.pageId(), page);
try {
DataPageIO.VERSIONS.latest().initNewPage(pageAddr, fullId.pageId(), mem.pageSize());
@@ -239,11 +239,11 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
PageUtils.putByte(pageAddr, i, (byte)0xAB);
}
finally {
- mem.writeUnlock(fullId.cacheId(), fullId.pageId(), page, null, true);
+ mem.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, true);
}
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
@@ -527,26 +527,26 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
pageIds[i] = new FullPageId(mem.allocatePage(cacheId, 0, PageIdAllocator.FLAG_DATA), cacheId);
for (FullPageId fullId : pageIds) {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- assertTrue(mem.isDirty(fullId.cacheId(), fullId.pageId(), page)); //page is dirty right after allocation
+ assertTrue(mem.isDirty(fullId.groupId(), fullId.pageId(), page)); //page is dirty right after allocation
- long pageAddr = mem.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.writeLock(fullId.groupId(), fullId.pageId(), page);
PageIO.setPageId(pageAddr, fullId.pageId());
try {
- assertTrue(mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ assertTrue(mem.isDirty(fullId.groupId(), fullId.pageId(), page));
}
finally {
- mem.writeUnlock(fullId.cacheId(), fullId.pageId(),page, null,true);
+ mem.writeUnlock(fullId.groupId(), fullId.pageId(),page, null,true);
}
- assertTrue(mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ assertTrue(mem.isDirty(fullId.groupId(), fullId.pageId(), page));
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
@@ -564,24 +564,24 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
ByteBuffer buf = ByteBuffer.allocate(mem.pageSize());
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- assertTrue(mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ assertTrue(mem.isDirty(fullId.groupId(), fullId.pageId(), page));
- long pageAddr = mem.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.writeLock(fullId.groupId(), fullId.pageId(), page);
try {
- assertFalse(mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ assertFalse(mem.isDirty(fullId.groupId(), fullId.pageId(), page));
for (int i = PageIO.COMMON_HEADER_END; i < mem.pageSize(); i++)
PageUtils.putByte(pageAddr, i, (byte)1);
}
finally {
- mem.writeUnlock(fullId.cacheId(), fullId.pageId(), page, null, true);
+ mem.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, true);
}
- assertTrue(mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ assertTrue(mem.isDirty(fullId.groupId(), fullId.pageId(), page));
buf.rewind();
@@ -593,7 +593,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
assertEquals((byte)0, buf.get());
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
@@ -604,12 +604,12 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
mem.finishCheckpoint();
for (FullPageId fullId : pageIds) {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- assertTrue(mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ assertTrue(mem.isDirty(fullId.groupId(), fullId.pageId(), page));
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
@@ -618,9 +618,9 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
* @throws Exception if failed.
*/
private void writePageData(FullPageId fullId, PageMemory mem) throws Exception {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- long pageAddr = mem.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.writeLock(fullId.groupId(), fullId.pageId(), page);
try {
DataPageIO.VERSIONS.latest().initNewPage(pageAddr, fullId.pageId(), mem.pageSize());
@@ -631,11 +631,11 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
PageUtils.putByte(pageAddr, i, (byte)rnd.nextInt(255));
}
finally {
- mem.writeUnlock(fullId.cacheId(), fullId.pageId(), page, null, true);
+ mem.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, true);
}
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
@@ -693,9 +693,9 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
assertNotNull("Missing WAL record for a written page: " + fullId, walData);
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- long pageAddr = mem.readLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.readLock(fullId.groupId(), fullId.pageId(), page);
try {
for (int i = PageIO.COMMON_HEADER_END; i < mem.pageSize(); i++) {
@@ -707,11 +707,11 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
}
}
finally {
- mem.readUnlock(fullId.cacheId(), fullId.pageId(), page);
+ mem.readUnlock(fullId.groupId(), fullId.pageId(), page);
}
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
}
@@ -772,10 +772,10 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
ig.context().cache().context().database().checkpointReadLock();
try {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
- long pageAddr = mem.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ long pageAddr = mem.writeLock(fullId.groupId(), fullId.pageId(), page);
PageIO.setPageId(pageAddr, fullId.pageId());
@@ -813,11 +813,11 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
resMap.put(fullId, state);
}
finally {
- mem.writeUnlock(fullId.cacheId(), fullId.pageId(),page, null,true);
+ mem.writeUnlock(fullId.groupId(), fullId.pageId(),page, null,true);
}
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(),page);}
+ mem.releasePage(fullId.groupId(), fullId.pageId(),page);}
}
finally {
ig.context().cache().context().database().checkpointReadUnlock();
@@ -958,17 +958,17 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
for (FullPageId fullId : pages) {
- long page = mem.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = mem.acquirePage(fullId.groupId(), fullId.pageId());
try {
assertFalse("Page has a temp heap copy after the last checkpoint: [cacheId=" +
- fullId.cacheId() + ", pageId=" + fullId.pageId() + "]", mem.hasTempCopy(page));
+ fullId.groupId() + ", pageId=" + fullId.pageId() + "]", mem.hasTempCopy(page));
assertFalse("Page is dirty after the last checkpoint: [cacheId=" +
- fullId.cacheId() + ", pageId=" + fullId.pageId() + "]", mem.isDirty(fullId.cacheId(), fullId.pageId(), page));
+ fullId.groupId() + ", pageId=" + fullId.pageId() + "]", mem.isDirty(fullId.groupId(), fullId.pageId(), page));
}
finally {
- mem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ mem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsEvictionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsEvictionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsEvictionTest.java
index ea4a0e9..d7790c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsEvictionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsEvictionTest.java
@@ -203,10 +203,10 @@ public class IgnitePdsEvictionTest extends GridCommonAbstractTest {
try {
FullPageId fullId = pageIds.get(i);
- long page = memory.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = memory.acquirePage(fullId.groupId(), fullId.pageId());
try {
- final long pageAddr = memory.writeLock(fullId.cacheId(), fullId.pageId(), page);
+ final long pageAddr = memory.writeLock(fullId.groupId(), fullId.pageId(), page);
try {
PageIO.setPageId(pageAddr, fullId.pageId());
@@ -214,11 +214,11 @@ public class IgnitePdsEvictionTest extends GridCommonAbstractTest {
PageUtils.putLong(pageAddr, PageIO.COMMON_HEADER_END, i * 2);
}
finally {
- memory.writeUnlock(fullId.cacheId(), fullId.pageId(), page, null, true);
+ memory.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, true);
}
}
finally {
- memory.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ memory.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
finally {
@@ -252,19 +252,19 @@ public class IgnitePdsEvictionTest extends GridCommonAbstractTest {
try {
final FullPageId fullId = pageIds.get(i);
- long page = memory.acquirePage(fullId.cacheId(), fullId.pageId());
+ long page = memory.acquirePage(fullId.groupId(), fullId.pageId());
try {
- final long pageAddr = memory.readLock(fullId.cacheId(), fullId.pageId(), page);
+ final long pageAddr = memory.readLock(fullId.groupId(), fullId.pageId(), page);
try {
assertEquals(i * 2, PageUtils.getLong(pageAddr, PageIO.COMMON_HEADER_END));
}
finally {
- memory.readUnlock(fullId.cacheId(), fullId.pageId(), page);
+ memory.readUnlock(fullId.groupId(), fullId.pageId(), page);
}
}
finally {
- memory.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ memory.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/89e74546/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index 843fb5b..c5d6a8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -934,7 +934,7 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
else if (rec instanceof PageDeltaRecord) {
PageDeltaRecord delta = (PageDeltaRecord)rec;
- FullPageId fullId = new FullPageId(delta.pageId(), delta.cacheId());
+ FullPageId fullId = new FullPageId(delta.pageId(), delta.groupId());
byte[] pageData = rolledPages.get(fullId);
@@ -976,10 +976,10 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
ignite0.context().cache().context().database().checkpointReadLock();
try {
- long page = pageMem.acquirePage(fullId.cacheId(), fullId.pageId(), true);
+ long page = pageMem.acquirePage(fullId.groupId(), fullId.pageId(), true);
try {
- long buf = pageMem.writeLock(fullId.cacheId(), fullId.pageId(), page, true);
+ long buf = pageMem.writeLock(fullId.groupId(), fullId.pageId(), page, true);
try {
byte[] data = entry.getValue();
@@ -992,11 +992,11 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
}
}
finally {
- pageMem.writeUnlock(fullId.cacheId(), fullId.pageId(), page, null, false, true);
+ pageMem.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, false, true);
}
}
finally {
- pageMem.releasePage(fullId.cacheId(), fullId.pageId(), page);
+ pageMem.releasePage(fullId.groupId(), fullId.pageId(), page);
}
}
finally {