asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jianfeng Jia (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in asterixdb[master]: Fix the ASTERIXDB-1336 and ASTERIXDB-1413
Date Sun, 24 Apr 2016 08:22:09 GMT
Jianfeng Jia has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/830

Change subject: Fix the ASTERIXDB-1336 and ASTERIXDB-1413
......................................................................

Fix the ASTERIXDB-1336 and ASTERIXDB-1413

Change-Id: Iffc60490aea144cec9abd38349853764024b0ce0
---
M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/RunFileReader.java
M hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/30/830/1

diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/RunFileReader.java
b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/RunFileReader.java
index fb160f0..e513f06 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/RunFileReader.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/io/RunFileReader.java
@@ -28,6 +28,7 @@
 import org.apache.hyracks.api.io.IIOManager;
 
 public class RunFileReader implements IFrameReader {
+
     private final FileReference file;
     private IFileHandle handle;
     private final IIOManager ioManager;
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 @@
 
 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 @@
     }
 
     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 @@
             }
         }
 
+        FileUtils.deleteQuietly(wr.getFileReference().getFile()); // delete the runfile if
it already loaded into memory.
         r.close();
         spilledStatus.set(pid, false);
         buildRFWriters[pid] = null;

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/830
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffc60490aea144cec9abd38349853764024b0ce0
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Jianfeng Jia <jianfeng.jia@gmail.com>

Mime
View raw message