Applied Yingyi's review comments
diff --git a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ReduceWriter.java b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ReduceWriter.java
index 028a299..1a6f6fd 100644
--- a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ReduceWriter.java
+++ b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ReduceWriter.java
@@ -122,8 +122,9 @@
}
fta.reset(group.get(bPtr), true);
if (!fta.append(accessor, tIndex)) {
- throw new HyracksDataException("Record size larger than frame size (" + group.get(bPtr).capacity()
- + ")");
+ throw new HyracksDataException("Record size ("
+ + (accessor.getTupleEndOffset(tIndex) - accessor.getTupleStartOffset(tIndex))
+ + ") larger than frame size (" + group.get(bPtr).capacity() + ")");
}
}
}
diff --git a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ShuffleFrameReader.java b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ShuffleFrameReader.java
index 8085002..253dcbf 100644
--- a/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ShuffleFrameReader.java
+++ b/hyracks/hyracks-dataflow-hadoop/src/main/java/edu/uci/ics/hyracks/dataflow/hadoop/mapreduce/ShuffleFrameReader.java
@@ -154,8 +154,9 @@
if (!fta.append(accessor, tIdx)) {
flush();
if (!fta.append(accessor, tIdx)) {
- throw new HyracksDataException("Record size larger than frame size (" + fta.getBuffer().capacity()
- + ")");
+ throw new HyracksDataException("Record size ("
+ + (accessor.getTupleEndOffset(tIdx) - accessor.getTupleStartOffset(tIdx))
+ + ") larger than frame size (" + fta.getBuffer().capacity() + ")");
}
}
}
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java
index 8c2d2a1..bc0189e 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java
@@ -128,7 +128,8 @@
appender.reset(outBuffer, true);
if (!appender.appendConcat(accessorProbe, i, nullTupleBuild.getFieldEndOffsets(),
nullTupleBuild.getByteArray(), 0, nullTupleBuild.getSize())) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ throw new HyracksDataException("Record size larger than frame size ("
+ + appender.getBuffer().capacity() + ")");
}
}
@@ -156,7 +157,12 @@
flushFrame(outBuffer, writer);
appender.reset(outBuffer, true);
if (!appender.appendConcat(accessorProbe, probeSidetIx, accessorBuild, buildSidetIx)) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ int tSize = accessorProbe.getTupleEndOffset(probeSidetIx)
+ - accessorProbe.getTupleStartOffset(probeSidetIx)
+ + accessorBuild.getTupleEndOffset(buildSidetIx)
+ - accessorBuild.getTupleStartOffset(buildSidetIx);
+ throw new HyracksDataException("Record size (" + tSize + ") larger than frame size ("
+ + appender.getBuffer().capacity() + ")");
}
}
} else {
@@ -164,7 +170,12 @@
flushFrame(outBuffer, writer);
appender.reset(outBuffer, true);
if (!appender.appendConcat(accessorBuild, buildSidetIx, accessorProbe, probeSidetIx)) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ int tSize = accessorProbe.getTupleEndOffset(probeSidetIx)
+ - accessorProbe.getTupleStartOffset(probeSidetIx)
+ + accessorBuild.getTupleEndOffset(buildSidetIx)
+ - accessorBuild.getTupleStartOffset(buildSidetIx);
+ throw new HyracksDataException("Record size (" + tSize + ") larger than frame size ("
+ + appender.getBuffer().capacity() + ")");
}
}
}
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
index ff7dd2b..546e80f 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
@@ -136,7 +136,10 @@
flushFrame(outBuffer, writer);
appender.reset(outBuffer, true);
if (!appender.appendConcat(accessorOuter, i, accessorInner, j)) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ int tSize = accessorOuter.getTupleEndOffset(i) - accessorOuter.getTupleStartOffset(i)
+ + accessorInner.getTupleEndOffset(j) - accessorInner.getTupleStartOffset(j);
+ throw new HyracksDataException("Record size (" + tSize + ") larger than frame size ("
+ + appender.getBuffer().capacity() + ")");
}
}
}
@@ -149,7 +152,10 @@
appender.reset(outBuffer, true);
if (!appender.appendConcat(accessorOuter, i, nullTupleBuilder.getFieldEndOffsets(),
nullTupleBuilder.getByteArray(), 0, nullTupleBuilder.getSize())) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ int tSize = accessorOuter.getTupleEndOffset(i) - accessorOuter.getTupleStartOffset(i)
+ + nullTupleBuilder.getSize();
+ throw new HyracksDataException("Record size (" + tSize + ") larger than frame size ("
+ + appender.getBuffer().capacity() + ")");
}
}
}
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/ExternalSortRunMerger.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/ExternalSortRunMerger.java
index 62049f3..39cfb88 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/ExternalSortRunMerger.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/ExternalSortRunMerger.java
@@ -194,7 +194,9 @@
outFrameAppender.reset(outFrame, true);
for (int i = 0; i < copyCount; i++) {
if (!outFrameAppender.append(fta, i)) {
- throw new HyracksDataException("Record size larger than frame size (" + outFrameAppender.getBuffer().capacity() + ")");
+ throw new HyracksDataException("Record size ("
+ + (fta.getTupleEndOffset(i) - fta.getTupleStartOffset(i))
+ + ") larger than frame size (" + outFrameAppender.getBuffer().capacity() + ")");
}
totalCount++;
}
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/FrameSorter.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/FrameSorter.java
index e15068e..ff02d57 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/FrameSorter.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/FrameSorter.java
@@ -132,7 +132,8 @@
FrameUtils.flushFrame(outFrame, writer);
appender.reset(outFrame, true);
if (!appender.append(fta1, tStart, tEnd)) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ throw new HyracksDataException("Record size (" + (tEnd - tStart) + ") larger than frame size ("
+ + appender.getBuffer().capacity() + ")");
}
}
}
diff --git a/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/dataflow/LSMIndexInsertUpdateDeleteOperatorNodePushable.java b/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/dataflow/LSMIndexInsertUpdateDeleteOperatorNodePushable.java
index f41ede2..a3e84ed 100644
--- a/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/dataflow/LSMIndexInsertUpdateDeleteOperatorNodePushable.java
+++ b/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/dataflow/LSMIndexInsertUpdateDeleteOperatorNodePushable.java
@@ -113,7 +113,9 @@
appender.reset(writeBuffer, true);
for (int i = startTupleIndex; i < endTupleIndex; i++) {
if (!appender.append(accessor, i)) {
- throw new HyracksDataException("Record size larger than frame size (" + appender.getBuffer().capacity() + ")");
+ throw new HyracksDataException("Record size ("
+ + (accessor.getTupleEndOffset(i) - accessor.getTupleStartOffset(i))
+ + ") larger than frame size (" + appender.getBuffer().capacity() + ")");
}
}
FrameUtils.flushFrame(writeBuffer, writer);