You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2009/11/24 22:07:29 UTC
svn commit: r883877 - in /hadoop/pig/trunk: CHANGES.txt
src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
test/org/apache/pig/test/TestLogicalPlanBuilder.java
Author: gates
Date: Tue Nov 24 21:07:28 2009
New Revision: 883877
URL: http://svn.apache.org/viewvc?rev=883877&view=rev
Log:
PIG-1101: Allow arugment to limit to be long in addition to int.
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
hadoop/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=883877&r1=883876&r2=883877&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Tue Nov 24 21:07:28 2009
@@ -24,6 +24,9 @@
IMPROVEMENTS
+PIG-1101: Allow arugment to limit to be long in addition to int (ashutoshc via
+ gates)
+
PIG-872: use distributed cache for the replicated data set in FR join
(sriranjan via olgan)
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=883877&r1=883876&r2=883877&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 Tue Nov 24 21:07:28 2009
@@ -1470,15 +1470,18 @@
{
LogicalOperator input;
Token t;
+ long l;
log.trace("Entering LimitClause");
}
{
(
input = NestedExpr(lp) {log.debug("Limit input: " + input);}
- t = <INTEGER>
+ (
+ t = <INTEGER> { l = Long.parseLong(t.image); }
+ | t = <LONGINTEGER> { l = Long.parseLong(t.image.substring(0, t.image.length() - 1)); }
)
+ )
{
- long l = Integer.parseInt(t.image);
LogicalOperator limit = new LOLimit(lp, new OperatorKey(scope, getNextId()), l);
addAlias(input.getAlias(), input);
lp.add(limit);
Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java?rev=883877&r1=883876&r2=883877&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java Tue Nov 24 21:07:28 2009
@@ -999,6 +999,11 @@
}
@Test
+ public void testLimitWithLong() {
+ buildPlan("limit (load 'a') 100L;");
+ }
+
+ @Test
public void testQuery75() {
buildPlan("a = union (load 'a'), (load 'b'), (load 'c');");
buildPlan("b = foreach a {generate $0;} parallel 10;");