Removed MultiComparator from insert API in TreeIndexFrame.
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_btree_updates_next@620 123451ca-8445-de46-9d55-352943316053
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 dcb7d2f..d1012a5 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
@@ -250,7 +250,7 @@
}
@Override
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex) {
+ public void insert(ITupleReference tuple, int tupleIndex) {
int slot = slotManager.insertSlot(tupleIndex, buf.getInt(freeSpaceOff));
int prefixSlotNum = slotManager.decodeFirstSlotField(slot);
int numPrefixFields = 0;
@@ -650,7 +650,7 @@
// insert last key
int targetTupleIndex = ((IBTreeLeafFrame)targetFrame).findInsertTupleIndex(tuple, cmp);
- targetFrame.insert(tuple, cmp, targetTupleIndex);
+ targetFrame.insert(tuple, targetTupleIndex);
// set split key to be highest value in left page
frameTuple.resetByTupleIndex(this, getTupleCount() - 1);
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 00ec3cd..95fcd14 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
@@ -52,8 +52,8 @@
cmpFrameTuple = tupleWriter.createTupleReference();
}
- private int getLeftChildPageOff(ITupleReference tuple, MultiComparator cmp) {
- return tuple.getFieldStart(cmp.getKeyFieldCount() - 1) + tuple.getFieldLength(cmp.getKeyFieldCount() - 1);
+ private int getLeftChildPageOff(ITupleReference tuple) {
+ return tuple.getFieldStart(tuple.getFieldCount() - 1) + tuple.getFieldLength(tuple.getFieldCount() - 1);
}
@Override
@@ -96,11 +96,11 @@
}
@Override
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex) {
+ public void insert(ITupleReference tuple, int tupleIndex) {
int slotOff = slotManager.insertSlot(tupleIndex, buf.getInt(freeSpaceOff));
int freeSpace = buf.getInt(freeSpaceOff);
- int bytesWritten = tupleWriter.writeTupleFields(tuple, 0, cmp.getKeyFieldCount(), buf, freeSpace);
- System.arraycopy(tuple.getFieldData(cmp.getKeyFieldCount() - 1), getLeftChildPageOff(tuple, cmp), buf.array(),
+ int bytesWritten = tupleWriter.writeTupleFields(tuple, 0, tuple.getFieldCount(), buf, freeSpace);
+ System.arraycopy(tuple.getFieldData(tuple.getFieldCount() - 1), getLeftChildPageOff(tuple), buf.array(),
freeSpace + bytesWritten, childPtrSize);
int tupleSize = bytesWritten + childPtrSize;
@@ -110,7 +110,7 @@
// did insert into the rightmost slot?
if (slotOff == slotManager.getSlotEndOff()) {
- System.arraycopy(tuple.getFieldData(cmp.getKeyFieldCount() - 1), getLeftChildPageOff(tuple, cmp)
+ System.arraycopy(tuple.getFieldData(tuple.getFieldCount() - 1), getLeftChildPageOff(tuple)
+ childPtrSize, buf.array(), rightLeafOff, childPtrSize);
} else {
// if slotOff has a right (slot-)neighbor then update its child
@@ -122,8 +122,8 @@
if (buf.getInt(tupleCountOff) > 1) {
int rightNeighborOff = slotOff - slotManager.getSlotSize();
frameTuple.resetByTupleOffset(buf, slotManager.getTupleOff(rightNeighborOff));
- System.arraycopy(tuple.getFieldData(0), getLeftChildPageOff(tuple, cmp) + childPtrSize, buf.array(),
- getLeftChildPageOff(frameTuple, cmp), childPtrSize);
+ System.arraycopy(tuple.getFieldData(0), getLeftChildPageOff(tuple) + childPtrSize, buf.array(),
+ getLeftChildPageOff(frameTuple), childPtrSize);
}
}
}
@@ -133,13 +133,13 @@
int freeSpace = buf.getInt(freeSpaceOff);
slotManager.insertSlot(-1, freeSpace);
int bytesWritten = tupleWriter.writeTupleFields(tuple, 0, cmp.getKeyFieldCount(), buf, freeSpace);
- System.arraycopy(tuple.getFieldData(cmp.getKeyFieldCount() - 1), getLeftChildPageOff(tuple, cmp), buf.array(),
+ System.arraycopy(tuple.getFieldData(cmp.getKeyFieldCount() - 1), getLeftChildPageOff(tuple), buf.array(),
freeSpace + bytesWritten, childPtrSize);
int tupleSize = bytesWritten + childPtrSize;
buf.putInt(tupleCountOff, buf.getInt(tupleCountOff) + 1);
buf.putInt(freeSpaceOff, buf.getInt(freeSpaceOff) + tupleSize);
buf.putInt(totalFreeSpaceOff, buf.getInt(totalFreeSpaceOff) - tupleSize - slotManager.getSlotSize());
- System.arraycopy(tuple.getFieldData(0), getLeftChildPageOff(tuple, cmp) + childPtrSize, buf.array(),
+ System.arraycopy(tuple.getFieldData(0), getLeftChildPageOff(tuple) + childPtrSize, buf.array(),
rightLeafOff, childPtrSize);
}
@@ -191,7 +191,7 @@
int deleteTupleOff = slotManager.getTupleOff(slotManager.getSlotEndOff());
frameTuple.resetByTupleOffset(buf, deleteTupleOff);
- buf.putInt(rightLeafOff, buf.getInt(getLeftChildPageOff(frameTuple, cmp)));
+ buf.putInt(rightLeafOff, buf.getInt(getLeftChildPageOff(frameTuple)));
buf.putInt(tupleCountOff, tuplesToLeft - 1);
// compact both pages
@@ -200,7 +200,7 @@
// insert key
int targetTupleIndex = ((BTreeNSMInteriorFrame)targetFrame).findInsertTupleIndex(savedSplitKey.getTuple(), cmp);
- targetFrame.insert(savedSplitKey.getTuple(), cmp, targetTupleIndex);
+ targetFrame.insert(savedSplitKey.getTuple(), targetTupleIndex);
return 0;
}
@@ -314,7 +314,7 @@
}
frameTuple.resetByTupleOffset(buf, slotManager.getTupleOff(slotOff));
- int childPageOff = getLeftChildPageOff(frameTuple, srcCmp);
+ int childPageOff = getLeftChildPageOff(frameTuple);
return buf.getInt(childPageOff);
}
}
@@ -359,7 +359,7 @@
int tupleOff = slotManager.getTupleOff(slotManager.getSlotStartOff());
frameTuple.setFieldCount(cmp.getKeyFieldCount());
frameTuple.resetByTupleOffset(buf, tupleOff);
- int childPageOff = getLeftChildPageOff(frameTuple, cmp);
+ int childPageOff = getLeftChildPageOff(frameTuple);
return buf.getInt(childPageOff);
}
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 bf4faf6..1acee76 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
@@ -101,7 +101,7 @@
}
@Override
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex) {
+ public void insert(ITupleReference tuple, int tupleIndex) {
slotManager.insertSlot(tupleIndex, buf.getInt(freeSpaceOff));
int freeSpace = buf.getInt(freeSpaceOff);
int bytesWritten = tupleWriter.writeTuple(tuple, buf.array(), freeSpace);
@@ -159,7 +159,7 @@
// insert last key
int targetTupleIndex = ((BTreeNSMLeafFrame)targetFrame).findInsertTupleIndex(tuple, cmp);
- targetFrame.insert(tuple, cmp, targetTupleIndex);
+ targetFrame.insert(tuple, targetTupleIndex);
// set split key to be highest value in left page
tupleOff = slotManager.getTupleOff(slotManager.getSlotEndOff());
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 6dbfa1c..03c1272 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 @@
// in unsetSmPages
ctx.splitKey.setLeftPage(newLeftId);
int targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(ctx.splitKey.getTuple(), cmp);
- ctx.interiorFrame.insert(ctx.splitKey.getTuple(), cmp, targetTupleIndex);
+ ctx.interiorFrame.insert(ctx.splitKey.getTuple(), targetTupleIndex);
} finally {
newLeftNode.releaseWriteLatch();
bufferCache.unpin(newLeftNode);
@@ -315,7 +315,7 @@
FrameOpSpaceStatus spaceStatus = ctx.leafFrame.hasSpaceInsert(tuple, cmp);
switch (spaceStatus) {
case SUFFICIENT_CONTIGUOUS_SPACE: {
- ctx.leafFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
break;
}
@@ -324,7 +324,7 @@
if (slotsChanged) {
targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
}
- ctx.leafFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
break;
}
@@ -337,7 +337,7 @@
spaceStatus = ctx.leafFrame.hasSpaceInsert(tuple, cmp);
}
if (spaceStatus == FrameOpSpaceStatus.SUFFICIENT_CONTIGUOUS_SPACE) {
- ctx.leafFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
} else {
performLeafSplit(pageId, tuple, ctx);
@@ -438,7 +438,7 @@
ctx.leafFrame.delete(tuple, cmp, oldTupleIndex);
ctx.leafFrame.compact(cmp);
int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
- ctx.leafFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
break;
}
@@ -450,7 +450,7 @@
spaceStatus = ctx.leafFrame.hasSpaceInsert(tuple, cmp);
if (spaceStatus == FrameOpSpaceStatus.SUFFICIENT_CONTIGUOUS_SPACE) {
int targetTupleIndex = ctx.leafFrame.findInsertTupleIndex(tuple, cmp);
- ctx.leafFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.leafFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
} else {
performLeafSplit(pageId, tuple, ctx);
@@ -504,7 +504,7 @@
}
case SUFFICIENT_CONTIGUOUS_SPACE: {
- ctx.interiorFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.interiorFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
break;
}
@@ -514,7 +514,7 @@
if (slotsChanged) {
targetTupleIndex = ctx.interiorFrame.findInsertTupleIndex(tuple, cmp);
}
- ctx.interiorFrame.insert(tuple, cmp, targetTupleIndex);
+ ctx.interiorFrame.insert(tuple, targetTupleIndex);
ctx.splitKey.reset();
break;
}
@@ -937,7 +937,7 @@
}
@Override
- public void bulkLoadAddTuple(IIndexBulkLoadContext ictx, ITupleReference tuple) throws HyracksDataException {
+ public void bulkLoadAddTuple(ITupleReference tuple, IIndexBulkLoadContext ictx) throws HyracksDataException {
BulkLoadContext ctx = (BulkLoadContext) ictx;
NodeFrontier leafFrontier = ctx.nodeFrontiers.get(0);
IBTreeLeafFrame leafFrame = ctx.leafFrame;
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndex.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndex.java
index 8ca7679..d4e1703 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndex.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/api/ITreeIndex.java
@@ -26,7 +26,7 @@
ITreeIndexMetaDataFrame metaFrame) throws HyracksDataException;
public void open(int indexFileId);
-
+
public void close();
// operations:
@@ -48,10 +48,11 @@
public IIndexBulkLoadContext beginBulkLoad(float fillFactor,
ITreeIndexFrame leafFrame, ITreeIndexFrame interiorFrame,
- ITreeIndexMetaDataFrame metaFrame) throws TreeIndexException, HyracksDataException;
+ ITreeIndexMetaDataFrame metaFrame) throws TreeIndexException,
+ HyracksDataException;
- public void bulkLoadAddTuple(IIndexBulkLoadContext ictx,
- ITupleReference tuple) throws HyracksDataException;
+ public void bulkLoadAddTuple(ITupleReference tuple,
+ IIndexBulkLoadContext ictx) throws HyracksDataException;
public void endBulkLoad(IIndexBulkLoadContext ictx)
throws HyracksDataException;
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 5a9cb23..f9e6a1c 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
@@ -25,7 +25,7 @@
import edu.uci.ics.hyracks.storage.common.buffercache.ICachedPage;
public interface ITreeIndexFrame {
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex);
+ public void insert(ITupleReference tuple, int tupleIndex);
public void update(ITupleReference newTuple, int oldTupleIndex, boolean inPlace);
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexBulkLoadOperatorNodePushable.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexBulkLoadOperatorNodePushable.java
index 42dfaab..a5d5e85 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexBulkLoadOperatorNodePushable.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexBulkLoadOperatorNodePushable.java
@@ -78,8 +78,8 @@
int tupleCount = accessor.getTupleCount();
for (int i = 0; i < tupleCount; i++) {
tuple.reset(accessor, i);
- treeIndexOpHelper.getTreeIndex().bulkLoadAddTuple(bulkLoadCtx,
- tuple);
+ treeIndexOpHelper.getTreeIndex().bulkLoadAddTuple(tuple,
+ bulkLoadCtx);
}
}
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/frames/TreeIndexNSMFrame.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/frames/TreeIndexNSMFrame.java
index 135d5ae..91acc6c 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/frames/TreeIndexNSMFrame.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/frames/TreeIndexNSMFrame.java
@@ -206,7 +206,7 @@
}
@Override
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex) {
+ public void insert(ITupleReference tuple, int tupleIndex) {
slotManager.insertSlot(tupleIndex, buf.getInt(freeSpaceOff));
int bytesWritten = tupleWriter.writeTuple(tuple, buf.array(), buf.getInt(freeSpaceOff));
buf.putInt(tupleCountOff, buf.getInt(tupleCountOff) + 1);
diff --git a/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java b/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java
index 2dda265..29dd930 100644
--- a/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java
+++ b/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java
@@ -201,7 +201,7 @@
// reset tuple reference
ctx.btreeFrameTupleReference.reset(ctx.btreeFrameTupleAccessor, 0);
- btree.bulkLoadAddTuple(ctx.btreeBulkLoadCtx, ctx.btreeFrameTupleReference);
+ btree.bulkLoadAddTuple(ctx.btreeFrameTupleReference, ctx.btreeBulkLoadCtx);
}
public void endBulkLoad(BulkLoadContext ctx) throws HyracksDataException {
diff --git a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/api/IRTreeInteriorFrame.java b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/api/IRTreeInteriorFrame.java
index 4c251d2..2b3065d 100644
--- a/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/api/IRTreeInteriorFrame.java
+++ b/hyracks-storage-am-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/api/IRTreeInteriorFrame.java
@@ -23,7 +23,7 @@
public boolean findBestChild(ITupleReference tuple, MultiComparator cmp);
- public int getBestChildPageId(MultiComparator cmp);
+ public int getBestChildPageId();
public int getChildPageIdIfIntersect(ITupleReference tuple, int tupleIndex,
MultiComparator cmp);
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 14e2efa..f644cb2 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
@@ -174,8 +174,8 @@
}
@Override
- public int getBestChildPageId(MultiComparator cmp) {
- return buf.getInt(getChildPointerOff(frameTuple, cmp));
+ public int getBestChildPageId() {
+ return buf.getInt(getChildPointerOff(frameTuple));
}
@Override
@@ -210,7 +210,7 @@
return -1;
}
}
- return buf.getInt(getChildPointerOff(frameTuple, cmp));
+ return buf.getInt(getChildPointerOff(frameTuple));
}
@Override
@@ -224,7 +224,7 @@
return i;
} else {
int pageId = IntegerSerializerDeserializer.getInt(frameTuple.getFieldData(cmp.getKeyFieldCount() - 1),
- getChildPointerOff(frameTuple, cmp));
+ getChildPointerOff(frameTuple));
traverseList.add(pageId, -1, parentIndex);
}
}
@@ -295,8 +295,8 @@
private int pointerCmp(ITupleReference tupleA, ITupleReference tupleB, MultiComparator cmp) {
return childPtrCmp.compare(tupleA.getFieldData(cmp.getKeyFieldCount() - 1),
- getChildPointerOff(tupleA, cmp), childPtrSize, tupleB.getFieldData(cmp.getKeyFieldCount() - 1),
- getChildPointerOff(tupleB, cmp), childPtrSize);
+ getChildPointerOff(tupleA), childPtrSize, tupleB.getFieldData(cmp.getKeyFieldCount() - 1),
+ getChildPointerOff(tupleB), childPtrSize);
}
@Override
@@ -409,13 +409,13 @@
for (int i = startIndex; i < endIndex; i++) {
if (tupleEntries1.get(i).getTupleIndex() != -1) {
frameTuple.resetByTupleIndex(this, tupleEntries1.get(i).getTupleIndex());
- rightFrame.insert(frameTuple, cmp, -1);
+ rightFrame.insert(frameTuple, -1);
((UnorderedSlotManager) slotManager).modifySlot(
slotManager.getSlotOff(tupleEntries1.get(i).getTupleIndex()), -1);
totalBytes += tupleWriter.bytesRequired(frameTuple) + childPtrSize;
numOfDeletedTuples++;
} else {
- rightFrame.insert(tuple, cmp, -1);
+ rightFrame.insert(tuple, -1);
tupleInserted = true;
}
}
@@ -431,7 +431,7 @@
compact(cmp);
if (!tupleInserted) {
- insert(tuple, cmp, -1);
+ insert(tuple, -1);
}
int tupleOff = slotManager.getTupleOff(slotManager.getSlotEndOff());
@@ -453,17 +453,17 @@
return 0;
}
- private int getChildPointerOff(ITupleReference tuple, MultiComparator cmp) {
- return tuple.getFieldStart(cmp.getKeyFieldCount() - 1) + tuple.getFieldLength(cmp.getKeyFieldCount() - 1);
+ private int getChildPointerOff(ITupleReference tuple) {
+ return tuple.getFieldStart(tuple.getFieldCount() - 1) + tuple.getFieldLength(tuple.getFieldCount() - 1);
}
@Override
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex) {
- frameTuple.setFieldCount(cmp.getKeyFieldCount());
+ public void insert(ITupleReference tuple, int tupleIndex) {
+ frameTuple.setFieldCount(tuple.getFieldCount());
slotManager.insertSlot(-1, buf.getInt(freeSpaceOff));
int freeSpace = buf.getInt(freeSpaceOff);
- int bytesWritten = tupleWriter.writeTupleFields(tuple, 0, cmp.getKeyFieldCount(), buf, freeSpace);
- System.arraycopy(tuple.getFieldData(cmp.getKeyFieldCount() - 1), getChildPointerOff(tuple, cmp), buf.array(),
+ int bytesWritten = tupleWriter.writeTupleFields(tuple, 0, tuple.getFieldCount(), buf, freeSpace);
+ System.arraycopy(tuple.getFieldData(tuple.getFieldCount() - 1), getChildPointerOff(tuple), buf.array(),
freeSpace + bytesWritten, childPtrSize);
int tupleSize = bytesWritten + childPtrSize;
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 bdf3e6b..5adc373 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
@@ -175,13 +175,13 @@
for (int i = startIndex; i < endIndex; i++) {
if (tupleEntries1.get(i).getTupleIndex() != -1) {
frameTuple.resetByTupleIndex(this, tupleEntries1.get(i).getTupleIndex());
- rightFrame.insert(frameTuple, cmp, -1);
+ rightFrame.insert(frameTuple, -1);
((UnorderedSlotManager) slotManager).modifySlot(
slotManager.getSlotOff(tupleEntries1.get(i).getTupleIndex()), -1);
totalBytes += tupleWriter.bytesRequired(frameTuple);
numOfDeletedTuples++;
} else {
- rightFrame.insert(tuple, cmp, -1);
+ rightFrame.insert(tuple, -1);
tupleInserted = true;
}
}
@@ -197,7 +197,7 @@
compact(cmp);
if (!tupleInserted) {
- insert(tuple, cmp, -1);
+ insert(tuple, -1);
}
int tupleOff = slotManager.getTupleOff(slotManager.getSlotEndOff());
@@ -220,7 +220,7 @@
}
@Override
- public void insert(ITupleReference tuple, MultiComparator cmp, int tupleIndex) {
+ public void insert(ITupleReference tuple, int tupleIndex) {
slotManager.insertSlot(-1, buf.getInt(freeSpaceOff));
int bytesWritten = tupleWriter.writeTuple(tuple, buf.array(), buf.getInt(freeSpaceOff));
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 0bb712c..db94765 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
@@ -353,7 +353,7 @@
if (!isLeaf) {
// findBestChild must be called *before* getBestChildPageId
ctx.interiorFrame.findBestChild(ctx.getTuple(), cmp);
- int childPageId = ctx.interiorFrame.getBestChildPageId(cmp);
+ int childPageId = ctx.interiorFrame.getBestChildPageId();
if (!writeLatched) {
node.releaseReadLatch();
@@ -409,11 +409,11 @@
switch (spaceStatus) {
case SUFFICIENT_CONTIGUOUS_SPACE: {
if (!isLeaf) {
- ctx.interiorFrame.insert(tuple, cmp, -1);
+ ctx.interiorFrame.insert(tuple, -1);
incrementGlobalNsn();
ctx.interiorFrame.setPageLsn(getGlobalNsn());
} else {
- ctx.leafFrame.insert(tuple, cmp, -1);
+ ctx.leafFrame.insert(tuple, -1);
incrementGlobalNsn();
ctx.leafFrame.setPageLsn(getGlobalNsn());
}
@@ -424,12 +424,12 @@
case SUFFICIENT_SPACE: {
if (!isLeaf) {
ctx.interiorFrame.compact(cmp);
- ctx.interiorFrame.insert(tuple, cmp, -1);
+ ctx.interiorFrame.insert(tuple, -1);
incrementGlobalNsn();
ctx.interiorFrame.setPageLsn(getGlobalNsn());
} else {
ctx.leafFrame.compact(cmp);
- ctx.leafFrame.insert(tuple, cmp, -1);
+ ctx.leafFrame.insert(tuple, -1);
incrementGlobalNsn();
ctx.leafFrame.setPageLsn(getGlobalNsn());
}
@@ -503,8 +503,8 @@
ctx.splitKey.setLeftPage(newLeftId);
- ctx.interiorFrame.insert(ctx.splitKey.getLeftTuple(), cmp, -1);
- ctx.interiorFrame.insert(ctx.splitKey.getRightTuple(), cmp, -1);
+ ctx.interiorFrame.insert(ctx.splitKey.getLeftTuple(), -1);
+ ctx.interiorFrame.insert(ctx.splitKey.getRightTuple(), -1);
incrementGlobalNsn();
int newNsn = getGlobalNsn();
@@ -896,7 +896,7 @@
}
@Override
- public void bulkLoadAddTuple(IIndexBulkLoadContext ictx, ITupleReference tuple) throws HyracksDataException {
+ public void bulkLoadAddTuple(ITupleReference tuple, IIndexBulkLoadContext ictx) throws HyracksDataException {
try {
insert(tuple, ((BulkLoadContext) ictx).insertOpCtx);
} catch (Exception e) {
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 e49dc05..3c82529 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
@@ -147,7 +147,7 @@
ITupleReference tuple = createTuple(ctx, a, b, c, false);
try {
int targetTupleIndex = frame.findInsertTupleIndex(tuple, cmp);
- frame.insert(tuple, cmp, targetTupleIndex);
+ frame.insert(tuple, targetTupleIndex);
} catch (BTreeException e) {
e.printStackTrace();
} catch (Exception e) {
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeTest.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeTest.java
index a158916..905f79e 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeTest.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeTest.java
@@ -1105,7 +1105,7 @@
tuple.reset(accessor, 0);
- btree.bulkLoadAddTuple(bulkLoadCtx, tuple);
+ btree.bulkLoadAddTuple(tuple, bulkLoadCtx);
}
btree.endBulkLoad(bulkLoadCtx);
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeTestUtils.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeTestUtils.java
index 1f28807..07acaa8 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeTestUtils.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/util/BTreeTestUtils.java
@@ -401,7 +401,7 @@
LOGGER.info("Bulk Loading Tuple " + c + "/" + numTuples);
}
createTupleFromCheckTuple(checkTuple, tupleBuilder, tuple, testCtx.fieldSerdes);
- testCtx.btree.bulkLoadAddTuple(bulkLoadCtx, tuple);
+ testCtx.btree.bulkLoadAddTuple(tuple, bulkLoadCtx);
c++;
}
testCtx.btree.endBulkLoad(bulkLoadCtx);