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/19 09:27:25 UTC
[14/32] ignite git commit: GG-12495 SaveStoreMetadata doesn't work
for local cache. Got NPE.
GG-12495 SaveStoreMetadata doesn't work for local cache. Got NPE.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d6b7308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d6b7308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d6b7308
Branch: refs/heads/ignite-5578
Commit: 0d6b73081725d006947a11bfe787bf01f0e869f4
Parents: 310d903
Author: Ivan Rakov <iv...@gmail.com>
Authored: Mon Jul 17 13:25:58 2017 +0300
Committer: Ivan Rakov <iv...@gmail.com>
Committed: Mon Jul 17 13:25:58 2017 +0300
----------------------------------------------------------------------
.../wal/record/delta/MetaPageUpdatePartitionDataRecord.java | 2 ++
.../processors/cache/persistence/GridCacheOffheapManager.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d6b7308/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 f85f468..a6ed7c5 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
@@ -111,6 +111,8 @@ public class MetaPageUpdatePartitionDataRecord extends PageDeltaRecord {
io.setGlobalRemoveId(pageAddr, globalRmvId);
io.setSize(pageAddr, partSize);
io.setCountersPageId(pageAddr, cntrsPageId);
+ io.setPartitionState(pageAddr, state);
+ io.setCandidatePageCount(pageAddr, allocatedIdxCandidate);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d6b7308/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 6e6b7df..ed6eee2 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
@@ -363,7 +363,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
rmvId,
size,
cntrsPageId,
- (byte)state.ordinal(),
+ state == null ? -1 : (byte)state.ordinal(),
pageCnt
));
}