You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/06/30 13:25:12 UTC
[50/50] [abbrv] ignite git commit: IGNITE-8900 Attempting to fix the
link issue
IGNITE-8900 Attempting to fix the link issue
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c9c746c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c9c746c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c9c746c
Branch: refs/heads/ignite-8900-repro
Commit: 1c9c746c9ebae59a83f030689d0d7e90a429152e
Parents: 1e05b99
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Sat Jun 30 16:23:21 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Sat Jun 30 16:23:21 2018 +0300
----------------------------------------------------------------------
.../delta/DataPageInsertFragmentRecord.java | 2 +-
.../persistence/freelist/AbstractFreeList.java | 2 +-
.../persistence/freelist/CacheFreeListImpl.java | 11 ++++++++++
.../persistence/tree/io/AbstractDataPageIO.java | 23 ++++++++------------
4 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9c746c/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 5324d56..32f8092 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
@@ -57,7 +57,7 @@ public class DataPageInsertFragmentRecord extends PageDeltaRecord {
@Override public void applyDelta(PageMemory pageMem, long pageAddr) throws IgniteCheckedException {
AbstractDataPageIO io = PageIO.getPageIO(pageAddr);
- io.addRowFragment(pageAddr, payload, lastLink, pageMem.pageSize());
+ io.addRowFragment(pageAddr, PageIO.getPageId(pageAddr), payload, lastLink, pageMem.pageSize());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9c746c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
index c1a48bb..bcedd8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
@@ -233,7 +233,7 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
// Read last link before the fragment write, because it will be updated there.
long lastLink = row.link();
- int payloadSize = io.addRowFragment(pageMem, pageAddr, row, written, rowSize, pageSize());
+ int payloadSize = io.addRowFragment(pageMem, pageId, pageAddr, row, written, rowSize, pageSize());
assert payloadSize > 0 : payloadSize;
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9c746c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/CacheFreeListImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/CacheFreeListImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/CacheFreeListImpl.java
index dc0c92e..4aa9d88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/CacheFreeListImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/CacheFreeListImpl.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.persistence.freelist;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.processors.cache.persistence.DataRegion;
@@ -26,6 +27,7 @@ import org.apache.ignite.internal.processors.cache.persistence.tree.io.AbstractD
import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
+import org.apache.ignite.internal.util.typedef.internal.U;
/**
* FreeList implementation for cache.
@@ -53,6 +55,15 @@ public class CacheFreeListImpl extends AbstractFreeList<CacheDataRow> {
}
/** {@inheritDoc} */
+ @Override public void insertDataRow(CacheDataRow row) throws IgniteCheckedException {
+ super.insertDataRow(row);
+
+ assert row.key().partition() == PageIdUtils.partId(row.link()) :
+ "Constructed a link with invalid partition ID [partId=" + row.key().partition() +
+ ", link=" + U.hexLong(row.link()) + ']';
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return "FreeList [name=" + name + ']';
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9c746c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
index ca63f27..50b5779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java
@@ -907,6 +907,7 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO {
* Adds maximum possible fragment of the given row to this data page and sets respective link to the row.
*
* @param pageMem Page memory.
+ * @param pageId Page ID to use to construct a link.
* @param pageAddr Page address.
* @param row Data row.
* @param written Number of bytes of row size that was already written.
@@ -917,18 +918,20 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO {
*/
public int addRowFragment(
PageMemory pageMem,
+ long pageId,
long pageAddr,
T row,
int written,
int rowSize,
int pageSize
) throws IgniteCheckedException {
- return addRowFragment(pageMem, pageAddr, written, rowSize, row.link(), row, null, pageSize);
+ return addRowFragment(pageMem, pageId, pageAddr, written, rowSize, row.link(), row, null, pageSize);
}
/**
* Adds this payload as a fragment to this data page.
*
+ * @param pageId Page ID to use to construct a link.
* @param pageAddr Page address.
* @param payload Payload bytes.
* @param lastLink Link to the previous written fragment (link to the tail).
@@ -936,18 +939,20 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO {
* @throws IgniteCheckedException If failed.
*/
public void addRowFragment(
+ long pageId,
long pageAddr,
byte[] payload,
long lastLink,
int pageSize
) throws IgniteCheckedException {
- addRowFragment(null, pageAddr, 0, 0, lastLink, null, payload, pageSize);
+ addRowFragment(null, pageId, pageAddr, 0, 0, lastLink, null, payload, pageSize);
}
/**
* Adds maximum possible fragment of the given row to this data page and sets respective link to the row.
*
* @param pageMem Page memory.
+ * @param pageId Page ID to use to construct a link.
* @param pageAddr Page address.
* @param written Number of bytes of row size that was already written.
* @param rowSize Row size.
@@ -960,6 +965,7 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO {
*/
private int addRowFragment(
PageMemory pageMem,
+ long pageId,
long pageAddr,
int written,
int rowSize,
@@ -1004,24 +1010,13 @@ public abstract class AbstractDataPageIO<T extends Storable> extends PageIO {
int itemId = addItem(pageAddr, fullEntrySize, directCnt, indirectCnt, dataOff, pageSize);
if (row != null)
- setLink(row, pageAddr, itemId);
+ setLinkByPageId(row, pageId, itemId);
return payloadSize;
}
/**
* @param row Row to set link to.
- * @param pageAddr Page address.
- * @param itemId Item ID.
- */
- private void setLink(T row, long pageAddr, int itemId) {
- long pageId = getPageId(pageAddr);
-
- setLinkByPageId(row, pageId, itemId);
- }
-
- /**
- * @param row Row to set link to.
* @param pageId Page ID.
* @param itemId Item ID.
*/