http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q17.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q17.test 
b/testdata/workloads/tpch_nested/queries/tpch-q17.test
deleted file mode 100644
index d4b59f3..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q17.test
+++ /dev/null
@@ -1,25 +0,0 @@
-====
----- QUERY: TPCH-Q17
-# Q17 - Small-Quantity-Order Revenue Query
-select
-  sum(l_extendedprice) / 7.0 as avg_yearly
-from
-  customer.c_orders.o_lineitems l,
-  part p
-where
-  p_partkey = l_partkey
-  and p_brand = 'Brand#23'
-  and p_container = 'MED BOX'
-  and l_quantity < (
-    select
-      0.2 * avg(l_quantity)
-    from
-      customer.c_orders.o_lineitems l
-    where
-      l_partkey = p_partkey
-  )
----- RESULTS
-348406.05
----- TYPES
-decimal
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q18.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q18.test 
b/testdata/workloads/tpch_nested/queries/tpch-q18.test
deleted file mode 100644
index 658af2a..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q18.test
+++ /dev/null
@@ -1,81 +0,0 @@
-====
----- QUERY: TPCH-Q18
-# Q18 - Large Value Customer Query
-select
-  c_name,
-  c_custkey,
-  o_orderkey,
-  o_orderdate,
-  o_totalprice,
-  sum_quantity
-from
-  customer c,
-  c.c_orders o,
-  (select sum(l_quantity) sum_quantity from o.o_lineitems) l
-where
-  sum_quantity > 300
-order by
-  o_totalprice desc,
-  o_orderdate
-limit 100
----- RESULTS
-'Customer#000128120',128120,4722021,'1994-04-07',544089.09,323.00
-'Customer#000144617',144617,3043270,'1997-02-12',530604.44,317.00
-'Customer#000013940',13940,2232932,'1997-04-13',522720.61,304.00
-'Customer#000066790',66790,2199712,'1996-09-30',515531.82,327.00
-'Customer#000046435',46435,4745607,'1997-07-03',508047.99,309.00
-'Customer#000015272',15272,3883783,'1993-07-28',500241.33,302.00
-'Customer#000146608',146608,3342468,'1994-06-12',499794.58,303.00
-'Customer#000096103',96103,5984582,'1992-03-16',494398.79,312.00
-'Customer#000024341',24341,1474818,'1992-11-15',491348.26,302.00
-'Customer#000137446',137446,5489475,'1997-05-23',487763.25,311.00
-'Customer#000107590',107590,4267751,'1994-11-04',485141.38,301.00
-'Customer#000050008',50008,2366755,'1996-12-09',483891.26,302.00
-'Customer#000015619',15619,3767271,'1996-08-07',480083.96,318.00
-'Customer#000077260',77260,1436544,'1992-09-12',479499.43,307.00
-'Customer#000109379',109379,5746311,'1996-10-10',478064.11,302.00
-'Customer#000054602',54602,5832321,'1997-02-09',471220.08,307.00
-'Customer#000105995',105995,2096705,'1994-07-03',469692.58,307.00
-'Customer#000148885',148885,2942469,'1992-05-31',469630.44,313.00
-'Customer#000114586',114586,551136,'1993-05-19',469605.59,308.00
-'Customer#000105260',105260,5296167,'1996-09-06',469360.57,303.00
-'Customer#000147197',147197,1263015,'1997-02-02',467149.67,320.00
-'Customer#000064483',64483,2745894,'1996-07-04',466991.35,304.00
-'Customer#000136573',136573,2761378,'1996-05-31',461282.73,301.00
-'Customer#000016384',16384,502886,'1994-04-12',458378.92,312.00
-'Customer#000117919',117919,2869152,'1996-06-20',456815.92,317.00
-'Customer#000012251',12251,735366,'1993-11-24',455107.26,309.00
-'Customer#000120098',120098,1971680,'1995-06-14',453451.23,308.00
-'Customer#000066098',66098,5007490,'1992-08-07',453436.16,304.00
-'Customer#000117076',117076,4290656,'1997-02-05',449545.85,301.00
-'Customer#000129379',129379,4720454,'1997-06-07',448665.79,303.00
-'Customer#000126865',126865,4702759,'1994-11-07',447606.65,320.00
-'Customer#000088876',88876,983201,'1993-12-30',446717.46,304.00
-'Customer#000036619',36619,4806726,'1995-01-17',446704.09,328.00
-'Customer#000141823',141823,2806245,'1996-12-29',446269.12,310.00
-'Customer#000053029',53029,2662214,'1993-08-13',446144.49,302.00
-'Customer#000018188',18188,3037414,'1995-01-25',443807.22,308.00
-'Customer#000066533',66533,29158,'1995-10-21',443576.50,305.00
-'Customer#000037729',37729,4134341,'1995-06-29',441082.97,309.00
-'Customer#000003566',3566,2329187,'1998-01-04',439803.36,304.00
-'Customer#000045538',45538,4527553,'1994-05-22',436275.31,305.00
-'Customer#000081581',81581,4739650,'1995-11-04',435405.90,305.00
-'Customer#000119989',119989,1544643,'1997-09-20',434568.25,320.00
-'Customer#000003680',3680,3861123,'1998-07-03',433525.97,301.00
-'Customer#000113131',113131,967334,'1995-12-15',432957.75,301.00
-'Customer#000141098',141098,565574,'1995-09-24',430986.69,301.00
-'Customer#000093392',93392,5200102,'1997-01-22',425487.51,304.00
-'Customer#000015631',15631,1845057,'1994-05-12',419879.59,302.00
-'Customer#000112987',112987,4439686,'1996-09-17',418161.49,305.00
-'Customer#000012599',12599,4259524,'1998-02-12',415200.61,304.00
-'Customer#000105410',105410,4478371,'1996-03-05',412754.51,302.00
-'Customer#000149842',149842,5156581,'1994-05-30',411329.35,302.00
-'Customer#000010129',10129,5849444,'1994-03-21',409129.85,309.00
-'Customer#000069904',69904,1742403,'1996-10-19',408513.00,305.00
-'Customer#000017746',17746,6882,'1997-04-09',408446.93,303.00
-'Customer#000013072',13072,1481925,'1998-03-15',399195.47,301.00
-'Customer#000082441',82441,857959,'1994-02-07',382579.74,305.00
-'Customer#000088703',88703,2995076,'1994-01-30',363812.12,302.00
----- TYPES
-STRING, BIGINT, BIGINT, STRING, DECIMAL, DECIMAL
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q19.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q19.test 
b/testdata/workloads/tpch_nested/queries/tpch-q19.test
deleted file mode 100644
index 6bbe4f8..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q19.test
+++ /dev/null
@@ -1,43 +0,0 @@
-====
----- QUERY: TPCH-Q19
-# Q19 - Discounted Revenue Query
-select
-  sum(l_extendedprice * (1 - l_discount)) as revenue
-from
-  customer.c_orders.o_lineitems l,
-  part p
-where
-  p_partkey = l_partkey
-  and (
-    (
-      p_brand = 'Brand#12'
-      and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG')
-      and l_quantity >= 1 and l_quantity <= 11
-      and p_size between 1 and 5
-      and l_shipmode in ('AIR', 'AIR REG')
-      and l_shipinstruct = 'DELIVER IN PERSON'
-    )
-    or
-    (
-      p_brand = 'Brand#23'
-      and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')
-      and l_quantity >= 10 and l_quantity <= 20
-      and p_size between 1 and 10
-      and l_shipmode in ('AIR', 'AIR REG')
-      and l_shipinstruct = 'DELIVER IN PERSON'
-    )
-    or
-    (
-      p_brand = 'Brand#34'
-      and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG')
-      and l_quantity >= 20 and l_quantity <= 30
-      and p_size between 1 and 15
-      and l_shipmode in ('AIR', 'AIR REG')
-      and l_shipinstruct = 'DELIVER IN PERSON'
-    )
-  )
----- RESULTS
-3083843.0578
----- TYPES
-decimal
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q2.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q2.test 
b/testdata/workloads/tpch_nested/queries/tpch-q2.test
deleted file mode 100644
index 0ef4768..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q2.test
+++ /dev/null
@@ -1,147 +0,0 @@
-====
----- QUERY: TPCH-Q2
-# Q2 - Minimum Cost Supplier Query
-select
-  s_acctbal,
-  s_name,
-  n_name,
-  p_partkey,
-  p_mfgr,
-  s_address,
-  s_phone,
-  s_comment
-from
-  supplier s,
-  s.s_partsupps ps,
-  part p,
-  region r,
-  r.r_nations n
-where
-  p_partkey = ps_partkey
-  and p_size = 15
-  and p_type like '%BRASS'
-  and s_nationkey = n_nationkey
-  and r_name = 'EUROPE'
-  and ps_supplycost = (
-    select
-      min(ps_supplycost)
-    from
-      supplier s,
-      s.s_partsupps ps,
-      region r,
-      r.r_nations n
-    where
-      p_partkey = ps_partkey
-      and s_nationkey = n_nationkey
-      and r_name = 'EUROPE'
-    )
-order by
-  s_acctbal desc,
-  n_name,
-  s_name,
-  p_partkey
-limit 100
----- RESULTS
-9938.53,'Supplier#000005359','UNITED 
KINGDOM',185358,'Manufacturer#4','QKuHYh,vZGiwu2FWEJoLDx04','33-429-790-6131','uriously
 regular requests hag'
-9937.84,'Supplier#000005969','ROMANIA',108438,'Manufacturer#1','ANDENSOSmk,miq23Xfb5RWt6dvUcvt6Qa','29-520-692-3537','efully
 express instructions. regular requests against the slyly fin'
-9936.22,'Supplier#000005250','UNITED 
KINGDOM',249,'Manufacturer#4','B3rqp0xbSEim4Mpy2RH J','33-320-228-2957','etect 
about the furiously final accounts. slyly ironic pinto beans sleep inside the 
furiously'
-9923.77,'Supplier#000002324','GERMANY',29821,'Manufacturer#4','y3OD9UywSTOk','17-779-299-1839','ackages
 boost blithely. blithely regular deposits c'
-9871.22,'Supplier#000006373','GERMANY',43868,'Manufacturer#5','J8fcXWsTqM','17-813-485-8637','etect
 blithely bold asymptotes. fluffily ironic platelets wake furiously; blit'
-9870.78,'Supplier#000001286','GERMANY',81285,'Manufacturer#2','YKA,E2fjiVd7eUrzp2Ef8j1QxGo2DFnosaTEH','17-516-924-4574','
 regular accounts. furiously unusual courts above the fi'
-9870.78,'Supplier#000001286','GERMANY',181285,'Manufacturer#4','YKA,E2fjiVd7eUrzp2Ef8j1QxGo2DFnosaTEH','17-516-924-4574','
 regular accounts. furiously unusual courts above the fi'
-9852.52,'Supplier#000008973','RUSSIA',18972,'Manufacturer#2','t5L67YdBYYH6o,Vz24jpDyQ9','32-188-594-7038','rns
 wake final foxes. carefully unusual depende'
-9847.83,'Supplier#000008097','RUSSIA',130557,'Manufacturer#2','xMe97bpE69NzdwLoX','32-375-640-3593','
 the special excuses. silent sentiments serve carefully final ac'
-9847.57,'Supplier#000006345','FRANCE',86344,'Manufacturer#1','VSt3rzk3qG698u6ld8HhOByvrTcSTSvQlDQDag','16-886-766-7945','ges.
 slyly regular requests are. ruthless, express excuses cajole blithely across 
the unu'
-9847.57,'Supplier#000006345','FRANCE',173827,'Manufacturer#2','VSt3rzk3qG698u6ld8HhOByvrTcSTSvQlDQDag','16-886-766-7945','ges.
 slyly regular requests are. ruthless, express excuses cajole blithely across 
the unu'
-9836.93,'Supplier#000007342','RUSSIA',4841,'Manufacturer#4','JOlK7C1,7xrEZSSOw','32-399-414-5385','blithely
 carefully bold theodolites. fur'
-9817.10,'Supplier#000002352','RUSSIA',124815,'Manufacturer#2','4LfoHUZjgjEbAKw 
TgdKcgOc4D4uCYw','32-551-831-1437','wake carefully alongside of the carefully 
final ex'
-9817.10,'Supplier#000002352','RUSSIA',152351,'Manufacturer#3','4LfoHUZjgjEbAKw 
TgdKcgOc4D4uCYw','32-551-831-1437','wake carefully alongside of the carefully 
final ex'
-9739.86,'Supplier#000003384','FRANCE',138357,'Manufacturer#2','o,Z3v4POifevE 
k9U1b 6J1ucX,I','16-494-913-5925','s after the furiously bold packages sleep 
fluffily idly final requests: quickly final'
-9721.95,'Supplier#000008757','UNITED 
KINGDOM',156241,'Manufacturer#3','Atg6GnM4dT2','33-821-407-2995','eep furiously 
sauternes; quickl'
-9681.33,'Supplier#000008406','RUSSIA',78405,'Manufacturer#1',',qUuXcftUl','32-139-873-8571','haggle
 slyly regular excuses. quic'
-9643.55,'Supplier#000005148','ROMANIA',107617,'Manufacturer#1','kT4ciVFslx9z4s79p
 Js825','29-252-617-4850','final excuses. final ideas boost quickly furiously 
speci'
-9624.82,'Supplier#000001816','FRANCE',34306,'Manufacturer#3','e7vab91vLJPWxxZnewmnDBpDmxYHrb','16-392-237-6726','e
 packages are around the special ideas. special, pending foxes us'
-9624.78,'Supplier#000009658','ROMANIA',189657,'Manufacturer#1','oE9uBgEfSS4opIcepXyAYM,x','29-748-876-2014','ronic
 asymptotes wake bravely final'
-9612.94,'Supplier#000003228','ROMANIA',120715,'Manufacturer#2','KDdpNKN3cWu7ZSrbdqp7AfSLxx,qWB','29-325-784-8187','warhorses.
 quickly even deposits sublate daringly ironic instructions. slyly blithe t'
