You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by th...@apache.org on 2011/04/06 16:00:12 UTC
svn commit: r1089461 - in /pig/trunk/contrib/piggybank/java/src:
main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
test/java/org/apache/pig/piggybank/test/TestPigStorageSchema.java
Author: thejas
Date: Wed Apr 6 14:00:11 2011
New Revision: 1089461
URL: http://svn.apache.org/viewvc?rev=1089461&view=rev
Log:
PIG-1964: PigStorageSchema fails if a column value is null (thejas)
Modified:
pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/TestPigStorageSchema.java
Modified: pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java?rev=1089461&r1=1089460&r2=1089461&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java (original)
+++ pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java Wed Apr 6 14:00:11 2011
@@ -92,9 +92,13 @@ public class PigStorageSchema extends Pi
// and cast those.
for (int i = 0; i < fieldSchemas.length; i++) {
if (mRequiredColumns == null || mRequiredColumns[i]) {
- byte[] bytes = ((DataByteArray) tup.get(tupleIdx)).get();
- tup.set(tupleIdx, CastUtils.convertToType(caster, bytes,
- fieldSchemas[i], fieldSchemas[i].getType()));
+ Object val = null;
+ if(tup.get(tupleIdx) != null){
+ byte[] bytes = ((DataByteArray) tup.get(tupleIdx)).get();
+ val = CastUtils.convertToType(caster, bytes,
+ fieldSchemas[i], fieldSchemas[i].getType());
+ }
+ tup.set(tupleIdx, val);
tupleIdx++;
}
}
Modified: pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/TestPigStorageSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/TestPigStorageSchema.java?rev=1089461&r1=1089460&r2=1089461&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/TestPigStorageSchema.java (original)
+++ pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/TestPigStorageSchema.java Wed Apr 6 14:00:11 2011
@@ -200,7 +200,7 @@ public class TestPigStorageSchema {
public void testByteArrayConversion() throws IOException {
Util.createInputFile(cluster, "originput2",
new String[] {"peter\t1", "samir\t2", "michael\t4",
- "peter\t2", "peter\t4", "samir\t1"
+ "peter\t2", "peter\t4", "samir\t1", "john\t"
});
Util.createInputFile(cluster, ".pig_schema",
new String[] {