tmp
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/328cddc2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/328cddc2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/328cddc2 Branch: refs/heads/ignite-3477-compact2 Commit: 328cddc2c1e2ee4a74b0fa815a6588e37bd61a2a Parents: e623cf8 Author: sboikov <[email protected]> Authored: Fri Feb 10 16:52:43 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Feb 10 16:52:43 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/database/tree/io/DataPageIO.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/328cddc2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java index aad16a0..d9b4117 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java @@ -872,7 +872,7 @@ public class DataPageIO extends PageIO { CacheDataRow row ) throws IgniteCheckedException { if (!isEnoughSpace(entryFullSize, dataOff, directCnt, indirectCnt)) { - dataOff = compactDataEntries(pageAddr, directCnt, indirectCnt, pageSize, entryFullSize, row); + dataOff = compactDataEntries(pageAddr, directCnt, indirectCnt, pageSize, entryFullSize, row, dataOff); assert dataOff == 0 || isEnoughSpace(entryFullSize, dataOff, directCnt, indirectCnt); } @@ -1283,7 +1283,8 @@ public class DataPageIO extends PageIO { int indirectCnt, int pageSize, int newEntrySize, - CacheDataRow row) throws IgniteCheckedException { + CacheDataRow row, + int firstEntryOff) throws IgniteCheckedException { cnt.increment(); assert checkCount(directCnt): directCnt; @@ -1293,7 +1294,7 @@ public class DataPageIO extends PageIO { boolean canAddItem; if (rmvdCnt > 0 && row != null) { - canAddItem = canAddItem(pageAddr, directCnt, indirectCnt, getFirstEntryOffset(pageAddr)); + canAddItem = canAddItem(pageAddr, directCnt, indirectCnt, firstEntryOff); if (canAddItem) { int cnt = 0; @@ -1403,7 +1404,7 @@ public class DataPageIO extends PageIO { // int firstOff = offs[0] >>> 8; // canAddItem = firstOff > (directCnt + indirectCnt) * ITEM_SIZE + ITEMS_OFF + ITEM_SIZE; // } - canAddItem = canAddItem(pageAddr, directCnt, indirectCnt, getFirstEntryOffset(pageAddr)); + canAddItem = canAddItem(pageAddr, directCnt, indirectCnt, firstEntryOff); if (!canAddItem) row = null;
