| commit | d73275bcdd0f32d43412f3ffddd84ac4a72f8a7b | [log] [tgz] |
|---|---|---|
| author | vinayakb <vinayakb@123451ca-8445-de46-9d55-352943316053> | Mon May 16 16:41:38 2011 +0000 |
| committer | vinayakb <vinayakb@123451ca-8445-de46-9d55-352943316053> | Mon May 16 16:41:38 2011 +0000 |
| tree | 4a1ed5847a2aaed3d3bafbe2d44cd9e535d715af | |
| parent | 7e9ec1329a589c5560cb11ae46059af1f527badd [diff] |
Merged r455:456 from hyracks_scheduling git-svn-id: https://hyracks.googlecode.com/svn/trunk/hyracks@457 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java index 5ee8fd5..105a344 100644 --- a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java +++ b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
@@ -64,7 +64,6 @@ public void cache(ByteBuffer buffer) throws HyracksDataException { runFileWriter.nextFrame(buffer); - System.out.println(runFileWriter.getFileSize()); } public void join(ByteBuffer outerBuffer, IFrameWriter writer) throws HyracksDataException {
diff --git a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java index 1436e30..efee8ff 100644 --- a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java +++ b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java
@@ -89,7 +89,7 @@ public void nextFrame(ByteBuffer buffer) throws HyracksDataException { ByteBuffer copyBuffer = ctx.allocateFrame(); FrameUtils.copy(buffer, copyBuffer); - copyBuffer.flip(); + FrameUtils.makeReadable(copyBuffer); joiner.cache(copyBuffer); } @@ -154,4 +154,4 @@ return NestedLoopJoinOperatorDescriptor.this; } } -} +} \ No newline at end of file