>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19906 )
Change subject: Null merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Null merge branch 'gerrit/trinity' into 'gerrit/ionic'
Ext-ref: MB-66611
Change-Id: Iefe9e6d5e72353d1db7292a5e49389b8d83e627b
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
M
hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.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/DebugBufferCache.java
M
hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
8 files changed, 16 insertions(+), 35 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/06/19906/1
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
index fe85e49..cb5323f 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
@@ -327,16 +327,12 @@
@Override
public void unpin(ICachedPage page) {
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
unpin(page, DEFAULT);
}
@Override
public void unpin(ICachedPage page, IBufferCacheReadContext context) {
vbc.unpin(page, context);
-=======
- vbc.unpin(page);
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
index ba90968..7f4fd38 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java
@@ -80,16 +80,12 @@
@Override
public void unpin(ICachedPage page) {
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
unpin(page, DEFAULT);
}
@Override
public void unpin(ICachedPage page, IBufferCacheReadContext context) {
vbc.unpin(page, context);
-=======
- vbc.unpin(page);
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
@Override
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 a9089ca..66c596d 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
@@ -328,13 +328,10 @@
@Override
public void unpin(ICachedPage page) {
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
}
@Override
public void unpin(ICachedPage page, IBufferCacheReadContext context) {
-=======
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
index 0c5883b..a77ccdf 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
@@ -602,22 +602,16 @@
@Override
public void unpin(ICachedPage page) {
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
unpin(page, defaultContext);
}
@Override
public void unpin(ICachedPage page, IBufferCacheReadContext context) {
-=======
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
if (closed) {
throw new IllegalStateException("unpin called on a closed cache");
}
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
context.onUnpin(page);
-=======
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
int pinCount = ((CachedPage) page).decrementAndGetPinCount();
if (DEBUG && pinCount == 0) {
pinnedPageOwner.remove(page);
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
index c4ff954..f1298b7 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
@@ -98,13 +98,8 @@
}
@Override
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
public void unpin(ICachedPage page, IBufferCacheReadContext context) {
bufferCache.unpin(page, context);
-=======
- public void unpin(ICachedPage page) {
- bufferCache.unpin(page);
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
unpinCount.addAndGet(1);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
index b2b068f..81d6d56 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
@@ -103,15 +103,9 @@
* Unpin a page to indicate can be evicted
* Note: this will use the default {@link IBufferCacheReadContext}
*
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
* @param page the page
-=======
- * @param page
- * the page
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
*/
void unpin(ICachedPage page);
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
/**
* Unpin a page to indicate can be evicted
@@ -121,8 +115,6 @@
* @param context read context
*/
void unpin(ICachedPage page, IBufferCacheReadContext context);
-=======
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
/**
* Flush the page if it is dirty
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
index 54a2b54..d4ea5a0 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestVirtualBufferCache.java
@@ -116,13 +116,8 @@
}
@Override
-<<<<<<< HEAD (a013fb [ASTERIXDB-3620][STO] Fix writing null values to
columnar st)
public void unpin(ICachedPage page, IBufferCacheReadContext context) {
vbc.unpin(page, context);
-=======
- public void unpin(ICachedPage page) {
- vbc.unpin(page);
->>>>>>> BRANCH (ae0b2e Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
@Override
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19906
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: Iefe9e6d5e72353d1db7292a5e49389b8d83e627b
Gerrit-Change-Number: 19906
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