-9612.94,'Supplier#000003228','ROMANIA',198189,'Manufacturer#4','KDdpNKN3cWu7ZSrbdqp7AfSLxx,qWB','29-325-784-8187','warhorses.
 quickly even deposits sublate daringly ironic instructions. slyly blithe t'
-9571.83,'Supplier#000004305','ROMANIA',179270,'Manufacturer#2','qNHZ7WmCzygwMPRDO9Ps','29-973-481-1831','kly
 carefully express asymptotes. furiou'
-9558.10,'Supplier#000003532','UNITED 
KINGDOM',88515,'Manufacturer#4','EOeuiiOn21OVpTlGguufFDFsbN1p0lhpxHp','33-152-301-2164','
 foxes. quickly even excuses use. slyly special foxes nag bl'
-9492.79,'Supplier#000005975','GERMANY',25974,'Manufacturer#5','S6mIiCTx82z7lV','17-992-579-4839','arefully
 pending accounts. blithely regular excuses boost carefully carefully ironic p'
-9461.05,'Supplier#000002536','UNITED 
KINGDOM',20033,'Manufacturer#1','8mmGbyzaU 
7ZS2wJumTibypncu9pNkDc4FYA','33-556-973-5522','. slyly regular deposits wake 
slyly. furiously regular warthogs are.'
-9453.01,'Supplier#000000802','ROMANIA',175767,'Manufacturer#1',',6HYXb4uaHITmtMBj4Ak57Pd','29-342-882-6463','gular
 frets. permanently special multipliers believe blithely alongs'
-9408.65,'Supplier#000007772','UNITED 
KINGDOM',117771,'Manufacturer#4','AiC5YAH,gdu0i7','33-152-491-1126','nag 
against the final requests. furiously unusual packages cajole blit'
-9359.61,'Supplier#000004856','ROMANIA',62349,'Manufacturer#5','HYogcF3Jb 
yh1','29-334-870-9731','y ironic theodolites. blithely sile'
-9357.45,'Supplier#000006188','UNITED 
KINGDOM',138648,'Manufacturer#1','g801,ssP8wpTk4Hm','33-583-607-1633','ously 
always regular packages. fluffily even accounts beneath the furiously final 
pack'
-9352.04,'Supplier#000003439','GERMANY',170921,'Manufacturer#4','qYPDgoiBGhCYxjgC','17-128-996-4650','
 according to the carefully bold ideas'
-9312.97,'Supplier#000007807','RUSSIA',90279,'Manufacturer#5','oGYMPCk9XHGB2PBfKRnHA','32-673-872-5854','ecial
 packages among the pending, even requests use regula'
-9312.97,'Supplier#000007807','RUSSIA',100276,'Manufacturer#5','oGYMPCk9XHGB2PBfKRnHA','32-673-872-5854','ecial
 packages among the pending, even requests use regula'
-9280.27,'Supplier#000007194','ROMANIA',47193,'Manufacturer#3','zhRUQkBSrFYxIAXTfInj
 vyGRQjeK','29-318-454-2133','o beans haggle after the furiously unusual 
deposits. carefully silent dolphins cajole carefully'
-9274.80,'Supplier#000008854','RUSSIA',76346,'Manufacturer#3','1xhLoOUM7I3mZ1mKnerw
 OSqdbb4QbGa','32-524-148-5221','y. courts do wake slyly. carefully ironic 
platelets haggle above the slyly regular the'
-9249.35,'Supplier#000003973','FRANCE',26466,'Manufacturer#1','d18GiDsL6Wm2IsGXM,RZf1jCsgZAOjNYVThTRP4','16-722-866-1658','uests
 are furiously. regular tithes through the regular, final accounts cajole 
furiously above the q'
-9249.35,'Supplier#000003973','FRANCE',33972,'Manufacturer#1','d18GiDsL6Wm2IsGXM,RZf1jCsgZAOjNYVThTRP4','16-722-866-1658','uests
 are furiously. regular tithes through the regular, final accounts cajole 
furiously above the q'
-9208.70,'Supplier#000007769','ROMANIA',40256,'Manufacturer#5','rsimdze 5o9P 
Ht7xS','29-964-424-9649','lites was quickly above the furiously ironic 
requests. slyly even foxes against the blithely bold '
-9201.47,'Supplier#000009690','UNITED KINGDOM',67183,'Manufacturer#5','CB 
BnUTlmi5zdeEl7R7','33-121-267-9529','e even, even foxes. blithely ironic 
packages cajole regular packages. slyly final ide'
-9192.10,'Supplier#000000115','UNITED KINGDOM',85098,'Manufacturer#3','nJ 
2t0f7Ve,wL1,6WzGBJLNBUCKlsV','33-597-248-1220','es across the carefully express 
accounts boost caref'
-9189.98,'Supplier#000001226','GERMANY',21225,'Manufacturer#4','qsLCqSvLyZfuXIpjz','17-725-903-1381','
 deposits. blithely bold excuses about the slyly bold forges wake '
-9128.97,'Supplier#000004311','RUSSIA',146768,'Manufacturer#5','I8IjnXd7NSJRs594RxsRR0','32-155-440-7120','refully.
 blithely unusual asymptotes haggle '
-9104.83,'Supplier#000008520','GERMANY',150974,'Manufacturer#4','RqRVDgD0ER J9 
b41vR2,3','17-728-804-1793','ly about the blithely ironic depths. slyly final 
theodolites among the fluffily bold ideas print'
-9101.00,'Supplier#000005791','ROMANIA',128254,'Manufacturer#5','zub2zCV,jhHPPQqi,P2INAjE1zI
 n66cOEoXFG','29-549-251-5384','ts. notornis detect blithely above the 
carefully bold requests. blithely even package'
-9094.57,'Supplier#000004582','RUSSIA',39575,'Manufacturer#1','WB0XkCSG3r,mnQ 
n,h9VIxjjr9ARHFvKgMDf','32-587-577-1351','jole. regular accounts sleep blithely 
frets. final pinto beans play furiously past the '
-8996.87,'Supplier#000004702','FRANCE',102191,'Manufacturer#5','8XVcQK23akp','16-811-269-8946','ickly
 final packages along the express plat'
-8996.14,'Supplier#000009814','ROMANIA',139813,'Manufacturer#2','af0O5pg83lPU4IDVmEylXZVqYZQzSDlYLAmR','29-995-571-8781','
 dependencies boost quickly across the furiously pending requests! unusual 
dolphins play sl'
-8968.42,'Supplier#000010000','ROMANIA',119999,'Manufacturer#5','aTGLEusCiL4F 
PDBdv665XBJhPyCOB0i','29-578-432-2146','ly regular foxes boost slyly. quickly 
special waters boost carefully ironi'
-8936.82,'Supplier#000007043','UNITED 
KINGDOM',109512,'Manufacturer#1','FVajceZInZdbJE6Z9XsRUxrUEpiwHDrOXi,1Rz','33-784-177-8208','efully
 regular courts. furiousl'
-8929.42,'Supplier#000008770','FRANCE',173735,'Manufacturer#4','R7cG26TtXrHAP9 
HckhfRi','16-242-746-9248','cajole furiously unusual requests. quickly stealthy 
requests are. '
-8920.59,'Supplier#000003967','ROMANIA',26460,'Manufacturer#1','eHoAXe62SY9','29-194-731-3944','aters.
 express, pending instructions sleep. brave, r'
-8920.59,'Supplier#000003967','ROMANIA',173966,'Manufacturer#2','eHoAXe62SY9','29-194-731-3944','aters.
 express, pending instructions sleep. brave, r'
-8913.96,'Supplier#000004603','UNITED 
KINGDOM',137063,'Manufacturer#2','OUzlvMUr7n,utLxmPNeYKSf3T24OXskxB5','33-789-255-7342','
 haggle slyly above the furiously regular pinto beans. even '
-8877.82,'Supplier#000007967','FRANCE',167966,'Manufacturer#5','A3pi1BARM4nx6R,qrwFoRPU','16-442-147-9345','ously
 foxes. express, ironic requests im'
-8862.24,'Supplier#000003323','ROMANIA',73322,'Manufacturer#3','W9 
lYcsC9FwBqk3ItL','29-736-951-3710','ly pending ideas sleep about the furiously 
unu'
-8841.59,'Supplier#000005750','ROMANIA',100729,'Manufacturer#5','Erx3lAgu0g62iaHF9x50uMH4EgeN9hEG','29-344-502-5481','gainst
 the pinto beans. fluffily unusual dependencies affix slyly even deposits.'
-8781.71,'Supplier#000003121','ROMANIA',13120,'Manufacturer#5','wNqTogx238ZYCamFb,50v,bj
 4IbNFW9Bvw1xP','29-707-291-5144','s wake quickly ironic ideas'
-8754.24,'Supplier#000009407','UNITED 
KINGDOM',179406,'Manufacturer#4','CHRCbkaWcf5B','33-903-970-9604','e ironic 
requests. carefully even foxes above the furious'
-8691.06,'Supplier#000004429','UNITED 
KINGDOM',126892,'Manufacturer#2','k,BQms5UhoAF1B2Asi,fLib','33-964-337-5038','efully
 express deposits kindle after the deposits. final '
-8655.99,'Supplier#000006330','RUSSIA',193810,'Manufacturer#2','UozlaENr0ytKe2w6CeIEWFWn
 iO3S8Rae7Ou','32-561-198-3705','symptotes use about the express dolphins. 
requests use after the express platelets. final, ex'
-8638.36,'Supplier#000002920','RUSSIA',75398,'Manufacturer#1','Je2a8bszf3L','32-122-621-7549','ly
 quickly ironic requests. even requests whithout t'
-8638.36,'Supplier#000002920','RUSSIA',170402,'Manufacturer#3','Je2a8bszf3L','32-122-621-7549','ly
 quickly ironic requests. even requests whithout t'
-8607.69,'Supplier#000006003','UNITED 
KINGDOM',76002,'Manufacturer#2','EH9wADcEiuenM0NR08zDwMidw,52Y2RyILEiA','33-416-807-5206','ar,
 pending accounts. pending depende'
-8569.52,'Supplier#000005936','RUSSIA',5935,'Manufacturer#5','jXaNZ6vwnEWJ2ksLZJpjtgt0bY2a3AU','32-644-251-7916','.
 regular foxes nag carefully atop the regular, silent deposits. quickly regular 
packages '
-8564.12,'Supplier#000000033','GERMANY',110032,'Manufacturer#1','gfeKpYw3400L0SDywXA6Ya1Qmq1w6YB9f3R','17-138-897-9374','n
 sauternes along the regular asymptotes are regularly along the '
-8553.82,'Supplier#000003979','ROMANIA',143978,'Manufacturer#4','BfmVhCAnCMY3jzpjUMy4CNWs9
 HzpdQR7INJU','29-124-646-4897','ic requests wake against the blithely unusual 
accounts. fluffily r'
-8517.23,'Supplier#000009529','RUSSIA',37025,'Manufacturer#5','e44R8o7JAIS9iMcr','32-565-297-8775','ove
 the even courts. furiously special platelets '
-8517.23,'Supplier#000009529','RUSSIA',59528,'Manufacturer#2','e44R8o7JAIS9iMcr','32-565-297-8775','ove
 the even courts. furiously special platelets '
-8503.70,'Supplier#000006830','RUSSIA',44325,'Manufacturer#4','BC4WFCYRUZyaIgchU
 4S','32-147-878-5069','pades cajole. furious packages among the carefully 
express excuses boost furiously across th'
-8457.09,'Supplier#000009456','UNITED 
KINGDOM',19455,'Manufacturer#1','7SBhZs8gP1cJjT0Qf433YBk','33-858-440-4349','cing
 requests along the furiously unusual deposits promise among the furiously unus'
-8441.40,'Supplier#000003817','FRANCE',141302,'Manufacturer#2','hU3fz3xL78','16-339-356-5115','ely
 even ideas. ideas wake slyly furiously unusual instructions. pinto beans sleep 
ag'
-8432.89,'Supplier#000003990','RUSSIA',191470,'Manufacturer#1','wehBBp1RQbfxAYDASS75MsywmsKHRVdkrvNe6m','32-839-509-9301','ep
 furiously. packages should have to haggle slyly across the deposits. furiously 
regu'
-8431.40,'Supplier#000002675','ROMANIA',5174,'Manufacturer#1','HJFStOu9R5NGPOegKhgbzBdyvrG2yh8w','29-474-643-1443','ithely
 express pinto beans. blithely even foxes haggle. furiously regular theodol'
-8407.04,'Supplier#000005406','RUSSIA',162889,'Manufacturer#4','j7 
gYF5RW8DC5UrjKC','32-626-152-4621','r the blithely regular packages. slyly 
ironic theodoli'
-8386.08,'Supplier#000008518','FRANCE',36014,'Manufacturer#3','2jqzqqAVe9crMVGP,n9nTsQXulNLTUYoJjEDcqWV','16-618-780-7481','blithely
 bold pains are carefully platelets. finally regular pinto beans sleep 
carefully special'
-8376.52,'Supplier#000005306','UNITED KINGDOM',190267,'Manufacturer#5','9t8Y8 
QqSIsoADPt6NLdk,TP5zyRx41oBUlgoGc9','33-632-514-7931','ly final accounts sleep 
special, regular requests. furiously regular'
-8348.74,'Supplier#000008851','FRANCE',66344,'Manufacturer#4','nWxi7GwEbjhw1','16-796-240-2472','
 boldly final deposits. regular, even instructions detect slyly. fluffily 
unusual pinto bea'
-8338.58,'Supplier#000007269','FRANCE',17268,'Manufacturer#4','ZwhJSwABUoiB04,3','16-267-277-4365','iously
 final accounts. even pinto beans cajole slyly regular'
