svn commit: r1100411 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/util/LogUtils.java
Author: rding
Date: Fri May 6 22:52:21 2011
New Revision: 1100411
URL: http://svn.apache.org/viewvc?rev=1100411view=rev
Log:
PIG-2049: Pig should display TokenMgrError message consistently across all
parsers
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/impl/util/LogUtils.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1100411r1=1100410r2=1100411view=diff
==
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri May 6 22:52:21 2011
@@ -202,6 +202,8 @@ PIG-1696: Performance: Use System.arrayc
BUG FIXES
+PIG-2049: Pig should display TokenMgrError message consistently across all
parsers (rding)
+
PIG-2041: Minicluster should make each run independent (daijy)
PIG-2040: Move classloader from QueryParserDriver to PigContext (daijy)
Modified: pig/trunk/src/org/apache/pig/impl/util/LogUtils.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java?rev=1100411r1=1100410r2=1100411view=diff
==
--- pig/trunk/src/org/apache/pig/impl/util/LogUtils.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/LogUtils.java Fri May 6 22:52:21
2011
@@ -106,7 +106,8 @@ public class LogUtils {
} else {
if((t instanceof ParseException
|| t instanceof
org.apache.pig.tools.pigscript.parser.TokenMgrError
-|| t instanceof
org.apache.pig.impl.logicalLayer.parser.TokenMgrError)) {
+|| t instanceof
org.apache.pig.impl.logicalLayer.parser.TokenMgrError
+|| t instanceof
org.apache.pig.tools.parameters.TokenMgrError)) {
message = ERROR 1000: Error during parsing. +
t.getMessage();
} else if (t instanceof IOException) {
message = ERROR 2997: Encountered IOException. +
t.getMessage();
svn commit: r1100414 - in /pig/branches/branch-0.9: CHANGES.txt src/org/apache/pig/impl/util/JarManager.java
Author: daijy
Date: Fri May 6 23:55:36 2011
New Revision: 1100414
URL: http://svn.apache.org/viewvc?rev=1100414view=rev
Log:
PIG-2043: Ship antlr-runtime.jar to backend
Modified:
pig/branches/branch-0.9/CHANGES.txt
pig/branches/branch-0.9/src/org/apache/pig/impl/util/JarManager.java
Modified: pig/branches/branch-0.9/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.9/CHANGES.txt?rev=1100414r1=1100413r2=1100414view=diff
==
--- pig/branches/branch-0.9/CHANGES.txt (original)
+++ pig/branches/branch-0.9/CHANGES.txt Fri May 6 23:55:36 2011
@@ -174,6 +174,8 @@ PIG-1696: Performance: Use System.arrayc
BUG FIXES
+PIG-2043: Ship antlr-runtime.jar to backend (daijy)
+
PIG-2049: Pig should display TokenMgrError message consistently across all
parsers (rding)
PIG-2041: Minicluster should make each run independent (daijy)
Modified: pig/branches/branch-0.9/src/org/apache/pig/impl/util/JarManager.java
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/impl/util/JarManager.java?rev=1100414r1=1100413r2=1100414view=diff
==
--- pig/branches/branch-0.9/src/org/apache/pig/impl/util/JarManager.java
(original)
+++ pig/branches/branch-0.9/src/org/apache/pig/impl/util/JarManager.java Fri
May 6 23:55:36 2011
@@ -85,7 +85,7 @@ public class JarManager {
}
final static String pigPackagesToSend[] = {
org/apache/pig,org/apache/tools/bzip2r,
-dk/brics/automaton };
+dk/brics/automaton, org/antlr/runtime };
/**
* Create a jarfile in a temporary path, that is a merge of all the
jarfiles containing the
svn commit: r1100415 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/util/JarManager.java
Author: daijy
Date: Fri May 6 23:56:41 2011
New Revision: 1100415
URL: http://svn.apache.org/viewvc?rev=1100415view=rev
Log:
PIG-2043: Ship antlr-runtime.jar to backend
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/impl/util/JarManager.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1100415r1=1100414r2=1100415view=diff
==
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri May 6 23:56:41 2011
@@ -202,6 +202,8 @@ PIG-1696: Performance: Use System.arrayc
BUG FIXES
+PIG-2043: Ship antlr-runtime.jar to backend (daijy)
+
PIG-2049: Pig should display TokenMgrError message consistently across all
parsers (rding)
PIG-2041: Minicluster should make each run independent (daijy)
Modified: pig/trunk/src/org/apache/pig/impl/util/JarManager.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/JarManager.java?rev=1100415r1=1100414r2=1100415view=diff
==
--- pig/trunk/src/org/apache/pig/impl/util/JarManager.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/JarManager.java Fri May 6 23:56:41
2011
@@ -85,7 +85,7 @@ public class JarManager {
}
final static String pigPackagesToSend[] = {
org/apache/pig,org/apache/tools/bzip2r,
-dk/brics/automaton };
+dk/brics/automaton, org/antlr/runtime };
/**
* Create a jarfile in a temporary path, that is a merge of all the
jarfiles containing the
svn commit: r1100416 [2/2] - in /pig/trunk: ./ src/ src/org/apache/pig/ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ src/org/apache/pig/impl/logicalLayer/ src/org/apache/pig/impl/l
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld?rev=1100416r1=1100415r2=1100416view=diff
==
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld Fri May 6
23:57:21 2011
@@ -18,4 +18,4 @@ Reduce Plan Empty
| | |
| | Project[tuple][*] - scope-111
| |
-| |---b:
Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihbhhaeaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhcacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpemhhaiaabahihdhbaahoaaakdpemhhaiaabbhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaagiheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaabacaaagfkaaaogjhdfahcgpgkgfgdhefegpefgogefkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghejaaaihdhegbhcheedgpgmemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhed
lhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaabachihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaabacaaalfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfa
gmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapdchahahahahahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachahdhbaahoaaabhhaeaaakhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailachihahihihdhbaahoaaabhhaeaaakhbaahoaablhihdhbaahoaaakdpemhhaiaabbhbaahoaablhbaahoaaaphihdhbaahoaaa
ahhaeaaakhihdhbaahoaaaihdhbaahoaaakdpemhhaiaabahihdhbaahoaaaihdhbaahoaaakdpemhhaiaabahihdhbaahoaaaihdhbaahoaaakdpemhhaiaabahiaahahi','','b','scope','true'))
- scope-102
\ No newline at end of file
+| |---b:
svn commit: r1100418 - in /pig/branches/branch-0.9: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Author: rding
Date: Sat May 7 00:12:29 2011
New Revision: 1100418
URL: http://svn.apache.org/viewvc?rev=1100418view=rev
Log:
PIG-2033: Pig returns sucess for the failed Pig script
Modified:
pig/branches/branch-0.9/CHANGES.txt
pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Modified: pig/branches/branch-0.9/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.9/CHANGES.txt?rev=1100418r1=1100417r2=1100418view=diff
==
--- pig/branches/branch-0.9/CHANGES.txt (original)
+++ pig/branches/branch-0.9/CHANGES.txt Sat May 7 00:12:29 2011
@@ -535,6 +535,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
BUG FIXES
+PIG-2033: Pig returns sucess for the failed Pig script (rding)
+
PIG-1993: PigStorageSchema throw NPE with ColumnPruning (daijy)
PIG-1935: New logical plan: Should not push up filter in front of Bincond
(daijy)
Modified:
pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java?rev=1100418r1=1100417r2=1100418view=diff
==
---
pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
(original)
+++
pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Sat May 7 00:12:29 2011
@@ -354,6 +354,10 @@ public class MapReduceLauncher extends L
// stats collection is done, log the results
PigStatsUtil.stopCollection(true);
+// PigStatsUtil.stopCollection also computes the return code based on
+// total jobs to run, jobs successful and jobs failed
+failed = failed || !PigStats.get().isSuccessful();
+
MapEnum, Long warningAggMap = new HashMapEnum, Long();
if (succJobs != null) {
svn commit: r1100419 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Author: rding
Date: Sat May 7 00:12:55 2011
New Revision: 1100419
URL: http://svn.apache.org/viewvc?rev=1100419view=rev
Log:
PIG-2033: Pig returns sucess for the failed Pig script
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1100419r1=1100418r2=1100419view=diff
==
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat May 7 00:12:55 2011
@@ -557,6 +557,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
BUG FIXES
+PIG-2033: Pig returns sucess for the failed Pig script (rding)
+
PIG-1993: PigStorageSchema throw NPE with ColumnPruning (daijy)
PIG-1935: New logical plan: Should not push up filter in front of Bincond
(daijy)
Modified:
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java?rev=1100419r1=1100418r2=1100419view=diff
==
---
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
(original)
+++
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Sat May 7 00:12:55 2011
@@ -354,6 +354,10 @@ public class MapReduceLauncher extends L
// stats collection is done, log the results
PigStatsUtil.stopCollection(true);
+// PigStatsUtil.stopCollection also computes the return code based on
+// total jobs to run, jobs successful and jobs failed
+failed = failed || !PigStats.get().isSuccessful();
+
MapEnum, Long warningAggMap = new HashMapEnum, Long();
if (succJobs != null) {
svn commit: r1100420 [1/19] - in /pig/branches/branch-0.9: ./ src/ src/org/apache/pig/ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ src/org/apache/pig/impl/logicalLayer/ src/org/ap
Author: xuefu Date: Sat May 7 00:15:40 2011 New Revision: 1100420 URL: http://svn.apache.org/viewvc?rev=1100420view=rev Log: PIG-1775: Removal of old logical plan Modified: pig/branches/branch-0.9/build.xml pig/branches/branch-0.9/src/org/apache/pig/SortInfoSetter.java pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/CastFinder.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ColumnPruner.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/DotLOPrinter.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ExpressionOperator.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOAdd.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOAnd.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOBinCond.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOCast.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOCogroup.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOConst.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOCross.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LODefine.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LODistinct.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LODivide.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOEqual.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOFilter.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOForEach.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOGenerate.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOIsNull.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOJoin.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLimit.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLoad.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOMod.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOMultiply.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONative.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONegative.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONot.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONotEqual.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOOr.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOPrinter.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOProject.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LORegexp.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSort.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSplit.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOStore.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOStream.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSubtract.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOUnion.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOVisitor.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalPlan.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloner.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/PColFilterExtractor.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/PlanSetter.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectFixerUpper.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectStarTranslator.java pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectionMapCalculator.java
svn commit: r1100420 [13/19] - in /pig/branches/branch-0.9: ./ src/ src/org/apache/pig/ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ src/org/apache/pig/impl/logicalLayer/ src/org/a
Modified: pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/parser/grammar URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/parser/grammar?rev=1100420r1=1100419r2=1100420view=diff == --- pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/parser/grammar (original) +++ pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/parser/grammar Sat May 7 00:15:40 2011 @@ -1,61 +0,0 @@ -query := expr ; - -expr := [alias =] baseexpr [PARALLEL integer] - -baseexpr := alias | LOAD loadclause | EVAL evalclause | FILTER filterclause | [CO]GROUP cogroupclause | CROSS nestedexprs | UNION nestedexprs | LIMIT limitclause |( baseexpr ) | mapreduce mapreduceclause - -nestedexpr := alias | (expr) - -nestedexprs := nestedexpr [, nestedexprs] - -loadclause := filename [USING loadfunc([loadfuncargs])] - -loadfuncargs := constant [, loadfuncargs] - -cogroupclause := groupexpr [OUTER | INNER] - -groupexpr := BY simpleprojitem | BY groupfunc(simpleproj) | ALL | ANY - -simpleproj := simpleprojitem [, simpleproj] - -simpleprojitem := field | constant | * - -field := $integer - -filename := quotedstring - -constant := quotedstring - -quotedstring := 'string' - -filterclause := FILTER filter OVER nestedexpr - -limitclause := LIMIT nestedexpr integer - -filter := cond ? [simpleproj : simpleproj] - -cond := basecond | cond AND cond | cond OR cond | NOT cond | (cond) - -basecond := comparable compareop comparable | comparable MATCHES 'regex' | filterfunc(simpleproj) - -comparable := field | constant - -compareop := == | != | | = | | = - -evalclause := EVAL evalitemlist OVER nestedexpr - -evalitemlist := (evalitem | (nestableevalitem ([innerevalspec])* [.subproj])) [, evalitemlist] - -innerevalspec := [EVAL] simpleproj | FILTER filter | sad - -subproj := subprojitem | ( subprojitem (, subprojitem)* ) - -subprojitem := * | field - -nestableevalitem := field | alias | evalfunc(argslist) - -argslist := (evalitem | (nestableevalitem ([innerevalspec])*) [, argslist] - -evalitem := constant | * - -sad := (SORT | ARRANGE) BY simpleproj | DISTINCT [simpleproj] Modified: pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/schema/Schema.java URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/schema/Schema.java?rev=1100420r1=1100419r2=1100420view=diff == --- pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/schema/Schema.java (original) +++ pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/schema/Schema.java Sat May 7 00:15:40 2011 @@ -26,9 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.Collection; -import java.util.Map.Entry; -import org.apache.pig.FuncSpec; import org.apache.pig.PigException; import org.apache.pig.ResourceSchema; import org.apache.pig.ResourceSchema.ResourceFieldSchema; @@ -38,7 +36,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.pig.impl.util.MultiMap; import org.apache.pig.impl.logicalLayer.FrontendException; -import org.apache.pig.impl.logicalLayer.LogicalOperator; import org.apache.pig.impl.logicalLayer.CanonicalNamer; /** @@ -92,33 +89,6 @@ public class Schema implements Serializa */ public String canonicalName = null; -/* - * Map of canonical names used for this field in other sections of the - * plan. It can occur that a single field will have different - * canonical names in different branches of a plan. For example, - * C = cogroup A by x, B by y. In subsequent statements, the grouping - * column will have canonical name, say, of 'r'. But in branches - * above the cogroup it may have been known as 's' in the A branch and - * 't' in the B branch. This map preserves that. The key is a - * logical operator, and the value is the canonical name - * associated with the field for that operator. - */ -// marking transient since this data structure is only used in front-end -// query planning to figure out lineage for casts on bytearrays and need -// not be serialized to the backend -transient private MapString, LogicalOperator canonicalMap = null; - -/** - * A reverse lookup of canonical names to logical operators. The reverse - * lookup serves cases where the canonical name of the predecessor - * cannot be determined. In such cases the keys of the reverse lookup - * can be used to navigate the plan - */ -// marking transient since this data structure is only used in front-end -// query planning to figure out lineage for casts on bytearrays and need -// not be serialized to
svn commit: r1100420 [11/19] - in /pig/branches/branch-0.9: ./ src/ src/org/apache/pig/ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ src/org/apache/pig/impl/logicalLayer/ src/org/a
Modified:
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/SchemaCalculator.java
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/SchemaCalculator.java?rev=1100420r1=1100419r2=1100420view=diff
==
---
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/SchemaCalculator.java
(original)
+++
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/SchemaCalculator.java
Sat May 7 00:15:40 2011
@@ -1,311 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pig.impl.logicalLayer.optimizer;
-
-import org.apache.pig.impl.logicalLayer.*;
-import org.apache.pig.impl.plan.PlanVisitor;
-import org.apache.pig.impl.plan.DependencyOrderWalker;
-import org.apache.pig.impl.plan.VisitorException;
-
-/**
- * A visitor to reset all the schemas in a logical plan.
- */
-public class SchemaCalculator extends LOVisitor {
-
-public SchemaCalculator(LogicalPlan plan) {
-super(plan,
-new DependencyOrderWalkerLogicalOperator, LogicalPlan(plan));
-}
-
-/**
- * @param binOp
- *the logical binary expression operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(BinaryExpressionOperator binOp)
-throws VisitorException {
-try {
-binOp.getFieldSchema();
-super.visit(binOp);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param uniOp
- *the logical unary operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(UnaryExpressionOperator uniOp) throws
VisitorException {
-try {
-uniOp.getFieldSchema();
-super.visit(uniOp);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param cg
- *the logical cogroup operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(LOCogroup cg) throws VisitorException {
-try {
-cg.getSchema();
-super.visit(cg);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param join
- *the logical join operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(LOJoin join) throws VisitorException {
-try {
-join.getSchema();
-super.visit(join);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param s
- *the logical sort operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(LOSort s) throws VisitorException {
-try {
-s.getSchema();
-super.visit(s);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param limit
- *the logical limit operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(LOLimit limit) throws VisitorException {
-try {
-limit.getSchema();
-super.visit(limit);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param filter
- *the logical filter operator that has to be visited
- * @throws VisitorException
- */
-protected void visit(LOFilter filter) throws VisitorException {
-try {
-filter.getSchema();
-super.visit(filter);
-} catch (FrontendException fe) {
-throw new VisitorException(fe);
-}
-}
-
-/**
- *
- * @param split
- *the logical split operator that has to be visited
- * @throws VisitorException
- */
-protected void
svn commit: r1100422 - /pig/branches/branch-0.9/src/org/apache/pig/impl/util/Utils.java
Author: daijy
Date: Sat May 7 00:19:16 2011
New Revision: 1100422
URL: http://svn.apache.org/viewvc?rev=1100422view=rev
Log:
PIG-1775: Removal of old logical plan (nodeprecate.patch)
Modified:
pig/branches/branch-0.9/src/org/apache/pig/impl/util/Utils.java
Modified: pig/branches/branch-0.9/src/org/apache/pig/impl/util/Utils.java
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/impl/util/Utils.java?rev=1100422r1=1100421r2=1100422view=diff
==
--- pig/branches/branch-0.9/src/org/apache/pig/impl/util/Utils.java (original)
+++ pig/branches/branch-0.9/src/org/apache/pig/impl/util/Utils.java Sat May 7
00:19:16 2011
@@ -158,7 +158,6 @@ public class Utils {
}
/**
- * @deprecated Use parseSchema() instead.
* @param schemaString
* @return Schema instance
* @throws ParserException
svn commit: r1100423 - /pig/trunk/src/org/apache/pig/impl/util/Utils.java
Author: daijy
Date: Sat May 7 00:19:57 2011
New Revision: 1100423
URL: http://svn.apache.org/viewvc?rev=1100423view=rev
Log:
PIG-1775: Removal of old logical plan (nodeprecate.patch)
Modified:
pig/trunk/src/org/apache/pig/impl/util/Utils.java
Modified: pig/trunk/src/org/apache/pig/impl/util/Utils.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/Utils.java?rev=1100423r1=1100422r2=1100423view=diff
==
--- pig/trunk/src/org/apache/pig/impl/util/Utils.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/Utils.java Sat May 7 00:19:57 2011
@@ -158,7 +158,6 @@ public class Utils {
}
/**
- * @deprecated Use parseSchema() instead.
* @param schemaString
* @return Schema instance
* @throws ParserException
