Author: gates
Date: Thu Feb 14 14:24:04 2008
New Revision: 627897
URL: http://svn.apache.org/viewvc?rev=627897&view=rev
Log:
PIG-84: Converted printStackTrace calls to calls to the logger.
Modified:
incubator/pig/trunk/CHANGES.txt
incubator/pig/trunk/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
incubator/pig/trunk/src/org/apache/pig/Main.java
incubator/pig/trunk/src/org/apache/pig/StandAloneParser.java
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HJob.java
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/SplitSpec.java
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigCombine.java
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigMapReduce.java
incubator/pig/trunk/src/org/apache/pig/backend/local/executionengine/POStore.java
incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java
incubator/pig/trunk/src/org/apache/pig/impl/builtin/ShellBagEvalFunc.java
incubator/pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java
incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
incubator/pig/trunk/src/org/apache/pig/impl/util/ObjectSerializer.java
incubator/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
Modified: incubator/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Thu Feb 14 14:24:04 2008
@@ -107,3 +107,6 @@
exception being caught, and a different exception then thrown. All
those
locations have been changed so that the new exception now wraps the old.
(francisoud via gates).
+
+ PIG-84: Converted printStackTrace calls to calls to the logger.
+ (francisoud via gates).
Modified:
incubator/pig/trunk/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
---
incubator/pig/trunk/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
(original)
+++
incubator/pig/trunk/lib-src/shock/org/apache/pig/shock/SSHSocketImplFactory.java
Thu Feb 14 14:24:04 2008
@@ -401,7 +401,7 @@
log.error("EOF");
}
} catch (JSchException e) {
- e.printStackTrace();
+ log.error(e);
IOException newE = new IOException(e.getMessage());
newE.setStackTrace(e.getStackTrace());
throw newE;
@@ -460,7 +460,7 @@
connectTest("www.yahoo.com");
log.error("Finished " +
this);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
}
}
}.start();
@@ -477,13 +477,13 @@
connectTest("www.flickr.com");
log.error("Finished " +
this);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
}
}
}.start();
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
}
}
Modified: incubator/pig/trunk/src/org/apache/pig/Main.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/Main.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/Main.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/Main.java Thu Feb 14 14:24:04 2008
@@ -23,6 +23,8 @@
import java.util.jar.*;
import java.text.ParseException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.util.HadoopExe;
import org.apache.log4j.BasicConfigurator;
@@ -42,6 +44,7 @@
public class Main
{
+ private final static Log log = LogFactory.getLog(Main.class);
private enum ExecMode {STRING, FILE, SHELL, UNKNOWN};
@@ -268,7 +271,7 @@
usage();
rc = 1;
} catch (Throwable e) {
- recursivePrintStackTrace(e);
+ log.error(e);
} finally {
PerformanceTimerFactory.getPerfTimerFactory().dumpTimers();
System.exit(rc);
@@ -291,18 +294,4 @@
System.out.println(" -v, -verbose print all log messages to screen
(default to print only INFO and above to screen)");
System.out.println(" -x, -exectype local|mapreduce, mapreduce is
default");
}
-
-
- /**
- * Prints a stack trace of an exception followed by any exceptions that
are the causes of that
- * exception.
- */
- private static void recursivePrintStackTrace(Throwable e) {
- while (e != null) {
- e.printStackTrace();
- e = e.getCause();
- }
- }
-
-
}
Modified: incubator/pig/trunk/src/org/apache/pig/StandAloneParser.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/StandAloneParser.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/StandAloneParser.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/StandAloneParser.java Thu Feb 14
14:24:04 2008
@@ -46,7 +46,7 @@
try {
line = in.readLine();
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e);
return;
}
Modified:
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HJob.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HJob.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
---
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HJob.java
(original)
+++
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HJob.java
Thu Feb 14 14:24:04 2008
@@ -6,6 +6,8 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.executionengine.ExecJob;
import org.apache.pig.data.Tuple;
@@ -18,6 +20,8 @@
public class HJob implements ExecJob {
+ private final Log log = LogFactory.getLog(getClass());
+
protected JOB_STATUS status;
protected PigContext pigContext;
protected FileSpec outFileSpec;
@@ -65,7 +69,7 @@
if (t == null)
atEnd = true;
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
t = null;
atEnd = true;
}
@@ -81,7 +85,7 @@
try {
next = p.getNext();
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
}
if (next == null)
atEnd = true;
Modified:
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/SplitSpec.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/SplitSpec.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
---
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/SplitSpec.java
(original)
+++
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/SplitSpec.java
Thu Feb 14 14:24:04 2008
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pig.impl.FunctionInstantiator;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.eval.cond.Cond;
@@ -32,6 +34,7 @@
public class SplitSpec implements Serializable{
private static final long serialVersionUID = 1L;
+ private final Log log = LogFactory.getLog(getClass());
public ArrayList<Cond> conditions;
public List<String> tempFiles;
@@ -47,7 +50,7 @@
tempFiles.add(getTempFile(pigContext));
}
}catch (IOException e){
- e.printStackTrace();
+ log.error(e);
}
}
Modified:
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigCombine.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigCombine.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
---
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigCombine.java
(original)
+++
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigCombine.java
Thu Feb 14 14:24:04 2008
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.OutputCollector;
@@ -41,6 +43,8 @@
public class PigCombine implements Reducer {
+ private final Log log = LogFactory.getLog(getClass());
+
private JobConf job;
private CombineDataOutputCollector finalout;
private DataCollector evalPipe;
@@ -96,7 +100,7 @@
evalPipe.add(t);
// evalPipe.add(null); // EOF marker
} catch (Throwable tr) {
- tr.printStackTrace();
+ log.error(tr);
RuntimeException exp = new RuntimeException(tr.getMessage());
exp.setStackTrace(tr.getStackTrace());
throw exp;
Modified:
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigMapReduce.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigMapReduce.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
---
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigMapReduce.java
(original)
+++
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigMapReduce.java
Thu Feb 14 14:24:04 2008
@@ -24,6 +24,8 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
@@ -77,6 +79,8 @@
*/
public class PigMapReduce implements MapRunnable, Reducer {
+ private final Log log = LogFactory.getLog(getClass());
+
public static Reporter reporter = null;
JobConf job;
@@ -147,7 +151,7 @@
evalPipe.add(t);
} catch (Throwable tr) {
- tr.printStackTrace();
+ log.error(tr);
RuntimeException exp = new RuntimeException(tr.getMessage());
exp.setStackTrace(tr.getStackTrace());
throw exp;
@@ -278,7 +282,7 @@
try{
writer.close(reporter);
}catch(IOException e){
- e.printStackTrace();
+ log.error(e);
}
}
}
Modified:
incubator/pig/trunk/src/org/apache/pig/backend/local/executionengine/POStore.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/local/executionengine/POStore.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
---
incubator/pig/trunk/src/org/apache/pig/backend/local/executionengine/POStore.java
(original)
+++
incubator/pig/trunk/src/org/apache/pig/backend/local/executionengine/POStore.java
Thu Feb 14 14:24:04 2008
@@ -123,7 +123,7 @@
public int getOutputType(){
log.error("No one should be asking my output type");
RuntimeException runtimeException = new RuntimeException();
- runtimeException.printStackTrace();
+ log.error(runtimeException);
throw runtimeException;
}
Modified: incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java Thu Feb 14
14:24:04 2008
@@ -145,7 +145,7 @@
fileProperties.load(pis);
}
}catch (IOException e){
- e.printStackTrace();
+ log.error(e);
throw new RuntimeException(e);
}
Modified:
incubator/pig/trunk/src/org/apache/pig/impl/builtin/ShellBagEvalFunc.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/builtin/ShellBagEvalFunc.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/builtin/ShellBagEvalFunc.java
(original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/builtin/ShellBagEvalFunc.java
Thu Feb 14 14:24:04 2008
@@ -24,6 +24,8 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pig.EvalFunc;
import org.apache.pig.data.DataBag;
import org.apache.pig.data.Datum;
@@ -31,6 +33,9 @@
public class ShellBagEvalFunc extends EvalFunc<DataBag> {
+
+ private final Log log = LogFactory.getLog(getClass());
+
byte groupDelim = '\n';
byte recordDelim = '\n';
byte fieldDelim = '\t';
@@ -76,7 +81,7 @@
System.err.write(b, 0, rc);
}
} catch(Exception e) {
- e.printStackTrace();
+ log.error(e);
}
}
}.start();
@@ -97,7 +102,7 @@
try {
readBag(bag);
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e);
}
}
}
@@ -132,7 +137,7 @@
bags.put(new EndOfQueue());
}catch(InterruptedException e){}
}catch(IOException e){
- e.printStackTrace();
+ log.error(e);
}
while(true){
try{
Modified: incubator/pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java Thu Feb
14 14:24:04 2008
@@ -31,6 +31,8 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.mapred.JobConf;
import org.apache.pig.PigServer.ExecType;
import org.apache.pig.backend.datastorage.DataStorage;
@@ -46,6 +48,8 @@
import java.util.Properties;
public class FileLocalizer {
+ private static final Log log = LogFactory.getLog(FileLocalizer.class);
+
static public final String LOCAL_PREFIX = "file:";
public static class DataStorageInputStreamIterator extends InputStream {
@@ -252,7 +256,7 @@
elem.delete();
}
catch (IOException e) {
- e.printStackTrace();
+ log.error(e);
}
}
}
Modified:
incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
(original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
Thu Feb 14 14:24:04 2008
@@ -24,19 +24,23 @@
import java.util.List;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pig.impl.util.ObjectSerializer;
public abstract class Schema implements Serializable {
+ private final Log log = LogFactory.getLog(getClass());
+
protected Set<String> aliases = new HashSet<String>();
public Schema copy(){
try{
return
(Schema)ObjectSerializer.deserialize(ObjectSerializer.serialize(this));
}catch (IOException e){
- e.printStackTrace();
+ log.error(e);
throw new RuntimeException(e);
}
}
Modified: incubator/pig/trunk/src/org/apache/pig/impl/util/ObjectSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/util/ObjectSerializer.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/util/ObjectSerializer.java
(original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/util/ObjectSerializer.java Thu
Feb 14 14:24:04 2008
@@ -25,8 +25,13 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
public class ObjectSerializer {
+ private static final Log log = LogFactory.getLog(ObjectSerializer.class);
+
public static String serialize(Serializable obj) throws IOException {
if (obj == null) return "";
try {
Modified:
incubator/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java?rev=627897&r1=627896&r2=627897&view=diff
==============================================================================
--- incubator/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
(original)
+++ incubator/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
Thu Feb 14 14:24:04 2008
@@ -26,6 +26,8 @@
import org.junit.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pig.LoadFunc;
import org.apache.pig.PigServer;
import org.apache.pig.builtin.PigStorage;
@@ -44,6 +46,8 @@
public class TestLogicalPlanBuilder extends junit.framework.TestCase {
+ private final Log log = LogFactory.getLog(getClass());
+
@Test
public void testQuery1() {
String query = "foreach (load 'a') generate $1,$2;";
@@ -550,10 +554,10 @@
assertTrue(lp != null);
return lp;
} catch (IOException e) {
- // e.printStackTrace();
+ // log.error(e);
fail("IOException: " + e.getMessage());
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
fail(e.getClass().getName() + ": " + e.getMessage() + " -- " +
query);
}
return null;
