QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73747
Change subject: Switch Zero's returned schema to tuple
......................................................................
Switch Zero's returned schema to tuple
When using current svn's pig, zero_carrier.pig failed with
<file zero_carrier.pig, line 37, column 14> pig script failed to validate:
org.apache.pig.impl.logicalLayer.FrontendException: ERROR 0: Given UDF returns
an improper Schema. Schema should only contain one field of a Tuple, Bag, or a
single type. Returns: {chararray,chararray}
. We fix the output schema of Zero to return a tuple.
Change-Id: I09f18af429bd655b673072e37336f02d98811ba2
---
M kraken-pig/src/main/java/org/wikimedia/analytics/kraken/pig/Zero.java
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/kraken
refs/changes/47/73747/1
diff --git
a/kraken-pig/src/main/java/org/wikimedia/analytics/kraken/pig/Zero.java
b/kraken-pig/src/main/java/org/wikimedia/analytics/kraken/pig/Zero.java
index 91e5c9b..13aa086 100644
--- a/kraken-pig/src/main/java/org/wikimedia/analytics/kraken/pig/Zero.java
+++ b/kraken-pig/src/main/java/org/wikimedia/analytics/kraken/pig/Zero.java
@@ -27,14 +27,13 @@
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
+import org.apache.pig.impl.logicalLayer.FrontendException;
import org.wikimedia.analytics.kraken.schemas.JsonToClassConverter;
import org.wikimedia.analytics.kraken.schemas.MccMnc;
import org.wikimedia.analytics.kraken.schemas.Schema;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
/**
@@ -132,11 +131,15 @@
throw new RuntimeException(e);
}
-
- List<org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema>
fields = new
ArrayList<org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema>();
- // Carrier and ISO country are chararrays
- fields.add(new
org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema(null,
DataType.CHARARRAY));
- fields.add(new
org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema(null,
DataType.CHARARRAY));
- return new org.apache.pig.impl.logicalLayer.schema.Schema(fields);
+ org.apache.pig.impl.logicalLayer.schema.Schema tupleSchema = new
org.apache.pig.impl.logicalLayer.schema.Schema();
+ tupleSchema.add(new
org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema("carrier",
DataType.CHARARRAY));
+ tupleSchema.add(new
org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema("iso",
DataType.CHARARRAY));
+ org.apache.pig.impl.logicalLayer.schema.Schema ret;
+ try {
+ ret = new org.apache.pig.impl.logicalLayer.schema.Schema(new
org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema(null,tupleSchema,
DataType.TUPLE));
+ } catch (FrontendException e) {
+ throw new RuntimeException(e);
+ }
+ return ret;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/73747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09f18af429bd655b673072e37336f02d98811ba2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/kraken
Gerrit-Branch: master
Gerrit-Owner: QChris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
