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 2017/04/12 10:51:19 UTC
ignite git commit: .NET - do not check in debug
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-debug f1aaf6236 -> 47bee8219
.NET - do not check in debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47bee821
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47bee821
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47bee821
Branch: refs/heads/ignite-3477-debug
Commit: 47bee821915ae4e2c2791f71bc8c15951935a92d
Parents: f1aaf62
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Apr 12 13:51:42 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Apr 12 13:51:42 2017 +0300
----------------------------------------------------------------------
.../cache/database/tree/io/DataPageIO.java | 23 +++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/47bee821/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 6265900..6fc0cb6 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
@@ -135,7 +135,7 @@ public class DataPageIO extends PageIO {
* @param show What elements of data page entry to show in the result.
* @return Data page entry size.
*/
- private int getPageEntrySize(long pageAddr, int dataOff, int show) {
+ private int getPageEntrySize(long pageAddr, int dataOff, int show, boolean check) {
int payloadLen = PageUtils.getShort(pageAddr, dataOff) & 0xFFFF;
int payloadLen0 = payloadLen;
@@ -146,7 +146,7 @@ public class DataPageIO extends PageIO {
show &= ~SHOW_LINK; // We are not fragmented, never have a link.
try {
- return getPageEntrySize(payloadLen, show);
+ return getPageEntrySize(payloadLen, show, check);
}
catch (AssertionError e) {
U.debug("Failed [pageAddr=" + U.hexLong(pageAddr) + ", dataOff=" + dataOff + ", show=" + show +
@@ -156,13 +156,17 @@ public class DataPageIO extends PageIO {
}
}
+ private int getPageEntrySize(long pageAddr, int dataOff, int show) {
+ return getPageEntrySize(pageAddr, dataOff, show, true);
+ }
+
/**
* @param payloadLen Length of the payload, may be a full data row or a row fragment length.
* @param show What elements of data page entry to show in the result.
* @return Data page entry size.
*/
- private int getPageEntrySize(int payloadLen, int show) {
- assert payloadLen > 0 : payloadLen;
+ private int getPageEntrySize(int payloadLen, int show, boolean check) {
+ assert !check || payloadLen > 0 : payloadLen;
int res = payloadLen;
@@ -179,6 +183,15 @@ public class DataPageIO extends PageIO {
}
/**
+ * @param payloadLen Length of the payload, may be a full data row or a row fragment length.
+ * @param show What elements of data page entry to show in the result.
+ * @return Data page entry size.
+ */
+ private int getPageEntrySize(int payloadLen, int show) {
+ return getPageEntrySize(payloadLen, show, true);
+ }
+
+ /**
* @param pageAddr Page address.
* @param dataOff Entry data offset.
* @param pageSize Page size.
@@ -385,7 +398,7 @@ public class DataPageIO extends PageIO {
if (item < ITEMS_OFF || item >= pageSize)
valid = false;
- entriesSize += getPageEntrySize(pageAddr, item, SHOW_PAYLOAD_LEN | SHOW_LINK);
+ entriesSize += getPageEntrySize(pageAddr, item, SHOW_PAYLOAD_LEN | SHOW_LINK, false);
b.a(item);
b.a("{").a(entriesSize).a("}");