You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2009/01/06 19:33:05 UTC
svn commit: r732041 - in /hadoop/pig/branches/types: CHANGES.txt
src/org/apache/pig/PigServer.java src/org/apache/pig/data/DataByteArray.java
src/org/apache/pig/impl/logicalLayer/LOLoad.java
src/org/apache/pig/impl/logicalLayer/LOStore.java
Author: gates
Date: Tue Jan 6 10:33:04 2009
New Revision: 732041
URL: http://svn.apache.org/viewvc?rev=732041&view=rev
Log:
PIG-572 A PigServer.registerScript() method, which lets a client programmatically register a Pig Script.
Modified:
hadoop/pig/branches/types/CHANGES.txt
hadoop/pig/branches/types/src/org/apache/pig/PigServer.java
hadoop/pig/branches/types/src/org/apache/pig/data/DataByteArray.java
hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java
hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java
Modified: hadoop/pig/branches/types/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/CHANGES.txt?rev=732041&r1=732040&r2=732041&view=diff
==============================================================================
--- hadoop/pig/branches/types/CHANGES.txt (original)
+++ hadoop/pig/branches/types/CHANGES.txt Tue Jan 6 10:33:04 2009
@@ -351,3 +351,5 @@
PIG-558: Distinct followed by a Join results in Invalid size 0 for a tuple
error (pradeepk via olgan)
+ PIG-572 A PigServer.registerScript() method, which lets a client
+ programmatically register a Pig Script. (shubhamc via gates)
Modified: hadoop/pig/branches/types/src/org/apache/pig/PigServer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/src/org/apache/pig/PigServer.java?rev=732041&r1=732040&r2=732041&view=diff
==============================================================================
--- hadoop/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ hadoop/pig/branches/types/src/org/apache/pig/PigServer.java Tue Jan 6 10:33:04 2009
@@ -18,6 +18,8 @@
package org.apache.pig;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URL;
@@ -67,6 +69,7 @@
import org.apache.pig.impl.logicalLayer.LODefine;
import org.apache.pig.impl.logicalLayer.LOStore;
import org.apache.pig.pen.ExampleGenerator;
+import org.apache.pig.tools.grunt.GruntParser;
/**
*
@@ -348,6 +351,23 @@
public void registerQuery(String query) throws IOException {
registerQuery(query, 1);
}
+
+ public void registerScript(String fileName) throws IOException {
+ try {
+ GruntParser grunt = new GruntParser(new FileReader(new File(fileName)));
+ grunt.setInteractive(false);
+ grunt.setParams(this);
+ grunt.parseStopOnError();
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ throw new IOException(e.getCause());
+ } catch (org.apache.pig.tools.pigscript.parser.ParseException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ throw new IOException(e.getCause());
+ }
+ }
public void dumpSchema(String alias) throws IOException{
try {
Modified: hadoop/pig/branches/types/src/org/apache/pig/data/DataByteArray.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/src/org/apache/pig/data/DataByteArray.java?rev=732041&r1=732040&r2=732041&view=diff
==============================================================================
--- hadoop/pig/branches/types/src/org/apache/pig/data/DataByteArray.java (original)
+++ hadoop/pig/branches/types/src/org/apache/pig/data/DataByteArray.java Tue Jan 6 10:33:04 2009
@@ -18,6 +18,7 @@
package org.apache.pig.data;
import java.io.IOException;
+import java.io.Serializable;
import java.lang.StringBuilder;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,7 +28,7 @@
* need to be able to implement compareTo, toString, hashCode, and some
* other methods.
*/
-public class DataByteArray implements Comparable {
+public class DataByteArray implements Comparable, Serializable {
byte[] mData = null;
/**
Modified: hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java?rev=732041&r1=732040&r2=732041&view=diff
==============================================================================
--- hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java (original)
+++ hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java Tue Jan 6 10:33:04 2009
@@ -40,10 +40,10 @@
protected boolean splittable = true;
private FileSpec mInputFileSpec;
- private LoadFunc mLoadFunc;
+ transient private LoadFunc mLoadFunc;
private String mSchemaFile;
private Schema mEnforcedSchema = null ;
- private DataStorage mStorage;
+ transient private DataStorage mStorage;
private ExecType mExecType;
private static Log log = LogFactory.getLog(LOLoad.class);
private Schema mDeterminedSchema = null;
Modified: hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java?rev=732041&r1=732040&r2=732041&view=diff
==============================================================================
--- hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java (original)
+++ hadoop/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java Tue Jan 6 10:33:04 2009
@@ -37,7 +37,7 @@
private static final long serialVersionUID = 2L;
private FileSpec mOutputFile;
- private StoreFunc mStoreFunc;
+ transient private StoreFunc mStoreFunc;
private static Log log = LogFactory.getLog(LOStore.class);
/**