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 2014/11/10 00:05:42 UTC
svn commit: r1637760 [2/2] - in /pig/branches/branch-0.14: ./
shims/test/hadoop23/org/apache/pig/test/ src/org/apache/pig/
src/org/apache/pig/backend/hadoop/executionengine/fetch/
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ src/or...
Modified: pig/branches/branch-0.14/test/org/apache/pig/test/TestPredeployedJar.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/test/org/apache/pig/test/TestPredeployedJar.java?rev=1637760&r1=1637759&r2=1637760&view=diff
==============================================================================
--- pig/branches/branch-0.14/test/org/apache/pig/test/TestPredeployedJar.java (original)
+++ pig/branches/branch-0.14/test/org/apache/pig/test/TestPredeployedJar.java Sun Nov 9 23:05:41 2014
@@ -54,7 +54,7 @@ public class TestPredeployedJar {
logger.addAppender(appender);
PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getConfiguration());
- pigServer.getPigContext().getProperties().put(PigConfiguration.OPT_FETCH, "false");
+ pigServer.getPigContext().getProperties().put(PigConfiguration.PIG_OPT_FETCH, "false");
String[] inputData = new String[] { "hello", "world" };
Util.createInputFile(cluster, "a.txt", inputData);
String guavaJar = JarManager.findContainingJar(com.google.common.collect.Multimaps.class);
Modified: pig/branches/branch-0.14/test/org/apache/pig/test/TestStore.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/test/org/apache/pig/test/TestStore.java?rev=1637760&r1=1637759&r2=1637760&view=diff
==============================================================================
--- pig/branches/branch-0.14/test/org/apache/pig/test/TestStore.java (original)
+++ pig/branches/branch-0.14/test/org/apache/pig/test/TestStore.java Sun Nov 9 23:05:41 2014
@@ -902,7 +902,7 @@ public class TestStore {
}
private void checkStorePath(String orig, String expected, boolean isTmp) throws Exception {
- pc.getProperties().setProperty(PigConfiguration.OPT_MULTIQUERY,""+true);
+ pc.getProperties().setProperty(PigConfiguration.PIG_OPT_MULTIQUERY,""+true);
DataStorage dfs = pc.getDfs();
dfs.setActiveContainer(dfs.asContainer("/tmp"));
Modified: pig/branches/branch-0.14/test/org/apache/pig/tez/TestSecondarySortTez.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/test/org/apache/pig/tez/TestSecondarySortTez.java?rev=1637760&r1=1637759&r2=1637760&view=diff
==============================================================================
--- pig/branches/branch-0.14/test/org/apache/pig/tez/TestSecondarySortTez.java (original)
+++ pig/branches/branch-0.14/test/org/apache/pig/tez/TestSecondarySortTez.java Sun Nov 9 23:05:41 2014
@@ -47,12 +47,12 @@ public class TestSecondarySortTez extend
TezCompiler comp = new TezCompiler(pp, pc);
TezOperPlan tezPlan = comp.compile();
boolean nocombiner = Boolean.parseBoolean(pc.getProperties().getProperty(
- PigConfiguration.PROP_NO_COMBINER, "false"));
+ PigConfiguration.PIG_EXEC_NO_COMBINER, "false"));
// Run CombinerOptimizer on Tez plan
if (!nocombiner) {
boolean doMapAgg = Boolean.parseBoolean(pc.getProperties()
- .getProperty(PigConfiguration.PROP_EXEC_MAP_PARTAGG,
+ .getProperty(PigConfiguration.PIG_EXEC_MAP_PARTAGG,
"false"));
CombinerOptimizer co = new CombinerOptimizer(tezPlan, doMapAgg);
co.visit();
Modified: pig/branches/branch-0.14/test/org/apache/pig/tez/TestTezCompiler.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/test/org/apache/pig/tez/TestTezCompiler.java?rev=1637760&r1=1637759&r2=1637760&view=diff
==============================================================================
--- pig/branches/branch-0.14/test/org/apache/pig/tez/TestTezCompiler.java (original)
+++ pig/branches/branch-0.14/test/org/apache/pig/tez/TestTezCompiler.java Sun Nov 9 23:05:41 2014
@@ -73,8 +73,8 @@ public class TestTezCompiler {
@Before
public void setUp() throws ExecException {
resetScope();
- pc.getProperties().remove(PigConfiguration.OPT_MULTIQUERY);
- pc.getProperties().remove(PigConfiguration.TEZ_OPT_UNION);
+ pc.getProperties().remove(PigConfiguration.PIG_OPT_MULTIQUERY);
+ pc.getProperties().remove(PigConfiguration.PIG_TEZ_OPT_UNION);
pc.getProperties().remove(PigConfiguration.PIG_EXEC_NO_SECONDARY_KEY);
pigServer = new PigServer(pc);
}
@@ -273,9 +273,9 @@ public class TestTezCompiler {
"store c into 'file:///tmp/output/c';" +
"store d into 'file:///tmp/output/d';";
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + true);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld");
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + false);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld");
}
@@ -309,9 +309,9 @@ public class TestTezCompiler {
"store f1 into 'file:///tmp/output/f1';" +
"store f2 into 'file:///tmp/output/f2';";
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + true);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld");
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + false);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld");
}
@@ -326,9 +326,9 @@ public class TestTezCompiler {
"store b into 'file:///tmp/output/b';" +
"store c into 'file:///tmp/output/c';";
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + true);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld");
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + false);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld");
}
@@ -344,9 +344,9 @@ public class TestTezCompiler {
"store d into 'file:///tmp/output/d';" +
"store e into 'file:///tmp/output/e';";
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + true);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld");
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + false);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld");
}
@@ -363,9 +363,9 @@ public class TestTezCompiler {
"e = foreach d GENERATE a::x, a::y;" +
"store e into 'file:///tmp/output/e';";
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + true);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld");
- setProperty(PigConfiguration.OPT_MULTIQUERY, "" + false);
+ setProperty(PigConfiguration.PIG_OPT_MULTIQUERY, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld");
}
@@ -377,9 +377,9 @@ public class TestTezCompiler {
"c = union onschema a, b;" +
"store c into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld");
}
@@ -393,9 +393,9 @@ public class TestTezCompiler {
"e = foreach d generate group, SUM(c.y);" +
"store e into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld");
}
@@ -409,9 +409,9 @@ public class TestTezCompiler {
"e = join c by x, d by x;" +
"store e into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld");
}
@@ -427,9 +427,9 @@ public class TestTezCompiler {
"store e into 'file:///tmp/output';";
//TODO: PIG-3856 Not optimized
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld");
query =
@@ -441,9 +441,9 @@ public class TestTezCompiler {
"store e into 'file:///tmp/output';";
// Optimized
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld");
}
@@ -457,9 +457,9 @@ public class TestTezCompiler {
"e = join c by x, d by x using 'skewed';" +
"store e into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld");
}
@@ -472,9 +472,9 @@ public class TestTezCompiler {
"d = order c by x;" +
"store d into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld");
}
@@ -488,9 +488,9 @@ public class TestTezCompiler {
"d = limit c 1;" +
"store d into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld");
}
@@ -506,9 +506,9 @@ public class TestTezCompiler {
"store d into 'file:///tmp/output/d';" +
"store e into 'file:///tmp/output/e';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld");
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld");
}
@@ -523,10 +523,10 @@ public class TestTezCompiler {
"f = group e by x;" +
"store f into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld");
resetScope();
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld");
}
@@ -541,10 +541,10 @@ public class TestTezCompiler {
"e = union onschema c, d;" +
"store e into 'file:///tmp/output';";
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + true);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + true);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11.gld");
resetScope();
- setProperty(PigConfiguration.TEZ_OPT_UNION, "" + false);
+ setProperty(PigConfiguration.PIG_TEZ_OPT_UNION, "" + false);
run(query, "test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-11-OPTOFF.gld");
}