You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/09/27 00:00:32 UTC
svn commit: r1627896 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/builtin/Bloom.java
Author: daijy
Date: Fri Sep 26 22:00:32 2014
New Revision: 1627896
URL: http://svn.apache.org/r1627896
Log:
PIG-4176: Fix tez e2e test Bloom_[1-3]
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/builtin/Bloom.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1627896&r1=1627895&r2=1627896&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Sep 26 22:00:32 2014
@@ -84,6 +84,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4176: Fix tez e2e test Bloom_[1-3] (daijy)
+
PIG-4164: After Pig job finish, Pig client spend too much time retry to connect to AM (daijy)
PIG-4195: Support loading char/varchar data in OrcStorage (daijy)
Modified: pig/trunk/src/org/apache/pig/builtin/Bloom.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/Bloom.java?rev=1627896&r1=1627895&r2=1627896&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/Bloom.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/Bloom.java Fri Sep 26 22:00:32 2014
@@ -21,7 +21,9 @@ package org.apache.pig.builtin;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
+import java.io.File;
import java.io.FileInputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +31,6 @@ import java.util.List;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.util.bloom.BloomFilter;
import org.apache.hadoop.util.bloom.Key;
-
import org.apache.pig.FilterFunc;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
@@ -94,8 +95,16 @@ public class Bloom extends FilterFunc {
private void init() throws IOException {
filter = new BloomFilter();
- String dcFile = "./" + getFilenameFromPath(bloomFile) +
- "/part-r-00000";
+ String dir = "./" + getFilenameFromPath(bloomFile);
+ String[] partFiles = new File(dir)
+ .list(new FilenameFilter() {
+ @Override
+ public boolean accept(File current, String name) {
+ return name.startsWith("part");
+ }
+ });
+
+ String dcFile = dir + "/" + partFiles[0];
filter.readFields(new DataInputStream(new FileInputStream(dcFile)));
}