You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by rd...@apache.org on 2010/01/20 21:08:32 UTC
svn commit: r901360 [1/2] - in /hadoop/pig/branches/load-store-redesign:
contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/
contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/
contrib/piggybank/ja...
Author: rding
Date: Wed Jan 20 20:08:28 2010
New Revision: 901360
URL: http://svn.apache.org/viewvc?rev=901360&view=rev
Log:
PIG-1090: Update sources to reflect recent changes in load-store interfaces
Modified:
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/RegExLoader.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/SequenceFileLoader.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCombinedLogLoader.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCommonLogLoader.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestRegExLoader.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/LoadMetadata.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/ResourceStatistics.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/StoreFunc.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/BinStorage.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/DataType.java
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,7 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
+
/**
* math.ABS implements a binding to the Java function
* {@link java.lang.Math#abs(double) Math.abs(double)} for computing the
@@ -75,7 +75,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.abs(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ABS implements a binding to the Java function
@@ -69,7 +68,7 @@
try{
d = (Double)input.get(0);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.abs(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java Wed Jan 20 20:08:28 2010
@@ -25,7 +25,6 @@
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.FuncSpec;
import org.apache.pig.data.Tuple;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
@@ -49,7 +48,7 @@
Double val = (Double)input.get(0);
return (val == null ? null : compute(val));
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input of " + this.getClass().getName(), e);
+ throw new IOException("Caught exception processing input of " + this.getClass().getName(), e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java Wed Jan 20 20:08:28 2010
@@ -25,7 +25,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.copySign implements a binding to the Java function
@@ -73,7 +72,7 @@
double second = (Double)input.get(1);
return Math.copySign(first, second);
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java Wed Jan 20 20:08:28 2010
@@ -25,7 +25,6 @@
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.FuncSpec;
import org.apache.pig.data.Tuple;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
@@ -50,7 +49,7 @@
Double val2 = (Double)input.get(1);
return (val1 == null || val2 == null) ? null : compute(val1, val2);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input of " + this.getClass().getName(), e);
+ throw new IOException("Caught exception processing input of " + this.getClass().getName(), e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.getExponent implements a binding to the Java function
@@ -70,7 +69,7 @@
Double d = (Double)input.get(0);
return Math.getExponent(d);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Double second = (Double)input.get(1);
return Math.max(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Double second = (Double)input.get(1);
return Math.min(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.nextAfter implements a binding to the Java function
@@ -76,7 +75,7 @@
double second = (Double)input.get(0);
return Math.nextAfter(first, second);
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in DoubleNextAfter", e);
+ throw new IOException("Caught exception in DoubleNextAfter", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.NEXTUP implements a binding to the Java function
@@ -68,7 +67,7 @@
try{
d = (Double)input.get(0);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.nextUp(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ROUND implements a binding to the Java function
@@ -70,7 +69,7 @@
Double d = (Double)input.get(0);
return Math.round(d);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.SIGNUM implements a binding to the Java function
@@ -70,7 +69,7 @@
Double d = (Double)input.get(0);
return Math.signum(d);
}catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ULP implements a binding to the Java function
@@ -74,7 +73,7 @@
Double d = (Double)input.get(0);
return Math.ulp(d);
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in DoubleUlp", e);
+ throw new IOException("Caught exception in DoubleUlp", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,7 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
+
/**
* math.ABS implements a binding to the Java function
* {@link java.lang.Math#abs(double) Math.abs(float)} for computing the
@@ -68,7 +68,7 @@
try{
d = (Float)input.get(0);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.abs(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java Wed Jan 20 20:08:28 2010
@@ -25,7 +25,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.copySign implements a binding to the Java function
@@ -73,7 +72,7 @@
float second = (Float)input.get(1);
return Math.copySign(first, second);
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.getExponent implements a binding to the Java function
@@ -70,7 +69,7 @@
Float d = (Float)input.get(0);
return Math.getExponent(d);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Float second = (Float)input.get(1);
return Math.max(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Float second = (Float)input.get(1);
return Math.min(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.nextAfter implements a binding to the Java function
@@ -76,7 +75,7 @@
Double second = (Double)input.get(0);
return Math.nextAfter(first, second);
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in FloatNextAfter", e);
+ throw new IOException("Caught exception in FloatNextAfter", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.NEXTUP implements a binding to the Java function
@@ -68,7 +67,7 @@
try{
d = (Float)input.get(0);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.nextUp(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ROUND implements a binding to the Java function
@@ -70,7 +69,7 @@
Float d = (Float)input.get(0);
return Math.round(d);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.SIGNUM implements a binding to the Java function
@@ -70,7 +69,7 @@
Float d = (Float)input.get(0);
return Math.signum(d);
}catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ULP implements a binding to the Java function
@@ -74,7 +73,7 @@
Float d = (Float)input.get(0);
return Math.ulp(d);
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in DoubleUlp", e);
+ throw new IOException("Caught exception in DoubleUlp", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -68,7 +67,7 @@
try{
d = (Integer)input.get(0);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.abs(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Integer second = (Integer)input.get(1);
return Math.max(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Integer second = (Integer)input.get(1);
return Math.min(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java Wed Jan 20 20:08:28 2010
@@ -24,7 +24,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ABS implements a binding to the Java function
@@ -69,7 +68,7 @@
try{
d = (Long)input.get(0);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.abs(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Long second = (Long)input.get(1);
return Math.max(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java Wed Jan 20 20:08:28 2010
@@ -20,7 +20,6 @@
import java.io.IOException;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -69,7 +68,7 @@
Long second = (Long)input.get(1);
return Math.min(first, second);
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.MAX implements a binding to the Java function
@@ -79,7 +78,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in MAX.Initial", e);
+ throw new IOException("Caught exception in MAX.Initial", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java Wed Jan 20 20:08:28 2010
@@ -19,17 +19,16 @@
package org.apache.pig.piggybank.evaluation.math;
import java.io.IOException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import org.apache.pig.EvalFunc;
import org.apache.pig.FuncSpec;
-import org.apache.pig.data.Tuple;
-import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
+import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
+import org.apache.pig.impl.logicalLayer.schema.Schema;
+
/**
* math.MIN implements a binding to the Java function
@@ -80,7 +79,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in MIN.Initial", e);
+ throw new IOException("Caught exception in MIN.Initial", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.NEXTUP implements a binding to the Java function
@@ -75,7 +74,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
return Math.nextUp(d);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ROUND implements a binding to the Java function
@@ -77,7 +76,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.SCALB implements a binding to the Java function
@@ -83,7 +82,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in MAX.Initial", e);
+ throw new IOException("Caught exception in MAX.Initial", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.SIGNUM implements a binding to the Java function
@@ -77,7 +76,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
}catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.ULP implements a binding to the Java function
@@ -77,7 +76,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in ULP.", e);
+ throw new IOException("Caught exception in ULP.", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java Wed Jan 20 20:08:28 2010
@@ -18,12 +18,11 @@
package org.apache.pig.piggybank.evaluation.math;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import org.apache.pig.FuncSpec;
import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.data.DataType;
/**
* base class for math udfs
*/
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.copySign implements a binding to the Java function
@@ -79,7 +78,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.getExponent implements a binding to the Java function
@@ -77,7 +76,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java Wed Jan 20 20:08:28 2010
@@ -28,7 +28,6 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* math.nextAfter implements a binding to the Java function
@@ -79,7 +78,7 @@
System.err.println("Failed to process input; error - " + nfe.getMessage());
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in nextAfter", e);
+ throw new IOException("Caught exception in nextAfter", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java Wed Jan 20 20:08:28 2010
@@ -31,7 +31,6 @@
import org.apache.pig.data.DefaultTupleFactory;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* Computes the correlation between sets of data. The returned value
@@ -191,7 +190,7 @@
try{
return combine((DataBag)input.get(0));
}catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in COR.Intermed", e);
+ throw new IOException("Caught exception in COR.Intermed", e);
}
}
}
@@ -216,7 +215,7 @@
try{
combined = combine((DataBag)input.get(0));
}catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in COR.Final", e);
+ throw new IOException("Caught exception in COR.Final", e);
}
int count = 0;
//for each pair of input schema combined contain 2 member. first member
@@ -312,7 +311,7 @@
output.append(count);
}
}catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in COR.combine", e);
+ throw new IOException("Caught exception in COR.combine", e);
}
return output;
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java Wed Jan 20 20:08:28 2010
@@ -31,7 +31,6 @@
import org.apache.pig.data.DefaultTupleFactory;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* Computes the covariance between sets of data. The returned value
@@ -190,7 +189,7 @@
try{
return combine((DataBag)input.get(0));
}catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in COV.Intermed", e);
+ throw new IOException("Caught exception in COV.Intermed", e);
}
}
}
@@ -250,7 +249,7 @@
}
}
}catch(Exception e){
- throw WrappedIOException.wrap("Caught exception in COV.Intermed", e);
+ throw new IOException("Caught exception in COV.Intermed", e);
}
return output;
@@ -297,7 +296,7 @@
output.append(count);
}
}catch(Exception e){
- throw WrappedIOException.wrap("Caught exception processing input", e);
+ throw new IOException("Caught exception processing input", e);
}
return output;
@@ -324,7 +323,7 @@
sum_y+=y;
}
}catch (Exception e){
- throw WrappedIOException.wrap("Caught exception processing input", e);
+ throw new IOException("Caught exception processing input", e);
}
Tuple result = DefaultTupleFactory.getInstance().newTuple(3);
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java Wed Jan 20 20:08:28 2010
@@ -27,7 +27,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* DateExtractor has four different constructors which each allow for different functionality. The
@@ -117,7 +116,7 @@
System.err.println("piggybank.evaluation.util.apachelogparser.DateExtractor: unable to parse date "+str);
return null;
} catch(Exception e){
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java Wed Jan 20 20:08:28 2010
@@ -26,7 +26,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* HostExtractor takes a url and returns the host. For example,
@@ -56,7 +55,7 @@
"url parsing exception for "+str);
return null;
} catch (Exception e) {
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java Wed Jan 20 20:08:28 2010
@@ -25,7 +25,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.util.WrappedIOException;
/**
* SearchEngineExtractor takes a url string and extracts the search engine. For example, given
@@ -405,7 +404,7 @@
return searchEngine;
} catch (Exception e) {
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java Wed Jan 20 20:08:28 2010
@@ -30,7 +30,6 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.util.WrappedIOException;
/**
@@ -193,7 +192,7 @@
} catch (MalformedURLException e) {
return null;
} catch (Exception e) {
- throw WrappedIOException.wrap("Caught exception processing input row ", e);
+ throw new IOException("Caught exception processing input row ", e);
}
}
Modified: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java?rev=901360&r1=901359&r2=901360&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java Wed Jan 20 20:08:28 2010
@@ -12,30 +12,35 @@
*/
package org.apache.pig.piggybank.storage;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.zip.GZIPOutputStream;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.PathFilter;
-import org.apache.hadoop.mapred.FileOutputFormat;
-import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.WritableComparable;
+import org.apache.hadoop.io.compress.BZip2Codec;
+import org.apache.hadoop.io.compress.GzipCodec;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.OutputFormat;
+import org.apache.hadoop.mapreduce.RecordWriter;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskID;
+import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
+import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
+import org.apache.pig.LoadFunc;
+import org.apache.pig.ResourceSchema;
import org.apache.pig.StoreFunc;
import org.apache.pig.backend.executionengine.ExecException;
-import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigMapReduce;
-import org.apache.pig.builtin.PigStorage;
-import org.apache.pig.builtin.Utf8StorageConverter;
import org.apache.pig.data.Tuple;
-import org.apache.tools.bzip2r.CBZip2OutputStream;
+import org.apache.pig.impl.util.StorageUtil;
/**
* The UDF is useful for splitting the output data into a bunch of directories
@@ -64,28 +69,13 @@
* 1 reducer. So in the above case for e.g. there will be only 1 file each under
* 'a1' and 'a2' directories.
*/
-public class MultiStorage extends Utf8StorageConverter implements StoreFunc {
+public class MultiStorage implements StoreFunc {
- // map of all (key-field-values, PigStorage) received by this store
- private Map<String, PigStorage> storeMap;
- private List<OutputStream> outStreamList; // list of all open streams
- private boolean isAbsolute; // Is the user specified output path absolute
- private String partition; // Reduce partition ID executing this store
private Path outputPath; // User specified output Path
- private Path workOutputPath; // Task specific temporary output path
- private Compression comp; // Compression type of output data.
private int splitFieldIndex = -1; // Index of the key field
private String fieldDel; // delimiter of the output record.
- private FileSystem fs; // Output file system
-
- // filter for removing hidden files in a listing
- public static final PathFilter hiddenPathFilter = new PathFilter() {
- public boolean accept(Path p) {
- String name = p.getName();
- return !name.startsWith("_") && !name.startsWith(".");
- }
- };
-
+ private Compression comp; // Compression type of output data.
+
// Compression types supported by this store
enum Compression {
none, bz2, bz, gz;
@@ -98,7 +88,6 @@
public MultiStorage(String parentPathStr, String splitFieldIndex,
String compression) {
this(parentPathStr, splitFieldIndex, compression, "\\t");
-
}
/**
@@ -118,11 +107,9 @@
this.outputPath = new Path(parentPathStr);
this.splitFieldIndex = Integer.parseInt(splitFieldIndex);
this.fieldDel = fieldDel;
- this.storeMap = new HashMap<String, PigStorage>();
- this.outStreamList = new ArrayList<OutputStream>();
try {
this.comp = (compression == null) ? Compression.none : Compression
- .valueOf(compression.toLowerCase());
+ .valueOf(compression.toLowerCase());
} catch (IllegalArgumentException e) {
System.err.println("Exception when converting compression string: "
+ compression + " to enum. No compression will be used");
@@ -130,109 +117,13 @@
}
}
- /**
- * Return the work output path suffixed with the parent output dir name.
- *
- * @param conf
- * @return
- * @throws IOException
- */
- private Path getWorkOutputPath(JobConf conf) throws IOException {
- Path outPath = (conf != null) ? new Path(FileOutputFormat
- .getWorkOutputPath(conf), this.outputPath) : this.outputPath;
- return outPath;
- }
-
- /**
- * Get the partition number of the reduce task in which it is executing.
- *
- * @param conf
- * @return
- */
- private String getPartition(JobConf conf) {
- int part = (conf != null) ? conf.getInt("mapred.task.partition", -1) : 0;
- NumberFormat numberFormat = NumberFormat.getInstance();
- numberFormat.setMinimumIntegerDigits(5);
- numberFormat.setGroupingUsed(false);
- return numberFormat.format(part);
- }
-
- /**
- * hack to get the map/reduce task unique ID in which this is running. Also
- * get the outputPath of the job to be used as base path where field value
- * specific sub-directories will be created.
- *
- * @throws IOException
- */
- private void initJobSpecificParams() throws IOException {
- this.partition = (this.partition == null) ? getPartition(PigMapReduce.sJobConf)
- : this.partition;
- // workOutputPath = workOutputPath/outputPath. Later we will remove the
- // suffix.
- this.workOutputPath = (this.workOutputPath == null) ? getWorkOutputPath(PigMapReduce.sJobConf)
- : this.workOutputPath;
- if (this.fs == null) {
- this.fs = (PigMapReduce.sJobConf == null) ? FileSystem
- .getLocal(new Configuration()) : FileSystem
- .get(PigMapReduce.sJobConf);
- }
- }
-
- @Override
- public void bindTo(OutputStream os) throws IOException {
- // Nothing to bind here as we will be writing each tuple into a split
- // based on its schema
- }
-
- /**
- * Create an appropriate output stream for the fieldValue.
- *
- * @param fieldValue
- * @return
- * @throws IOException
- */
- private OutputStream createOutputStream(String fieldValue) throws IOException {
- Path path = new Path(fieldValue, fieldValue + '-' + partition);
- Path fieldValueBasedPath = new Path(workOutputPath, path);
- OutputStream os = null;
- switch (comp) {
- case bz:
- case bz2:
- os = fs.create(fieldValueBasedPath.suffix(".bz2"), false);
- os = new CBZip2OutputStream(os);
- break;
- case gz:
- os = fs.create(fieldValueBasedPath.suffix(".gz"), false);
- os = new GZIPOutputStream(os);
- break;
- case none:
- os = fs.create(fieldValueBasedPath, false);
- }
- return os;
- }
-
- /**
- * Retrieve the pig storage corresponding to the field value.
- *
- * @param fieldValue
- * @return
- * @throws IOException
- */
- private PigStorage getStore(String fieldValue) throws IOException {
- PigStorage store = storeMap.get(fieldValue);
- if (store == null) {
- store = new PigStorage(fieldDel);
- OutputStream os = createOutputStream(fieldValue);
- store.bindTo(os);
- outStreamList.add(os);
- storeMap.put(fieldValue, store);
- }
- return store;
- }
+ //--------------------------------------------------------------------------
+ // Implementation of StoreFunc
+ private RecordWriter<String, Tuple> writer;
+
@Override
public void putNext(Tuple tuple) throws IOException {
- initJobSpecificParams();
if (tuple.size() <= splitFieldIndex) {
throw new IOException("split field index:" + this.splitFieldIndex
+ " >= tuple size:" + tuple.size());
@@ -243,64 +134,150 @@
} catch (ExecException exec) {
throw new IOException(exec);
}
- PigStorage store = getStore(String.valueOf(field));
- store.putNext(tuple);
+ try {
+ writer.write(String.valueOf(field), tuple);
+ } catch (InterruptedException e) {
+ throw new IOException(e);
+ }
}
+
+ @Override
+ public void checkSchema(ResourceSchema s) throws IOException {
- /**
- * Flush the output streams and call pigStorage.finish() for each pigStorage
- * object. Clear the map of pigStorage objects and move the final results to
- * the correct location from the temporary output path since multiquery
- * implementation might ignore our results.
- *
- * @ throws IOException
- */
+ }
+
+ @SuppressWarnings("unchecked")
@Override
- public void finish() throws IOException {
- Collection<PigStorage> pigStores = storeMap.values();
- for (PigStorage store : pigStores) {
- store.finish();
- }
- storeMap.clear();
- for (OutputStream os : outStreamList) {
- os.flush();
- os.close();
- }
- outStreamList.clear();
- // move the results here
- if (PigMapReduce.sJobConf != null) {
- Path rem = FileOutputFormat.getWorkOutputPath(PigMapReduce.sJobConf);
- String pathToRemove = rem.toUri().getPath() + (!isAbsolute ? "/" : "");
- moveResults(workOutputPath, pathToRemove);
+ public OutputFormat getOutputFormat() throws IOException {
+ MultiStorageOutputFormat format = new MultiStorageOutputFormat();
+ format.setKeyValueSeparator(fieldDel);
+ return format;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void prepareToWrite(RecordWriter writer) throws IOException {
+ this.writer = writer;
+ }
+
+ @Override
+ public String relToAbsPathForStoreLocation(String location, Path curDir)
+ throws IOException {
+ return LoadFunc.getAbsolutePath(location, curDir);
+ }
+
+ @Override
+ public void setStoreLocation(String location, Job job) throws IOException {
+ job.getConfiguration().set("mapred.textoutputformat.separator", "");
+ FileOutputFormat.setOutputPath(job, new Path(location));
+ if (comp == Compression.bz2 || comp == Compression.bz) {
+ FileOutputFormat.setCompressOutput(job, true);
+ FileOutputFormat.setOutputCompressorClass(job, BZip2Codec.class);
+ } else if (comp == Compression.gz) {
+ FileOutputFormat.setCompressOutput(job, true);
+ FileOutputFormat.setOutputCompressorClass(job, GzipCodec.class);
}
}
+
+ @Override
+ public void setStoreFuncUDFContextSignature(String signature) {
- /**
- * Moves the files and dir under given path 'p' to the actual path. The API
- * traverses the workOutputPath recursively and renames the files and
- * directories by removing 'rem' from their path names
- *
- * @param p
- * The
- * @param rem
- * @throws IOException
- */
- private void moveResults(Path p, String rem) throws IOException {
- for (FileStatus fstat : fs.listStatus(p, hiddenPathFilter)) {
- Path src = fstat.getPath();
- Path dst = new Path(src.toUri().getPath().replace(rem, ""));
- if (fstat.isDir()) {
- fs.mkdirs(dst);
- moveResults(src, rem);
- } else {
- fs.rename(src, dst);
+ }
+
+ //--------------------------------------------------------------------------
+ // Implementation of OutputFormat
+
+ public static class MultiStorageOutputFormat extends
+ TextOutputFormat<String, Tuple> {
+
+ private String keyValueSeparator = "\\t";
+ private byte fieldDel = '\t';
+
+ @Override
+ public RecordWriter<String, Tuple>
+ getRecordWriter(TaskAttemptContext context
+ ) throws IOException, InterruptedException {
+
+ final TaskAttemptContext ctx = context;
+
+ return new RecordWriter<String, Tuple>() {
+
+ private Map<String, MyLineRecordWriter> storeMap =
+ new HashMap<String, MyLineRecordWriter>();
+
+ private static final int BUFFER_SIZE = 1024;
+
+ private ByteArrayOutputStream mOut =
+ new ByteArrayOutputStream(BUFFER_SIZE);
+
+ public void write(String key, Tuple val) throws IOException {
+ int sz = val.size();
+ for (int i = 0; i < sz; i++) {
+ Object field;
+ try {
+ field = val.get(i);
+ } catch (ExecException ee) {
+ throw ee;
+ }
+
+ StorageUtil.putField(mOut, field);
+
+ if (i != sz - 1) {
+ mOut.write(fieldDel);
+ }
+ }
+
+ getStore(key).write(null, new Text(mOut.toByteArray()));
+
+ mOut.reset();
+ }
+
+ public void close(TaskAttemptContext context) throws IOException {
+ for (MyLineRecordWriter out : storeMap.values()) {
+ out.close(context);
+ }
+ }
+
+ private MyLineRecordWriter getStore(String fieldValue) throws IOException {
+ MyLineRecordWriter store = storeMap.get(fieldValue);
+ if (store == null) {
+ DataOutputStream os = createOutputStream(fieldValue);
+ store = new MyLineRecordWriter(os, keyValueSeparator);
+ storeMap.put(fieldValue, store);
+ }
+ return store;
+ }
+
+ private DataOutputStream createOutputStream(String fieldValue) throws IOException {
+ Configuration conf = ctx.getConfiguration();
+ TaskID taskId = ctx.getTaskAttemptID().getTaskID();
+ Path path = new Path(fieldValue, fieldValue + '-'
+ + NumberFormat.getInstance().format(taskId.getId()));
+ Path workOutputPath = ((FileOutputCommitter)getOutputCommitter(ctx)).getWorkPath();
+ Path file = new Path(workOutputPath, path);
+ FileSystem fs = file.getFileSystem(conf);
+ FSDataOutputStream fileOut = fs.create(file, false);
+ return fileOut;
+ }
+
+ };
+ }
+
+ public void setKeyValueSeparator(String sep) {
+ keyValueSeparator = sep;
+ fieldDel = StorageUtil.parseFieldDel(keyValueSeparator);
+ }
+
+ //------------------------------------------------------------------------
+ //
+
+ protected static class MyLineRecordWriter
+ extends TextOutputFormat.LineRecordWriter<WritableComparable, Text> {
+
+ public MyLineRecordWriter(DataOutputStream out, String keyValueSeparator) {
+ super(out, keyValueSeparator);
}
}
}
- // @Override
- public Class getStorePreparationClass() throws IOException {
- // TODO Auto-generated method stub
- return null;
- }
}