You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by rd...@apache.org on 2010/02/22 22:49:11 UTC
svn commit: r915079 - in /hadoop/pig/trunk: src/org/apache/pig/
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/
src/org/apache/pig/builtin/ src/org/apache/pig/impl/logicalLayer/parser/
src/org/apache/pig/impl/stream...
Author: rding
Date: Mon Feb 22 21:49:10 2010
New Revision: 915079
URL: http://svn.apache.org/viewvc?rev=915079&view=rev
Log:
code refactoring: move class PigStreaming to the builtin packge, move interfaces PigToStream and StreamToPig to the top-level package
Added:
hadoop/pig/trunk/src/org/apache/pig/PigToStream.java
- copied, changed from r915009, hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigToStream.java
hadoop/pig/trunk/src/org/apache/pig/StreamToPig.java
- copied, changed from r915009, hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamToPig.java
hadoop/pig/trunk/src/org/apache/pig/builtin/PigStreaming.java
- copied, changed from r915009, hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigStreaming.java
Removed:
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigStreaming.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigToStream.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamToPig.java
Modified:
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultInputHandler.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultOutputHandler.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileInputHandler.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileOutputHandler.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/InputHandler.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/OutputHandler.java
hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamingCommand.java
hadoop/pig/trunk/src/org/apache/pig/impl/util/StorageUtil.java
hadoop/pig/trunk/test/org/apache/pig/test/TestStreaming.java
Copied: hadoop/pig/trunk/src/org/apache/pig/PigToStream.java (from r915009, hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigToStream.java)
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/PigToStream.java?p2=hadoop/pig/trunk/src/org/apache/pig/PigToStream.java&p1=hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigToStream.java&r1=915009&r2=915079&rev=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigToStream.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/PigToStream.java Mon Feb 22 21:49:10 2010
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pig.impl.streaming;
+package org.apache.pig;
import java.io.IOException;
Copied: hadoop/pig/trunk/src/org/apache/pig/StreamToPig.java (from r915009, hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamToPig.java)
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/StreamToPig.java?p2=hadoop/pig/trunk/src/org/apache/pig/StreamToPig.java&p1=hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamToPig.java&r1=915009&r2=915079&rev=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamToPig.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/StreamToPig.java Mon Feb 22 21:49:10 2010
@@ -15,11 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pig.impl.streaming;
+package org.apache.pig;
import java.io.IOException;
-import org.apache.pig.LoadCaster;
import org.apache.pig.data.Tuple;
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java Mon Feb 22 21:49:10 2010
@@ -42,7 +42,7 @@
import org.apache.pig.impl.plan.OperatorKey;
import org.apache.pig.impl.plan.NodeIdGenerator;
import org.apache.pig.impl.plan.VisitorException;
-import org.apache.pig.impl.streaming.StreamToPig;
+import org.apache.pig.StreamToPig;
import org.apache.pig.impl.util.CastUtils;
/**
Copied: hadoop/pig/trunk/src/org/apache/pig/builtin/PigStreaming.java (from r915009, hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigStreaming.java)
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/builtin/PigStreaming.java?p2=hadoop/pig/trunk/src/org/apache/pig/builtin/PigStreaming.java&p1=hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigStreaming.java&r1=915009&r2=915079&rev=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/PigStreaming.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/builtin/PigStreaming.java Mon Feb 22 21:49:10 2010
@@ -15,14 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pig.impl.streaming;
+package org.apache.pig.builtin;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.hadoop.io.Text;
import org.apache.pig.LoadCaster;
-import org.apache.pig.builtin.Utf8StorageConverter;
+import org.apache.pig.PigToStream;
+import org.apache.pig.StreamToPig;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.util.StorageUtil;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt Mon Feb 22 21:49:10 2010
@@ -53,9 +53,9 @@
import org.apache.pig.impl.plan.PlanException;
import org.apache.pig.impl.streaming.StreamingCommand;
import org.apache.pig.impl.streaming.StreamingCommand.HandleSpec;
-import org.apache.pig.impl.streaming.StreamToPig;
-import org.apache.pig.impl.streaming.PigToStream;
-import org.apache.pig.impl.streaming.PigStreaming;
+import org.apache.pig.StreamToPig;
+import org.apache.pig.PigToStream;
+import org.apache.pig.builtin.PigStreaming;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.data.Tuple;
import org.apache.pig.data.BagFactory;
@@ -4005,4 +4005,4 @@
log.trace("Exiting AliasFieldOrSpec");
return item;
}
-}
\ No newline at end of file
+}
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultInputHandler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultInputHandler.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultInputHandler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultInputHandler.java Mon Feb 22 21:49:10 2010
@@ -19,7 +19,9 @@
import java.io.IOException;
+import org.apache.pig.PigToStream;
import org.apache.pig.impl.PigContext;
+import org.apache.pig.builtin.PigStreaming;
import org.apache.pig.impl.streaming.StreamingCommand.HandleSpec;
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultOutputHandler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultOutputHandler.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultOutputHandler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/DefaultOutputHandler.java Mon Feb 22 21:49:10 2010
@@ -17,7 +17,9 @@
*/
package org.apache.pig.impl.streaming;
+import org.apache.pig.StreamToPig;
import org.apache.pig.impl.PigContext;
+import org.apache.pig.builtin.PigStreaming;
import org.apache.pig.impl.streaming.StreamingCommand.HandleSpec;
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileInputHandler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileInputHandler.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileInputHandler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileInputHandler.java Mon Feb 22 21:49:10 2010
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.pig.PigToStream;
import org.apache.pig.PigException;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.PigContext;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileOutputHandler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileOutputHandler.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileOutputHandler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/FileOutputHandler.java Mon Feb 22 21:49:10 2010
@@ -22,6 +22,7 @@
import java.io.IOException;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.StreamToPig;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.BufferedPositionedInputStream;
import org.apache.pig.impl.streaming.StreamingCommand.HandleSpec;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/InputHandler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/InputHandler.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/InputHandler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/InputHandler.java Mon Feb 22 21:49:10 2010
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.pig.PigToStream;
import org.apache.pig.data.Tuple;
/**
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/OutputHandler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/OutputHandler.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/OutputHandler.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/OutputHandler.java Mon Feb 22 21:49:10 2010
@@ -21,6 +21,7 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.util.LineReader;
+import org.apache.pig.StreamToPig;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.io.BufferedPositionedInputStream;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamingCommand.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamingCommand.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamingCommand.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/streaming/StreamingCommand.java Mon Feb 22 21:49:10 2010
@@ -31,6 +31,7 @@
import java.util.TreeMap;
import org.apache.pig.builtin.PigStorage;
+import org.apache.pig.builtin.PigStreaming;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileLocalizer;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/util/StorageUtil.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/util/StorageUtil.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/util/StorageUtil.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/util/StorageUtil.java Mon Feb 22 21:49:10 2010
@@ -32,7 +32,7 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.builtin.PigStorage;
-import org.apache.pig.impl.streaming.PigStreaming;
+import org.apache.pig.builtin.PigStreaming;
/**
* This util class provides methods that are shared by storage class
Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestStreaming.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestStreaming.java?rev=915079&r1=915078&r2=915079&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestStreaming.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestStreaming.java Mon Feb 22 21:49:10 2010
@@ -31,8 +31,8 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.io.FileLocalizer;
-import org.apache.pig.impl.streaming.PigStreaming;
-import org.apache.pig.impl.streaming.PigToStream;
+import org.apache.pig.builtin.PigStreaming;
+import org.apache.pig.PigToStream;
import org.apache.pig.impl.util.TupleFormat;
import org.junit.After;
import org.junit.Assert;