Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld?rev=762596&r1=762595&r2=762596&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld Tue Apr 7 02:29:05 2009 @@ -1,12 +1,14 @@ MapReduce(-1) - -107: -| Store(DummyFil:DummyLdr) - --506205335735031954 +| Store(DummyFil:DummyLdr) - --6047015131487356012 | | -| |---Package[tuple]{Unknown} - --2216790928607759809 +| |---Package[tuple]{Unknown} - --2771799342014688397 | Union[tuple] - -108 | | -| |---Filter[tuple] - --90170124379688035 +| |---Filter[tuple] - --1524666447399813617 +| | | | +| | | Constant(true) - --997494992827460962 | | | -| | |---Load(DummyFil:DummyLdr) - -7219092146411102494 +| | |---Load(DummyFil:DummyLdr) - -7955165653808522445 | | | |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -109 | | @@ -15,19 +17,19 @@ |---MapReduce(-1) - -104: | | Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -110 | | | -| | |---Local Rearrange[tuple]{Unknown}(false) - --1036765666284482668 +| | |---Local Rearrange[tuple]{Unknown}(false) - --4160312061837144266 | | | -| | |---Package[tuple]{Unknown} - --5111685507913827932 -| | Local Rearrange[tuple]{Unknown}(false) - -3719468117239527682 +| | |---Package[tuple]{Unknown} - --8706893458091286727 +| | Local Rearrange[tuple]{Unknown}(false) - -6693653468874366867 | | | -| | |---Load(DummyFil:DummyLdr) - -1761200043915140459 +| | |---Load(DummyFil:DummyLdr) - --3347320220748403847 | |---MapReduce(-1) - -106: | Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -112 | | - | |---Local Rearrange[tuple]{Unknown}(false) - -7127277012934370361 + | |---Local Rearrange[tuple]{Unknown}(false) - -4636081797237532954 | | - | |---Package[tuple]{Unknown} - --8622295867288126988 - | Local Rearrange[tuple]{Unknown}(false) - -810744320494301308 + | |---Package[tuple]{Unknown} - -2997708366016271267 + | Local Rearrange[tuple]{Unknown}(false) - --1195368474144577564 | | - | |---Load(DummyFil:DummyLdr) - -7860460526876129822 \ No newline at end of file + | |---Load(DummyFil:DummyLdr) - -3615014757987062850 \ No newline at end of file
Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld?rev=762596&r1=762595&r2=762596&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld Tue Apr 7 02:29:05 2009 @@ -1,37 +1,41 @@ MapReduce(-1) - -117: -| Store(DummyFil:DummyLdr) - --4160312061837144266 +| Store(DummyFil:DummyLdr) - --2711892325794580872 | | -| |---Package[tuple]{Unknown} - -2997708366016271267 +| |---Package[tuple]{Unknown} - --776319888013965510 | Union[tuple] - -118 | | -| |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -119 -| | -| |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -121 +| |---Filter[tuple] - --4867358672373443663 +| | | | +| | | Constant(true) - -7965768498188214494 +| | | +| | |---Load(DummyFil:DummyLdr) - -31712229583931650 | | -| |---Filter[tuple] - -3615014757987062850 +| |---Filter[tuple] - --4213306726552862637 +| | | | +| | | Constant(true) - --7335024873119453444 | | | -| | |---Load(DummyFil:DummyLdr) - --8706893458091286727 +| | |---Load(DummyFil:DummyLdr) - -4589138876054328603 | | -| |---Filter[tuple] - -9019572209815819418 -| | -| |---Load(DummyFil:DummyLdr) - --1195368474144577564 +| |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -119 +| | +| |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -121 | -|---MapReduce(-1) - -113: +|---MapReduce(-1) - -115: | | Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -120 | | | -| | |---Local Rearrange[tuple]{Unknown}(false) - --3347320220748403847 +| | |---Local Rearrange[tuple]{Unknown}(false) - --1848504978980807369 | | | -| | |---Package[tuple]{Unknown} - --203604194309414000 -| | Local Rearrange[tuple]{Unknown}(false) - --7092666336106039025 +| | |---Package[tuple]{Unknown} - --8479692259657755370 +| | Local Rearrange[tuple]{Unknown}(false) - -9193928674704944093 | | | -| | |---Load(DummyFil:DummyLdr) - --2465563180022385815 +| | |---Load(DummyFil:DummyLdr) - --4238531569995320849 | -|---MapReduce(-1) - -115: +|---MapReduce(-1) - -116: | Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -122 | | - | |---Local Rearrange[tuple]{Unknown}(false) - -6693653468874366867 + | |---Local Rearrange[tuple]{Unknown}(false) - -4744867519639813717 | | - | |---Package[tuple]{Unknown} - -8554221887998033529 - | Local Rearrange[tuple]{Unknown}(false) - -913122466036599874 + | |---Package[tuple]{Unknown} - -8767305735755351861 + | Local Rearrange[tuple]{Unknown}(false) - -5965044993061572808 | | - | |---Load(DummyFil:DummyLdr) - -8515950928528386562 \ No newline at end of file + | |---Load(DummyFil:DummyLdr) - -8914265632748254170 \ No newline at end of file Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld?rev=762596&r1=762595&r2=762596&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld Tue Apr 7 02:29:05 2009 @@ -1,13 +1,17 @@ MapReduce(-1) - -125: -| Store(DummyFil:DummyLdr) - --6047015131487356012 +| Store(DummyFil:DummyLdr) - --3148893660811981376 | | -| |---Package[tuple]{Unknown} - --2771799342014688397 +| |---Package[tuple]{Unknown} - --3359714221559579809 | Union[tuple] - -126 | | -| |---Filter[tuple] - --997494992827460962 +| |---Filter[tuple] - -727770031531364881 +| | | | +| | | Constant(true) - --8002381389674382470 | | | -| | |---Load(DummyFil:DummyLdr) - --1524666447399813617 +| | |---Load(DummyFil:DummyLdr) - -7128285064986147947 | | -| |---Filter[tuple] - -7955165653808522445 +| |---Filter[tuple] - -8639002377389679348 +| | | +| | Constant(true) - --7926255547935388282 | | -| |---Load(DummyFil:DummyLdr) - -3777104251028634198 \ No newline at end of file +| |---Load(DummyFil:DummyLdr) - --5683415113785058706 \ No newline at end of file Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/GenPhyOp.java URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/GenPhyOp.java?rev=762596&r1=762595&r2=762596&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/GenPhyOp.java (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/GenPhyOp.java Tue Apr 7 02:29:05 2009 @@ -158,6 +158,11 @@ public static POLocalRearrange topLocalRearrangeOp() { POLocalRearrange ret = new POLocalRearrange(new OperatorKey("", r .nextLong())); + List<PhysicalPlan> plans = new LinkedList<PhysicalPlan>(); + try { + ret.setPlans(plans); + } catch(PlanException pe) { + } return ret; } @@ -574,6 +579,11 @@ public static POFilter topFilterOp() { POFilter ret = new POFilter(new OperatorKey("", r.nextLong())); + ConstantExpression ex = GenPhyOp.exprConst(); + ex.setValue(new Boolean(true)); + PhysicalPlan pp = new PhysicalPlan(); + pp.add(ex); + ret.setPlan(pp); return ret; }
