Index: ql/src/test/results/clientpositive/ptf_general_queries.q.out =================================================================== --- ql/src/test/results/clientpositive/ptf_general_queries.q.out (revision 1441972) +++ ql/src/test/results/clientpositive/ptf_general_queries.q.out (working copy) @@ -2,14 +2,6 @@ PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE part POSTHOOK: type: DROPTABLE -PREHOOK: query: DROP TABLE part_rc -PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE part_rc -POSTHOOK: type: DROPTABLE -PREHOOK: query: DROP TABLE part_seq -PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE part_seq -POSTHOOK: type: DROPTABLE PREHOOK: query: DROP TABLE flights_tiny PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE flights_tiny @@ -47,68 +39,6 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD POSTHOOK: Output: default@part -PREHOOK: query: CREATE TABLE part_rc( - p_partkey INT, - p_name STRING, - p_mfgr STRING, - p_brand STRING, - p_type STRING, - p_size INT, - p_container STRING, - p_retailprice DOUBLE, - p_comment STRING -) STORED AS RCFILE -PREHOOK: type: CREATETABLE -POSTHOOK: query: CREATE TABLE part_rc( - p_partkey INT, - p_name STRING, - p_mfgr STRING, - p_brand STRING, - p_type STRING, - p_size INT, - p_container STRING, - p_retailprice DOUBLE, - p_comment STRING -) STORED AS RCFILE -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: default@part_rc -PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part.rc' overwrite into table part_rc -PREHOOK: type: LOAD -PREHOOK: Output: default@part_rc -POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part.rc' overwrite into table part_rc -POSTHOOK: type: LOAD -POSTHOOK: Output: default@part_rc -PREHOOK: query: CREATE TABLE part_seq( - p_partkey INT, - p_name STRING, - p_mfgr STRING, - p_brand STRING, - p_type STRING, - p_size INT, - p_container STRING, - p_retailprice DOUBLE, - p_comment STRING -) STORED AS SEQUENCEFILE -PREHOOK: type: CREATETABLE -POSTHOOK: query: CREATE TABLE part_seq( - p_partkey INT, - p_name STRING, - p_mfgr STRING, - p_brand STRING, - p_type STRING, - p_size INT, - p_container STRING, - p_retailprice DOUBLE, - p_comment STRING -) STORED AS SEQUENCEFILE -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: default@part_seq -PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part.seq' overwrite into table part_seq -PREHOOK: type: LOAD -PREHOOK: Output: default@part_seq -POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part.seq' overwrite into table part_seq -POSTHOOK: type: LOAD -POSTHOOK: Output: default@part_seq PREHOOK: query: create table flights_tiny ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -2478,114 +2408,18 @@ Manufacturer#5 almond azure blanched chiffon midnight 1 23 115 Manufacturer#5 almond azure blanched chiffon midnight 2 23 92 Manufacturer#5 almond azure blanched chiffon midnight 3 23 69 -PREHOOK: query: -- 48. testWindowingPTFWithPartRC -select p_mfgr, p_name, p_size, -rank() as r, -denserank() as dr, -sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) -from noop(part_rc -distribute by p_mfgr -sort by p_name) -PREHOOK: type: QUERY -PREHOOK: Input: default@part_rc -#### A masked pattern was here #### -POSTHOOK: query: -- 48. testWindowingPTFWithPartRC -select p_mfgr, p_name, p_size, -rank() as r, -denserank() as dr, -sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) -from noop(part_rc -distribute by p_mfgr -sort by p_name) -POSTHOOK: type: QUERY -POSTHOOK: Input: default@part_rc -#### A masked pattern was here #### -Manufacturer#1 almond antique burnished rose metallic 2 1 1 1173.15 -Manufacturer#1 almond antique burnished rose metallic 2 1 1 2346.3 -Manufacturer#1 almond antique chartreuse lavender yellow 34 3 2 4100.06 -Manufacturer#1 almond antique salmon chartreuse burlywood 6 4 3 5702.650000000001 -Manufacturer#1 almond aquamarine burnished black steel 28 5 4 7117.070000000001 -Manufacturer#1 almond aquamarine pink moccasin thistle 42 6 5 8749.730000000001 -Manufacturer#2 almond antique violet chocolate turquoise 14 1 1 1690.68 -Manufacturer#2 almond antique violet turquoise frosted 40 2 2 3491.38 -Manufacturer#2 almond aquamarine midnight light salmon 2 3 3 5523.360000000001 -Manufacturer#2 almond aquamarine rose maroon antique 25 4 4 7222.02 -Manufacturer#2 almond aquamarine sandy cyan gainsboro 18 5 5 8923.62 -Manufacturer#3 almond antique chartreuse khaki white 17 1 1 1671.68 -Manufacturer#3 almond antique forest lavender goldenrod 14 2 2 2861.95 -Manufacturer#3 almond antique metallic orange dim 19 3 3 4272.34 -Manufacturer#3 almond antique misty red olive 1 4 4 6195.32 -Manufacturer#3 almond antique olive coral navajo 45 5 5 7532.61 -Manufacturer#4 almond antique gainsboro frosted violet 10 1 1 1620.67 -Manufacturer#4 almond antique violet mint lemon 39 2 2 2996.09 -Manufacturer#4 almond aquamarine floral ivory bisque 27 3 3 4202.35 -Manufacturer#4 almond aquamarine yellow dodger mint 7 4 4 6047.27 -Manufacturer#4 almond azure aquamarine papaya violet 12 5 5 7337.620000000001 -Manufacturer#5 almond antique blue firebrick mint 31 1 1 1789.69 -Manufacturer#5 almond antique medium spring khaki 6 2 2 3401.3500000000004 -Manufacturer#5 almond antique sky peru orange 2 3 3 5190.08 -Manufacturer#5 almond aquamarine dodger light gainsboro 46 4 4 6208.18 -Manufacturer#5 almond azure blanched chiffon midnight 23 5 5 7672.66 -PREHOOK: query: -- 49. testWindowingPTFWithPartSeqFile -select p_mfgr, p_name, p_size, -rank() as r, -denserank() as dr, -sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) -from noop(part_seq -distribute by p_mfgr -sort by p_name) -PREHOOK: type: QUERY -PREHOOK: Input: default@part_seq -#### A masked pattern was here #### -POSTHOOK: query: -- 49. testWindowingPTFWithPartSeqFile -select p_mfgr, p_name, p_size, -rank() as r, -denserank() as dr, -sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) -from noop(part_seq -distribute by p_mfgr -sort by p_name) -POSTHOOK: type: QUERY -POSTHOOK: Input: default@part_seq -#### A masked pattern was here #### -Manufacturer#1 almond antique burnished rose metallic 2 1 1 1173.15 -Manufacturer#1 almond antique burnished rose metallic 2 1 1 2346.3 -Manufacturer#1 almond antique chartreuse lavender yellow 34 3 2 4100.06 -Manufacturer#1 almond antique salmon chartreuse burlywood 6 4 3 5702.650000000001 -Manufacturer#1 almond aquamarine burnished black steel 28 5 4 7117.070000000001 -Manufacturer#1 almond aquamarine pink moccasin thistle 42 6 5 8749.730000000001 -Manufacturer#2 almond antique violet chocolate turquoise 14 1 1 1690.68 -Manufacturer#2 almond antique violet turquoise frosted 40 2 2 3491.38 -Manufacturer#2 almond aquamarine midnight light salmon 2 3 3 5523.360000000001 -Manufacturer#2 almond aquamarine rose maroon antique 25 4 4 7222.02 -Manufacturer#2 almond aquamarine sandy cyan gainsboro 18 5 5 8923.62 -Manufacturer#3 almond antique chartreuse khaki white 17 1 1 1671.68 -Manufacturer#3 almond antique forest lavender goldenrod 14 2 2 2861.95 -Manufacturer#3 almond antique metallic orange dim 19 3 3 4272.34 -Manufacturer#3 almond antique misty red olive 1 4 4 6195.32 -Manufacturer#3 almond antique olive coral navajo 45 5 5 7532.61 -Manufacturer#4 almond antique gainsboro frosted violet 10 1 1 1620.67 -Manufacturer#4 almond antique violet mint lemon 39 2 2 2996.09 -Manufacturer#4 almond aquamarine floral ivory bisque 27 3 3 4202.35 -Manufacturer#4 almond aquamarine yellow dodger mint 7 4 4 6047.27 -Manufacturer#4 almond azure aquamarine papaya violet 12 5 5 7337.620000000001 -Manufacturer#5 almond antique blue firebrick mint 31 1 1 1789.69 -Manufacturer#5 almond antique medium spring khaki 6 2 2 3401.3500000000004 -Manufacturer#5 almond antique sky peru orange 2 3 3 5190.08 -Manufacturer#5 almond aquamarine dodger light gainsboro 46 4 4 6208.18 -Manufacturer#5 almond azure blanched chiffon midnight 23 5 5 7672.66 -PREHOOK: query: -- 50. testConstExprInSelect +PREHOOK: query: -- 48. testConstExprInSelect select 'tst1' as key, count(1) as value from part PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 50. testConstExprInSelect +POSTHOOK: query: -- 48. testConstExprInSelect select 'tst1' as key, count(1) as value from part POSTHOOK: type: QUERY POSTHOOK: Input: default@part #### A masked pattern was here #### tst1 26 -PREHOOK: query: -- 51. testMultipleInserts3SWQs +PREHOOK: query: -- 49. testMultipleInserts3SWQs CREATE TABLE part_1( p_mfgr STRING, p_name STRING, @@ -2594,7 +2428,7 @@ dr INT, s DOUBLE) PREHOOK: type: CREATETABLE -POSTHOOK: query: -- 51. testMultipleInserts3SWQs +POSTHOOK: query: -- 49. testMultipleInserts3SWQs CREATE TABLE part_1( p_mfgr STRING, p_name STRING, @@ -2886,7 +2720,7 @@ Manufacturer#5 almond antique medium spring khaki 6 5 5 31 Manufacturer#5 almond aquamarine dodger light gainsboro 46 5 5 6 Manufacturer#5 almond azure blanched chiffon midnight 23 5 5 2 -PREHOOK: query: -- 52. testGroupByHavingWithSWQAndAlias +PREHOOK: query: -- 50. testGroupByHavingWithSWQAndAlias select p_mfgr, p_name, p_size, min(p_retailprice) as mi, rank() as r, denserank() as dr, @@ -2899,7 +2733,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 52. testGroupByHavingWithSWQAndAlias +POSTHOOK: query: -- 50. testGroupByHavingWithSWQAndAlias select p_mfgr, p_name, p_size, min(p_retailprice) as mi, rank() as r, denserank() as dr, @@ -2958,7 +2792,7 @@ Manufacturer#5 almond antique sky peru orange 2 1788.73 3 3 2 -4 Manufacturer#5 almond aquamarine dodger light gainsboro 46 1018.1 4 4 46 44 Manufacturer#5 almond azure blanched chiffon midnight 23 1464.48 5 5 23 -23 -PREHOOK: query: -- 53. testMultipleRangeWindows +PREHOOK: query: -- 51. testMultipleRangeWindows select p_mfgr,p_name, p_size, sum(p_size) as s2 over (range between p_size 10 less and current row), sum(p_size) as s1 over (range between current row and p_size 10 more ) @@ -2969,7 +2803,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 53. testMultipleRangeWindows +POSTHOOK: query: -- 51. testMultipleRangeWindows select p_mfgr,p_name, p_size, sum(p_size) as s2 over (range between p_size 10 less and current row), sum(p_size) as s1 over (range between current row and p_size 10 more ) @@ -3027,7 +2861,7 @@ Manufacturer#5 almond azure blanched chiffon midnight 23 23 54 Manufacturer#5 almond antique blue firebrick mint 31 54 31 Manufacturer#5 almond aquamarine dodger light gainsboro 46 46 46 -PREHOOK: query: -- 54. testMultipleInserts2SWQsWithPTF +PREHOOK: query: -- 52. testMultipleInserts2SWQsWithPTF CREATE TABLE part_4( p_mfgr STRING, p_name STRING, @@ -3036,7 +2870,7 @@ dr INT, s DOUBLE) PREHOOK: type: CREATETABLE -POSTHOOK: query: -- 54. testMultipleInserts2SWQsWithPTF +POSTHOOK: query: -- 52. testMultipleInserts2SWQsWithPTF CREATE TABLE part_4( p_mfgr STRING, p_name STRING, @@ -3330,14 +3164,14 @@ Manufacturer#5 almond antique medium spring khaki 6 37 37 2 2 0.4 31 Manufacturer#5 almond aquamarine dodger light gainsboro 46 85 46 4 4 0.8 6 Manufacturer#5 almond azure blanched chiffon midnight 23 108 69 5 5 1.0 2 -PREHOOK: query: -- 55. testPartOrderInUDAFInvoke +PREHOOK: query: -- 53. testPartOrderInUDAFInvoke select p_mfgr, p_name, p_size, sum(p_size) as s over (distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following) from part PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 55. testPartOrderInUDAFInvoke +POSTHOOK: query: -- 53. testPartOrderInUDAFInvoke select p_mfgr, p_name, p_size, sum(p_size) as s over (distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following) from part @@ -3406,7 +3240,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 Manufacturer#5 almond azure blanched chiffon midnight 23 71 -PREHOOK: query: -- 56. testPartOrderInWdwDef +PREHOOK: query: -- 54. testPartOrderInWdwDef select p_mfgr, p_name, p_size, sum(p_size) as s over (w1) from part @@ -3414,7 +3248,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 56. testPartOrderInWdwDef +POSTHOOK: query: -- 54. testPartOrderInWdwDef select p_mfgr, p_name, p_size, sum(p_size) as s over (w1) from part @@ -3484,7 +3318,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 Manufacturer#5 almond azure blanched chiffon midnight 23 71 -PREHOOK: query: -- 57. testDefaultPartitioningSpecRules +PREHOOK: query: -- 55. testDefaultPartitioningSpecRules select p_mfgr, p_name, p_size, sum(p_size) as s over (w1), sum(p_size) as s2 over(w2) @@ -3495,7 +3329,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 57. testDefaultPartitioningSpecRules +POSTHOOK: query: -- 55. testDefaultPartitioningSpecRules select p_mfgr, p_name, p_size, sum(p_size) as s over (w1), sum(p_size) as s2 over(w2) @@ -3568,7 +3402,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 108 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 108 Manufacturer#5 almond azure blanched chiffon midnight 23 71 108 -PREHOOK: query: -- 58. testWindowCrossReference +PREHOOK: query: -- 56. testWindowCrossReference select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2) @@ -3578,7 +3412,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 58. testWindowCrossReference +POSTHOOK: query: -- 56. testWindowCrossReference select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2) @@ -3650,7 +3484,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 108 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 77 Manufacturer#5 almond azure blanched chiffon midnight 23 71 71 -PREHOOK: query: -- 59. testWindowInheritance +PREHOOK: query: -- 57. testWindowInheritance select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2) @@ -3660,7 +3494,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 59. testWindowInheritance +POSTHOOK: query: -- 57. testWindowInheritance select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2) @@ -3732,7 +3566,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 39 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 85 Manufacturer#5 almond azure blanched chiffon midnight 23 71 108 -PREHOOK: query: -- 60. testWindowForwardReference +PREHOOK: query: -- 58. testWindowForwardReference select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2), @@ -3746,7 +3580,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 60. testWindowForwardReference +POSTHOOK: query: -- 58. testWindowForwardReference select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2), @@ -3822,7 +3656,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 39 39 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 85 85 Manufacturer#5 almond azure blanched chiffon midnight 23 71 108 108 -PREHOOK: query: -- 61. testWindowDefinitionPropagation +PREHOOK: query: -- 59. testWindowDefinitionPropagation select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2), @@ -3836,7 +3670,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 61. testWindowDefinitionPropagation +POSTHOOK: query: -- 59. testWindowDefinitionPropagation select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2), @@ -3912,7 +3746,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 39 108 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 85 77 Manufacturer#5 almond azure blanched chiffon midnight 23 71 108 71 -PREHOOK: query: -- 62. testDistinctWithWindowing +PREHOOK: query: -- 60. testDistinctWithWindowing select DISTINCT p_mfgr, p_name, p_size, sum(p_size) as s over (w1) from part @@ -3922,7 +3756,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 62. testDistinctWithWindowing +POSTHOOK: query: -- 60. testDistinctWithWindowing select DISTINCT p_mfgr, p_name, p_size, sum(p_size) as s over (w1) from part @@ -3993,7 +3827,7 @@ Manufacturer#5 almond antique sky peru orange 2 108 Manufacturer#5 almond aquamarine dodger light gainsboro 46 77 Manufacturer#5 almond azure blanched chiffon midnight 23 71 -PREHOOK: query: -- 63. testMulti2OperatorsFunctionChainWithMap +PREHOOK: query: -- 61. testMulti2OperatorsFunctionChainWithMap select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4012,7 +3846,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 63. testMulti2OperatorsFunctionChainWithMap +POSTHOOK: query: -- 61. testMulti2OperatorsFunctionChainWithMap select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4093,7 +3927,7 @@ Manufacturer#5 almond antique sky peru orange 1 1 2 2 Manufacturer#5 almond aquamarine dodger light gainsboro 1 1 46 46 Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 23 -PREHOOK: query: -- 64. testMulti3OperatorsFunctionChain +PREHOOK: query: -- 62. testMulti3OperatorsFunctionChain select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4112,7 +3946,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 64. testMulti3OperatorsFunctionChain +POSTHOOK: query: -- 62. testMulti3OperatorsFunctionChain select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4193,7 +4027,7 @@ Manufacturer#5 almond antique sky peru orange 1 1 2 39 Manufacturer#5 almond aquamarine dodger light gainsboro 1 1 46 85 Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 108 -PREHOOK: query: -- 65. testMultiOperatorChainWithNoWindowing +PREHOOK: query: -- 63. testMultiOperatorChainWithNoWindowing select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4210,7 +4044,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 65. testMultiOperatorChainWithNoWindowing +POSTHOOK: query: -- 63. testMultiOperatorChainWithNoWindowing select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4289,7 +4123,7 @@ Manufacturer#5 almond antique sky peru orange 1 1 2 108 Manufacturer#5 almond aquamarine dodger light gainsboro 1 1 46 108 Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 108 -PREHOOK: query: -- 66. testMultiOperatorChainEndsWithNoopMap +PREHOOK: query: -- 64. testMultiOperatorChainEndsWithNoopMap select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4308,7 +4142,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 66. testMultiOperatorChainEndsWithNoopMap +POSTHOOK: query: -- 64. testMultiOperatorChainEndsWithNoopMap select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4389,7 +4223,7 @@ Manufacturer#5 almond antique sky peru orange 1 1 2 2 Manufacturer#5 almond aquamarine dodger light gainsboro 1 1 46 46 Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 23 -PREHOOK: query: --67. testMultiOperatorChainWithDiffPartitionForWindow1 +PREHOOK: query: --65. testMultiOperatorChainWithDiffPartitionForWindow1 select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4407,7 +4241,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: --67. testMultiOperatorChainWithDiffPartitionForWindow1 +POSTHOOK: query: --65. testMultiOperatorChainWithDiffPartitionForWindow1 select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4487,7 +4321,7 @@ Manufacturer#5 almond antique sky peru orange 1 1 2 2 2 Manufacturer#5 almond aquamarine dodger light gainsboro 1 1 46 46 46 Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 23 23 -PREHOOK: query: --68. testMultiOperatorChainWithDiffPartitionForWindow2 +PREHOOK: query: --66. testMultiOperatorChainWithDiffPartitionForWindow2 select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4503,7 +4337,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: --68. testMultiOperatorChainWithDiffPartitionForWindow2 +POSTHOOK: query: --66. testMultiOperatorChainWithDiffPartitionForWindow2 select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -4581,7 +4415,7 @@ Manufacturer#5 almond antique sky peru orange 1 1 2 39 39 Manufacturer#5 almond aquamarine dodger light gainsboro 1 1 46 85 85 Manufacturer#5 almond azure blanched chiffon midnight 1 1 23 108 108 -PREHOOK: query: -- 69. basic Npath test +PREHOOK: query: -- 67. basic Npath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from npath( 'LATE.LATE+', @@ -4595,7 +4429,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@flights_tiny #### A masked pattern was here #### -POSTHOOK: query: -- 69. basic Npath test +POSTHOOK: query: -- 67. basic Npath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from npath( 'LATE.LATE+', @@ -4661,14 +4495,14 @@ Chicago 897 2010 10 20 4 [{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":20,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":21,"arr_delay":77.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":22,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":24,"arr_delay":113.0,"fl_num":"897"}] Chicago 897 2010 10 21 3 [{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":21,"arr_delay":77.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":22,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":24,"arr_delay":113.0,"fl_num":"897"}] Chicago 897 2010 10 22 2 [{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":22,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":24,"arr_delay":113.0,"fl_num":"897"}] -PREHOOK: query: -- 70. testRankWithPartitioning +PREHOOK: query: -- 68. testRankWithPartitioning select p_mfgr, p_name, p_size, rank() as r over (distribute by p_mfgr sort by p_name ) from part PREHOOK: type: QUERY PREHOOK: Input: default@part #### A masked pattern was here #### -POSTHOOK: query: -- 70. testRankWithPartitioning +POSTHOOK: query: -- 68. testRankWithPartitioning select p_mfgr, p_name, p_size, rank() as r over (distribute by p_mfgr sort by p_name ) from part Index: ql/src/test/queries/clientpositive/ptf_rcfile.q =================================================================== --- ql/src/test/queries/clientpositive/ptf_rcfile.q (revision 0) +++ ql/src/test/queries/clientpositive/ptf_rcfile.q (revision 0) @@ -0,0 +1,24 @@ +DROP TABLE part_rc; + +CREATE TABLE part_rc( + p_partkey INT, + p_name STRING, + p_mfgr STRING, + p_brand STRING, + p_type STRING, + p_size INT, + p_container STRING, + p_retailprice DOUBLE, + p_comment STRING +) STORED AS RCFILE ; + +LOAD DATA LOCAL INPATH '../data/files/part.rc' overwrite into table part_rc; + +-- testWindowingPTFWithPartRC +select p_mfgr, p_name, p_size, +rank() as r, +denserank() as dr, +sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) +from noop(part_rc +distribute by p_mfgr +sort by p_name); Index: ql/src/test/queries/clientpositive/ptf_general_queries.q =================================================================== --- ql/src/test/queries/clientpositive/ptf_general_queries.q (revision 1441972) +++ ql/src/test/queries/clientpositive/ptf_general_queries.q (working copy) @@ -1,6 +1,4 @@ DROP TABLE part; -DROP TABLE part_rc; -DROP TABLE part_seq; DROP TABLE flights_tiny; -- data setup @@ -18,34 +16,6 @@ LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part; -CREATE TABLE part_rc( - p_partkey INT, - p_name STRING, - p_mfgr STRING, - p_brand STRING, - p_type STRING, - p_size INT, - p_container STRING, - p_retailprice DOUBLE, - p_comment STRING -) STORED AS RCFILE ; - -LOAD DATA LOCAL INPATH '../data/files/part.rc' overwrite into table part_rc; - -CREATE TABLE part_seq( - p_partkey INT, - p_name STRING, - p_mfgr STRING, - p_brand STRING, - p_type STRING, - p_size INT, - p_container STRING, - p_retailprice DOUBLE, - p_comment STRING -) STORED AS SEQUENCEFILE ; - -LOAD DATA LOCAL INPATH '../data/files/part.seq' overwrite into table part_seq; - create table flights_tiny ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -531,28 +501,10 @@ sort by p_name window w1 as rows between 2 preceding and current row; --- 48. testWindowingPTFWithPartRC -select p_mfgr, p_name, p_size, -rank() as r, -denserank() as dr, -sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) -from noop(part_rc -distribute by p_mfgr -sort by p_name); - --- 49. testWindowingPTFWithPartSeqFile -select p_mfgr, p_name, p_size, -rank() as r, -denserank() as dr, -sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) -from noop(part_seq -distribute by p_mfgr -sort by p_name); - --- 50. testConstExprInSelect +-- 48. testConstExprInSelect select 'tst1' as key, count(1) as value from part; --- 51. testMultipleInserts3SWQs +-- 49. testMultipleInserts3SWQs CREATE TABLE part_1( p_mfgr STRING, p_name STRING, @@ -615,7 +567,7 @@ select * from part_3; --- 52. testGroupByHavingWithSWQAndAlias +-- 50. testGroupByHavingWithSWQAndAlias select p_mfgr, p_name, p_size, min(p_retailprice) as mi, rank() as r, denserank() as dr, @@ -626,7 +578,7 @@ distribute by p_mfgr sort by p_name; --- 53. testMultipleRangeWindows +-- 51. testMultipleRangeWindows select p_mfgr,p_name, p_size, sum(p_size) as s2 over (range between p_size 10 less and current row), sum(p_size) as s1 over (range between current row and p_size 10 more ) @@ -635,7 +587,7 @@ sort by p_mfgr, p_size window w1 as rows between 2 preceding and 2 following; --- 54. testMultipleInserts2SWQsWithPTF +-- 52. testMultipleInserts2SWQsWithPTF CREATE TABLE part_4( p_mfgr STRING, p_name STRING, @@ -680,18 +632,18 @@ select * from part_5; --- 55. testPartOrderInUDAFInvoke +-- 53. testPartOrderInUDAFInvoke select p_mfgr, p_name, p_size, sum(p_size) as s over (distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following) from part; --- 56. testPartOrderInWdwDef +-- 54. testPartOrderInWdwDef select p_mfgr, p_name, p_size, sum(p_size) as s over (w1) from part window w1 as distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following; --- 57. testDefaultPartitioningSpecRules +-- 55. testDefaultPartitioningSpecRules select p_mfgr, p_name, p_size, sum(p_size) as s over (w1), sum(p_size) as s2 over(w2) @@ -700,7 +652,7 @@ window w1 as distribute by p_mfgr rows between 2 preceding and 2 following, w2 as distribute by p_mfgr sort by p_name; --- 58. testWindowCrossReference +-- 56. testWindowCrossReference select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2) @@ -709,7 +661,7 @@ w2 as w1; --- 59. testWindowInheritance +-- 57. testWindowInheritance select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2) @@ -718,7 +670,7 @@ w2 as w1 rows between unbounded preceding and current row; --- 60. testWindowForwardReference +-- 58. testWindowForwardReference select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2), @@ -731,7 +683,7 @@ w3 as rows between unbounded preceding and current row; --- 61. testWindowDefinitionPropagation +-- 59. testWindowDefinitionPropagation select p_mfgr, p_name, p_size, sum(p_size) as s1 over (w1), sum(p_size) as s2 over (w2), @@ -743,7 +695,7 @@ w2 as w3, w3 as rows between unbounded preceding and current row; --- 62. testDistinctWithWindowing +-- 60. testDistinctWithWindowing select DISTINCT p_mfgr, p_name, p_size, sum(p_size) as s over (w1) from part @@ -751,7 +703,7 @@ sort by p_name window w1 as rows between 2 preceding and 2 following; --- 63. testMulti2OperatorsFunctionChainWithMap +-- 61. testMulti2OperatorsFunctionChainWithMap select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -768,7 +720,7 @@ distribute by p_mfgr,p_name sort by p_mfgr,p_name) ; --- 64. testMulti3OperatorsFunctionChain +-- 62. testMulti3OperatorsFunctionChain select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -785,7 +737,7 @@ distribute by p_mfgr sort by p_mfgr ) ; --- 65. testMultiOperatorChainWithNoWindowing +-- 63. testMultiOperatorChainWithNoWindowing select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -801,7 +753,7 @@ sort by p_mfgr)); --- 66. testMultiOperatorChainEndsWithNoopMap +-- 64. testMultiOperatorChainEndsWithNoopMap select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -818,7 +770,7 @@ distribute by p_mfgr,p_name sort by p_mfgr,p_name); ---67. testMultiOperatorChainWithDiffPartitionForWindow1 +--65. testMultiOperatorChainWithDiffPartitionForWindow1 select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -834,7 +786,7 @@ sort by p_mfgr )); ---68. testMultiOperatorChainWithDiffPartitionForWindow2 +--66. testMultiOperatorChainWithDiffPartitionForWindow2 select p_mfgr, p_name, rank() as r, denserank() as dr, @@ -848,7 +800,7 @@ sort by p_mfgr, p_name) )); --- 69. basic Npath test +-- 67. basic Npath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from npath( 'LATE.LATE+', @@ -860,7 +812,7 @@ sort by year, month, day_of_month ); --- 70. testRankWithPartitioning +-- 68. testRankWithPartitioning select p_mfgr, p_name, p_size, rank() as r over (distribute by p_mfgr sort by p_name ) from part; Index: ql/src/test/queries/clientpositive/ptf_seqfile.q =================================================================== --- ql/src/test/queries/clientpositive/ptf_seqfile.q (revision 0) +++ ql/src/test/queries/clientpositive/ptf_seqfile.q (revision 0) @@ -0,0 +1,24 @@ +DROP TABLE part_seq; + +CREATE TABLE part_seq( + p_partkey INT, + p_name STRING, + p_mfgr STRING, + p_brand STRING, + p_type STRING, + p_size INT, + p_container STRING, + p_retailprice DOUBLE, + p_comment STRING +) STORED AS SEQUENCEFILE ; + +LOAD DATA LOCAL INPATH '../data/files/part.seq' overwrite into table part_seq; + +-- testWindowingPTFWithPartSeqFile +select p_mfgr, p_name, p_size, +rank() as r, +denserank() as dr, +sum(p_retailprice) as s1 over (rows between unbounded preceding and current row) +from noop(part_seq +distribute by p_mfgr +sort by p_name);