You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ji...@apache.org on 2016/04/24 22:01:13 UTC
incubator-asterixdb git commit: Fix the ASTERIXDB-1336 and
ASTERIXDB-1413
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master dbd828587 -> 458d89bbf
Fix the ASTERIXDB-1336 and ASTERIXDB-1413
Change-Id: Iffc60490aea144cec9abd38349853764024b0ce0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/830
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/458d89bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/458d89bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/458d89bb
Branch: refs/heads/master
Commit: 458d89bbfc92bd7759fb31fbbaf495abb7f45c42
Parents: dbd8285
Author: Jianfeng Jia <ji...@gmail.com>
Authored: Sun Apr 24 11:19:29 2016 -0700
Committer: Jianfeng Jia <ji...@gmail.com>
Committed: Sun Apr 24 13:01:14 2016 -0700
----------------------------------------------------------------------
.../hyracks/dataflow/std/join/OptimizedHybridHashJoin.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/458d89bb/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
index ebcb462..810039b 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
@@ -20,7 +20,9 @@ package org.apache.hyracks.dataflow.std.join;
import java.nio.ByteBuffer;
import java.util.BitSet;
+import java.util.logging.Logger;
+import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.comm.IFrame;
import org.apache.hyracks.api.comm.IFrameWriter;
import org.apache.hyracks.api.comm.VSizeFrame;
@@ -273,7 +275,7 @@ public class OptimizedHybridHashJoin {
}
private boolean loadPartitionInMem(int pid, RunFileWriter wr) throws HyracksDataException {
- RunFileReader r = wr.createDeleteOnCloseReader();
+ RunFileReader r = wr.createReader();
r.open();
if (reloadBuffer == null) {
reloadBuffer = new VSizeFrame(ctx);
@@ -290,6 +292,7 @@ public class OptimizedHybridHashJoin {
}
}
+ FileUtils.deleteQuietly(wr.getFileReference().getFile()); // delete the runfile if it already loaded into memory.
r.close();
spilledStatus.set(pid, false);
buildRFWriters[pid] = null;