-8328.46,'Supplier#000001744','ROMANIA',69237,'Manufacturer#5','oLo3fV64q2,FKHa3p,qHnS7Yzv,ps8','29-330-728-5873','ep
 carefully-- even, careful packages are slyly along t'
-8307.93,'Supplier#000003142','GERMANY',18139,'Manufacturer#1','dqblvV8dCNAorGlJ','17-595-447-6026','olites
 wake furiously regular decoys. final requests nod '
-8231.61,'Supplier#000009558','RUSSIA',192000,'Manufacturer#2','mcdgen,yT1iJDHDS5fV','32-762-137-5858','
 foxes according to the furi'
-8152.61,'Supplier#000002731','ROMANIA',15227,'Manufacturer#4',' 
nluXJCuY1tu','29-805-463-2030',' special requests. even, regular warhorses 
affix among the final gr'
-8109.09,'Supplier#000009186','FRANCE',99185,'Manufacturer#1','wgfosrVPexl9pEXWywaqlBMDYYf','16-668-570-1402','tions
 haggle slyly about the sil'
-8102.62,'Supplier#000003347','UNITED KINGDOM',18344,'Manufacturer#5','m 
CtXS2S16i','33-454-274-8532','egrate with the slyly bold instructions. special 
foxes haggle silently among the'
-8046.07,'Supplier#000008780','FRANCE',191222,'Manufacturer#3','AczzuE0UK9osj 
,Lx0Jmh','16-473-215-6395','onic platelets cajole after the regular 
instructions. permanently bold excuses'
-8042.09,'Supplier#000003245','RUSSIA',135705,'Manufacturer#4','Dh8Ikg39onrbOL4DyTfGw8a9oKUX3d9Y','32-836-132-8872','osits.
 packages cajole slyly. furiously regular deposits cajole slyly. q'
-8042.09,'Supplier#000003245','RUSSIA',150729,'Manufacturer#1','Dh8Ikg39onrbOL4DyTfGw8a9oKUX3d9Y','32-836-132-8872','osits.
 packages cajole slyly. furiously regular deposits cajole slyly. q'
-7992.40,'Supplier#000006108','FRANCE',118574,'Manufacturer#1','8tBydnTDwUqfBfFV4l3','16-974-998-8937','
 ironic ideas? fluffily even instructions wake. blithel'
-7980.65,'Supplier#000001288','FRANCE',13784,'Manufacturer#4','zE,7HgVPrCn','16-646-464-8247','ully
 bold courts. escapades nag slyly. furiously fluffy theodo'
-7950.37,'Supplier#000008101','GERMANY',33094,'Manufacturer#5','kkYvL6IuvojJgTNG
 IKkaXQDYgx8ILohj','17-627-663-8014','arefully unusual requests x-ray above the 
quickly final deposits. '
-7937.93,'Supplier#000009012','ROMANIA',83995,'Manufacturer#2','iUiTziH,Ek3i4lwSgunXMgrcTzwdb','29-250-925-9690','to
 the blithely ironic deposits nag sly'
-7914.45,'Supplier#000001013','RUSSIA',125988,'Manufacturer#2','riRcntps4KEDtYScjpMIWeYF6mNnR','32-194-698-3365','
 busily bold packages are dolphi'
-7912.91,'Supplier#000004211','GERMANY',159180,'Manufacturer#5','2wQRVovHrm3,v03IKzfTd,1PYsFXQFFOG','17-266-947-7315','ay
 furiously regular platelets. cou'
-7912.91,'Supplier#000004211','GERMANY',184210,'Manufacturer#4','2wQRVovHrm3,v03IKzfTd,1PYsFXQFFOG','17-266-947-7315','ay
 furiously regular platelets. cou'
-7894.56,'Supplier#000007981','GERMANY',85472,'Manufacturer#4','NSJ96vMROAbeXP','17-963-404-3760','ic
 platelets affix after the furiously'
-7887.08,'Supplier#000009792','GERMANY',164759,'Manufacturer#3','Y28ITVeYriT3kIGdV2K8fSZ
 V2UqT5H1Otz','17-988-938-4296','ckly around the carefully fluffy theodolites. 
slyly ironic pack'
-7871.50,'Supplier#000007206','RUSSIA',104695,'Manufacturer#1','3w 
fNCnrVmvJjE95sgWZzvW','32-432-452-7731','ironic requests. furiously final 
theodolites cajole. final, express packages sleep. quickly reg'
-7852.45,'Supplier#000005864','RUSSIA',8363,'Manufacturer#4','WCNfBPZeSXh3h,c','32-454-883-3821','usly
 unusual pinto beans. brave ideas sleep carefully quickly ironi'
-7850.66,'Supplier#000001518','UNITED 
KINGDOM',86501,'Manufacturer#1','ONda3YJiHKJOC','33-730-383-3892','ifts haggle 
fluffily pending pai'
-7843.52,'Supplier#000006683','FRANCE',11680,'Manufacturer#4','2Z0JGkiv01Y00oCFwUGfviIbhzCdy','16-464-517-8943','
 express, final pinto beans x-ray slyly asymptotes. unusual, unusual'
