You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/06/23 04:10:02 UTC
Change in asterixdb[master]: Cleanup Large Page Logic
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/955
Change subject: Cleanup Large Page Logic
......................................................................
Cleanup Large Page Logic
Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
---
M hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
4 files changed, 26 insertions(+), 14 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/55/955/1
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
index 63f516e..fe9ceab 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
@@ -175,10 +175,7 @@
}
boolean isLargeTuple(int tupleSize) {
- // TODO(mblow): make page size available to avoid calculating it
- int pageSize = getLargeFlag() ? buf.capacity() / page.getFrameSizeMultiplier() : buf.capacity();
-
- return tupleSize > getMaxTupleSize(pageSize);
+ return tupleSize > getMaxTupleSize(page.getPageSize());
}
@Override
@@ -247,9 +244,11 @@
targetFrame = this;
}
int tuplesToRight = tupleCount - tuplesToLeft;
- if (getLargeFlag()) {
- ((BTreeNSMLeafFrame) rightFrame).growCapacity(extraPageBlockHelper, bufferCache,
- buf.capacity() - rightFrame.getBuffer().capacity());
+
+ ((BTreeNSMLeafFrame) rightFrame).setLargeFlag(getLargeFlag());
+ int deltaPages = page.getFrameSizeMultiplier() - rightFrame.getPage().getFrameSizeMultiplier();
+ if (deltaPages > 0) {
+ ((BTreeNSMLeafFrame) rightFrame).growCapacity(extraPageBlockHelper, bufferCache, deltaPages);
}
ByteBuffer right = rightFrame.getBuffer();
@@ -298,18 +297,19 @@
public void ensureCapacity(IBufferCache bufferCache, ITupleReference tuple,
IExtraPageBlockHelper extraPageBlockHelper) throws HyracksDataException {
+ // we call ensureCapacity() for large tuples- ensure large flag is set
+ setLargeFlag(true);
int gapBytes = getBytesRequiredToWriteTuple(tuple) - getFreeContiguousSpace();
- growCapacity(extraPageBlockHelper, bufferCache, gapBytes);
+ int deltaPages = (int) Math.ceil((double) gapBytes / bufferCache.getPageSize());
+ growCapacity(extraPageBlockHelper, bufferCache, deltaPages);
}
- public void growCapacity(IExtraPageBlockHelper extraPageBlockHelper,
- IBufferCache bufferCache, int delta) throws HyracksDataException {
- setLargeFlag(true);
- if (delta <= 0) {
+ private void growCapacity(IExtraPageBlockHelper extraPageBlockHelper,
+ IBufferCache bufferCache, int deltaPages) throws HyracksDataException {
+ if (deltaPages <= 0) {
return;
}
- int deltaPages = (int) Math.ceil((double) delta / bufferCache.getPageSize());
- int framePagesOld = getBuffer().capacity() / bufferCache.getPageSize();
+ int framePagesOld = page.getFrameSizeMultiplier();
int newMultiplier = framePagesOld + deltaPages;
// we need to get the old slot offsets before we grow
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
index 40c7734..c8ce00f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
@@ -405,6 +405,11 @@
}
@Override
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ @Override
public int getFrameSizeMultiplier() {
return multiplier;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
index 4541d52..f003649 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
@@ -165,6 +165,11 @@
}
@Override
+ public int getPageSize() {
+ return pageReplacementStrategy.getPageSize();
+ }
+
+ @Override
public void setFrameSizeMultiplier(int multiplier) {
this.multiplier = multiplier;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
index 8107234..abbe233 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
@@ -38,5 +38,7 @@
void setQueueInfo(IQueueInfo queueInfo);
+ int getPageSize();
+
int getFrameSizeMultiplier();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Change in asterixdb[master]: Cleanup Large Page Logic
Posted by "abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org>.
abdullah alamoudi has posted comments on this change.
Change subject: Cleanup Large Page Logic
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Cleanup Large Page Logic
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello abdullah alamoudi, Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/955
to look at the new patch set (#2).
Change subject: Cleanup Large Page Logic
......................................................................
Cleanup Large Page Logic
Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
---
M hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
4 files changed, 27 insertions(+), 16 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/55/955/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Change in asterixdb[master]: Cleanup Large Page Logic
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Cleanup Large Page Logic
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1727/
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Cleanup Large Page Logic
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Cleanup Large Page Logic
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1736/
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Cleanup Large Page Logic
Posted by "abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org>.
abdullah alamoudi has posted comments on this change.
Change subject: Cleanup Large Page Logic
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Cleanup Large Page Logic
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has submitted this change and it was merged.
Change subject: Cleanup Large Page Logic
......................................................................
Cleanup Large Page Logic
Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/955
Reviewed-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>
---
M hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
4 files changed, 27 insertions(+), 16 deletions(-)
Approvals:
abdullah alamoudi: Looks good to me, approved
Jenkins: Looks good to me, but someone else must approve; Verified
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
index 63f516e..f7af7ad 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
@@ -175,10 +175,7 @@
}
boolean isLargeTuple(int tupleSize) {
- // TODO(mblow): make page size available to avoid calculating it
- int pageSize = getLargeFlag() ? buf.capacity() / page.getFrameSizeMultiplier() : buf.capacity();
-
- return tupleSize > getMaxTupleSize(pageSize);
+ return tupleSize > getMaxTupleSize(page.getPageSize());
}
@Override
@@ -247,9 +244,11 @@
targetFrame = this;
}
int tuplesToRight = tupleCount - tuplesToLeft;
- if (getLargeFlag()) {
- ((BTreeNSMLeafFrame) rightFrame).growCapacity(extraPageBlockHelper, bufferCache,
- buf.capacity() - rightFrame.getBuffer().capacity());
+
+ ((BTreeNSMLeafFrame) rightFrame).setLargeFlag(getLargeFlag());
+ int deltaPages = page.getFrameSizeMultiplier() - rightFrame.getPage().getFrameSizeMultiplier();
+ if (deltaPages > 0) {
+ ((BTreeNSMLeafFrame) rightFrame).growCapacity(extraPageBlockHelper, bufferCache, deltaPages);
}
ByteBuffer right = rightFrame.getBuffer();
@@ -298,18 +297,18 @@
public void ensureCapacity(IBufferCache bufferCache, ITupleReference tuple,
IExtraPageBlockHelper extraPageBlockHelper) throws HyracksDataException {
+ // we call ensureCapacity() for large tuples- ensure large flag is set
+ setLargeFlag(true);
int gapBytes = getBytesRequiredToWriteTuple(tuple) - getFreeContiguousSpace();
- growCapacity(extraPageBlockHelper, bufferCache, gapBytes);
+ if (gapBytes > 0) {
+ int deltaPages = (int) Math.ceil((double) gapBytes / bufferCache.getPageSize());
+ growCapacity(extraPageBlockHelper, bufferCache, deltaPages);
+ }
}
- public void growCapacity(IExtraPageBlockHelper extraPageBlockHelper,
- IBufferCache bufferCache, int delta) throws HyracksDataException {
- setLargeFlag(true);
- if (delta <= 0) {
- return;
- }
- int deltaPages = (int) Math.ceil((double) delta / bufferCache.getPageSize());
- int framePagesOld = getBuffer().capacity() / bufferCache.getPageSize();
+ private void growCapacity(IExtraPageBlockHelper extraPageBlockHelper,
+ IBufferCache bufferCache, int deltaPages) throws HyracksDataException {
+ int framePagesOld = page.getFrameSizeMultiplier();
int newMultiplier = framePagesOld + deltaPages;
// we need to get the old slot offsets before we grow
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
index 40c7734..c8ce00f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/VirtualBufferCache.java
@@ -405,6 +405,11 @@
}
@Override
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ @Override
public int getFrameSizeMultiplier() {
return multiplier;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
index 4541d52..f003649 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/CachedPage.java
@@ -165,6 +165,11 @@
}
@Override
+ public int getPageSize() {
+ return pageReplacementStrategy.getPageSize();
+ }
+
+ @Override
public void setFrameSizeMultiplier(int multiplier) {
this.multiplier = multiplier;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
index 8107234..abbe233 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ICachedPage.java
@@ -38,5 +38,7 @@
void setQueueInfo(IQueueInfo queueInfo);
+ int getPageSize();
+
int getFrameSizeMultiplier();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/955
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26f9a8e4530edfda1b5f78114a5c8038bf8a27f4
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>