Author: rohini
Date: Wed Mar 25 18:23:24 2015
New Revision: 1669196
URL: http://svn.apache.org/r1669196
Log:
PIG-4476: Fix logging in AvroStorage* classes and SchemaTuple class (rdsr via
rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/data/SchemaTuple.java
pig/trunk/src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
pig/trunk/src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1669196&r1=1669195&r2=1669196&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Mar 25 18:23:24 2015
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-4476: Fix logging in AvroStorage* classes and SchemaTuple class (rdsr via
rohini)
+
PIG-4458: Support UDFs in a FOREACH Before a Merge Join (wattsinabox via daijy)
PIG-4454: Upgrade tez to 0.6.0 (daijy)
Modified: pig/trunk/src/org/apache/pig/data/SchemaTuple.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/data/SchemaTuple.java?rev=1669196&r1=1669195&r2=1669196&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/data/SchemaTuple.java (original)
+++ pig/trunk/src/org/apache/pig/data/SchemaTuple.java Wed Mar 25 18:23:24 2015
@@ -26,6 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
@@ -37,7 +39,6 @@ import org.apache.pig.data.utils.MethodH
import org.apache.pig.data.utils.SedesHelper;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.util.ObjectSerializer;
-import org.mortbay.log.Log;
import com.google.common.collect.Lists;
@@ -52,6 +53,7 @@ import com.google.common.collect.Lists;
@InterfaceAudience.Public
@InterfaceStability.Unstable
public abstract class SchemaTuple<T extends SchemaTuple<T>> extends
AbstractTuple implements TypeAwareTuple {
+ private static final Log LOG = LogFactory.getLog(SchemaTuple.class);
private static final long serialVersionUID = 1L;
private static final int ONE_MINUTE = 60000;
@@ -924,7 +926,7 @@ public abstract class SchemaTuple<T exte
protected static Schema staticSchemaGen(String s) {
try {
if (s.equals("")) {
- Log.warn("No Schema present in SchemaTuple generated class");
+ LOG.warn("No Schema present in SchemaTuple generated class");
return new Schema();
}
return (Schema) ObjectSerializer.deserialize(s);
Modified:
pig/trunk/src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java?rev=1669196&r1=1669195&r2=1669196&view=diff
==============================================================================
---
pig/trunk/src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
(original)
+++
pig/trunk/src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
Wed Mar 25 18:23:24 2015
@@ -28,12 +28,13 @@ import org.apache.avro.AvroRuntimeExcept
import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
import org.apache.avro.Schema.Type;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pig.LoadPushDown.RequiredField;
import org.apache.pig.ResourceSchema;
import org.apache.pig.LoadPushDown.RequiredFieldList;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.DataType;
-import org.mortbay.log.Log;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -44,6 +45,7 @@ import com.google.common.collect.Sets;
* and vice versa.
*/
public class AvroStorageSchemaConversionUtilities {
+ private static final Log LOG =
LogFactory.getLog(AvroStorageSchemaConversionUtilities.class);
/**
* Determines the pig object type of the Avro schema.
@@ -606,7 +608,7 @@ public class AvroStorageSchemaConversion
return null;
}
} catch (ExecException e) {
- Log.warn("ExecException caught in newSchemaFromRequiredFieldList",
e);
+ LOG.warn("ExecException caught in newSchemaFromRequiredFieldList",
e);
return null;
}
if (rf.getSubFields() == null) {
Modified: pig/trunk/src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java?rev=1669196&r1=1669195&r2=1669196&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java Wed Mar
25 18:23:24 2015
@@ -28,6 +28,7 @@ import org.apache.avro.generic.GenericAr
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericEnumSymbol;
import org.apache.avro.generic.IndexedRecord;
+import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.DataByteArray;
@@ -47,6 +48,7 @@ import java.util.Map;
*/
public final class AvroTupleWrapper <T extends IndexedRecord>
implements Tuple {
+ private static final Log LOG = LogFactory.getLog(AvroTupleWrapper.class);
/**
* The Avro object wrapped in the pig Tuple.
@@ -169,8 +171,7 @@ public final class AvroTupleWrapper <T e
try {
all.add(get(f.pos()));
} catch (ExecException e) {
- LogFactory.getLog(getClass()).error(
- "could not process tuple with contents " + avroObject, e);
+ LOG.error("could not process tuple with contents " + avroObject, e);
return null;
}
}
