You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/03/02 21:03:17 UTC
svn commit: r1451930 - in /hive/branches/ptf-windowing/ql/src:
java/org/apache/hadoop/hive/ql/parse/ test/queries/clientnegative/
test/queries/clientpositive/ test/results/clientpositive/
Author: hashutosh
Date: Sat Mar 2 20:03:17 2013
New Revision: 1451930
URL: http://svn.apache.org/r1451930
Log:
HIVE-3987
Summary: ON keyword is required and is first one needed at beginning of ptf func defintion. Adds named parameter support as well. Note that this just updates the grammar for named params. They are still treated positionally internally. This makes sql syntax compliant but needs more work to loosen the restriction of argument needing to be positional.
Test Plan: Existing test cases are updated.
Reviewers: hbutani
Differential Revision: https://reviews.facebook.net/D9027
Modified:
hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_general_queries.q
hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_rcfile.q
hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_seqfile.q
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_general_queries.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_rcfile.q.out
hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_seqfile.q.out
Modified: hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g (original)
+++ hive/branches/ptf-windowing/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g Sat Mar 2 20:03:17 2013
@@ -1941,9 +1941,8 @@ partitionedTableFunction
@after { msgs.pop(); }
:
name=Identifier
- LPAREN
- ((expression COMMA)=> expression (COMMA expression)* KW_ON)?
- ptfsrc=partitionTableFunctionSource partitioningSpec?
+ LPAREN KW_ON
+ ptfsrc=partitionTableFunctionSource partitioningSpec? ((Identifier LPAREN expression RPAREN ) => Identifier LPAREN expression RPAREN ( COMMA Identifier LPAREN expression RPAREN)*)?
RPAREN alias=Identifier?
-> ^(TOK_PTBLFUNCTION $name $alias? partitionTableFunctionSource partitioningSpec? expression*)
;
Modified: hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q (original)
+++ hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q Sat Mar 2 20:03:17 2013
@@ -14,7 +14,7 @@ CREATE TABLE part(
-- testHavingLeadWithPTF
select p_mfgr,p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
having lead(p_size, 1) <= p_size
Modified: hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q (original)
+++ hive/branches/ptf-windowing/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q Sat Mar 2 20:03:17 2013
@@ -14,7 +14,7 @@ CREATE TABLE part(
-- testJoinWithAmbigousAlias
select abc.*
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part on abc.p_partkey = p1.p_partkey;
Modified: hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_general_queries.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_general_queries.q?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_general_queries.q (original)
+++ hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_general_queries.q Sat Mar 2 20:03:17 2013
@@ -33,7 +33,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
);
@@ -53,7 +53,7 @@ rank() as r,
dense_rank() as dr,
p_retailprice, sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row),
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
);
@@ -84,7 +84,7 @@ sort by p1.p_name ;
-- 7. testJoinWithNoop
select p_mfgr, p_name,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop ( (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
+from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
distribute by j.p_mfgr
sort by j.p_name)
distribute by p_mfgr
@@ -113,7 +113,7 @@ sort by p_name ;
-- 10. testOnlyPTF
select p_mfgr, p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name);
@@ -122,7 +122,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc;
@@ -132,7 +132,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -145,7 +145,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -189,14 +189,14 @@ sort by p_name
-- 17. testJoin
select abc.*
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey;
-- 18. testJoinRight
select abc.*
-from part p1 join noop(part
+from part p1 join noop(on part
partition by p_mfgr
order by p_name
) abc on abc.p_partkey = p1.p_partkey;
@@ -207,7 +207,7 @@ rank() as r,
dense_rank() as dr,
abc.p_retailprice, sum(abc.p_retailprice) as s1 over (rows between unbounded preceding and current row),
abc.p_size, abc.p_size - lag(abc.p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -223,7 +223,7 @@ sort by p_name, p_size desc;
-- 21. testNoopWithMap
select p_mfgr, p_name, p_size,
rank() as r over (partition by p_mfgr order by p_name, p_size desc)
-from noopwithmap(part
+from noopwithmap(on part
partition by p_mfgr
order by p_name, p_size desc);
@@ -232,7 +232,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noopwithmap(part
+from noopwithmap(on part
partition by p_mfgr
order by p_name);
@@ -261,7 +261,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
having rank() < 4;
@@ -349,7 +349,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(noopwithmap(noop(part
+from noop(on noopwithmap(on noop(on part
partition by p_mfgr
order by p_mfgr, p_name
)));
@@ -361,7 +361,7 @@ from (select p_mfgr, p_name,
count(p_size) as cd,
p_retailprice,
sum(p_retailprice) as s1 over w1
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 2 following)
@@ -385,7 +385,7 @@ dense_rank() as dr,
count(abc.p_name) as cd,
abc.p_retailprice, sum(abc.p_retailprice) as s1 over (rows between unbounded preceding and current row),
abc.p_size, abc.p_size - lag(abc.p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -448,7 +448,7 @@ window w1 as (rows between 2 preceding a
-- 42. testDistinctInSelectWithPTF
select DISTINCT p_mfgr, p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name);
@@ -479,7 +479,7 @@ window w1 as (rows between 2 preceding a
-- 45. testViewAsTableInputToPTF
select p_mfgr, p_brand, s,
sum(s) as s1 over w1
-from noop(mfgr_price_view
+from noop(on mfgr_price_view
partition by p_mfgr
order by p_mfgr)
window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding and current row);
@@ -610,7 +610,7 @@ dr INT,
cud DOUBLE,
fv1 INT);
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
INSERT OVERWRITE TABLE part_4 select p_mfgr, p_name, p_size,
@@ -711,10 +711,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr,p_name rows between unbounded preceding and current row)
-from noop(
- noopwithmap(
- noop(
- noop(part
+from noop(on
+ noopwithmap(on
+ noop(on
+ noop(on part
partition by p_mfgr
order by p_mfgr)
)
@@ -728,10 +728,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(
- noop(
- noop(
- noop(part
+from noop(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr
order by p_mfgr)
)
@@ -745,10 +745,10 @@ select p_mfgr, p_name,
rank() as r over (partition by p_mfgr order by p_name),
dense_rank() as dr,
p_size, sum(p_size) as s1
-from noop(
- noop(
- noop(
- noop(part
+from noop(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr,p_name
order by p_mfgr,p_name)
)
@@ -761,10 +761,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr,p_name rows between unbounded preceding and current row)
-from noopwithmap(
- noop(
- noop(
- noop(part
+from noopwithmap(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr,p_name
order by p_mfgr,p_name)
)
@@ -780,9 +780,9 @@ dense_rank() as dr,
p_size,
sum(p_size) as s1 over (rows between unbounded preceding and current row),
sum(p_size) as s2 over (partition by p_mfgr,p_name order by p_mfgr,p_name rows between unbounded preceding and current row)
-from noop(
- noopwithmap(
- noop(part
+from noop(on
+ noopwithmap(on
+ noop(on part
partition by p_mfgr, p_name
order by p_mfgr, p_name)
partition by p_mfgr
@@ -796,23 +796,22 @@ dense_rank() as dr,
p_size,
sum(p_size) as s1 over (rows between unbounded preceding and current row),
sum(p_size) as s2 over (partition by p_mfgr order by p_mfgr rows between unbounded preceding and current row)
-from noopwithmap(
- noop(
- noop(part
+from noopwithmap(on
+ noop(on
+ noop(on part
partition by p_mfgr, p_name
order by p_mfgr, p_name)
));
-- 67. basic Npath test
select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
-from npath(
- 'LATE.LATE+',
- 'LATE', arr_delay > 15,
- 'origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath as tpath'
- on
+from npath(on
flights_tiny
distribute by fl_num
- sort by year, month, day_of_month
+ sort by year, month, day_of_month
+ arg1('LATE.LATE+'),
+ arg2('LATE'), arg3(arr_delay > 15),
+ arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath as tpath')
);
-- 68. testRankWithPartitioning
@@ -836,4 +835,4 @@ sum(p_retailprice) as s1 over (partition
min(p_retailprice) as s2 over (distribute by p_mfgr, p_name sort by p_mfgr, p_name rows between unbounded preceding and current row),
max(p_retailprice) as s3 over (cluster by p_mfgr, p_name )
from part
-;
\ No newline at end of file
+;
Modified: hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_rcfile.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_rcfile.q?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_rcfile.q (original)
+++ hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_rcfile.q Sat Mar 2 20:03:17 2013
@@ -19,6 +19,6 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part_rc
+from noop(on part_rc
partition by p_mfgr
order by p_name);
Modified: hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_seqfile.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_seqfile.q?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_seqfile.q (original)
+++ hive/branches/ptf-windowing/ql/src/test/queries/clientpositive/ptf_seqfile.q Sat Mar 2 20:03:17 2013
@@ -19,6 +19,6 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part_seq
+from noop(on part_seq
partition by p_mfgr
order by p_name);
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_general_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_general_queries.q.out?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_general_queries.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_general_queries.q.out Sat Mar 2 20:03:17 2013
@@ -71,7 +71,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -83,7 +83,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -170,7 +170,7 @@ rank() as r,
dense_rank() as dr,
p_retailprice, sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row),
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -183,7 +183,7 @@ rank() as r,
dense_rank() as dr,
p_retailprice, sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row),
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -357,7 +357,7 @@ Manufacturer#5 almond azure blanched chi
PREHOOK: query: -- 7. testJoinWithNoop
select p_mfgr, p_name,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop ( (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
+from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
distribute by j.p_mfgr
sort by j.p_name)
distribute by p_mfgr
@@ -368,7 +368,7 @@ PREHOOK: Input: default@part
POSTHOOK: query: -- 7. testJoinWithNoop
select p_mfgr, p_name,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop ( (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
+from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
distribute by j.p_mfgr
sort by j.p_name)
distribute by p_mfgr
@@ -506,7 +506,7 @@ Manufacturer#5 almond aquamarine dodger
Manufacturer#5 almond azure blanched chiffon midnight 23 1464.48 5 5 23 -23
PREHOOK: query: -- 10. testOnlyPTF
select p_mfgr, p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
PREHOOK: type: QUERY
@@ -514,7 +514,7 @@ PREHOOK: Input: default@part
#### A masked pattern was here ####
POSTHOOK: query: -- 10. testOnlyPTF
select p_mfgr, p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
POSTHOOK: type: QUERY
@@ -551,7 +551,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc
@@ -563,7 +563,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc
@@ -601,7 +601,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -616,7 +616,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -657,7 +657,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -672,7 +672,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
p_size, p_size - lag(p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
)
@@ -865,7 +865,7 @@ POSTHOOK: Input: default@part
5 5 5 7672.66 -23
PREHOOK: query: -- 17. testJoin
select abc.*
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -874,7 +874,7 @@ PREHOOK: Input: default@part
#### A masked pattern was here ####
POSTHOOK: query: -- 17. testJoin
select abc.*
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -911,7 +911,7 @@ POSTHOOK: Input: default@part
195606 almond aquamarine sandy cyan gainsboro Manufacturer#2 Brand#25 STANDARD PLATED TIN 18 SM PKG 1701.6 ic de
PREHOOK: query: -- 18. testJoinRight
select abc.*
-from part p1 join noop(part
+from part p1 join noop(on part
partition by p_mfgr
order by p_name
) abc on abc.p_partkey = p1.p_partkey
@@ -920,7 +920,7 @@ PREHOOK: Input: default@part
#### A masked pattern was here ####
POSTHOOK: query: -- 18. testJoinRight
select abc.*
-from part p1 join noop(part
+from part p1 join noop(on part
partition by p_mfgr
order by p_name
) abc on abc.p_partkey = p1.p_partkey
@@ -961,7 +961,7 @@ rank() as r,
dense_rank() as dr,
abc.p_retailprice, sum(abc.p_retailprice) as s1 over (rows between unbounded preceding and current row),
abc.p_size, abc.p_size - lag(abc.p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -976,7 +976,7 @@ rank() as r,
dense_rank() as dr,
abc.p_retailprice, sum(abc.p_retailprice) as s1 over (rows between unbounded preceding and current row),
abc.p_size, abc.p_size - lag(abc.p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -1058,7 +1058,7 @@ Manufacturer#5 almond azure blanched chi
PREHOOK: query: -- 21. testNoopWithMap
select p_mfgr, p_name, p_size,
rank() as r over (partition by p_mfgr order by p_name, p_size desc)
-from noopwithmap(part
+from noopwithmap(on part
partition by p_mfgr
order by p_name, p_size desc)
PREHOOK: type: QUERY
@@ -1067,7 +1067,7 @@ PREHOOK: Input: default@part
POSTHOOK: query: -- 21. testNoopWithMap
select p_mfgr, p_name, p_size,
rank() as r over (partition by p_mfgr order by p_name, p_size desc)
-from noopwithmap(part
+from noopwithmap(on part
partition by p_mfgr
order by p_name, p_size desc)
POSTHOOK: type: QUERY
@@ -1104,7 +1104,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noopwithmap(part
+from noopwithmap(on part
partition by p_mfgr
order by p_name)
PREHOOK: type: QUERY
@@ -1115,7 +1115,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noopwithmap(part
+from noopwithmap(on part
partition by p_mfgr
order by p_name)
POSTHOOK: type: QUERY
@@ -1236,7 +1236,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
having rank() < 4
@@ -1248,7 +1248,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
having rank() < 4
@@ -1610,7 +1610,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(noopwithmap(noop(part
+from noop(on noopwithmap(on noop(on part
partition by p_mfgr
order by p_mfgr, p_name
)))
@@ -1622,7 +1622,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(noopwithmap(noop(part
+from noop(on noopwithmap(on noop(on part
partition by p_mfgr
order by p_mfgr, p_name
)))
@@ -1662,7 +1662,7 @@ from (select p_mfgr, p_name,
count(p_size) as cd,
p_retailprice,
sum(p_retailprice) as s1 over w1
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 2 following)
@@ -1677,7 +1677,7 @@ from (select p_mfgr, p_name,
count(p_size) as cd,
p_retailprice,
sum(p_retailprice) as s1 over w1
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 2 following)
@@ -1765,7 +1765,7 @@ dense_rank() as dr,
count(abc.p_name) as cd,
abc.p_retailprice, sum(abc.p_retailprice) as s1 over (rows between unbounded preceding and current row),
abc.p_size, abc.p_size - lag(abc.p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -1781,7 +1781,7 @@ dense_rank() as dr,
count(abc.p_name) as cd,
abc.p_retailprice, sum(abc.p_retailprice) as s1 over (rows between unbounded preceding and current row),
abc.p_size, abc.p_size - lag(abc.p_size,1) as deltaSz
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name
) abc join part p1 on abc.p_partkey = p1.p_partkey
@@ -2077,7 +2077,7 @@ Manufacturer#5 almond aquamarine dodger
Manufacturer#5 almond azure blanched chiffon midnight 23 [{"x":1018.1,"y":1.0},{"x":1464.48,"y":1.0},{"x":1788.73,"y":1.0}] 78486.0 5
PREHOOK: query: -- 42. testDistinctInSelectWithPTF
select DISTINCT p_mfgr, p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
PREHOOK: type: QUERY
@@ -2085,7 +2085,7 @@ PREHOOK: Input: default@part
#### A masked pattern was here ####
POSTHOOK: query: -- 42. testDistinctInSelectWithPTF
select DISTINCT p_mfgr, p_name, p_size
-from noop(part
+from noop(on part
partition by p_mfgr
order by p_name)
POSTHOOK: type: QUERY
@@ -2222,7 +2222,7 @@ Manufacturer#5 Brand#53 2806.83 7672.66
PREHOOK: query: -- 45. testViewAsTableInputToPTF
select p_mfgr, p_brand, s,
sum(s) as s1 over w1
-from noop(mfgr_price_view
+from noop(on mfgr_price_view
partition by p_mfgr
order by p_mfgr)
window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding and current row)
@@ -2233,7 +2233,7 @@ PREHOOK: Input: default@part
POSTHOOK: query: -- 45. testViewAsTableInputToPTF
select p_mfgr, p_brand, s,
sum(s) as s1 over w1
-from noop(mfgr_price_view
+from noop(on mfgr_price_view
partition by p_mfgr
order by p_mfgr)
window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding and current row)
@@ -2951,7 +2951,7 @@ POSTHOOK: Lineage: part_3.fv SCRIPT [(pa
POSTHOOK: Lineage: part_3.p_mfgr SCRIPT [(part)part.FieldSchema(name:p_partkey, type:int, comment:null), (part)part.FieldSchema(name:p_name, type:string, comment:null), (part)part.FieldSchema(name:p_mfgr, type:string, comment:null), (part)part.FieldSchema(name:p_brand, type:string, comment:null), (part)part.FieldSchema(name:p_type, type:string, comment:null), (part)part.FieldSchema(name:p_size, type:int, comment:null), (part)part.FieldSchema(name:p_container, type:string, comment:null), (part)part.FieldSchema(name:p_retailprice, type:double, comment:null), (part)part.FieldSchema(name:p_comment, type:string, comment:null), (part)part.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), (part)part.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
POSTHOOK: Lineage: part_3.p_name SCRIPT [(part)part.FieldSchema(name:p_partkey, type:int, comment:null), (part)part.FieldSchema(name:p_name, type:string, comment:null), (part)part.FieldSchema(name:p_mfgr, type:string, comment:null), (part)part.FieldSchema(name:p_brand, type:string, comment:null), (part)part.FieldSchema(name:p_type, type:string, comment:null), (part)part.FieldSchema(name:p_size, type:int, comment:null), (part)part.FieldSchema(name:p_container, type:string, comment:null), (part)part.FieldSchema(name:p_retailprice, type:double, comment:null), (part)part.FieldSchema(name:p_comment, type:string, comment:null), (part)part.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), (part)part.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
POSTHOOK: Lineage: part_3.p_size SCRIPT [(part)part.FieldSchema(name:p_partkey, type:int, comment:null), (part)part.FieldSchema(name:p_name, type:string, comment:null), (part)part.FieldSchema(name:p_mfgr, type:string, comment:null), (part)part.FieldSchema(name:p_brand, type:string, comment:null), (part)part.FieldSchema(name:p_type, type:string, comment:null), (part)part.FieldSchema(name:p_size, type:int, comment:null), (part)part.FieldSchema(name:p_container, type:string, comment:null), (part)part.FieldSchema(name:p_retailprice, type:double, comment:null), (part)part.FieldSchema(name:p_comment, type:string, comment:null), (part)part.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), (part)part.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-PREHOOK: query: from noop(part
+PREHOOK: query: from noop(on part
partition by p_mfgr
order by p_name)
INSERT OVERWRITE TABLE part_4 select p_mfgr, p_name, p_size,
@@ -2975,7 +2975,7 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@part
PREHOOK: Output: default@part_4
PREHOOK: Output: default@part_5
-POSTHOOK: query: from noop(part
+POSTHOOK: query: from noop(on part
partition by p_mfgr
order by p_name)
INSERT OVERWRITE TABLE part_4 select p_mfgr, p_name, p_size,
@@ -3838,10 +3838,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr,p_name rows between unbounded preceding and current row)
-from noop(
- noopwithmap(
- noop(
- noop(part
+from noop(on
+ noopwithmap(on
+ noop(on
+ noop(on part
partition by p_mfgr
order by p_mfgr)
)
@@ -3857,10 +3857,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr,p_name rows between unbounded preceding and current row)
-from noop(
- noopwithmap(
- noop(
- noop(part
+from noop(on
+ noopwithmap(on
+ noop(on
+ noop(on part
partition by p_mfgr
order by p_mfgr)
)
@@ -3938,10 +3938,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(
- noop(
- noop(
- noop(part
+from noop(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr
order by p_mfgr)
)
@@ -3957,10 +3957,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(
- noop(
- noop(
- noop(part
+from noop(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr
order by p_mfgr)
)
@@ -4038,10 +4038,10 @@ select p_mfgr, p_name,
rank() as r over (partition by p_mfgr order by p_name),
dense_rank() as dr,
p_size, sum(p_size) as s1
-from noop(
- noop(
- noop(
- noop(part
+from noop(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr,p_name
order by p_mfgr,p_name)
)
@@ -4055,10 +4055,10 @@ select p_mfgr, p_name,
rank() as r over (partition by p_mfgr order by p_name),
dense_rank() as dr,
p_size, sum(p_size) as s1
-from noop(
- noop(
- noop(
- noop(part
+from noop(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr,p_name
order by p_mfgr,p_name)
)
@@ -4134,10 +4134,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr,p_name rows between unbounded preceding and current row)
-from noopwithmap(
- noop(
- noop(
- noop(part
+from noopwithmap(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr,p_name
order by p_mfgr,p_name)
)
@@ -4153,10 +4153,10 @@ select p_mfgr, p_name,
rank() as r,
dense_rank() as dr,
p_size, sum(p_size) as s1 over (partition by p_mfgr,p_name rows between unbounded preceding and current row)
-from noopwithmap(
- noop(
- noop(
- noop(part
+from noopwithmap(on
+ noop(on
+ noop(on
+ noop(on part
partition by p_mfgr,p_name
order by p_mfgr,p_name)
)
@@ -4236,9 +4236,9 @@ dense_rank() as dr,
p_size,
sum(p_size) as s1 over (rows between unbounded preceding and current row),
sum(p_size) as s2 over (partition by p_mfgr,p_name order by p_mfgr,p_name rows between unbounded preceding and current row)
-from noop(
- noopwithmap(
- noop(part
+from noop(on
+ noopwithmap(on
+ noop(on part
partition by p_mfgr, p_name
order by p_mfgr, p_name)
partition by p_mfgr
@@ -4254,9 +4254,9 @@ dense_rank() as dr,
p_size,
sum(p_size) as s1 over (rows between unbounded preceding and current row),
sum(p_size) as s2 over (partition by p_mfgr,p_name order by p_mfgr,p_name rows between unbounded preceding and current row)
-from noop(
- noopwithmap(
- noop(part
+from noop(on
+ noopwithmap(on
+ noop(on part
partition by p_mfgr, p_name
order by p_mfgr, p_name)
partition by p_mfgr
@@ -4334,9 +4334,9 @@ dense_rank() as dr,
p_size,
sum(p_size) as s1 over (rows between unbounded preceding and current row),
sum(p_size) as s2 over (partition by p_mfgr order by p_mfgr rows between unbounded preceding and current row)
-from noopwithmap(
- noop(
- noop(part
+from noopwithmap(on
+ noop(on
+ noop(on part
partition by p_mfgr, p_name
order by p_mfgr, p_name)
))
@@ -4350,9 +4350,9 @@ dense_rank() as dr,
p_size,
sum(p_size) as s1 over (rows between unbounded preceding and current row),
sum(p_size) as s2 over (partition by p_mfgr order by p_mfgr rows between unbounded preceding and current row)
-from noopwithmap(
- noop(
- noop(part
+from noopwithmap(on
+ noop(on
+ noop(on part
partition by p_mfgr, p_name
order by p_mfgr, p_name)
))
@@ -4423,28 +4423,26 @@ Manufacturer#5 almond aquamarine dodger
Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 108 108
PREHOOK: query: -- 67. basic Npath test
select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
-from npath(
- 'LATE.LATE+',
- 'LATE', arr_delay > 15,
- 'origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath as tpath'
- on
+from npath(on
flights_tiny
distribute by fl_num
- sort by year, month, day_of_month
+ sort by year, month, day_of_month
+ arg1('LATE.LATE+'),
+ arg2('LATE'), arg3(arr_delay > 15),
+ arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath as tpath')
)
PREHOOK: type: QUERY
PREHOOK: Input: default@flights_tiny
#### A masked pattern was here ####
POSTHOOK: query: -- 67. basic Npath test
select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
-from npath(
- 'LATE.LATE+',
- 'LATE', arr_delay > 15,
- 'origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath as tpath'
- on
+from npath(on
flights_tiny
distribute by fl_num
- sort by year, month, day_of_month
+ sort by year, month, day_of_month
+ arg1('LATE.LATE+'),
+ arg2('LATE'), arg3(arr_delay > 15),
+ arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath as tpath')
)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@flights_tiny
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_rcfile.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_rcfile.q.out?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_rcfile.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_rcfile.q.out Sat Mar 2 20:03:17 2013
@@ -38,7 +38,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part_rc
+from noop(on part_rc
partition by p_mfgr
order by p_name)
PREHOOK: type: QUERY
@@ -49,7 +49,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part_rc
+from noop(on part_rc
partition by p_mfgr
order by p_name)
POSTHOOK: type: QUERY
Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_seqfile.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_seqfile.q.out?rev=1451930&r1=1451929&r2=1451930&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_seqfile.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ptf_seqfile.q.out Sat Mar 2 20:03:17 2013
@@ -38,7 +38,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part_seq
+from noop(on part_seq
partition by p_mfgr
order by p_name)
PREHOOK: type: QUERY
@@ -49,7 +49,7 @@ select p_mfgr, p_name, p_size,
rank() as r,
dense_rank() as dr,
sum(p_retailprice) as s1 over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)
-from noop(part_seq
+from noop(on part_seq
partition by p_mfgr
order by p_name)
POSTHOOK: type: QUERY