Removed return value from split method in ITreeIndexFrame because it was not used anywhere.
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_btree_updates_next@650 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/api/IBTreeFrame.java b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/api/IBTreeFrame.java
index 7d981cb..a24c4d7 100644
--- a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/api/IBTreeFrame.java
+++ b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/api/IBTreeFrame.java
@@ -1,16 +1,15 @@
package edu.uci.ics.hyracks.storage.am.btree.api;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
import edu.uci.ics.hyracks.dataflow.common.data.accessors.ITupleReference;
import edu.uci.ics.hyracks.storage.am.common.api.ITreeIndexFrame;
import edu.uci.ics.hyracks.storage.am.common.api.TreeIndexException;
import edu.uci.ics.hyracks.storage.am.common.ophelpers.MultiComparator;
public interface IBTreeFrame extends ITreeIndexFrame {
- public int findUpdateTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException;
- public int findInsertTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException;
- public int findDeleteTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException;
- public void insertSorted(ITupleReference tuple, MultiComparator cmp) throws HyracksDataException;
+ public int findUpdateTupleIndex(ITupleReference tuple) throws TreeIndexException;
+ public int findInsertTupleIndex(ITupleReference tuple) throws TreeIndexException;
+ public int findDeleteTupleIndex(ITupleReference tuple) throws TreeIndexException;
+ public void insertSorted(ITupleReference tuple);
public boolean getSmFlag();
public void setSmFlag(boolean smFlag);
public void setMultiComparator(MultiComparator cmp);
diff --git a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeFieldPrefixNSMLeafFrame.java b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeFieldPrefixNSMLeafFrame.java
index 190e2b4..629824d 100644
--- a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeFieldPrefixNSMLeafFrame.java
+++ b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeFieldPrefixNSMLeafFrame.java
@@ -356,7 +356,7 @@
}
@Override
- public int findInsertTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findInsertTupleIndex(ITupleReference tuple) throws TreeIndexException {
int slot = slotManager.findSlot(tuple, frameTuple, framePrefixTuple, cmp, FindTupleMode.EXCLUSIVE_ERROR_IF_EXISTS,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
int tupleIndex = slotManager.decodeSecondSlotField(slot);
@@ -368,7 +368,7 @@
}
@Override
- public int findUpdateTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findUpdateTupleIndex(ITupleReference tuple) throws TreeIndexException {
int slot = slotManager.findSlot(tuple, frameTuple, framePrefixTuple, cmp, FindTupleMode.EXACT,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
int tupleIndex = slotManager.decodeSecondSlotField(slot);
@@ -380,7 +380,7 @@
}
@Override
- public int findDeleteTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findDeleteTupleIndex(ITupleReference tuple) throws TreeIndexException {
int slot = slotManager.findSlot(tuple, frameTuple, framePrefixTuple, cmp, FindTupleMode.EXACT,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
int tupleIndex = slotManager.decodeSecondSlotField(slot);
@@ -470,7 +470,7 @@
}
@Override
- public void insertSorted(ITupleReference tuple, MultiComparator cmp) throws HyracksDataException {
+ public void insertSorted(ITupleReference tuple) {
int freeSpace = buf.getInt(freeSpaceOff);
int fieldsToTruncate = 0;
@@ -501,7 +501,7 @@
}
@Override
- public int split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey)
+ public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey)
throws TreeIndexException {
BTreeFieldPrefixNSMLeafFrame rf = (BTreeFieldPrefixNSMLeafFrame)rightFrame;
@@ -510,6 +510,7 @@
int tupleCount = getTupleCount();
int prefixTupleCount = getPrefixTupleCount();
+ // Find split point, and determine into which frame the new tuple should be inserted into.
int tuplesToLeft;
int midSlotNum = tupleCount / 2;
ITreeIndexFrame targetFrame = null;
@@ -615,7 +616,7 @@
rightFrame.compact();
// insert last key
- int targetTupleIndex = ((IBTreeLeafFrame)targetFrame).findInsertTupleIndex(tuple, cmp);
+ int targetTupleIndex = ((IBTreeLeafFrame)targetFrame).findInsertTupleIndex(tuple);
targetFrame.insert(tuple, targetTupleIndex);
// set split key to be highest value in left page
@@ -625,8 +626,6 @@
splitKey.initData(splitKeySize);
tupleWriter.writeTupleFields(frameTuple, 0, cmp.getKeyFieldCount(), splitKey.getBuffer(), 0);
splitKey.getTuple().resetByTupleOffset(splitKey.getBuffer(), 0);
-
- return 0;
}
@Override
diff --git a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMInteriorFrame.java b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMInteriorFrame.java
index 05b9cf1..5a2d9db 100644
--- a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMInteriorFrame.java
+++ b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMInteriorFrame.java
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
import edu.uci.ics.hyracks.dataflow.common.data.accessors.ITupleReference;
import edu.uci.ics.hyracks.dataflow.common.data.marshalling.IntegerSerializerDeserializer;
import edu.uci.ics.hyracks.storage.am.btree.api.IBTreeInteriorFrame;
@@ -56,7 +55,7 @@
}
@Override
- public int findInsertTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findInsertTupleIndex(ITupleReference tuple) throws TreeIndexException {
return slotManager.findTupleIndex(tuple, frameTuple, cmp, FindTupleMode.INCLUSIVE,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
}
@@ -106,7 +105,7 @@
}
@Override
- public int findDeleteTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findDeleteTupleIndex(ITupleReference tuple) throws TreeIndexException {
return slotManager.findTupleIndex(tuple, frameTuple, cmp, FindTupleMode.INCLUSIVE,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
}
@@ -160,12 +159,12 @@
}
@Override
- public int findUpdateTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findUpdateTupleIndex(ITupleReference tuple) throws TreeIndexException {
throw new UnsupportedOperationException("Cannot update tuples in interior node.");
}
@Override
- public void insertSorted(ITupleReference tuple, MultiComparator cmp) throws HyracksDataException {
+ public void insertSorted(ITupleReference tuple) {
int freeSpace = buf.getInt(freeSpaceOff);
slotManager.insertSlot(slotManager.getGreatestKeyIndicator(), freeSpace);
int bytesWritten = tupleWriter.writeTuple(tuple, buf, freeSpace);
@@ -180,9 +179,11 @@
}
@Override
- public int split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
+ public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
ByteBuffer right = rightFrame.getBuffer();
int tupleCount = getTupleCount();
+
+ // Find split point, and determine into which frame the new tuple should be inserted into.
int tuplesToLeft = (tupleCount / 2) + (tupleCount % 2);
ITreeIndexFrame targetFrame = null;
frameTuple.resetByTupleIndex(this, tuplesToLeft - 1);
@@ -232,10 +233,8 @@
// Insert the saved split key.
int targetTupleIndex = ((BTreeNSMInteriorFrame) targetFrame)
- .findInsertTupleIndex(savedSplitKey.getTuple(), cmp);
+ .findInsertTupleIndex(savedSplitKey.getTuple());
targetFrame.insert(savedSplitKey.getTuple(), targetTupleIndex);
-
- return 0;
}
@Override
diff --git a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
index 5e1a3d2..fcc3f27 100644
--- a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
+++ b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/frames/BTreeNSMLeafFrame.java
@@ -17,7 +17,6 @@
import java.nio.ByteBuffer;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
import edu.uci.ics.hyracks.dataflow.common.data.accessors.ITupleReference;
import edu.uci.ics.hyracks.storage.am.btree.api.IBTreeLeafFrame;
import edu.uci.ics.hyracks.storage.am.btree.exceptions.BTreeDuplicateKeyException;
@@ -69,7 +68,7 @@
}
@Override
- public int findInsertTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findInsertTupleIndex(ITupleReference tuple) throws TreeIndexException {
int tupleIndex = slotManager.findTupleIndex(tuple, frameTuple, cmp, FindTupleMode.EXCLUSIVE_ERROR_IF_EXISTS,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
// Error indicator is set if there is an exact match.
@@ -80,7 +79,7 @@
}
@Override
- public int findUpdateTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findUpdateTupleIndex(ITupleReference tuple) throws TreeIndexException {
int tupleIndex = slotManager.findTupleIndex(tuple, frameTuple, cmp, FindTupleMode.EXACT,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
// Error indicator is set if there is no exact match.
@@ -91,7 +90,7 @@
}
@Override
- public int findDeleteTupleIndex(ITupleReference tuple, MultiComparator cmp) throws TreeIndexException {
+ public int findDeleteTupleIndex(ITupleReference tuple) throws TreeIndexException {
int tupleIndex = slotManager.findTupleIndex(tuple, frameTuple, cmp, FindTupleMode.EXACT,
FindTupleNoExactMatchPolicy.HIGHER_KEY);
// Error indicator is set if there is no exact match.
@@ -103,8 +102,8 @@
@Override
public void insert(ITupleReference tuple, int tupleIndex) {
- slotManager.insertSlot(tupleIndex, buf.getInt(freeSpaceOff));
int freeSpace = buf.getInt(freeSpaceOff);
+ slotManager.insertSlot(tupleIndex, freeSpace);
int bytesWritten = tupleWriter.writeTuple(tuple, buf.array(), freeSpace);
buf.putInt(tupleCountOff, buf.getInt(tupleCountOff) + 1);
buf.putInt(freeSpaceOff, buf.getInt(freeSpaceOff) + bytesWritten);
@@ -112,21 +111,17 @@
}
@Override
- public void insertSorted(ITupleReference tuple, MultiComparator cmp) throws HyracksDataException {
- int freeSpace = buf.getInt(freeSpaceOff);
- slotManager.insertSlot(-1, freeSpace);
- int bytesWritten = tupleWriter.writeTuple(tuple, buf.array(), freeSpace);
- buf.putInt(tupleCountOff, buf.getInt(tupleCountOff) + 1);
- buf.putInt(freeSpaceOff, buf.getInt(freeSpaceOff) + bytesWritten);
- buf.putInt(totalFreeSpaceOff, buf.getInt(totalFreeSpaceOff) - bytesWritten - slotManager.getSlotSize());
+ public void insertSorted(ITupleReference tuple) {
+ insert(tuple, slotManager.getGreatestKeyIndicator());
}
@Override
- public int split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
+ public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
ByteBuffer right = rightFrame.getBuffer();
int tupleCount = getTupleCount();
-
int tuplesToLeft;
+
+ // Find split point, and determine into which frame the new tuple should be inserted into.
int mid = tupleCount / 2;
ITreeIndexFrame targetFrame = null;
int tupleOff = slotManager.getTupleOff(slotManager.getSlotEndOff() + slotManager.getSlotSize() * mid);
@@ -140,10 +135,10 @@
}
int tuplesToRight = tupleCount - tuplesToLeft;
- // copy entire page
+ // Copy entire page.
System.arraycopy(buf.array(), 0, right.array(), 0, buf.capacity());
- // on right page we need to copy rightmost slots to left
+ // On the right page we need to copy rightmost slots to the left.
int src = rightFrame.getSlotManager().getSlotEndOff();
int dest = rightFrame.getSlotManager().getSlotEndOff() + tuplesToLeft
* rightFrame.getSlotManager().getSlotSize();
@@ -151,27 +146,24 @@
System.arraycopy(right.array(), src, right.array(), dest, length);
right.putInt(tupleCountOff, tuplesToRight);
- // on left page only change the tupleCount indicator
+ // On left page only change the tupleCount indicator.
buf.putInt(tupleCountOff, tuplesToLeft);
- // compact both pages
+ // Compact both pages.
rightFrame.compact();
compact();
- // insert last key
- int targetTupleIndex = ((BTreeNSMLeafFrame)targetFrame).findInsertTupleIndex(tuple, cmp);
+ // Insert the new tuple.
+ int targetTupleIndex = ((BTreeNSMLeafFrame)targetFrame).findInsertTupleIndex(tuple);
targetFrame.insert(tuple, targetTupleIndex);
- // set split key to be highest value in left page
+ // Set the split key to be highest key in the left page.
tupleOff = slotManager.getTupleOff(slotManager.getSlotEndOff());
frameTuple.resetByTupleOffset(buf, tupleOff);
-
int splitKeySize = tupleWriter.bytesRequired(frameTuple, 0, cmp.getKeyFieldCount());
splitKey.initData(splitKeySize);
tupleWriter.writeTupleFields(frameTuple, 0, cmp.getKeyFieldCount(), splitKey.getBuffer(), 0);
splitKey.getTuple().resetByTupleOffset(splitKey.getBuffer(), 0);
-
- return 0;
}
@Override
diff --git a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/impls/BTree.java b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/impls/BTree.java
index 3c510ec..0c57c7f 100644
--- a/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/impls/BTree.java
+++ b/hyracks-storage-am-btree/src/main/java/edu/uci/ics/hyracks/storage/am/btree/impls/BTree.java
@@ -236,7 +236,7 @@
ctx.interiorFrame.setSmFlag(true); // will be cleared later
// in unsetSmPages
ctx.splitKey.setLeftPage(newLeftId);
- int targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(ctx.splitKey.getTuple(), cmp);
+ int targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(ctx.splitKey.getTuple());
ctx.interiorFrame.insert(ctx.splitKey.getTuple(), targetTupleIndex);
} finally {
newLeftNode.releaseWriteLatch();
@@ -312,7 +312,7 @@
private void insertLeaf(ICachedPage node, int pageId, ITupleReference tuple, BTreeOpContext ctx) throws Exception {
ctx.leafFrame.setPage(node);
- int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
+ int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple);
FrameOpSpaceStatus spaceStatus = ctx.leafFrame.hasSpaceInsert(tuple);
switch (spaceStatus) {
case SUFFICIENT_CONTIGUOUS_SPACE: {
@@ -323,7 +323,7 @@
case SUFFICIENT_SPACE: {
boolean slotsChanged = ctx.leafFrame.compact();
if (slotsChanged) {
- targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
+ targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple);
}
ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
@@ -334,7 +334,7 @@
boolean reCompressed = ctx.leafFrame.compress();
if (reCompressed) {
// Compression could have changed the target tuple index, find it again.
- targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
+ targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple);
spaceStatus = ctx.leafFrame.hasSpaceInsert(tuple);
}
if (spaceStatus == FrameOpSpaceStatus.SUFFICIENT_CONTIGUOUS_SPACE) {
@@ -369,8 +369,7 @@
rightFrame.setPage(rightNode);
rightFrame.initBuffer((byte) 0);
rightFrame.setMultiComparator(cmp);
-
- int ret = ctx.leafFrame.split(rightFrame, tuple, ctx.splitKey);
+ ctx.leafFrame.split(rightFrame, tuple, ctx.splitKey);
ctx.smPages.add(pageId);
ctx.smPages.add(rightPageId);
@@ -388,11 +387,8 @@
rightFrame.setPageLsn(rightFrame.getPageLsn() + 1);
ctx.leafFrame.setPageLsn(ctx.leafFrame.getPageLsn() + 1);
- if (ret != 0) {
- ctx.splitKey.reset();
- } else {
- ctx.splitKey.setPages(pageId, rightPageId);
- }
+ ctx.splitKey.setPages(pageId, rightPageId);
+
if (rightSibling != null) {
rightSibling.acquireWriteLatch();
try {
@@ -422,7 +418,7 @@
private void updateLeaf(ICachedPage node, int pageId, ITupleReference tuple, BTreeOpContext ctx) throws Exception {
ctx.leafFrame.setPage(node);
- int oldTupleIndex = ctx.leafFrame.findUpdateTupleIndex(tuple, cmp);
+ int oldTupleIndex = ctx.leafFrame.findUpdateTupleIndex(tuple);
FrameOpSpaceStatus spaceStatus = ctx.leafFrame.hasSpaceUpdate(tuple, oldTupleIndex);
switch (spaceStatus) {
case SUFFICIENT_INPLACE_SPACE: {
@@ -439,7 +435,7 @@
// Delete the old tuple, compact the frame, and insert the new tuple.
ctx.leafFrame.delete(tuple, oldTupleIndex);
ctx.leafFrame.compact();
- int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
+ int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple);
ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
break;
@@ -451,7 +447,7 @@
// We need to insert the new tuple, so check if there is space.
spaceStatus = ctx.leafFrame.hasSpaceInsert(tuple);
if (spaceStatus == FrameOpSpaceStatus.SUFFICIENT_CONTIGUOUS_SPACE) {
- int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
+ int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple);
ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
} else {
@@ -467,7 +463,7 @@
private void insertInterior(ICachedPage node, int pageId, ITupleReference tuple, BTreeOpContext ctx)
throws Exception {
ctx.interiorFrame.setPage(node);
- int targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(tuple, cmp);
+ int targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(tuple);
FrameOpSpaceStatus spaceStatus = ctx.interiorFrame.hasSpaceInsert(tuple);
switch (spaceStatus) {
case INSUFFICIENT_SPACE: {
@@ -481,7 +477,7 @@
rightFrame.setMultiComparator(cmp);
// instead of creating a new split key, use the existing
// splitKey
- int ret = ctx.interiorFrame.split(rightFrame, ctx.splitKey.getTuple(), ctx.splitKey);
+ ctx.interiorFrame.split(rightFrame, ctx.splitKey.getTuple(), ctx.splitKey);
ctx.smPages.add(pageId);
ctx.smPages.add(rightPageId);
@@ -494,11 +490,7 @@
rightFrame.setPageLsn(rightFrame.getPageLsn() + 1);
ctx.interiorFrame.setPageLsn(ctx.interiorFrame.getPageLsn() + 1);
- if (ret != 0) {
- ctx.splitKey.reset();
- } else {
- ctx.splitKey.setPages(pageId, rightPageId);
- }
+ ctx.splitKey.setPages(pageId, rightPageId);
} finally {
rightNode.releaseWriteLatch();
bufferCache.unpin(rightNode);
@@ -515,7 +507,7 @@
case SUFFICIENT_SPACE: {
boolean slotsChanged = ctx.interiorFrame.compact();
if (slotsChanged) {
- targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(tuple, cmp);
+ targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(tuple);
}
ctx.interiorFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
@@ -527,7 +519,7 @@
// TODO: to avoid latch deadlock, must modify cursor to detect empty leaves
private void deleteLeaf(ICachedPage node, int pageId, ITupleReference tuple, BTreeOpContext ctx) throws Exception {
ctx.leafFrame.setPage(node);
- int tupleIndex = ctx.leafFrame.findDeleteTupleIndex(tuple, cmp);
+ int tupleIndex = ctx.leafFrame.findDeleteTupleIndex(tuple);
// Will this leaf become empty?
if (ctx.leafFrame.getTupleCount() == 1) {
IBTreeLeafFrame siblingFrame = (IBTreeLeafFrame) leafFrameFactory.createFrame();
@@ -619,7 +611,7 @@
throws Exception {
ctx.interiorFrame.setPage(node);
- int tupleIndex = ctx.interiorFrame.findDeleteTupleIndex(tuple, cmp);
+ int tupleIndex = ctx.interiorFrame.findDeleteTupleIndex(tuple);
// this means there is only a child pointer but no key, this case
// propagates the split
@@ -923,7 +915,7 @@
ctx.interiorFrame.setPage(frontier.page);
ctx.interiorFrame.initBuffer((byte) level);
}
- ctx.interiorFrame.insertSorted(tuple, cmp);
+ ctx.interiorFrame.insertSorted(tuple);
}
// assumes btree has been created and opened
@@ -984,7 +976,7 @@
}
leafFrame.setPage(leafFrontier.page);
- leafFrame.insertSorted(tuple, cmp);
+ leafFrame.insertSorted(tuple);
}
@Override
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndexFrame.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndexFrame.java
index 76e19b5..6853ed2 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndexFrame.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndexFrame.java
@@ -61,7 +61,7 @@
// for debugging
public void printHeader();
- public int split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException;
+ public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException;
public ISlotManager getSlotManager();
diff --git a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
index 8b56f97..96d739c 100644
--- a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
+++ b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
@@ -275,7 +275,7 @@
}
@Override
- public int split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
+ public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
RTreeSplitKey rTreeSplitKey = ((RTreeSplitKey) splitKey);
RTreeTypeAwareTupleWriter rTreeTupleWriterLeftFrame = ((RTreeTypeAwareTupleWriter) tupleWriter);
RTreeTypeAwareTupleWriter rTreeTupleWriterRightFrame = ((RTreeTypeAwareTupleWriter) rightFrame.getTupleWriter());
@@ -425,7 +425,6 @@
tupleEntries1.clear();
tupleEntries2.clear();
- return 0;
}
private int getChildPointerOff(ITupleReference tuple) {
diff --git a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrame.java b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrame.java
index ebd3818..b2ae5fc 100644
--- a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrame.java
+++ b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrame.java
@@ -64,7 +64,7 @@
}
@Override
- public int split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
+ public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey) throws TreeIndexException {
RTreeSplitKey rTreeSplitKey = ((RTreeSplitKey) splitKey);
RTreeTypeAwareTupleWriter rTreeTupleWriterLeftFrame = ((RTreeTypeAwareTupleWriter) tupleWriter);
@@ -216,7 +216,6 @@
tupleEntries1.clear();
tupleEntries2.clear();
- return 0;
}
@Override
diff --git a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/impls/RTree.java b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/impls/RTree.java
index e361f92..b85b4eb 100644
--- a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/impls/RTree.java
+++ b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/impls/RTree.java
@@ -447,15 +447,13 @@
try {
IRTreeFrame rightFrame;
- int ret;
numOfPages++; // debug
if (!isLeaf) {
splitsByLevel[ctx.interiorFrame.getLevel()]++; // debug
rightFrame = (IRTreeFrame) interiorFrameFactory.createFrame();
rightFrame.setPage(rightNode);
rightFrame.initBuffer((byte) ctx.interiorFrame.getLevel());
- //rightFrame.setPageTupleFieldCount(cmp.getKeyFieldCount());
- ret = ctx.interiorFrame.split(rightFrame, tuple, ctx.splitKey);
+ ctx.interiorFrame.split(rightFrame, tuple, ctx.splitKey);
ctx.interiorFrame.setRightPage(rightPageId);
rightFrame.setPageNsn(ctx.interiorFrame.getPageNsn());
incrementGlobalNsn();
@@ -468,7 +466,7 @@
rightFrame = (IRTreeFrame) leafFrameFactory.createFrame();
rightFrame.setPage(rightNode);
rightFrame.initBuffer((byte) 0);
- ret = ctx.leafFrame.split(rightFrame, tuple, ctx.splitKey);
+ ctx.leafFrame.split(rightFrame, tuple, ctx.splitKey);
ctx.leafFrame.setRightPage(rightPageId);
rightFrame.setPageNsn(ctx.leafFrame.getPageNsn());
incrementGlobalNsn();
@@ -477,11 +475,7 @@
ctx.leafFrame.setPageNsn(newNsn);
ctx.leafFrame.setPageLsn(newNsn);
}
- if (ret != 0) {
- ctx.splitKey.reset();
- } else {
- ctx.splitKey.setPages(pageId, rightPageId);
- }
+ ctx.splitKey.setPages(pageId, rightPageId);
if (pageId == rootPage) {
rootSplits++; // debug
splitsByLevel[currentLevel]++;
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeFieldPrefixNSMTest.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeFieldPrefixNSMTest.java
index c5ca61c..0f3edd6 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeFieldPrefixNSMTest.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeFieldPrefixNSMTest.java
@@ -144,7 +144,7 @@
ITupleReference tuple = createTuple(ctx, a, b, c, false);
try {
- int targetTupleIndex = frame.findInsertTupleIndex(tuple, cmp);
+ int targetTupleIndex = frame.findInsertTupleIndex(tuple);
frame.insert(tuple, targetTupleIndex);
} catch (BTreeException e) {
e.printStackTrace();
@@ -180,7 +180,7 @@
ITupleReference tuple = createTuple(ctx, savedFields[i][0], savedFields[i][1], savedFields[i][2], false);
try {
- int tupleIndex = frame.findDeleteTupleIndex(tuple, cmp);
+ int tupleIndex = frame.findDeleteTupleIndex(tuple);
frame.delete(tuple, tupleIndex);
} catch (Exception e) {
}