----- TYPES
-DECIMAL, STRING, STRING, BIGINT, STRING, STRING, STRING, STRING
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q20.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q20.test 
b/testdata/workloads/tpch_nested/queries/tpch-q20.test
deleted file mode 100644
index 87b1dcd..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q20.test
+++ /dev/null
@@ -1,226 +0,0 @@
-====
----- QUERY: TPCH-Q20
-# Q20 - Potential Part Promotion Query
-# Note: Tricky rewrite from the original to avoid mixing
-# correlated and uncorrelated table refs in a subquery.
-select distinct
-  s_name,
-  s_address
-from
-  supplier s,
-  s.s_partsupps ps,
-  region.r_nations n
-where
-  ps_partkey in (
-      select
-        p_partkey
-      from
-        part p
-      where
-        p_name like 'forest%'
-  )
-  and ps_availqty > (
-      select
-        0.5 * sum(l_quantity)
-      from
-        customer.c_orders.o_lineitems l
-      where
-        l_partkey = ps_partkey
-        and l_suppkey = s_suppkey
-        and l_shipdate >= '1994-01-01'
-        and l_shipdate < '1995-01-01'
-  )
-  and s_nationkey = n_nationkey
-  and n_name = 'CANADA'
-order by
-  s_name
----- RESULTS
-'Supplier#000000020','iybAE,RmTymrZVYaFZva2SH,j'
-'Supplier#000000091','YV45D7TkfdQanOOZ7q9QxkyGUapU1oOWU6q3'
-'Supplier#000000205','rF uV8d0JNEk'
-'Supplier#000000285','Br7e1nnt1yxrw6ImgpJ7YdhFDjuBf'
-'Supplier#000000287','7a9SP7qW5Yku5PvSg'
-'Supplier#000000354','w8fOo5W,aS'
-'Supplier#000000378','FfbhyCxWvcPrO8ltp9'
-'Supplier#000000402','i9Sw4DoyMhzhKXCH9By,AYSgmD'
-'Supplier#000000530','0qwCMwobKY OcmLyfRXlagA8ukENJv,'
-'Supplier#000000555','TfB,a5bfl3Ah 3Z 74GqnNs6zKVGM'
-'Supplier#000000640','mvvtlQKsTOsJj5Ihk7,cq'
-'Supplier#000000729','pqck2ppy758TQpZCUAjPvlU55K3QjfL7Bi'
-'Supplier#000000736','l6i2nMwVuovfKnuVgaSGK2rDy65DlAFLegiL7'
-'Supplier#000000761','zlSLelQUj2XrvTTFnv7WAcYZGvvMTx882d4'
-'Supplier#000000887','urEaTejH5POADP2ARrf'
-'Supplier#000000935','ij98czM 2KzWe7dDTOxB8sq0UfCdvrX'
-'Supplier#000000975',',AC e,tBpNwKb5xMUzeohxlRn, hdZJo73gFQF8y'
-'Supplier#000001263','rQWr6nf8ZhB2TAiIDIvo5Io'
-'Supplier#000001367','42YSkFcAXMMcucsqeEefOE4HeCC'
-'Supplier#000001426','bPOCc086oFm8sLtS,fGrH'
-'Supplier#000001446','lch9HMNU1R7a0LIybsUodVknk6'
-'Supplier#000001500','wDmF5xLxtQch9ctVu,'
-'Supplier#000001602','uKNWIeafaM644'
-'Supplier#000001626','UhxNRzUu1dtFmp0'
-'Supplier#000001682','pXTkGxrTQVyH1Rr'
-'Supplier#000001700','7hMlCof1Y5zLFg'
-'Supplier#000001726','TeRY7TtTH24sEword7yAaSkjx8'
-'Supplier#000001730','Rc8e,1Pybn r6zo0VJIEiD0UD vhk'
-'Supplier#000001746','qWsendlOekQG1aW4uq06uQaCm51se8lirv7 hBRd'
-'Supplier#000001806','M934fuZSnLW'
-'Supplier#000001855','MWk6EAeozXb'
-'Supplier#000001931','FpJbMU2h6ZR2eBv8I9NIxF'
-'Supplier#000002022',' dwebGX7Id2pc25YvY33'
-'Supplier#000002036','20ytTtVObjKUUI2WCB0A'
-'Supplier#000002096','kuxseyLtq QPLXxm9ZUrnB6Kkh92JtK5cQzzXNU '
-'Supplier#000002117','MRtkgKolHJ9Wh X9J,urANHKDzvjr'
-'Supplier#000002204','uYmlr46C06udCqanj0KiRsoTQakZsEyssL'
-'Supplier#000002218','nODZw5q4dx kp0K5'
-'Supplier#000002243','nSOEV3JeOU79'
-'Supplier#000002245','hz2qWXWVjOyKhqPYMoEwz6zFkrTaDM'
-'Supplier#000002282','ES21K9dxoW1I1TzWCj7ekdlNwSWnv1Z  6mQ,BKn'
-'Supplier#000002303','nCoWfpB6YOymbgOht7ltfklpkHl'
-'Supplier#000002331','WRh2w5WFvRg7Z0S1AvSvHCL'
-'Supplier#000002373','RzHSxOTQmElCjxIBiVA52Z JB58rJhPRylR'
-'Supplier#000002419','qydBQd14I5l5mVXa4fYY'
-'Supplier#000002571','JZUugz04c iJFLrlGsz9O N,W 1rVHNIReyq'
-'Supplier#000002585','CsPoKpw2QuTY4AV1NkWuttneIa4SN'
-'Supplier#000002629','0Bw,q5Zp8su9XrzoCngZ3cAEXZwZ'
-'Supplier#000002721','HVdFAN2JHMQSpKm'
-'Supplier#000002730','lIFxR4fzm31C6,muzJwl84z'
-'Supplier#000002775','yDclaDaBD4ihH'
-'Supplier#000002799','lwr, 6L3gdfc79PQut,4XO6nQsTJY63cAyYO'
-'Supplier#000002934','m,trBENywSArwg3DhB'
-'Supplier#000002941','Naddba 8YTEKekZyP0'
-'Supplier#000003028','jouzgX0WZjhNMWLaH4fy'
-'Supplier#000003095','HxON3jJhUi3zjt,r mTD'
-'Supplier#000003143','hdolgh608uTkHh7t6qfSqkifKaiFjnCH'
-'Supplier#000003185','hMa535Cbf2mj1Nw4OWOKWVrsK0VdDkJURrdjSIJe'
-'Supplier#000003189','DWdPxt7 RnkZv6VOByR0em'
-'Supplier#000003201','E87yws6I,t0qNs4QW7UzExKiJnJDZWue'
-'Supplier#000003213','pxrRP4irQ1VoyfQ,dTf3'
-'Supplier#000003275','9xO4nyJ2QJcX6vGf'
-'Supplier#000003288','EDdfNt7E5Uc,xLTupoIgYL4yY7ujh,'
-'Supplier#000003314','jnisU8MzqO4iUB3zsPcrysMw3DDUojS4q7LD'
-'Supplier#000003373','iy8VM48ynpc3N2OsBwAvhYakO2us9R1bi'
-'Supplier#000003421','Sh3dt9W5oeofFWovnFhrg,'
-'Supplier#000003422','DJoCEapUeBXoV1iYiCcPFQvzsTv2ZI960'
-'Supplier#000003441','zvFJIzS,oUuShHjpcX'
-'Supplier#000003590','sy79CMLxqb,Cbo'
-'Supplier#000003607','lNqFHQYjwSAkf'
-'Supplier#000003625','qY588W0Yk5iaUy1RXTgNrEKrMAjBYHcKs'
-'Supplier#000003723','jZEp0OEythCLcS OmJSrFtxJ66bMlzSp'
-'Supplier#000003849','KgbZEaRk,6Q3mWvwh6uptrs1KRUHg 0'
-'Supplier#000003894','vvGC rameLOk'
-'Supplier#000003941','Pmb05mQfBMS618O7WKqZJ 9vyv'
-'Supplier#000004059','umEYZSq9RJ2WEzdsv9meU8rmqwzVLRgiZwC'
-'Supplier#000004207','tF64pwiOM4IkWjN3mS,e06WuAjLx'
-'Supplier#000004236','dl,HPtJmGipxYsSqn9wmqkuWjst,mCeJ8O6T'
-'Supplier#000004278','bBddbpBxIVp Di9'
-'Supplier#000004281','1OwPHh Pgiyeus,iZS5eA23JDOipwk'
-'Supplier#000004304','hQCAz59k,HLlp2CKUrcBIL'
-'Supplier#000004346','S3076LEOwo'
-'Supplier#000004406','Ah0ZaLu6VwufPWUz,7kbXgYZhauEaHqGIg'
-'Supplier#000004430','yvSsKNSTL5HLXBET4luOsPNLxKzAMk'
-'Supplier#000004527','p pVXCnxgcklWF6A1o3OHY3qW6'
-'Supplier#000004655','67NqBc4 t3PG3F8aO IsqWNq4kGaPowYL'
-'Supplier#000004851','Rj,x6IgLT7kBL99nqp'
-'Supplier#000004871',',phpt6AWEnUS8t4Avb50rFfdg7O9c6nU8xxv8eC5'
-'Supplier#000004884','42Z1uLye9nsn6aTGBNd dI8 x'
-'Supplier#000004975','GPq5PMKY6Wy'
-'Supplier#000005076','Xl7h9ifgvIHmqxFLgWfHK4Gjav BkP'
-'Supplier#000005195','Woi3b2ZaicPh ZSfu1EfXhE'
-'Supplier#000005256','Onc3t57VAMchm,pmoVLaU8bONni9NsuaM PzMMFz'
-'Supplier#000005257','f9g8SEHB7obMj3QXAjXS2vfYY22'
-'Supplier#000005300','gXG28YqpxU'
-'Supplier#000005323','tMCkdqbDoyNo8vMIkzjBqYexoRAuv,T6 qzcu'
-'Supplier#000005386','Ub6AAfHpWLWP'
-'Supplier#000005426','9Dz2OVT1q sb4BK71ljQ1XjPBYRPvO'
-'Supplier#000005465','63cYZenZBRZ613Q1FaoG0,smnC5zl9'
-'Supplier#000005484','saFdOR qW7AFY,3asPqiiAa11Mo22pCoN0BtPrKo'
-'Supplier#000005505','d2sbjG43KwMPX'
-'Supplier#000005506','On f5ypzoWgB'
-'Supplier#000005631','14TVrjlzo2SJEBYCDgpMwTlvwSqC'
-'Supplier#000005642','ZwKxAv3V40tW E8P7Qwu,zlu,kPsL'
-'Supplier#000005686','f2RBKec2T1NIi7yS M'
-'Supplier#000005730','5rkb0PSews HvxkL8JaD41UpnSF2cg8H1'
-'Supplier#000005736','2dq XTYhtYWSfp'
-'Supplier#000005737','dmEWcS32C3kx,d,B95 OmYn48'
-'Supplier#000005797',',o,OebwRbSDmVl9gN9fpWPCiqB UogvlSR'
-'Supplier#000005875','lK,sYiGzB94hSyHy9xvSZFbVQNCZe2LXZuGbS'
-'Supplier#000005974','REhR5jE,lLusQXvf54SwYySgsSSVFhu'
-'Supplier#000006059','4m0cv8MwJ9yX2vlwI Z'
-'Supplier#000006065','UiI2Cy3W4Tu5sLk LuvXLRy6KihlGv'
-'Supplier#000006093','KJNUg1odUT2wtCS2s6PrH3D6fd'
-'Supplier#000006099','aZilwQKYDTVPoK'
-'Supplier#000006109','rY5gbfh3dKHnylcQUTPGCwnbe'
-'Supplier#000006217','RVN23SYT9jenUeaWGXUd'
-'Supplier#000006297','73VRDOO56GUCyvc40oYJ'
-'Supplier#000006435','xIgE69XszYbnO4Eon7cHHO8y'
-'Supplier#000006463','7 wkdj2EO49iotley2kmIM ADpLSszGV3RNWj'
-'Supplier#000006478','bQYPnj9lpmW3U'
-'Supplier#000006521','b9 2zjHzxR'
-'Supplier#000006642','N,CUclSqRLJcS8zQ'
-'Supplier#000006659','iTLsnvD8D2GzWNUv kRInwRjk5rDeEmfup1'
-'Supplier#000006669','NQ4Yryj624p7K53'
-'Supplier#000006748','rC,2rEn8gKDIS5Q0dJEoiF'
-'Supplier#000006761','n4jhxGMqB5prD1HhpLvwrWStOLlla'
-'Supplier#000006808','HGd2Xo 9nEcHJhZvXjXxWKIpApT'
-'Supplier#000006858','fnlINT885vBBhsWwTGiZ0o22thwGY16h GHJj21'
-'Supplier#000006946','To6Slo0GJTqcIvD'
-'Supplier#000006949','mLxYUJhsGcLtKe ,GFirNu183AvT'
-'Supplier#000007072','2tRyX9M1a 4Rcm57s779F1ANG9jlpK'
-'Supplier#000007098','G3j8g0KC4OcbAu2OVoPHrXQWMCUdjq8wgCHOExu'
-'Supplier#000007132','xonvn0KAQIL3p8kYk HC1FSSDSUSTC'
-'Supplier#000007135','ls DoKV7V5ulfQy9V'
-'Supplier#000007147','Xzb16kC63wmLVYexUEgB0hXFvHkjT5iPpq'
-'Supplier#000007160','TqDGBULB3cTqIT6FKDvm9BS4e4v,zwYiQPb'
-'Supplier#000007169','tEc95D2moN9S84nd55O,dlnW'
-'Supplier#000007278','I2ae3rS7KVF8GVHtB'
-'Supplier#000007365','51xhROLvQMJ05DndtZWt'
-'Supplier#000007398','V8eE6oZ00OFNU,'
-'Supplier#000007402','4UVv58ery1rjmqSR5'
-'Supplier#000007448','yhhpWiJi7EJ6Q5VCaQ'
-'Supplier#000007458','BYuucapYkptZl6fnd2QaDyZmI9gR1Ih16e'
-'Supplier#000007477','9m9j0wfhWzCvVHxkU,PpAxwSH0h'
-'Supplier#000007509','q8,V6LJRoHJjHcOuSG7aLTMg'
-'Supplier#000007561','rMcFg2530VC'
-'Supplier#000007616','R IovIqzDi3,QHnaqZk1xS4hGAgelhP4yj'
-'Supplier#000007760','JsPE18PvcdFTK'
-'Supplier#000007801','69fi,U1r6enUb '
-'Supplier#000007865','5cDGCS,T6N'
-'Supplier#000007885','u3sicchh5ZpyTUpN1cJKNcAoabIWgY'
-'Supplier#000007926','ErzCF80K9Uy'
-'Supplier#000007998','LnASFBfYRFOo9d6d,asBvVq9Lo2P'
-'Supplier#000008090','eonbJZvoDFYBNUinYfp6yERIg'
-'Supplier#000008224','TWxt9f,LVER'
-'Supplier#000008231','IK7eGw Yj90sTdpsP,vcqWxLB'
-'Supplier#000008243','2AyePMkDqmzVzjGTizXthFLo8h EiudCMxOmIIG'
-'Supplier#000008323','75I18sZmASwm POeheRMdj9tmpyeQ,BfCXN5BIAb'
-'Supplier#000008366','h778cEj14BuW9OEKlvPTWq4iwASR6EBBXN7zeS8'
-'Supplier#000008532','Uc29q4,5xVdDOF87UZrxhr4xWS0ihEUXuh'
-'Supplier#000008595','MH0iB73GQ3z UW3O DbCbqmc'
-'Supplier#000008610','SgVgP90vP452sUNTgzL9zKwXHXAzV6tV'
-'Supplier#000008683','gLuGcugfpJSeGQARnaHNCaWnGaqsNnjyl20'
-'Supplier#000008705','aE,trRNdPx,4yinTD9O3DebDIp'
-'Supplier#000008742','HmPlQEzKCPEcTUL14,kKq'
-'Supplier#000008841','I 85Lu1sekbg2xrSIzm0'
-'Supplier#000008872','8D 45GgxJO2OwwYP9S4AaXJKvDwPfLM'
-'Supplier#000008879','rDSA,D9oPM,65NMWEFrmGKAu'
-'Supplier#000008967','2kwEHyMG 7FwozNImAUE6mH0hYtqYculJM'
-'Supplier#000008972','w2vF6 D5YZO3visPXsqVfLADTK'
-'Supplier#000009032','qK,trB6Sdy4Dz1BRUFNy'
-'Supplier#000009043','57OPvKH4qyXIZ7IzYeCaw11a5N1Ki9f1WWmVQ,'
-'Supplier#000009278','RqYTzgxj93CLX 0mcYfCENOefD'
-'Supplier#000009326','XmiC,uy36B9,fb0zhcjaagiXQutg'
-'Supplier#000009430','igRqmneFt '
-'Supplier#000009549','h3RVchUf8MzY46IzbZ0ng09'
-'Supplier#000009601','51m637bO,Rw5DnHWFUvLacRx9'
-'Supplier#000009709','rRnCbHYgDgl9PZYnyWKVYSUW0vKg'
-'Supplier#000009753','wLhVEcRmd7PkJF4FBnGK7Z'
-'Supplier#000009799',' 4wNjXGa4OKWl'
-'Supplier#000009811','E3iuyq7UnZxU7oPZIe2Gu6'
-'Supplier#000009812','APFRMy3lCbgFga53n5t9DxzFPQPgnjrGt32'
-'Supplier#000009846','57sNwJJ3PtBDu,hMPP5QvpcOcSNRXn3PypJJrh'
-'Supplier#000009899','7XdpAHrzr1t,UQFZE'
-'Supplier#000009974','7wJ,J5DKcxSU4Kp1cQLpbcAvB5AsvKT'
----- TYPES
-string, string
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q21.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q21.test 
b/testdata/workloads/tpch_nested/queries/tpch-q21.test
deleted file mode 100644
index 24c1c41..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q21.test
+++ /dev/null
@@ -1,145 +0,0 @@
-====
----- QUERY: TPCH-Q21
-# Q21 - Suppliers Who Kept Orders Waiting Query
-select
-  s_name,
-  count(*) as numwait
-from
-  supplier s,
-  customer c,
-  c.c_orders o,
-  o.o_lineitems l1,
-  region.r_nations n
-where
-  s_suppkey = l1.l_suppkey
-  and o_orderstatus = 'F'
-  and l1.l_receiptdate > l1.l_commitdate
-  and exists (
-    select
-      *
-    from
-      o.o_lineitems l2
-    where
-      l2.l_suppkey <> l1.l_suppkey
-  )
-  and not exists (
-    select
-      *
-    from
-      o.o_lineitems l3
-    where
-      l3.l_suppkey <> l1.l_suppkey
-      and l3.l_receiptdate > l3.l_commitdate
-  )
-  and s_nationkey = n_nationkey
-  and n_name = 'SAUDI ARABIA'
-group by
-  s_name
-order by
-  numwait desc,
-  s_name
-limit 100
----- RESULTS
-'Supplier#000002829',20
-'Supplier#000005808',18
-'Supplier#000000262',17
-'Supplier#000000496',17
-'Supplier#000002160',17
-'Supplier#000002301',17
-'Supplier#000002540',17
-'Supplier#000003063',17
-'Supplier#000005178',17
-'Supplier#000008331',17
-'Supplier#000002005',16
-'Supplier#000002095',16
-'Supplier#000005799',16
-'Supplier#000005842',16
-'Supplier#000006450',16
-'Supplier#000006939',16
-'Supplier#000009200',16
-'Supplier#000009727',16
-'Supplier#000000486',15
-'Supplier#000000565',15
-'Supplier#000001046',15
-'Supplier#000001047',15
-'Supplier#000001161',15
-'Supplier#000001336',15
-'Supplier#000001435',15
-'Supplier#000003075',15
-'Supplier#000003335',15
-'Supplier#000005649',15
-'Supplier#000006027',15
-'Supplier#000006795',15
-'Supplier#000006800',15
-'Supplier#000006824',15
-'Supplier#000007131',15
-'Supplier#000007382',15
-'Supplier#000008913',15
-'Supplier#000009787',15
-'Supplier#000000633',14
-'Supplier#000001960',14
-'Supplier#000002323',14
-'Supplier#000002490',14
-'Supplier#000002993',14
-'Supplier#000003101',14
-'Supplier#000004489',14
-'Supplier#000005435',14
-'Supplier#000005583',14
-'Supplier#000005774',14
-'Supplier#000007579',14
-'Supplier#000008180',14
-'Supplier#000008695',14
-'Supplier#000009224',14
-'Supplier#000000357',13
-'Supplier#000000436',13
-'Supplier#000000610',13
-'Supplier#000000788',13
-'Supplier#000000889',13
-'Supplier#000001062',13
-'Supplier#000001498',13
-'Supplier#000002056',13
-'Supplier#000002312',13
-'Supplier#000002344',13
-'Supplier#000002596',13
-'Supplier#000002615',13
-'Supplier#000002978',13
-'Supplier#000003048',13
-'Supplier#000003234',13
-'Supplier#000003727',13
-'Supplier#000003806',13
-'Supplier#000004472',13
-'Supplier#000005236',13
-'Supplier#000005906',13
-'Supplier#000006241',13
-'Supplier#000006326',13
-'Supplier#000006384',13
-'Supplier#000006394',13
-'Supplier#000006624',13
-'Supplier#000006629',13
-'Supplier#000006682',13
-'Supplier#000006737',13
-'Supplier#000006825',13
-'Supplier#000007021',13
-'Supplier#000007417',13
-'Supplier#000007497',13
-'Supplier#000007602',13
-'Supplier#000008134',13
-'Supplier#000008234',13
-'Supplier#000009435',13
-'Supplier#000009436',13
-'Supplier#000009564',13
-'Supplier#000009896',13
-'Supplier#000000379',12
-'Supplier#000000673',12
-'Supplier#000000762',12
-'Supplier#000000811',12
-'Supplier#000000821',12
-'Supplier#000001337',12
-'Supplier#000001916',12
-'Supplier#000001925',12
-'Supplier#000002039',12
-'Supplier#000002357',12
-'Supplier#000002483',12
----- TYPES
-string, bigint
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q22.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q22.test 
b/testdata/workloads/tpch_nested/queries/tpch-q22.test
deleted file mode 100644
index 0312be3..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q22.test
+++ /dev/null
@@ -1,46 +0,0 @@
-====
----- QUERY: TPCH-Q22
-# Q22 - Global Sales Opportunity Query
-select
-  cntrycode,
-  count(*) as numcust,
-  sum(c_acctbal) as totacctbal
-from (
-  select
-    substr(c_phone, 1, 2) as cntrycode,
-    c_acctbal
-  from
-    customer c
-  where
-    substr(c_phone, 1, 2) in ('13', '31', '23', '29', '30', '18', '17')
-    and c_acctbal > (
-      select
-        avg(c_acctbal)
-      from
-        customer c
-      where
-        c_acctbal > 0.00
-        and substr(c_phone, 1, 2) in ('13', '31', '23', '29', '30', '18', '17')
-      )
-    and not exists (
-      select
-        o_orderkey
-      from
-        c.c_orders
-    )
-  ) as custsale
-group by
-  cntrycode
-order by
-  cntrycode
----- RESULTS
-'13',888,6737713.99
-'17',861,6460573.72
-'18',964,7236687.40
-'23',892,6701457.95
-'29',948,7158866.63
-'30',909,6808436.13
-'31',922,6806670.18
----- TYPES
-string, bigint, decimal
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q3.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q3.test 
b/testdata/workloads/tpch_nested/queries/tpch-q3.test
deleted file mode 100644
index 0c5b4e8..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q3.test
+++ /dev/null
@@ -1,38 +0,0 @@
-====
----- QUERY: TPCH-Q3
-# Q3 - Shipping Priority Query
-select
-  o_orderkey,
-  sum(l_extendedprice * (1 - l_discount)) as revenue,
-  o_orderdate,
-  o_shippriority
-from
-  customer c,
-  c.c_orders o,
-  o.o_lineitems l
-where
-  c_mktsegment = 'BUILDING'
-  and o_orderdate < '1995-03-15'
-  and l_shipdate > '1995-03-15'
-group by
-  o_orderkey,
-  o_orderdate,
-  o_shippriority
-order by
-  revenue desc,
-  o_orderdate
-limit 10
----- RESULTS
-2456423,406181.0111,'1995-03-05',0
-3459808,405838.6989,'1995-03-04',0
-492164,390324.0610,'1995-02-19',0
-1188320,384537.9359,'1995-03-09',0
-2435712,378673.0558,'1995-02-26',0
-4878020,378376.7952,'1995-03-12',0
-5521732,375153.9215,'1995-03-13',0
-2628192,373133.3094,'1995-02-22',0
-993600,371407.4595,'1995-03-05',0
-2300070,367371.1452,'1995-03-13',0
----- TYPES
-BIGINT, DECIMAL, STRING, INT
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q4.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q4.test 
b/testdata/workloads/tpch_nested/queries/tpch-q4.test
deleted file mode 100644
index 4b9d960..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q4.test
+++ /dev/null
@@ -1,33 +0,0 @@
-====
----- QUERY: TPCH-Q4
-# Q4 - Order Priority Checking Query
-select
-  o_orderpriority,
-  count(*) as order_count
-from
-  customer c,
-  c.c_orders o
-where
-  o_orderdate >= '1993-07-01'
-  and o_orderdate < '1993-10-01'
-  and exists (
-    select
-      *
-    from
-      o.o_lineitems
-    where
-      l_commitdate < l_receiptdate
-    )
-group by
-  o_orderpriority
-order by
-  o_orderpriority
----- RESULTS
-'1-URGENT',10594
-'2-HIGH',10476
-'3-MEDIUM',10410
-'4-NOT SPECIFIED',10556
-'5-LOW',10487
----- TYPES
-string, bigint
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q5.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q5.test 
b/testdata/workloads/tpch_nested/queries/tpch-q5.test
deleted file mode 100644
index fa66e09..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q5.test
+++ /dev/null
@@ -1,33 +0,0 @@
-====
----- QUERY: TPCH-Q5
-# Q5 - Local Supplier Volume Query
-select
-  n_name,
-  sum(l_extendedprice * (1 - l_discount)) as revenue
-from
-  customer c,
-  c.c_orders o,
-  o.o_lineitems l,
-  supplier s,
-  region r,
-  r.r_nations n
-where
-  l_suppkey = s_suppkey
-  and c_nationkey = s_nationkey
-  and s_nationkey = n_nationkey
-  and r_name = 'ASIA'
-  and o_orderdate >= '1994-01-01'
-  and o_orderdate < '1995-01-01'
-group by
-  n_name
-order by
-  revenue desc
----- RESULTS
-'INDONESIA',55502041.1697
-'VIETNAM',55295086.9967
-'CHINA',53724494.2566
-'INDIA',52035512.0002
-'JAPAN',45410175.6954
----- TYPES
-string, decimal
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q6.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q6.test 
b/testdata/workloads/tpch_nested/queries/tpch-q6.test
deleted file mode 100644
index efb43e8..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q6.test
+++ /dev/null
@@ -1,17 +0,0 @@
-====
----- QUERY: TPCH-Q6
-# Q6 - Forecasting Revenue Change Query
-select
-  sum(l_extendedprice * l_discount) as revenue
-from
-  customer.c_orders.o_lineitems
-where
-  l_shipdate >= '1994-01-01'
-  and l_shipdate < '1995-01-01'
-  and l_discount between 0.05 and 0.07
-  and l_quantity < 24
----- RESULTS
-123141078.2283
----- TYPES
-decimal
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q7.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q7.test 
b/testdata/workloads/tpch_nested/queries/tpch-q7.test
deleted file mode 100644
index 0c5878d..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q7.test
+++ /dev/null
@@ -1,47 +0,0 @@
-====
----- QUERY: TPCH-Q7
-# Q7 - Volume Shipping Query
-select
-  supp_nation,
-  cust_nation,
-  l_year,
-  sum(volume) as revenue
-from (
-  select
-    n1.n_name as supp_nation,
-    n2.n_name as cust_nation,
-    year(l_shipdate) as l_year,
-    l_extendedprice * (1 - l_discount) as volume
-  from
-    customer c,
-    c.c_orders o,
-    o.o_lineitems l,
-    supplier s,
-    region.r_nations n1,
-    region.r_nations n2
-  where
-    s_suppkey = l_suppkey
-    and s_nationkey = n1.n_nationkey
-    and c_nationkey = n2.n_nationkey
-    and (
-      (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY')
-      or (n1.n_name = 'GERMANY' and n2.n_name = 'FRANCE')
-    )
-    and l_shipdate between '1995-01-01' and '1996-12-31'
-  ) as shipping
-group by
-  supp_nation,
-  cust_nation,
-  l_year
-order by
-  supp_nation,
-  cust_nation,
-  l_year
----- RESULTS
-'FRANCE','GERMANY',1995,54639732.7336
-'FRANCE','GERMANY',1996,54633083.3076
-'GERMANY','FRANCE',1995,52531746.6697
-'GERMANY','FRANCE',1996,52520549.0224
----- TYPES
-STRING, STRING, INT, DECIMAL
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q8.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q8.test 
b/testdata/workloads/tpch_nested/queries/tpch-q8.test
deleted file mode 100644
index 94d91a6..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q8.test
+++ /dev/null
@@ -1,43 +0,0 @@
-====
----- QUERY: TPCH-Q8
-# Q8 - National Market Share Query
-select
-  o_year,
-  sum(case
-    when nation = 'BRAZIL'
-    then volume
-    else 0
-  end) / sum(volume) as mkt_share
-from (
-  select
-    year(o_orderdate) as o_year,
-    l_extendedprice * (1 - l_discount) as volume,
-    n2.n_name as nation
-  from
-    customer c,
-    c.c_orders o,
-    o.o_lineitems l,
-    supplier s,
-    part p,
-    region r,
-    r.r_nations n1,
-    region.r_nations n2
-  where
-    p_partkey = l_partkey
-    and s_suppkey = l_suppkey
-    and c_nationkey = n1.n_nationkey
-    and r_name = 'AMERICA'
-    and s_nationkey = n2.n_nationkey
-    and o_orderdate between '1995-01-01' and '1996-12-31'
-    and p_type = 'ECONOMY ANODIZED STEEL'
-  ) as all_nations
-group by
-  o_year
-order by
-  o_year
----- RESULTS
-1995,0.0344
-1996,0.0414
----- TYPES
-int, decimal
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch-q9.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch-q9.test 
b/testdata/workloads/tpch_nested/queries/tpch-q9.test
deleted file mode 100644
index 0290433..0000000
--- a/testdata/workloads/tpch_nested/queries/tpch-q9.test
+++ /dev/null
@@ -1,211 +0,0 @@
-====
----- QUERY: TPCH-Q9
-# Q9 - Product Type Measure Query
-select
-  nation,
-  o_year,
-  sum(amount) as sum_profit
-from(
-  select
-    n_name as nation,
-    year(o_orderdate) as o_year,
-    l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity as amount
-  from
-    customer.c_orders o,
-    o.o_lineitems l,
-    supplier s,
-    s.s_partsupps ps,
-    part p,
-    region.r_nations n
-  where
-    s_suppkey = l_suppkey
-    and ps_partkey = l_partkey
-    and p_partkey = l_partkey
-    and s_nationkey = n_nationkey
-    and p_name like '%green%'
-  ) as profit
-group by
-  nation,
-  o_year
-order by
-  nation,
-  o_year desc
----- RESULTS
-'ALGERIA',1998,27136900.1803
-'ALGERIA',1997,48611833.4962
-'ALGERIA',1996,48285482.6782
-'ALGERIA',1995,44402273.5999
-'ALGERIA',1994,48694008.0668
-'ALGERIA',1993,46044207.7838
-'ALGERIA',1992,45636849.4881
-'ARGENTINA',1998,28341663.7848
-'ARGENTINA',1997,47143964.1176
-'ARGENTINA',1996,45255278.6021
-'ARGENTINA',1995,45631769.2054
-'ARGENTINA',1994,48268856.3547
-'ARGENTINA',1993,48605593.6162
-'ARGENTINA',1992,46654240.7487
-'BRAZIL',1998,26527736.3960
-'BRAZIL',1997,45640660.7677
-'BRAZIL',1996,45090647.1630
-'BRAZIL',1995,44015888.5132
-'BRAZIL',1994,44854218.8932
-'BRAZIL',1993,45766603.7379
-'BRAZIL',1992,45280216.8027
-'CANADA',1998,26828985.3944
-'CANADA',1997,44849954.3186
-'CANADA',1996,46307936.1108
-'CANADA',1995,47311993.0441
-'CANADA',1994,46691491.9596
-'CANADA',1993,46634791.1121
-'CANADA',1992,45873849.6882
-'CHINA',1998,27510180.1657
-'CHINA',1997,46123865.4097
-'CHINA',1996,49532807.0601
-'CHINA',1995,46734651.4838
-'CHINA',1994,46397896.6097
-'CHINA',1993,49634673.9463
-'CHINA',1992,46949457.6426
-'EGYPT',1998,28401491.7968
-'EGYPT',1997,47674857.6783
-'EGYPT',1996,47745727.5450
-'EGYPT',1995,45897160.6783
-'EGYPT',1994,47194895.2280
-'EGYPT',1993,49133627.6471
-'EGYPT',1992,47000574.5027
-'ETHIOPIA',1998,25135046.1377
-'ETHIOPIA',1997,43010596.0838
-'ETHIOPIA',1996,43636287.1922
-'ETHIOPIA',1995,43575757.3343
-'ETHIOPIA',1994,41597208.5283
-'ETHIOPIA',1993,42622804.1616
-'ETHIOPIA',1992,44385735.6813
-'FRANCE',1998,26210392.2804
-'FRANCE',1997,42392969.4731
-'FRANCE',1996,43306317.9749
-'FRANCE',1995,46377408.4328
-'FRANCE',1994,43447352.9922
-'FRANCE',1993,43729961.0639
-'FRANCE',1992,44052308.4290
-'GERMANY',1998,25991257.1071
-'GERMANY',1997,43968355.8079
-'GERMANY',1996,45882074.8049
-'GERMANY',1995,43314338.3077
-'GERMANY',1994,44616995.4369
-'GERMANY',1993,45126645.9113
-'GERMANY',1992,44361141.2107
-'INDIA',1998,29626417.2379
-'INDIA',1997,51386111.3448
-'INDIA',1996,47571018.5122
-'INDIA',1995,49344062.2829
-'INDIA',1994,50106952.4261
-'INDIA',1993,48112766.6987
-'INDIA',1992,47914303.1234
-'INDONESIA',1998,27734909.6763
-'INDONESIA',1997,44593812.9863
-'INDONESIA',1996,44746729.8078
-'INDONESIA',1995,45593622.6993
-'INDONESIA',1994,45988483.8772
-'INDONESIA',1993,46147963.7895
-'INDONESIA',1992,45185777.0688
-'IRAN',1998,26661608.9301
-'IRAN',1997,45019114.1696
-'IRAN',1996,45891397.0992
-'IRAN',1995,44414285.2348
-'IRAN',1994,43696360.4795
-'IRAN',1993,45362775.8094
-'IRAN',1992,43052338.4143
-'IRAQ',1998,31188498.1914
-'IRAQ',1997,48585307.5222
-'IRAQ',1996,50036593.8404
-'IRAQ',1995,48774801.7275
-'IRAQ',1994,48795847.2310
-'IRAQ',1993,47435691.5082
-'IRAQ',1992,47562355.6571
-'JAPAN',1998,24694102.1720
-'JAPAN',1997,42377052.3454
-'JAPAN',1996,40267778.9094
-'JAPAN',1995,40925317.4650
-'JAPAN',1994,41159518.3058
-'JAPAN',1993,39589074.2771
-'JAPAN',1992,39113493.9052
-'JORDAN',1998,23489867.7893
-'JORDAN',1997,41615962.6619
-'JORDAN',1996,41860855.4684
-'JORDAN',1995,39931672.0908
-'JORDAN',1994,40707555.4638
-'JORDAN',1993,39060405.4658
-'JORDAN',1992,41657604.2684
-'KENYA',1998,25566337.4303
-'KENYA',1997,43108847.9024
-'KENYA',1996,43482953.5430
-'KENYA',1995,42517988.9814
-'KENYA',1994,43612479.4523
-'KENYA',1993,42724038.7571
-'KENYA',1992,43217106.2068
-'MOROCCO',1998,24915496.8756
-'MOROCCO',1997,42698382.8550
-'MOROCCO',1996,42986113.5049
-'MOROCCO',1995,42316089.1593
-'MOROCCO',1994,43458604.6029
-'MOROCCO',1993,42672288.0699
-'MOROCCO',1992,42800781.6415
-'MOZAMBIQUE',1998,28279876.0301
-'MOZAMBIQUE',1997,51159216.2298
-'MOZAMBIQUE',1996,48072525.0645
-'MOZAMBIQUE',1995,48905200.6007
-'MOZAMBIQUE',1994,46092076.2805
-'MOZAMBIQUE',1993,48555926.2669
-'MOZAMBIQUE',1992,47809075.1192
-'PERU',1998,26713966.2678
-'PERU',1997,48324008.6011
-'PERU',1996,50310008.8629
-'PERU',1995,49647080.9629
-'PERU',1994,46420910.2773
-'PERU',1993,51536906.2487
-'PERU',1992,47711665.3137
-'ROMANIA',1998,27271993.1010
-'ROMANIA',1997,45063059.1953
-'ROMANIA',1996,47492335.0323
-'ROMANIA',1995,45710636.2909
-'ROMANIA',1994,46088041.1066
-'ROMANIA',1993,47515092.5613
-'ROMANIA',1992,44111439.8044
-'RUSSIA',1998,27935323.7271
-'RUSSIA',1997,48222347.2924
-'RUSSIA',1996,47553559.4932
-'RUSSIA',1995,46755990.0976
-'RUSSIA',1994,48000515.6191
-'RUSSIA',1993,48569624.5082
-'RUSSIA',1992,47672831.5329
-'SAUDI ARABIA',1998,27113516.8424
-'SAUDI ARABIA',1997,46690468.9649
-'SAUDI ARABIA',1996,47775782.6670
-'SAUDI ARABIA',1995,46657107.8287
-'SAUDI ARABIA',1994,48181672.8100
-'SAUDI ARABIA',1993,45692556.4438
-'SAUDI ARABIA',1992,48924913.2717
-'UNITED KINGDOM',1998,26366682.8786
-'UNITED KINGDOM',1997,44518130.1851
-'UNITED KINGDOM',1996,45539729.6166
-'UNITED KINGDOM',1995,46845879.3390
-'UNITED KINGDOM',1994,43081609.5737
-'UNITED KINGDOM',1993,44770146.7555
-'UNITED KINGDOM',1992,44123402.5484
-'UNITED STATES',1998,27826593.6825
-'UNITED STATES',1997,46638572.3648
-'UNITED STATES',1996,46688280.5474
-'UNITED STATES',1995,48951591.6156
-'UNITED STATES',1994,45099092.0598
-'UNITED STATES',1993,46181600.5278
-'UNITED STATES',1992,46168214.0901
-'VIETNAM',1998,27281931.0011
-'VIETNAM',1997,48735914.1796
-'VIETNAM',1996,47824595.9040
-'VIETNAM',1995,48235135.8016
-'VIETNAM',1994,47729256.3324
-'VIETNAM',1993,45352676.8672
-'VIETNAM',1992,47846355.6485
----- TYPES
-STRING, INT, DECIMAL
-====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q1.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q1.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q1.test
new file mode 100644
index 0000000..e0ff4e9
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q1.test
@@ -0,0 +1,32 @@
+====
+---- QUERY: TPCH-Q1
+# Q1 - Pricing Summary Report Query
+select
+  l_returnflag,
+  l_linestatus,
+  sum(l_quantity) as sum_qty,
+  sum(l_extendedprice) as sum_base_price,
+  sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,
+  sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
+  avg(l_quantity) as avg_qty,
+  avg(l_extendedprice) as avg_price,
+  avg(l_discount) as avg_disc,
+  count(*) as count_order
+from
+  customer.c_orders.o_lineitems
+where
+  l_shipdate <= '1998-09-02'
+group by
+  l_returnflag,
+  l_linestatus
+order by
+  l_returnflag,
+  l_linestatus
+---- RESULTS
+'A','F',37734107.00,56586554400.73,53758257134.8700,55909065222.827692,25.52,38273.12,0.04,1478493
+'N','F',991417.00,1487504710.38,1413082168.0541,1469649223.194375,25.51,38284.46,0.05,38854
+'N','O',74476040.00,111701729697.74,106118230307.6056,110367043872.497010,25.50,38249.11,0.04,2920374
+'R','F',37719753.00,56568041380.90,53741292684.6040,55889619119.831932,25.50,38250.85,0.05,1478870
+---- TYPES
+string, string, decimal, decimal, decimal, decimal, decimal, decimal, decimal, 
bigint
+====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q10.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q10.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q10.test
new file mode 100644
index 0000000..7fb2170
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q10.test
@@ -0,0 +1,58 @@
+====
+---- QUERY: TPCH-Q10
+# Q10 - Returned Item Reporting Query
+# Converted select from multiple tables to joins
+select
+  c_custkey,
+  c_name,
+  sum(l_extendedprice * (1 - l_discount)) as revenue,
+  c_acctbal,
+  n_name,
+  c_address,
+  c_phone,
+  c_comment
+from
+  customer c,
+  c.c_orders o,
+  o.o_lineitems l,
+  region.r_nations n
+where
+  o_orderdate >= '1993-10-01'
+  and o_orderdate < '1994-01-01'
+  and l_returnflag = 'R'
+  and c_nationkey = n_nationkey
+group by
+  c_custkey,
+  c_name,
+  c_acctbal,
+  c_phone,
+  n_name,
+  c_address,
+  c_comment
+order by
+  revenue desc
+limit 20
+---- RESULTS
+57040,'Customer#000057040',734235.2455,632.87,'JAPAN','Eioyzjf4pp','22-895-641-3466','sits.
 slyly regular requests sleep alongside of the regular inst'
+143347,'Customer#000143347',721002.6948,2557.47,'EGYPT','1aReFYv,Kw4','14-742-935-3718','ggle
 carefully enticing requests. final deposits use bold, bold pinto beans. 
ironic, idle re'
+60838,'Customer#000060838',679127.3077,2454.77,'BRAZIL','64EaJ5vMAHWJlBOxJklpNc2RJiWE','12-913-494-9813','
 need to boost against the slyly regular account'
+101998,'Customer#000101998',637029.5667,3790.89,'UNITED 
KINGDOM','01c9CILnNtfOQYmZj','33-593-865-6378','ress foxes wake slyly after the 
bold excuses. ironic platelets are furiously carefully bold theodolites'
+125341,'Customer#000125341',633508.0860,4983.51,'GERMANY','S29ODD6bceU8QSuuEJznkNaK','17-582-695-5962','arefully
 even depths. blithely even excuses sleep furiously. foxes use except the 
dependencies. ca'
+25501,'Customer#000025501',620269.7849,7725.04,'ETHIOPIA','  
W556MXuoiaYCCZamJI,Rn0B4ACUGdkQ8DZ','15-874-808-6793','he pending instructions 
wake carefully at the pinto beans. regular, final instructions along the slyly 
fina'
+115831,'Customer#000115831',596423.8672,5098.10,'FRANCE','rFeBbEEyk dl 
ne7zV5fDrmiq1oK09wV7pxqCgIc','16-715-386-3788','l somas sleep. furiously final 
deposits wake blithely regular pinto b'
+84223,'Customer#000084223',594998.0239,528.65,'UNITED KINGDOM','nAVZCs6BaWap 
rrM27N 2qBnzc5WBauxbA','33-442-824-8191',' slyly final deposits haggle regular, 
pending dependencies. pending escapades wake '
+54289,'Customer#000054289',585603.3918,5583.02,'IRAN','vXCxoCsU0Bad5JQI 
,oobkZ','20-834-292-4707','ely special foxes are quickly finally ironic p'
+39922,'Customer#000039922',584878.1134,7321.11,'GERMANY','Zgy4s50l2GKN4pLDPBU8m342gIw6R','17-147-757-8036','y
 final requests. furiously final foxes cajole blithely special platelets. f'
+6226,'Customer#000006226',576783.7606,2230.09,'UNITED 
KINGDOM','8gPu8,NPGkfyQQ0hcIYUGPIBWc,ybP5g,','33-657-701-3391','ending 
platelets along the express deposits cajole carefully final '
+922,'Customer#000000922',576767.5333,3869.25,'GERMANY','Az9RFaut7NkPnc5zSD2PwHgVwr4jRzq','17-945-916-9648','luffily
 fluffy deposits. packages c'
+147946,'Customer#000147946',576455.1320,2030.13,'ALGERIA','iANyZHjqhyy7Ajah0pTrYyhJ','10-886-956-3143','ithely
 ironic deposits haggle blithely ironic requests. quickly regu'
+115640,'Customer#000115640',569341.1933,6436.10,'ARGENTINA','Vtgfia9qI 
7EpHgecU1X','11-411-543-4901','ost slyly along the patterns; pinto be'
+73606,'Customer#000073606',568656.8578,1785.67,'JAPAN','xuR0Tro5yChDfOCrjkd2ol','22-437-653-6966','he
 furiously regular ideas. slowly'
+110246,'Customer#000110246',566842.9815,7763.35,'VIETNAM','7KzflgX 
MDOq7sOkI','31-943-426-9837','egular deposits serve blithely above the fl'
+142549,'Customer#000142549',563537.2368,5085.99,'INDONESIA','ChqEoK43OysjdHbtKCp6dKqjNyvvi9','19-955-562-2398','sleep
 pending courts. ironic deposits against the carefully unusual platelets cajole 
carefully express accounts.'
+146149,'Customer#000146149',557254.9865,1791.55,'ROMANIA','s87fvzFQpU','29-744-164-6487','
 of the slyly silent accounts. quickly final accounts across the '
+52528,'Customer#000052528',556397.3509,551.79,'ARGENTINA','NFztyTOR10UOJ','11-208-192-3205','
 deposits hinder. blithely pending asymptotes breach slyly regular re'
+23431,'Customer#000023431',554269.5360,3381.86,'ROMANIA','HgiV0phqhaIa9aydNoIlb','29-915-458-2654','nusual,
 even instructions: furiously stealthy n'
+---- TYPES
+bigint, string, decimal, decimal, string, string, string, string
+====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q11.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q11.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q11.test
new file mode 100644
index 0000000..780b206
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q11.test
@@ -0,0 +1,1086 @@
+====
+---- QUERY: TPCH-Q11
+# Q11 - Important Stock Identification
+# Modifications: query was rewritten to not have a subquery in the having 
clause
+select
+  *
+from (
+  select
+    ps_partkey,
+    sum(ps_supplycost * ps_availqty) as value
+  from
+    supplier s,
+    s.s_partsupps ps,
+    region.r_nations n
+  where
+    s_nationkey = n_nationkey
+    and n_name = 'GERMANY'
+  group by
+    ps_partkey
+) as inner_query
+where
+  value > (
+    select
+      sum(ps_supplycost * ps_availqty) * 0.0001
+    from
+      supplier s,
+      s.s_partsupps ps,
+      region.r_nations n
+    where
+      s_nationkey = n_nationkey
+      and n_name = 'GERMANY'
+  )
+order by
+  value desc
+---- RESULTS
+129760,17538456.86
+166726,16503353.92
+191287,16474801.97
+161758,16101755.54
+34452,15983844.72
+139035,15907078.34
+9403,15451755.62
+154358,15212937.88
+38823,15064802.86
+85606,15053957.15
+33354,14408297.40
+154747,14407580.68
+82865,14235489.78
+76094,14094247.04
+222,13937777.74
+121271,13908336.00
+55221,13716120.47
+22819,13666434.28
+76281,13646853.68
+85298,13581154.93
+85158,13554904.00
+139684,13535538.72
+31034,13498025.25
+87305,13482847.04
+10181,13445148.75
+62323,13411824.30
+26489,13377256.38
+96493,13339057.83
+56548,13329014.97
+55576,13306843.35
+159751,13306614.48
+92406,13287414.50
+182636,13223726.74
+199969,13135288.21
+62865,13001926.94
+7284,12945298.19
+197867,12944510.52
+11562,12931575.51
+75165,12916918.12
+97175,12911283.50
+140840,12896562.23
+65241,12890600.46
+166120,12876927.22
+9035,12863828.70
+144616,12853549.30
+176723,12832309.74
+170884,12792136.58
+29790,12723300.33
+95213,12555483.73
+183873,12550533.05
+171235,12476538.30
+21533,12437821.32
+17290,12432159.50
+156397,12260623.50
+122611,12222812.98
+139155,12220319.25
+146316,12215800.61
+171381,12199734.52
+198633,12078226.95
+167417,12046637.62
+59512,12043468.76
+31688,12034893.64
+159586,12001505.84
+8993,11963814.30
+120302,11857707.55
+43536,11779340.52
+9552,11776909.16
+86223,11772205.08
+53776,11758669.65
+131285,11616953.74
+91628,11611114.83
+169644,11567959.72
+182299,11567462.05
+33107,11453818.76
+104184,11436657.44
+67027,11419127.14
+176869,11371451.71
+30885,11369674.79
+54420,11345076.88
+72240,11313951.05
+178708,11294635.17
+81298,11273686.13
+158324,11243442.72
+117095,11242535.24
+176793,11237733.38
+86091,11177793.79
+116033,11145434.36
+129058,11119112.20
+193714,11104706.39
+117195,11077217.96
+49851,11043701.78
+19791,11030662.62
+75800,11012401.62
+161562,10996371.69
+10119,10980015.75
+39185,10970042.56
+47223,10950022.13
+175594,10942923.05
+111295,10893675.61
+155446,10852764.57
+156391,10839810.38
+40884,10837234.19
+141288,10837130.21
+152388,10830977.82
+33449,10830858.72
+149035,10826130.02
+162620,10814275.68
+118324,10791788.10
+38932,10777541.75
+121294,10764225.22
+48721,10762582.49
+63342,10740132.60
+5614,10724668.80
+62266,10711143.10
+100202,10696675.55
+197741,10688560.72
+169178,10648522.80
+5271,10639392.65
+34499,10584177.10
+71108,10569117.56
+137132,10539880.47
+78451,10524873.24
+150827,10503810.48
+107237,10488030.84
+101727,10473558.10
+58708,10466280.44
+89768,10465477.22
+146493,10444291.58
+55424,10444006.48
+16560,10425574.74
+133114,10415097.90
+195810,10413625.20
+76673,10391977.18
+97305,10390890.57
+134210,10387210.02
+188536,10386529.92
+122255,10335760.32
+2682,10312966.10
+43814,10303086.61
+34767,10290405.18
+165584,10273705.89
+2231,10270415.55
+111259,10263256.56
+195578,10239795.82
+21093,10217531.30
+29856,10216932.54
+133686,10213345.76
+87745,10185509.40
+135153,10179379.70
+11773,10167410.84
+76316,10165151.70
+123076,10161225.78
+91894,10130462.19
+39741,10128387.52
+111753,10119780.98
+142729,10104748.89
+116775,10097750.42
+102589,10034784.36
+186268,10012181.57
+44545,10000286.48
+23307,9966577.50
+124281,9930018.90
+69604,9925730.64
+21971,9908982.03
+58148,9895894.40
+16532,9886529.90
+159180,9883744.43
+74733,9877582.88
+35173,9858275.92
+7116,9856881.02
+124620,9838589.14
+122108,9829949.35
+67200,9828690.69
+164775,9821424.44
+9039,9816447.72
+14912,9803102.20
+190906,9791315.70
+130398,9781674.27
+119310,9776927.21
+10132,9770930.78
+107211,9757586.25
+113958,9757065.50
+37009,9748362.69
+66746,9743528.76
+134486,9731922.00
+15945,9731096.45
+55307,9717745.80
+56362,9714922.83
+57726,9711792.10
+57256,9708621.00
+112292,9701653.08
+87514,9699492.53
+174206,9680562.02
+72865,9679043.34
+114357,9671017.44
+112807,9665019.21
+115203,9661018.73
+177454,9658906.35
+161275,9634313.71
+61893,9617095.44
+122219,9604888.20
+183427,9601362.58
+59158,9599705.96
+61931,9584918.98
+5532,9579964.14
+20158,9576714.38
+167199,9557413.08
+38869,9550279.53
+86949,9541943.70
+198544,9538613.92
+193762,9538238.94
+108807,9536247.16
+168324,9535647.99
+115588,9532195.04
+141372,9529702.14
+175120,9526068.66
+163851,9522808.83
+160954,9520359.45
+117757,9517882.80
+52594,9508325.76
+60960,9498843.06
+70272,9495775.62
+44050,9495515.36
+152213,9494756.96
+121203,9492601.30
+70114,9491012.30
+167588,9484741.11
+136455,9476241.78
+4357,9464355.64
+6786,9463632.57
+61345,9455336.70
+160826,9446754.84
+71275,9440138.40
+77746,9439118.35
+91289,9437472.00
+56723,9435102.16
+86647,9434604.18
+131234,9432120.00
+198129,9427651.36
+165530,9426193.68
+69233,9425053.92
+6243,9423304.66
+90110,9420422.70
+191980,9419368.36
+38461,9419316.07
+167873,9419024.49
+159373,9416950.15
+128707,9413428.50
+45267,9410863.78
+48460,9409793.93
+197672,9406887.68
+60884,9403442.40
+15209,9403245.31
+138049,9401262.10
+199286,9391770.70
+19629,9391236.40
+134019,9390615.15
+169475,9387639.58
+165918,9379510.44
+135602,9374251.54
+162323,9367566.51
+96277,9360850.68
+98336,9359671.29
+119781,9356395.73
+34440,9355365.00
+57362,9355180.10
+167236,9352973.84
+38463,9347530.94
+86749,9346826.44
+170007,9345699.90
+193087,9343744.00
+150383,9332576.75
+60932,9329582.02
+128420,9328206.35
+162145,9327722.88
+55686,9320304.40
+163080,9304916.96
+160583,9303515.92
+118153,9298606.56
+152634,9282184.57
+84731,9276586.92
+119989,9273814.20
+114584,9269698.65
+131817,9268570.08
+29068,9256583.88
+44116,9255922.00
+115818,9253311.91
+103388,9239218.08
+186118,9236209.12
+155809,9235410.84
+147003,9234847.99
+27769,9232511.64
+112779,9231927.36
+124851,9228982.68
+158488,9227216.40
+83328,9224792.20
+136797,9222927.09
+141730,9216370.68
+87304,9215695.50
+156004,9215557.90
+140740,9215329.20
+100648,9212185.08
+174774,9211718.00
+37644,9211578.60
+48807,9209496.24
+95940,9207948.40
+141586,9206699.22
+147248,9205654.95
+61372,9205228.76
+52970,9204415.95
+26430,9203710.51
+28504,9201669.20
+25810,9198878.50
+125329,9198688.50
+167867,9194022.72
+134767,9191444.72
+127745,9191271.56
+69208,9187110.00
+155222,9186469.16
+196916,9182995.82
+195590,9176353.12
+169155,9175176.09
+81558,9171946.50
+185136,9171293.04
+114790,9168509.10
+194142,9165836.61
+167639,9161165.00
+11241,9160789.46
+82628,9160155.54
+41399,9148338.00
+30755,9146196.84
+6944,9143574.58
+6326,9138803.16
+101296,9135657.62
+181479,9121093.30
+76898,9120983.10
+64274,9118745.25
+175826,9117387.99
+142215,9116876.88
+103415,9113128.62
+119765,9110768.79
+107624,9108837.45
+84215,9105257.36
+73774,9102651.92
+173972,9102069.00
+69817,9095513.88
+86943,9092253.00
+138859,9087719.30
+162273,9085296.48
+175945,9080401.21
+16836,9075715.44
+70224,9075265.95
+139765,9074755.89
+30319,9073233.10
+3851,9072657.24
+181271,9070631.52
+162184,9068835.78
+81683,9067258.47
+153028,9067010.51
+123324,9061870.95
+186481,9058608.30
+167680,9052908.76
+165293,9050545.70
+122148,9046298.17
+138604,9045840.80
+78851,9044822.60
+137280,9042355.34
+8823,9040855.10
+163900,9040848.48
+75600,9035392.45
+81676,9031999.40
+46033,9031460.58
+194917,9028500.00
+133936,9026949.02
+33182,9024971.10
+34220,9021485.39
+20118,9019942.60
+178258,9019881.66
+15560,9017687.28
+111425,9016198.56
+95942,9015585.12
+132709,9015240.15
+39731,9014746.95
+154307,9012571.20
+23769,9008157.60
+93328,9007211.20
+142826,8998297.44
+188792,8996014.00
+68703,8994982.22
+145280,8990941.05
+150725,8985686.16
+172046,8982469.52
+70476,8967629.50
+124988,8966805.22
+17937,8963319.76
+177372,8954873.64
+137994,8950916.79
+84019,8950039.98
+40389,8946158.20
+69187,8941054.14
+4863,8939044.92
+50465,8930503.14
+43686,8915543.84
+131352,8909053.59
+198916,8906940.03
+135932,8905282.95
+104673,8903682.00
+152308,8903244.08
+135298,8900323.20
+156873,8899429.10
+157454,8897339.20
+75415,8897068.09
+46325,8895569.09
+1966,8895117.06
+24576,8895034.75
+19425,8890156.60
+169735,8890085.56
+32225,8889829.28
+124537,8889770.71
+146327,8887836.23
+121562,8887740.40
+44731,8882444.95
+93141,8881850.88
+187871,8873506.18
+71709,8873057.28
+151913,8869321.17
+33786,8868955.39
+35902,8868126.06
+23588,8867769.90
+24508,8867616.00
+161282,8866661.43
+188061,8862304.00
+132847,8862082.00
+166843,8861200.80
+30609,8860214.73
+56191,8856546.96
+160740,8852685.43
+71229,8846106.99
+91208,8845541.28
+10995,8845306.56
+78094,8839938.29
+36489,8838538.10
+198437,8836494.84
+151693,8833807.64
+185367,8829791.37
+65682,8820622.89
+65421,8819329.24
+122225,8816821.86
+85330,8811013.16
+64555,8810643.12
+104188,8808211.02
+54411,8805703.40
+39438,8805282.56
+70795,8800060.92
+20383,8799073.28
+21952,8798624.19
+63584,8796590.00
+158768,8796422.95
+166588,8796214.38
+120600,8793558.06
+157202,8788287.88
+55358,8786820.75
+168322,8786670.73
+25143,8786324.80
+5368,8786274.14
+114025,8786201.12
+97744,8785315.94
+164327,8784503.86
+76542,8782613.28
+4731,8772846.70
+157590,8772006.45
+154276,8771733.91
+28705,8771576.64
+100226,8769455.00
+179195,8769185.16
+184355,8768118.05
+120408,8768011.12
+63145,8761991.96
+53135,8753491.80
+173071,8750508.80
+41087,8749436.79
+194830,8747438.40
+43496,8743359.30
+30235,8741611.00
+26391,8741399.64
+191816,8740258.72
+47616,8737229.68
+152101,8734432.76
+163784,8730514.34
+5134,8728424.64
+155241,8725429.86
+188814,8724182.40
+140782,8720378.75
+153141,8719407.51
+169373,8718609.06
+41335,8714773.80
+197450,8714617.32
+87004,8714017.79
+181804,8712257.76
+122814,8711119.14
+109939,8709193.16
+98094,8708780.04
+74630,8708040.75
+197291,8706519.09
+184173,8705467.45
+192175,8705411.12
+19471,8702536.12
+18052,8702155.70
+135560,8698137.72
+152791,8697325.80
+170953,8696909.19
+116137,8696687.17
+7722,8696589.40
+49788,8694846.71
+13252,8694822.42
+12633,8694559.36
+193438,8690426.72
+17326,8689329.16
+96124,8679794.58
+143802,8676626.48
+30389,8675826.60
+75250,8675257.14
+72613,8673524.94
+123520,8672456.25
+325,8667741.28
+167291,8667556.18
+150119,8663403.54
+88420,8663355.40
+179784,8653021.34
+130884,8651970.00
+172611,8648217.00
+85373,8647796.22
+122717,8646758.54
+113431,8646348.34
+66015,8643349.40
+33141,8643243.18
+69786,8637396.92
+181857,8637393.28
+122939,8636378.00
+196223,8635391.02
+50532,8632648.24
+58102,8632614.54
+93581,8632372.36
+52804,8632109.25
+755,8627091.68
+16597,8623357.05
+119041,8622397.00
+89050,8621185.98
+98696,8620784.82
+94399,8620524.00
+151295,8616671.02
+56417,8613450.35
+121322,8612948.23
+126883,8611373.42
+29155,8610163.64
+114530,8608471.74
+131007,8607394.82
+128715,8606833.62
+72522,8601479.98
+144061,8595718.74
+83503,8595034.20
+112199,8590717.44
+9227,8587350.42
+116318,8585910.66
+41248,8585559.64
+159398,8584821.00
+105966,8582308.79
+137876,8580641.30
+122272,8580400.77
+195717,8577278.10
+165295,8571121.92
+5840,8570728.74
+120860,8570610.44
+66692,8567540.52
+135596,8563276.31
+150576,8562794.10
+7500,8562393.84
+107716,8561541.56
+100611,8559995.85
+171192,8557390.08
+107660,8556696.60
+13461,8556545.12
+90310,8555131.51
+141493,8553782.93
+71286,8552682.00
+136423,8551300.76
+54241,8550785.25
+120325,8549976.60
+424,8547527.10
+196543,8545907.09
+13042,8542717.18
+58332,8536074.69
+9191,8535663.92
+134357,8535429.90
+96207,8534900.60
+92292,8530618.78
+181093,8528303.52
+105064,8527491.60
+59635,8526854.08
+136974,8524351.56
+126694,8522783.37
+6247,8522606.90
+139447,8522521.92
+96313,8520949.92
+108454,8520916.25
+181254,8519496.10
+71117,8519223.00
+131703,8517215.28
+59312,8510568.36
+2903,8509960.35
+102838,8509527.69
+162806,8508906.05
+41527,8508222.36
+118416,8505858.36
+180203,8505024.16
+14773,8500598.28
+140446,8499514.24
+199641,8497362.59
+109240,8494617.12
+150268,8494188.38
+45310,8492380.65
+36552,8490733.60
+199690,8490145.80
+185353,8488726.68
+163615,8484985.01
+196520,8483545.04
+133438,8483482.35
+77285,8481442.32
+55824,8476893.90
+76753,8475522.12
+46129,8472717.96
+28358,8472515.50
+9317,8472145.32
+33823,8469721.44
+39055,8469145.07
+91471,8468874.56
+142299,8466039.55
+97672,8464119.80
+134712,8461781.79
+157988,8460123.20
+102284,8458652.44
+73533,8458453.32
+90599,8457874.86
+112160,8457863.36
+124792,8457633.70
+66097,8457573.15
+165271,8456969.01
+146925,8454887.91
+164277,8454838.50
+131290,8454811.20
+179386,8450909.90
+90486,8447873.86
+175924,8444421.66
+185922,8442394.88
+38492,8436438.32
+172511,8436287.34
+139539,8434180.29
+11926,8433199.52
+55889,8431449.88
+163068,8431116.40
+138772,8428406.36
+126821,8425180.68
+22091,8420687.88
+55981,8419434.38
+100960,8419403.46
+172568,8417955.21
+63135,8415945.53
+137651,8413170.35
+191353,8413039.84
+62988,8411571.48
+103417,8411541.12
+12052,8411519.28
+104260,8408516.55
+157129,8405730.08
+77254,8405537.22
+112966,8403512.89
+168114,8402764.56
+49940,8402328.20
+52017,8398753.60
+176179,8398087.00
+100215,8395906.61
+61256,8392811.20
+15366,8388907.80
+109479,8388027.20
+66202,8386522.83
+81707,8385761.19
+51727,8385426.40
+9980,8382754.62
+174403,8378575.73
+54558,8378041.92
+3141,8377378.22
+134829,8377105.52
+145056,8376920.76
+194020,8375157.64
+7117,8373982.27
+120146,8373796.20
+126843,8370761.28
+62117,8369493.44
+111221,8367525.81
+159337,8366092.26
+173903,8365428.48
+136438,8364065.45
+56684,8363198.00
+137597,8363185.94
+20039,8361138.24
+121326,8359635.52
+48435,8352863.10
+1712,8349107.00
+167190,8347238.70
+32113,8346452.04
+40580,8342983.32
+74785,8342519.13
+14799,8342236.75
+177291,8341736.83
+198956,8340370.65
+69179,8338465.99
+118764,8337616.56
+128814,8336435.56
+82729,8331766.88
+152048,8330638.99
+171085,8326259.50
+126730,8325974.40
+77525,8323282.50
+170653,8322840.50
+5257,8320350.78
+67350,8318987.56
+109008,8317836.54
+199043,8316603.54
+139969,8316551.54
+22634,8316531.24
+173309,8315750.25
+10887,8315019.36
+42392,8312895.96
+126040,8312623.20
+101590,8304555.42
+46891,8302192.12
+138721,8301745.62
+113715,8301533.20
+78778,8299685.64
+142908,8299447.77
+64419,8297631.80
+21396,8296272.27
+4180,8295646.92
+63534,8295383.67
+135957,8294389.86
+30126,8291920.32
+158427,8288938.00
+14545,8288395.92
+75548,8288287.20
+64473,8286137.44
+149553,8285714.88
+151284,8283526.65
+171091,8282934.36
+194256,8278985.34
+952,8276136.00
+121541,8275390.26
+177664,8275315.20
+51117,8274504.30
+66770,8273407.80
+37238,8272728.06
+46679,8270486.55
+165852,8268312.60
+99458,8266564.47
+114519,8265493.54
+7231,8264881.50
+19033,8264826.56
+125123,8262732.65
+18642,8261578.99
+50386,8261380.05
+193770,8259578.82
+7276,8258101.60
+178045,8253904.15
+49033,8253696.23
+187195,8251334.58
+10590,8249227.40
+143779,8247057.70
+35205,8245675.17
+19729,8245081.60
+144946,8240479.80
+123786,8239581.24
+70843,8237973.20
+112437,8236907.52
+5436,8236039.57
+163754,8235471.16
+115945,8234811.36
+27918,8233957.88
+105712,8233571.86
+41007,8229431.79
+40476,8226640.41
+145620,8221371.60
+7771,8220413.33
+86424,8215572.61
+129137,8215478.40
+76020,8210495.36
+140213,8209831.80
+32379,8208338.88
+130616,8207715.75
+195469,8206609.80
+191805,8205147.75
+90906,8200951.20
+170910,8195558.01
+105399,8193122.63
+123798,8192385.97
+90218,8191689.16
+114766,8189339.54
+11289,8187354.72
+178308,8185750.50
+71271,8185519.24
+1115,8184903.38
+152636,8184530.72
+151619,8182909.05
+116943,8181072.69
+28891,8181051.54
+47049,8180955.00
+158827,8180470.90
+92620,8179671.55
+20814,8176953.54
+179323,8176795.55
+193453,8174343.94
+56888,8173342.00
+28087,8169876.30
+164254,8169632.35
+57661,8168848.16
+7363,8167538.05
+164499,8167512.08
+197557,8165940.45
+5495,8164805.22
+966,8163824.79
+98435,8161771.45
+127227,8161344.92
+194100,8160978.78
+40134,8160358.08
+107341,8159952.05
+6790,8158792.66
+43851,8157101.40
+51295,8156419.20
+69512,8151537.00
+164274,8149869.93
+130854,8145338.85
+186865,8143586.82
+176629,8141411.20
+193739,8141377.77
+6810,8139822.60
+27732,8136724.96
+50616,8134089.82
+123908,8128920.54
+140994,8128470.82
+99039,8128290.78
+62735,8124940.50
+47829,8122796.50
+192635,8122687.57
+192429,8119268.00
+145812,8119165.63
+42896,8118529.80
+146877,8118266.16
+60882,8116095.04
+18254,8114783.04
+165464,8114571.80
+57936,8111927.25
+52226,8110723.32
+128571,8106788.80
+100308,8105837.04
+8872,8102395.62
+58867,8102033.19
+145153,8100222.84
+172088,8098138.20
+59398,8095845.45
+89395,8093576.10
+171961,8093538.00
+88736,8090762.16
+174053,8090350.11
+102237,8089103.22
+43041,8086537.90
+110219,8085296.90
+126738,8084199.20
+44787,8083628.40
+31277,8083580.76
+93595,8082188.80
+189040,8080257.21
+59851,8079024.24
+175100,8077904.01
+43429,8076729.96
+154199,8074940.76
+60963,8073894.40
+8768,8072760.96
+66095,8071421.70
+111552,8068184.48
+24563,8067500.40
+16167,8067495.24
+12662,8067248.85
+94540,8063727.16
+23308,8063463.18
+27390,8062823.25
+130660,8062787.48
+8608,8062411.16
+181552,8062008.30
+199319,8060248.56
+55475,8058850.92
+142711,8057926.58
+103499,8056978.00
+105943,8056698.75
+8432,8053052.16
+149392,8049675.69
+101248,8048855.49
+140962,8047260.70
+87101,8046651.83
+133107,8046476.73
+45126,8045924.40
+87508,8042966.39
+124711,8042722.72
+173169,8042224.41
+175161,8041331.98
+167787,8040075.78
+3242,8038855.53
+114789,8038628.35
+43833,8038545.83
+141198,8035110.72
+137248,8034109.35
+96673,8033491.20
+32180,8032380.72
+166493,8031902.40
+66959,8031839.40
+85628,8029693.44
+110971,8029469.70
+130395,8027463.92
+7757,8026840.37
+178446,8025379.09
+41295,8024785.53
+100956,8024179.30
+131917,8021604.78
+24224,8020463.52
+2073,8020009.64
+121622,8018462.17
+14357,8016906.30
+135601,8016209.44
+58458,8016192.52
+73036,8015799.00
+184722,8015680.31
+151664,8014821.96
+195090,8012680.20
+162609,8011241.00
+83532,8009753.85
+50166,8007137.89
+181562,8006805.96
+175165,8005319.76
+62500,8005316.28
+36342,8004333.40
+128435,8004242.88
+92516,8003836.80
+30802,8003710.88
+107418,8000430.30
+46620,7999778.35
+191803,7994734.15
+106343,7993087.76
+59362,7990397.46
+8329,7990052.90
+75133,7988244.00
+179023,7986829.62
+135899,7985726.64
+5824,7985340.02
+148579,7984889.56
+95888,7984735.72
+9791,7982699.79
+170437,7982370.72
+39782,7977858.24
+20605,7977556.00
+28682,7976960.00
+42172,7973399.00
+56137,7971405.40
+64729,7970769.72
+98643,7968603.73
+153787,7967535.58
+8932,7967222.19
+20134,7965713.28
+197635,7963507.58
+80408,7963312.17
+37728,7961875.68
+26624,7961772.31
+44736,7961144.10
+29763,7960605.03
+36147,7959463.68
+146040,7957587.66
+115469,7957485.14
+142276,7956790.63
+181280,7954037.35
+115096,7953047.55
+109650,7952258.73
+93862,7951992.24
+158325,7950728.30
+55952,7950387.06
+122397,7947106.27
+28114,7946945.72
+11966,7945197.48
+47814,7944083.00
+85096,7943691.06
+51657,7943593.77
+196680,7943578.89
+13141,7942730.34
+193327,7941036.25
+152612,7940663.71
+139680,7939242.36
+31134,7938318.30
+45636,7937240.85
+56694,7936015.95
+8114,7933921.88
+71518,7932261.69
+72922,7930400.64
+146699,7929167.40
+92387,7928972.67
+186289,7928786.19
+95952,7927972.78
+196514,7927180.70
+4403,7925729.04
+2267,7925649.37
+45924,7925047.68
+11493,7916722.23
+104478,7916253.60
+166794,7913842.00
+161995,7910874.27
+23538,7909752.06
+41093,7909579.92
+112073,7908617.57
+92814,7908262.50
+88919,7907992.50
+79753,7907933.88
+108765,7905338.98
+146530,7905336.60
+71475,7903367.58
+36289,7901946.50
+61739,7900794.00
+52338,7898638.08
+194299,7898421.24
+105235,7897829.94
+77207,7897752.72
+96712,7897575.27
+10157,7897046.25
+171154,7896814.50
+79373,7896186.00
+113808,7893353.88
+27901,7892952.00
+128820,7892882.72
+25891,7890511.20
+122819,7888881.02
+154731,7888301.33
+101674,7879324.60
+51968,7879102.21
+72073,7877736.11
+5182,7874521.73
+---- TYPES
+BIGINT, decimal
+====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q12.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q12.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q12.test
new file mode 100644
index 0000000..a49754f
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q12.test
@@ -0,0 +1,36 @@
+====
+---- QUERY: TPCH-Q12
+# Q12 - Shipping Mode and Order Priority Query
+select
+  l_shipmode,
+  sum(case
+    when o_orderpriority = '1-URGENT'
+      or o_orderpriority = '2-HIGH'
+    then 1
+    else 0
+  end) as high_line_count,
+  sum(case
+    when o_orderpriority <> '1-URGENT'
+      and o_orderpriority <> '2-HIGH'
+    then 1
+    else 0
+  end) as low_line_count
+from
+  customer.c_orders o,
+  o.o_lineitems l
+where
+  l_shipmode in ('MAIL', 'SHIP')
+  and l_commitdate < l_receiptdate
+  and l_shipdate < l_commitdate
+  and l_receiptdate >= '1994-01-01'
+  and l_receiptdate < '1995-01-01'
+group by
+  l_shipmode
+order by
+  l_shipmode
+---- RESULTS
+'MAIL',6202,9324
+'SHIP',6200,9262
+---- TYPES
+string, bigint, bigint
+====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q13.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q13.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q13.test
new file mode 100644
index 0000000..af93fe8
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q13.test
@@ -0,0 +1,68 @@
+====
+---- QUERY: TPCH-Q13
+# Q13 - Customer Distribution Query
+select
+  c_count,
+  count(*) as custdist
+from (
+  select
+    c_custkey,
+    count(o_orderkey) as c_count
+  from
+    customer c left outer join c.c_orders on (
+      o_comment not like '%special%requests%'
+    )
+  group by
+    c_custkey
+  ) as c_orders
+group by
+  c_count
+order by
+  custdist desc,
+  c_count desc
+---- RESULTS
+0,50005
+9,6641
+10,6532
+11,6014
+8,5937
+12,5639
+13,5024
+19,4793
+7,4687
+17,4587
+18,4529
+20,4516
+15,4505
+14,4446
+16,4273
+21,4190
+22,3623
+6,3265
+23,3225
+24,2742
+25,2086
+5,1948
+26,1612
+27,1179
+4,1007
+28,893
+29,593
+3,415
+30,376
+31,226
+32,148
+2,134
+33,75
+34,50
+35,37
+1,17
+36,14
+38,5
+37,5
+40,4
+41,2
+39,1
+---- TYPES
+BIGINT, BIGINT
+====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q14.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q14.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q14.test
new file mode 100644
index 0000000..b4c66ff
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q14.test
@@ -0,0 +1,21 @@
+====
+---- QUERY: TPCH-Q14
+# Q14 - Promotion Effect
+select
+  100.00 * sum(case
+    when p_type like 'PROMO%'
+    then l_extendedprice * (1 - l_discount)
+    else 0.0
+    end) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue
+from
+  customer.c_orders.o_lineitems l,
+  part p
+where
+  l_partkey = p_partkey
+  and l_shipdate >= '1995-09-01'
+  and l_shipdate < '1995-10-01'
+---- RESULTS
+16.380778
+---- TYPES
+decimal
+====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/95f5fb75/testdata/workloads/tpch_nested/queries/tpch_nested-q15.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpch_nested/queries/tpch_nested-q15.test 
b/testdata/workloads/tpch_nested/queries/tpch_nested-q15.test
new file mode 100644
index 0000000..08569ca
--- /dev/null
+++ b/testdata/workloads/tpch_nested/queries/tpch_nested-q15.test
@@ -0,0 +1,38 @@
+====
+---- QUERY: TPCH-Q15
+# Q15 - Top Supplier Query
+with revenue_view as (
+  select
+    l_suppkey as supplier_no,
+    sum(l_extendedprice * (1 - l_discount)) as total_revenue
+  from
+    customer.c_orders.o_lineitems l
+  where
+    l_shipdate >= '1996-01-01'
+    and l_shipdate < '1996-04-01'
+  group by
+    l_suppkey)
+select
+  s_suppkey,
+  s_name,
+  s_address,
+  s_phone,
+  total_revenue
+from
+  supplier,
+  revenue_view
+where
+  s_suppkey = supplier_no
+  and total_revenue = (
+    select
+      max(total_revenue)
+    from
+      revenue_view
+    )
+order by
+  s_suppkey
+---- RESULTS
+8449,'Supplier#000008449','Wp34zim9qYFbVctdW','20-469-856-8873',1772627.2087
+---- TYPES
+BIGINT, STRING, STRING, STRING, DECIMAL
+====

Reply via email to