You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2012/11/01 05:32:38 UTC
svn commit: r1404462 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/PigServer.java src/org/apache/pig/impl/PigContext.java
test/org/apache/pig/test/TestFRJoin.java
test/org/apache/pig/test/TestHBaseStorage.java
Author: rohini
Date: Thu Nov 1 04:32:38 2012
New Revision: 1404462
URL: http://svn.apache.org/viewvc?rev=1404462&view=rev
Log:
PIG-2997: Provide a convenience constructor on PigServer that accepts Configuration (prkommireddi via rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/PigServer.java
pig/trunk/src/org/apache/pig/impl/PigContext.java
pig/trunk/test/org/apache/pig/test/TestFRJoin.java
pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1404462&r1=1404461&r2=1404462&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Nov 1 04:32:38 2012
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-2997: Provide a convenience constructor on PigServer that accepts Configuration (prkommireddi via rohini)
+
PIG-2933: HBaseStorage is using setScannerCaching which is deprecated (prkommireddi via rohini)
PIG-2881: Add SUBTRACT eval function (jocosti via cheolsoo)
Modified: pig/trunk/src/org/apache/pig/PigServer.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/PigServer.java?rev=1404462&r1=1404461&r2=1404462&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/PigServer.java (original)
+++ pig/trunk/src/org/apache/pig/PigServer.java Thu Nov 1 04:32:38 2012
@@ -45,6 +45,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.Job;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -104,8 +105,8 @@ import org.apache.pig.tools.parameters.P
import org.apache.pig.tools.pigstats.JobStats;
import org.apache.pig.tools.pigstats.OutputStats;
import org.apache.pig.tools.pigstats.PigStats;
-import org.apache.pig.tools.pigstats.PigStats.JobGraph;
import org.apache.pig.tools.pigstats.ScriptState;
+import org.apache.pig.tools.pigstats.PigStats.JobGraph;
/**
*
@@ -193,6 +194,10 @@ public class PigServer {
public PigServer(ExecType execType, Properties properties) throws ExecException {
this(new PigContext(execType, properties));
}
+
+ public PigServer(ExecType execType, Configuration conf) throws ExecException {
+ this(new PigContext(execType, conf));
+ }
public PigServer(PigContext context) throws ExecException {
this(context, true);
Modified: pig/trunk/src/org/apache/pig/impl/PigContext.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/PigContext.java?rev=1404462&r1=1404461&r2=1404462&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/PigContext.java (original)
+++ pig/trunk/src/org/apache/pig/impl/PigContext.java Thu Nov 1 04:32:38 2012
@@ -49,6 +49,7 @@ import org.apache.pig.backend.datastorag
import org.apache.pig.backend.datastorage.DataStorageException;
import org.apache.pig.backend.datastorage.ElementDescriptor;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
import org.apache.pig.backend.hadoop.datastorage.HDataStorage;
import org.apache.pig.backend.hadoop.executionengine.HExecutionEngine;
import org.apache.pig.backend.hadoop.streaming.HadoopExecutableManager;
@@ -178,6 +179,10 @@ public class PigContext implements Seria
public PigContext() {
this(ExecType.MAPREDUCE, new Properties());
}
+
+ public PigContext(ExecType execType, Configuration conf) {
+ this(execType, ConfigurationUtil.toProperties(conf));
+ }
public PigContext(ExecType execType, Properties properties){
this.execType = execType;
Modified: pig/trunk/test/org/apache/pig/test/TestFRJoin.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestFRJoin.java?rev=1404462&r1=1404461&r2=1404462&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestFRJoin.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestFRJoin.java Thu Nov 1 04:32:38 2012
@@ -18,15 +18,11 @@
package org.apache.pig.test;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.PrintStream;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -37,7 +33,6 @@ import org.apache.pig.FuncSpec;
import org.apache.pig.LoadFunc;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecException;
-import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigMapReduce;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
@@ -66,7 +61,6 @@ public class TestFRJoin extends TestCase
private static final String INPUT_FILE2 = "testFrJoinInput2.txt";
private PigServer pigServer;
private static MiniCluster cluster = MiniCluster.buildCluster();
- private File tmpFile;
public TestFRJoin() throws ExecException, IOException{
pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
@@ -139,7 +133,7 @@ public class TestFRJoin extends TestCase
private void setUpHashTable() throws IOException {
FileSpec replFile = new FileSpec(repl,new FuncSpec(PigStorage.class.getName()+"()"));
POLoad ld = new POLoad(new OperatorKey("Repl File Loader", 1L), replFile);
- PigContext pc = new PigContext(ExecType.MAPREDUCE,ConfigurationUtil.toProperties(PigMapReduce.sJobConfInternal.get()));
+ PigContext pc = new PigContext(ExecType.MAPREDUCE, PigMapReduce.sJobConfInternal.get());
try {
pc.connect();
Modified: pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java?rev=1404462&r1=1404461&r2=1404462&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java Thu Nov 1 04:32:38 2012
@@ -104,8 +104,7 @@ public class TestHBaseStorage {
@Before
public void beforeTest() throws Exception {
- pig = new PigServer(ExecType.LOCAL,
- ConfigurationUtil.toProperties(conf));
+ pig = new PigServer(ExecType.LOCAL, conf);
}
@After