| commit | 7168b1cb924ac11b052ff51dd1f4a7c4e4263213 | [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 | 4d9ae1a184491977517f1811d7f1ed3cf7aa2bbc | |
| parent | 0772c049e5165fd9bb2438b7229f02cc8e5018f5 [diff] |
Merged r455:456 from hyracks_scheduling git-svn-id: https://hyracks.googlecode.com/svn/trunk@457 123451ca-8445-de46-9d55-352943316053
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 5ee8fd5..105a344 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
@@ -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/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java index 1436e30..efee8ff 100644 --- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java +++ b/hyracks/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