http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q68.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q68.test 
b/testdata/workloads/tpcds/queries/tpcds-q68.test
index 1387e74..f3b9667 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q68.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q68.test
@@ -28,21 +28,11 @@ from
     and store_sales.ss_store_sk = store.s_store_sk
     and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk
     and store_sales.ss_addr_sk = customer_address.ca_address_sk
-    -- and date_dim.d_dom between 1 and 2
-    and (household_demographics.hd_dep_count = 5
+    and date_dim.d_dom between 1 and 2
+    and (household_demographics.hd_dep_count = 4
       or household_demographics.hd_vehicle_count = 3)
-    -- and date_dim.d_year in (1999, 1999 + 1, 1999 + 2)
+    and date_dim.d_year in (1999, 1999 + 1, 1999 + 2)
     and store.s_city in ('Midway', 'Fairview')
-    -- partition key filter
-    -- and ss_sold_date_sk in (2451180, 2451181, 2451211, 2451212, 2451239, 
2451240, 2451270, 2451271, 2451300, 2451301, 2451331, 
-    --                         2451332, 2451361, 2451362, 2451392, 2451393, 
2451423, 2451424, 2451453, 2451454, 2451484, 2451485, 
-    --                         2451514, 2451515, 2451545, 2451546, 2451576, 
2451577, 2451605, 2451606, 2451636, 2451637, 2451666, 
-    --                         2451667, 2451697, 2451698, 2451727, 2451728, 
2451758, 2451759, 2451789, 2451790, 2451819, 2451820, 
-    --                         2451850, 2451851, 2451880, 2451881, 2451911, 
2451912, 2451942, 2451943, 2451970, 2451971, 2452001, 
-    --                         2452002, 2452031, 2452032, 2452062, 2452063, 
2452092, 2452093, 2452123, 2452124, 2452154, 2452155, 
-    --                         2452184, 2452185, 2452215, 2452216, 2452245, 
2452246) 
-    and ss_sold_date_sk between 2451180 and 2451269 -- partition key filter (3 
months)
-    and d_date between '1999-01-01' and '1999-03-31'
   group by
     ss_ticket_number,
     ss_customer_sk,
@@ -60,106 +50,106 @@ order by
   ss_ticket_number
 limit 100;
 ---- RESULTS
-'','Marilyn','Woodville','Brownsville',31190,13820.61,894.62,30351.86
-'','Rosalba','Oak Grove','Cedar Grove',137323,18895.00,438.20,40219.12
-'','','Wilson','Lebanon',185660,12508.22,505.85,34109.94
-'','Robert','Mount Zion','Liberty',227572,8798.00,400.91,37292.31
-'Aguilar','Douglas','Pine Grove','Oak Grove',79385,11496.22,356.03,29407.88
-'Allison','Elsie','Shiloh','Harmony',201869,14130.10,563.71,27916.99
+'Aaron','Guy','Lakeside','Mount Pleasant',210815,24704.66,678.88,45673.18
+'Abbott','Joseph','Greenfield','Midway',62751,37795.50,1086.40,53385.17
+'Abbott','Harriet','Wesley','Forest Hills',84405,23666.36,1274.86,45689.64
+'Abney','Louis','Gladstone','Green Acres',140967,20698.82,491.86,48086.21
+'Acevedo','David','Clinton','Shady Grove',131505,22075.16,772.60,46961.99
+'Acosta','Johnnie','Centerville','Enterprise',69183,21688.97,1059.74,34387.30
+'Acosta','David','Harmony','Bunker Hill',112259,11738.20,399.34,17105.96
+'Adair','Evan','Blanchard','New Hope',117449,10843.01,540.08,20084.01
+'Adams','Genevieve','Enterprise','Union Hill',109910,32666.21,1432.96,61189.81
+'Adams','Joyce','Newtown','Concord',166181,18450.10,1108.79,28427.74
+'Adams','John','Marion','Oak Ridge',206733,34785.44,852.47,57926.68
+'Adams','David','Bridgeport','Antioch',213366,12990.48,225.47,28512.17
+'Aguayo','John','Newport','Newtown',156381,17114.17,567.09,30022.52
+'Aguayo','Jeanne','Glendale','Hopewell',199409,29035.37,1374.34,53784.57
+'Aguilar','Arlene','Ashland','Brownsville',121548,31984.01,1162.65,50601.98
+'Aguirre','Penny','Union Hill','Marion',104413,35843.61,966.63,52811.51
+'Ahmed','Maureen','Oak Hill','Union Hill',128051,23686.18,1174.98,41563.27
+'Aiken','James','Mount Olive','Crossroads',212463,18049.02,819.49,29911.37
+'Alarcon','Victoria','Spring Valley','Bunker 
Hill',134199,18533.41,710.55,37775.73
+'Alexander','Robert','Woodlawn','Arlington',174134,28340.20,914.46,51978.95
+'Alexander','Megan','White Oak','Greenfield',179976,21580.95,898.61,42878.10
+'Alexander','Beverly','Valley View','Five 
Forks',212635,15885.12,1067.05,30762.55
+'Allen','Amy','Oakland','Greenville',59638,27050.83,1879.66,41767.88
+'Allen','Kenneth','Springdale','Liberty',79152,10310.19,260.52,30436.60
+'Allen','Harold','Lincoln','Providence',84380,22544.47,1135.75,57628.38
+'Allen','William','Lewis','Springdale',101791,20167.15,1076.20,25099.71
+'Allen','Dustin','Arlington','Five Forks',167363,9931.55,397.05,41126.80
+'Allen','Marcus','Woodlawn','Belleville',213821,17649.78,797.92,66454.88
+'Allen','Curtis','Brentwood','Richardson',216964,5751.82,180.82,39045.19
+'Allison','Betty','Hamilton','Riverside',154720,13246.09,394.33,20798.94
+'Allison','Sylvia','Jackson','Woodland',162335,16473.74,541.19,37558.02
+'Alonzo','Charles','Unionville','Jamestown',91324,12253.64,736.42,31247.28
+'Alston','Jesus','Midway','Bridgeport',52608,30120.39,1733.46,61262.55
+'Alvarado','Brooke','Springfield','Deerfield',22264,7382.73,186.70,14659.04
+'Alvarado','Tyson','Pleasant Grove','Midway',187704,21663.47,1230.22,40665.04
+'Alvarez','Glenn','Mount 
Vernon','Martinsville',191809,19592.11,1176.85,41206.86
+'Amato','Nelson','Brownsville','Harmon',142017,25961.35,978.70,39198.79
+'Ames','Gregory','Summerfield','Carthage',239041,24406.60,890.32,48047.25
 'Anderson','Alan','Bunker Hill','Oakdale',31774,27005.34,1103.94,40676.61
+'Anderson','Mark','Clearwater','Shiloh',34383,11726.53,446.01,24160.55
+'Anderson','Eloise','Fairview','Midway',59994,24468.31,1185.01,71467.37
+'Anderson','Marcia','Clifton','Lawrenceville',83235,32158.02,1641.86,66411.93
+'Anderson','Margaret','Liberty','Woodville',122663,12244.97,448.17,24411.14
+'Anderson','Jeremy','Bridgeport','Golden',148124,18681.36,645.07,31244.92
+'Anderson','Marcia','Clifton','Belmont',156087,15630.25,586.02,36680.54
 'Anderson','Gerald','Centerville','Hamilton',161201,11833.74,556.97,28705.58
-'Andrews','Katrina','Lakeview','Bethel',141027,12124.94,753.03,35956.68
+'Anderson','Mark','Clearwater','Deerfield',178872,22171.96,746.63,35582.48
+'Anderson','Latasha','Florence','Altamont',187946,14746.73,254.79,31702.67
+'Anderson','John','Valley View','Pleasant 
Valley',207323,24052.33,890.91,40618.13
+'Andrews','Johnathan','Pleasant Valley','Cedar',135587,7745.55,264.73,14969.23
+'Angel','Claudette','Sunnyside','Edgewood',196703,40487.66,2101.67,74569.91
+'Antoine','Natalia','Pine Grove','Providence',17718,9705.04,248.18,35927.56
+'Applegate','Edith','Oak Ridge','Waterloo',99615,14067.16,321.47,28150.90
+'Arce','Casey','Sulphur Springs','Salem',22677,32542.08,1517.63,52981.23
+'Archuleta','NULL','Yorktown','Welcome',205016,18262.18,1100.87,35615.43
+'Armijo','Bryan','Pleasant Grove','Woodbury',91994,13606.26,864.10,42234.98
+'Armstrong','Charles','Providence','Pine Grove',62187,13115.42,655.65,45343.33
+'Ashby','Jeanne','Wildwood','Oakwood',28839,21247.34,1166.93,25034.57
+'Ashe','Barbara','Spring Hill','Bunker Hill',17181,23184.07,1387.18,48324.66
+'Ashley','Emmanuel','Forest Hills','Hopewell',170241,28574.95,475.41,80421.92
+'Atkinson','Cedric','Red Hill','Summit',194465,30255.47,1199.93,48718.93
+'Austin','Molly','Greenville','Midway',233037,21252.57,433.63,36658.60
+'Avila','Ashley','Clinton','Summit',214308,19752.60,476.87,47445.77
+'Ayala','Jesus','Woodville','Arlington',17419,30939.94,1343.98,56058.79
+'Ayala','Ana','Clinton','Oakdale',71608,32095.11,851.00,54011.17
+'Ayala','Stacy','Macedonia','Fairview',233483,21589.41,944.73,50167.53
+'Ayres','Loretta','Whispering Pines','Pine 
Grove',95587,16392.62,528.13,42092.74
+'Babin','Mike','Arcola','Sulphur Springs',179769,20294.32,731.54,46743.49
 'Bailey','Robert','Mountain View','Lakeview',234709,22616.93,831.50,55324.79
+'Baker','Jennifer','Georgetown','Enterprise',29854,22831.56,760.14,35952.11
+'Baker','Joel','Sulphur Springs','Lincoln',48913,17417.92,829.45,33206.23
+'Baker','Benjamin','Bethel','Oakland',79834,4618.07,149.22,24355.19
+'Baker','Richard','Five Forks','Greenfield',110320,20924.76,1460.23,41027.94
+'Baker','Craig','Oak Ridge','Providence',141109,24105.20,1083.53,42863.71
+'Baker','Daniel','Jackson','Wilson',201588,15385.36,778.77,31795.09
+'Baldridge','Victor','Siloam','Mount Pleasant',46121,32854.69,1031.00,77791.74
+'Baldwin','James','Bunker Hill','Edgewood',67593,13885.95,500.11,43493.89
 'Baldwin','Tena','Andover','Glenwood',180853,13526.84,678.23,35726.94
-'Banks','Max','Waterloo','Farmington',219523,26860.96,1766.22,38563.06
-'Barrett','','Hillcrest','Galena',209036,12472.56,159.20,27869.88
-'Barron','Garry','Mount Pleasant','Oakland',58808,39692.60,2165.23,61486.57
-'Belcher','Kristina','Springdale','Walnut 
Grove',185205,13614.82,463.86,28401.55
-'Bernal','Nilda','Fairfield','Glendale',163603,34518.45,1306.51,50328.56
-'Bilodeau','Angela','Waterloo','Woodville',140268,13353.70,591.96,32359.96
-'Boudreaux','John','Lincoln','Brownsville',99169,13077.89,428.10,41262.12
-'Brown','Dorothy','Centerville','Plainview',2960,27531.93,1965.84,49523.57
-'Brown','Dan','Clinton','Thompsonville',132552,6821.47,256.67,13260.74
-'Brown','Many','Centerville','Unionville',227538,10125.40,396.55,23505.85
-'Bullock','Kathryn','Edgewood','Lakeview',128851,8131.34,91.17,13148.83
-'Burger','Don','Bunker Hill','Riverview',237223,32678.32,1125.54,49741.24
-'Burgess','Andrew','Glenwood','Sunnyside',24111,56847.90,2500.66,85652.09
-'Burke','Molly','Green Acres','Valley View',128688,17253.27,752.49,46755.08
-'Burns','Betsy','Stringtown','Centerville',39637,12878.79,731.88,23691.40
-'Cameron','David','Greenfield','Edgewood',68787,15862.10,1076.35,45200.11
-'Campos','Charles','Oak Ridge','Antioch',77528,16539.22,683.13,51775.65
-'Chavez','William','Green Acres','Shiloh',10161,33452.73,837.38,65088.42
-'Clay','Sally','Woodville','Jackson',87955,23816.75,780.26,58500.40
-'Collins','Virgie','Gravel Hill','Spring Hill',124655,19339.40,745.96,37178.26
-'Collins','','Forest Hills','Five Forks',148125,24006.29,684.31,50396.26
-'Culpepper','Karl','Oakdale','Centerville',102332,35675.81,1728.56,56369.86
-'Curry','Frederick','Newtown','Buena Vista',145240,24748.60,1352.78,38228.32
-'Damico','Sylvester','Summit','Macedonia',133117,10251.62,442.20,18035.58
-'Daniel','Denise','Kelly','Franklin',38236,35911.27,1228.96,69693.19
-'Davis','Ronald','Deerfield','Montezuma',32323,19701.51,855.94,49898.34
-'Deaton','James','Bridgeport','Woodville',130270,23439.01,887.65,61285.95
-'Dill','Richard','Concord','Harmony',98553,37011.88,1403.83,72488.98
-'Eddy','Angela','Pleasant Grove','Edgewood',60661,10749.81,416.31,44736.67
-'Edge','Jacqueline','Ashland','Lincoln',188939,9957.05,391.05,21661.49
-'Finn','Kerry','Oak Hill','Green Acres',16411,21994.17,908.03,49362.90
-'Flagg','Aaron','Crossroads','Harmon',38182,24676.39,1064.65,42639.85
-'Garcia','Julia','Unionville','Shady Grove',126824,38321.98,963.51,50473.86
-'Gatlin','Thomas','Pleasant Valley','Evans',119439,35946.09,1529.65,57049.40
-'Gay','Russell','Ashland','Pleasant Grove',148869,19170.60,1067.99,57441.15
-'Goff','Delmer','Highland','Bridgeport',49186,45323.56,1255.54,101163.49
-'Gonzales','Benjamin','Maple Grove','Mount 
Zion',65066,32788.95,1517.85,57932.70
-'Gonzalez','Debbie','Jackson','Texas',16485,12464.59,562.85,28642.16
-'Gonzalez','','Pleasant Grove','Belmont',208180,25408.15,852.38,54009.28
-'Grayson','Johnny','Woodland','Red Hill',74249,25816.72,1253.78,49503.25
-'Griffin','Alicia','Union Hill','Hopewell',7035,27349.16,1374.73,47300.64
-'Griggs','John','','Clifton',141033,37263.87,2383.08,77072.72
-'Gustafson','Kristy','Riverview','Shiloh',138292,18850.53,769.44,50625.59
-'Haley','Susan','Belmont','Spring Valley',149258,23899.49,1529.79,39720.12
-'Hamlin','Heather','Midway','Spring Hill',101298,18640.78,806.16,22281.67
-'Hammond','Lisa','Bethel','Springdale',25363,14156.02,390.03,21094.80
-'Harmon','David','Glenwood','Oakdale',55476,10389.91,463.57,19160.24
-'Harris','Chase','Buena Vista','Woodville',8622,27194.96,1264.46,55859.57
-'Harrison','Holly','Mount Olive','Jamestown',197654,31504.27,1379.29,51800.28
-'Haynes','Louis','Riverdale','Highland Park',77028,14156.13,745.21,24799.38
-'Head','Joshua','Clinton','Pine Grove',87042,19061.53,807.20,53411.38
-'Hedrick','Pauline','Newport','Georgetown',149070,15738.66,512.31,45594.19
-'Hendrick','Helen','Marietta','Plainview',219985,32290.58,826.59,57382.84
-'Hendrix','Kristy','Glenwood','Enterprise',226605,19052.02,893.23,57311.55
-'Hernandez','William','Bridgeport','Antioch',229792,11987.61,460.63,21520.67
-'Hill','Charlotte','Hubbard','Friendship',176566,39892.02,1993.50,66001.20
-'Hogan','Virginia','Jamestown','Highland Park',111552,28335.19,1421.26,54353.32
-'Holloway','Monica','Montpelier','Morgantown',171143,17706.42,1318.35,24474.87
-'Hooker','Samuel','Crossroads','Enterprise',121595,21593.69,1240.92,33518.10
-'Howell','Sonny','Bunker Hill','Farmington',132414,12594.87,843.96,36570.84
-'Howland','Karen','Argyle','Five Forks',91452,17179.76,796.38,35015.58
-'Huynh','Sue','Valley View','Jamestown',196592,31298.24,1385.01,64201.20
-'Jennings','Ricardo','Springdale','Stringtown',87669,19001.92,303.95,42605.90
-'Johnson','David','Woodville','New Hope',219947,41035.61,1311.40,59017.99
-'Jones','Eleanor','Belmont','Leon',27477,46364.82,2758.46,74856.35
-'Jones','Amanda','Greenville','Arthur',89142,37399.82,1299.78,52318.38
-'Jones','Kevin','Bloomingdale','Newport',167542,39980.45,1771.25,61521.19
-'Jones','Loren','Springdale','Greenville',175093,12150.29,441.32,19749.85
-'Jordan','Susan','Liberty','Shady Grove',206223,37078.55,658.44,43113.84
-'Kelly','Rebecca','Lincoln','Woodland Park',60401,20095.11,638.25,34662.52
-'Kent','Kay','Crossroads','Clinton',193213,10725.71,420.15,26239.29
-'Kiefer','Ken','Edgewood','Riverdale',122840,44226.80,1719.42,78027.77
-'Kirkland','Tracy','Oak Hill','Whitney',13750,16069.61,723.11,21407.64
-'Lee','William','Florence','Forest Hills',158181,20864.69,912.60,36673.04
-'Little','Leo','Woodbury','Crystal',87779,8842.14,286.90,33848.37
-'Lively','Douglas','Mount Olive','Green Acres',127257,13754.21,629.84,30597.21
-'Luster','Michael','Fairbanks','New Hope',177314,45434.64,1788.10,64859.99
-'Lynch','Doris','Jamestown','',142431,22658.54,594.76,36029.35
-'Lyons','Rod','Kingston','Mount Olive',120177,27997.82,587.60,53099.48
-'Mann','Steve','','Valley View',177311,14364.24,352.58,26541.16
-'Markham','Detra','Hopewell','Friendship',132934,30913.00,1278.07,53566.17
-'Martin','Leroy','Wilson','Greenville',12711,19395.06,678.58,48990.53
-'Martinez','Stephen','Clearview','Clifton',117059,21485.75,1089.14,30704.96
-'Matney','Crystal','Pomona','Unionville',181728,40845.97,2483.16,58172.28
-'Mccain','Robert','Dewey','Plainview',13810,19145.52,979.49,40336.14
-'Mccarty','Eugene','Hopewell','Franklin',171331,21284.89,1218.57,28610.79
-'Mcclellan','Ruby','Lincoln','Friendship',48929,22901.35,1146.43,52148.39
-'Mcfarland','Carl','Spring Hill','Edgewood',157680,14399.37,661.82,39553.25
-'Mckeown','Gary','Concord','Ashland',52161,6974.46,206.39,19988.65
+'Baldwin','Barry','Walnut Grove','Clinton',187586,14637.55,609.62,21051.70
+'Ball','Lionel','Union','Concord',143182,25763.15,1287.78,42039.28
+'Ball','Evelyn','Spring Valley','Five Points',205355,6095.24,447.79,28374.50
+'Ballou','Michael','Reno','Lincoln',177577,10735.74,560.24,36449.75
+'Banks','Marian','Woodville','Richfield',52317,11876.83,597.09,28381.94
+'Banks','Angela','Harmony','Sullivan',90206,21927.27,1023.96,52589.76
+'Barajas','Wendy','Mount Vernon','Liberty',213552,27777.38,940.01,44515.82
+'Barker','Robert','Midway','Oak Ridge',23734,27986.16,662.34,49205.06
+'Barker','Keith','Summit','Lakewood',139745,4983.72,181.81,12471.30
+'Barker','Keith','Summit','Valley View',214164,20816.56,931.20,52036.95
+'Barnes','Arthur','Flint','Stringtown',71708,13512.86,711.46,32063.72
+'Barnes','Charles','Spring Hill','Franklin',79586,35911.85,759.04,61893.18
+'Barnett','Donald','Fairfield','Bethel',69630,28948.35,825.18,59288.30
+'Barnett','Stacie','Wilson','Greenfield',90549,21277.47,819.57,45569.89
+'Barnett','Linda','Centerville','Providence',226202,28599.43,1389.20,57758.69
+'Barney','Bernice','Mount Olive','Summit',192415,14490.99,919.54,33533.73
+'Barnhart','Josephine','Riverside','Salem',123737,17146.50,308.43,29986.14
+'Barr','Kyle','Shiloh','Greenfield',217215,2593.66,68.45,10983.70
+'Barrett','Robert','Kingston','Riverview',52319,23184.59,434.24,30968.82
+'Barton','Margaret','Sleepy Hollow','Highland 
Park',50712,15262.57,738.68,40574.06
+'Bates','Albert','Springdale','Gravel Hill',113737,12809.77,585.36,31662.77
+'Bauer','August','Fairfield','Belmont',134369,31443.79,1368.37,50747.16
 ---- TYPES
-STRING, STRING, STRING, STRING, INT, DECIMAL, DECIMAL, DECIMAL
+STRING, STRING, STRING, STRING, BIGINT, DECIMAL, DECIMAL, DECIMAL
 ====
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q7.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q7.test 
b/testdata/workloads/tpcds/queries/tpcds-q7.test
index aa76cbd..162a5af 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q7.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q7.test
@@ -17,119 +17,118 @@ where
   and ss_item_sk = i_item_sk
   and ss_cdemo_sk = cd_demo_sk
   and ss_promo_sk = p_promo_sk
-  and cd_gender = 'F'
-  and cd_marital_status = 'W'
-  and cd_education_status = 'Primary'
+  and cd_gender = 'M'
+  and cd_marital_status = 'S'
+  and cd_education_status = 'College'
   and (p_channel_email = 'N'
     or p_channel_event = 'N')
-  and d_year = 1998
-  and ss_sold_date_sk between 2450815 and 2451179 -- partition key filter
+  and d_year = 2000
 group by
   i_item_id
 order by
   i_item_id
 limit 100;
 ---- RESULTS
-'AAAAAAAAAAKBAAAA',7,87.58,64.06,16.64
-'AAAAAAAAAAPBAAAA',6,87.26,NULL,NULL
-'AAAAAAAAABEDAAAA',76,132.50,377.60,99.37
-'AAAAAAAAABGAAAAA',58,16.67,0.00,6.00
-'AAAAAAAAABLBAAAA',99,87.60,854.96,50.80
-'AAAAAAAAABOCAAAA',99,55.69,0.00,49.00
-'AAAAAAAAACJAAAAA',5,86.28,0.00,50.04
-'AAAAAAAAACJCAAAA',56,104.37,0.00,55.31
-'AAAAAAAAACLDAAAA',93,6.70,0.00,3.35
-'AAAAAAAAACPDAAAA',96,88.68,292.67,7.09
-'AAAAAAAAADDEAAAA',26,45.17,0.00,28.00
-'AAAAAAAAADHBAAAA',51,97.68,0.00,51.77
-'AAAAAAAAADKBAAAA',15,92.10,0.00,6.44
-'AAAAAAAAADNDAAAA',71,105.42,0.00,34.78
-'AAAAAAAAAEBDAAAA',76,105.15,1924.19,29.44
-'AAAAAAAAAEECAAAA',83,106.43,0.00,71.30
-'AAAAAAAAAEEDAAAA',1,37.90,0.00,35.62
-'AAAAAAAAAFDAAAAA',66,53.14,1115.99,45.70
-'AAAAAAAAAFGCAAAA',3,88.53,0.00,83.21
-'AAAAAAAAAFGDAAAA',71,34.19,0.00,24.61
-'AAAAAAAAAGBEAAAA',78,139.86,523.53,33.56
-'AAAAAAAAAHDEAAAA',72,118.30,0.00,13.01
-'AAAAAAAAAHIBAAAA',70,168.16,0.00,122.75
-'AAAAAAAAAIIBAAAA',65.5,115.60,797.94,64.73
-'AAAAAAAAAJBBAAAA',86,28.53,0.00,22.25
-'AAAAAAAAAJCCAAAA',74,71.12,0.00,9.24
-'AAAAAAAAAJHAAAAA',2,135.97,0.00,114.21
-'AAAAAAAAAJKAAAAA',15,88.40,0.00,70.72
-'AAAAAAAAAJLDAAAA',38,182.13,0.00,74.67
-'AAAAAAAAAKMDAAAA',77,101.27,0.00,98.23
-'AAAAAAAAALMAAAAA',23,101.43,198.48,37.52
-'AAAAAAAAAMABAAAA',55,127.02,1466.85,38.10
-'AAAAAAAAAMDBAAAA',5,85.09,0.00,51.90
-'AAAAAAAAAMDEAAAA',29,33.22,0.00,27.57
-'AAAAAAAAAMEAAAAA',98,147.70,0.00,13.29
-'AAAAAAAAAMICAAAA',37,69.07,42.91,16.57
-'AAAAAAAAAMLAAAAA',63,101.63,0.00,40.65
-'AAAAAAAAANABAAAA',85,38.40,0.00,16.51
-'AAAAAAAAANAEAAAA',54,31.49,0.00,24.56
-'AAAAAAAAANDDAAAA',43,170.16,0.00,122.51
-'AAAAAAAAAOEBAAAA',94,78.58,0.00,42.43
-'AAAAAAAAAOHBAAAA',42,141.03,0.00,115.64
-'AAAAAAAAAOKCAAAA',71,39.16,810.50,31.71
-'AAAAAAAAAPGBAAAA',32,99.61,0.00,58.76
-'AAAAAAAAAPIAAAAA',70,124.69,2793.71,120.94
-'AAAAAAAABAADAAAA',40,26.11,0.00,3.65
-'AAAAAAAABAFEAAAA',76,51.74,0.00,19.66
-'AAAAAAAABAJAAAAA',3,134.06,85.26,71.05
-'AAAAAAAABAKCAAAA',71,60.70,1672.16,24.28
-'AAAAAAAABAPDAAAA',44,88.92,0.00,62.24
-'AAAAAAAABBNBAAAA',42,139.89,0.00,48.96
-'AAAAAAAABCNAAAAA',84,139.60,0.00,37.69
-'AAAAAAAABDGDAAAA',49,24.89,0.00,2.24
-'AAAAAAAABDHCAAAA',60,27.62,0.00,25.41
-'AAAAAAAABFHDAAAA',94,31.46,0.00,0.00
-'AAAAAAAABIDBAAAA',56,140.91,0.00,23.95
-'AAAAAAAABIGBAAAA',21,37.77,0.00,24.92
-'AAAAAAAABJBCAAAA',32,2.96,0.00,0.00
-'AAAAAAAABJFEAAAA',96,43.52,0.00,16.97
-'AAAAAAAABKFDAAAA',47,23.11,487.22,11.78
-'AAAAAAAABLDEAAAA',10,12.16,0.00,9.12
-'AAAAAAAABMDAAAAA',84,43.80,0.00,35.91
-'AAAAAAAABNCAAAAA',37,122.93,0.00,11.06
-'AAAAAAAABNLDAAAA',56,83.50,0.00,5.01
-'AAAAAAAABOGBAAAA',42,98.26,3031.98,91.38
-'AAAAAAAABPGAAAAA',40,59.76,0.00,15.53
-'AAAAAAAACABEAAAA',35,107.64,0.00,35.52
-'AAAAAAAACACEAAAA',21,10.20,0.00,6.73
-'AAAAAAAACAEEAAAA',11,54.23,0.00,11.38
-'AAAAAAAACALBAAAA',72,146.68,0.00,71.87
-'AAAAAAAACAMCAAAA',29,5.33,0.00,4.79
-'AAAAAAAACAOBAAAA',9,34.38,103.65,17.19
-'AAAAAAAACBFCAAAA',4,73.22,14.05,3.66
-'AAAAAAAACBOCAAAA',100,85.56,0.00,83.84
-'AAAAAAAACCICAAAA',17,89.34,0.00,64.32
-'AAAAAAAACCMAAAAA',42,30.54,0.00,8.10
-'AAAAAAAACDIDAAAA',59,20.70,161.61,12.38
-'AAAAAAAACDLAAAAA',58,71.89,0.00,19.41
-'AAAAAAAACEABAAAA',63,110.83,0.00,5.54
-'AAAAAAAACEBEAAAA',74,31.51,90.90,8.19
-'AAAAAAAACEEAAAAA',42,116.06,0.00,49.90
-'AAAAAAAACFAEAAAA',17,51.60,0.00,27.86
-'AAAAAAAACFIBAAAA',93,121.19,0.00,9.69
-'AAAAAAAACGACAAAA',11,137.04,0.00,98.66
-'AAAAAAAACGMDAAAA',53,76.98,0.00,73.90
-'AAAAAAAACHBAAAAA',79,112.14,0.00,108.77
-'AAAAAAAACHICAAAA',99,42.85,0.00,42.42
-'AAAAAAAACHLAAAAA',26,146.89,0.00,8.81
-'AAAAAAAACHPCAAAA',13,45.93,0.00,18.83
-'AAAAAAAACIBDAAAA',2,6.31,0.16,4.10
-'AAAAAAAACJBEAAAA',71,46.81,0.00,1.87
-'AAAAAAAACJLDAAAA',35,91.70,2199.19,70.60
-'AAAAAAAACJODAAAA',4,68.66,140.87,65.22
-'AAAAAAAACKOAAAAA',17,164.89,0.00,153.34
-'AAAAAAAACLCEAAAA',18,78.95,0.00,43.42
-'AAAAAAAACLEAAAAA',84,55.07,0.00,51.21
-'AAAAAAAACLJDAAAA',28,14.37,72.85,5.31
-'AAAAAAAACMBEAAAA',18,133.72,0.00,64.18
-'AAAAAAAACMIBAAAA',6,100.05,0.00,19.00
-'AAAAAAAACMMAAAAA',36,127.11,0.00,105.50
+'AAAAAAAAAAACAAAA',17,13.15,7.70,1.97
+'AAAAAAAAAAAEAAAA',99,123.44,0.00,44.43
+'AAAAAAAAAABBAAAA',11,77.31,0.00,38.65
+'AAAAAAAAAABEAAAA',35.5,18.90,0.00,4.85
+'AAAAAAAAAACAAAAA',61,38.63,90.24,16.38
+'AAAAAAAAAACCAAAA',10.5,83.46,0.00,30.02
+'AAAAAAAAAADBAAAA',44,108.36,0.00,13.00
+'AAAAAAAAAADCAAAA',54,59.29,0.00,34.98
+'AAAAAAAAAADEAAAA',93,43.57,0.00,38.34
+'AAAAAAAAAAEAAAAA',72,16.46,0.00,13.33
+'AAAAAAAAAAEBAAAA',88,29.02,0.00,0.87
+'AAAAAAAAAAEDAAAA',91,84.37,0.00,9.09
+'AAAAAAAAAAFDAAAA',37,33.13,0.00,20.20
+'AAAAAAAAAAGEAAAA',35,56.48,881.45,23.63
+'AAAAAAAAAAHDAAAA',33,59.05,0.00,48.53
+'AAAAAAAAAAICAAAA',68.5,108.73,166.78,69.22
+'AAAAAAAAAAIDAAAA',76,97.19,0.00,43.73
+'AAAAAAAAAAJCAAAA',30,47.55,0.00,30.43
+'AAAAAAAAAAKBAAAA',59,55.08,0.00,17.07
+'AAAAAAAAAAMBAAAA',74,10.39,0.00,8.62
+'AAAAAAAAAAMCAAAA',86,24.10,0.41,0.48
+'AAAAAAAAAANAAAAA',43,80.16,0.00,41.68
+'AAAAAAAAAANBAAAA',28,112.27,0.00,57.25
+'AAAAAAAAAAOAAAAA',46,12.63,0.00,4.67
+'AAAAAAAAAAPBAAAA',66,39.59,969.80,18.60
+'AAAAAAAAAAPCAAAA',90,68.28,0.00,47.79
+'AAAAAAAAABAAAAAA',10.5,71.48,0.00,28.92
+'AAAAAAAAABABAAAA',12.5,100.53,2.23,34.80
+'AAAAAAAAABADAAAA',100,68.67,0.00,50.81
+'AAAAAAAAABAEAAAA',49,15.79,0.00,11.84
+'AAAAAAAAABBCAAAA',52,115.10,0.00,24.17
+'AAAAAAAAABDEAAAA',92,168.96,0.00,23.65
+'AAAAAAAAABEAAAAA',33.33333333333334,58.64,99.47,22.16
+'AAAAAAAAABECAAAA',43,167.74,0.00,88.90
+'AAAAAAAAABEDAAAA',74,129.10,0.00,108.44
+'AAAAAAAAABFBAAAA',36,115.18,0.00,109.42
+'AAAAAAAAABFCAAAA',51,121.98,0.00,17.07
+'AAAAAAAAABFEAAAA',65,117.88,0.00,107.27
+'AAAAAAAAABGBAAAA',52,71.54,0.00,30.28
+'AAAAAAAAABGDAAAA',67.5,58.86,0.00,35.25
+'AAAAAAAAABHAAAAA',71,39.38,804.37,8.38
+'AAAAAAAAABHCAAAA',48,12.67,52.16,4.18
+'AAAAAAAAABHDAAAA',55,17.78,0.00,5.51
+'AAAAAAAAABJAAAAA',32,20.11,0.00,15.68
+'AAAAAAAAABJBAAAA',21,72.33,0.00,11.37
+'AAAAAAAAABJDAAAA',43,74.92,0.00,8.24
+'AAAAAAAAABKAAAAA',67,103.07,0.00,34.01
+'AAAAAAAAABKCAAAA',43,73.93,0.00,48.05
+'AAAAAAAAABKDAAAA',84,102.95,0.00,42.20
+'AAAAAAAAABMAAAAA',58,136.34,0.00,35.44
+'AAAAAAAAABMDAAAA',80,3.06,0.00,1.89
+'AAAAAAAAABNAAAAA',96,81.95,0.00,64.74
+'AAAAAAAAABNCAAAA',42,88.83,0.00,20.65
+'AAAAAAAAABOBAAAA',18,81.49,0.00,58.67
+'AAAAAAAAABOCAAAA',31,73.87,0.00,59.94
+'AAAAAAAAABPBAAAA',48.5,37.83,183.78,11.72
+'AAAAAAAAACACAAAA',60,104.37,351.56,25.31
+'AAAAAAAAACADAAAA',29,43.74,0.00,13.99
+'AAAAAAAAACBBAAAA',44.5,87.51,0.00,36.14
+'AAAAAAAAACBEAAAA',76,156.05,0.00,113.91
+'AAAAAAAAACCDAAAA',26,35.57,0.00,13.01
+'AAAAAAAAACCEAAAA',4,10.98,0.00,4.94
+'AAAAAAAAACDAAAAA',16,87.87,36.26,75.56
+'AAAAAAAAACDCAAAA',27,89.86,0.00,40.43
+'AAAAAAAAACEBAAAA',42,94.58,0.00,51.26
+'AAAAAAAAACFBAAAA',45,88.30,0.00,24.26
+'AAAAAAAAACGAAAAA',47,10.46,0.00,5.64
+'AAAAAAAAACGDAAAA',24,51.54,0.00,18.83
+'AAAAAAAAACHBAAAA',44,103.27,0.00,65.06
+'AAAAAAAAACHCAAAA',68.5,91.68,0.00,66.16
+'AAAAAAAAACIAAAAA',7,25.42,0.00,8.64
+'AAAAAAAAACIBAAAA',21,89.29,915.01,71.43
+'AAAAAAAAACIDAAAA',43,56.28,56.11,4.50
+'AAAAAAAAACLAAAAA',36,125.57,0.00,13.81
+'AAAAAAAAACLDAAAA',61.33333333333334,114.20,0.00,59.12
+'AAAAAAAAACMDAAAA',56,79.02,0.00,64.00
+'AAAAAAAAACNCAAAA',63,54.20,0.00,29.26
+'AAAAAAAAACOAAAAA',50,27.43,229.21,13.43
+'AAAAAAAAACPAAAAA',32,147.62,2480.32,87.09
+'AAAAAAAAACPCAAAA',80,12.60,0.00,0.37
+'AAAAAAAAACPDAAAA',87,105.93,0.00,9.53
+'AAAAAAAAADABAAAA',68.5,35.79,0.00,27.84
+'AAAAAAAAADACAAAA',96,101.54,0.00,99.50
+'AAAAAAAAADAEAAAA',53,74.64,0.00,7.63
+'AAAAAAAAADBBAAAA',6,85.58,234.14,81.30
+'AAAAAAAAADBDAAAA',47,39.33,62.71,12.09
+'AAAAAAAAADBEAAAA',52,2.41,0.00,1.06
+'AAAAAAAAADCAAAAA',91,92.17,0.00,67.28
+'AAAAAAAAADCCAAAA',33,40.80,0.00,28.56
+'AAAAAAAAADDBAAAA',45,18.63,0.00,17.69
+'AAAAAAAAADDCAAAA',66,162.17,1525.90,37.29
+'AAAAAAAAADDEAAAA',35,78.25,0.00,36.63
+'AAAAAAAAADEBAAAA',59.5,110.38,157.96,16.16
+'AAAAAAAAADEEAAAA',17,54.54,0.00,16.36
+'AAAAAAAAADFAAAAA',44,133.51,0.00,25.36
+'AAAAAAAAADGBAAAA',31,107.55,919.82,56.53
+'AAAAAAAAADGCAAAA',78,119.61,0.00,74.15
+'AAAAAAAAADGEAAAA',45.5,99.30,0.00,1.06
+'AAAAAAAAADHAAAAA',86,81.09,0.00,37.30
+'AAAAAAAAADHBAAAA',28,68.58,223.79,53.61
 ---- TYPES
 STRING, DOUBLE, DECIMAL, DECIMAL, DECIMAL
 ====
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q73.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q73.test 
b/testdata/workloads/tpcds/queries/tpcds-q73.test
index b91a3a3..a11cac5 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q73.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q73.test
@@ -1,54 +1,43 @@
 ====
 ---- QUERY: TPCDS-Q73
-select
-  c_last_name,
-  c_first_name,
-  c_salutation,
-  c_preferred_cust_flag,
-  ss_ticket_number,
-  cnt
+select c_last_name,
+       c_first_name,
+       c_salutation,
+       c_preferred_cust_flag,
+       ss_ticket_number,
+       cnt
 from
   (select
     ss_ticket_number,
     ss_customer_sk,
     count(*) cnt
-  from
-    store_sales,
-    date_dim,
-    store,
-    household_demographics
-  where
-    store_sales.ss_sold_date_sk = date_dim.d_date_sk
+  from store_sales,
+       date_dim,
+       store,
+       household_demographics
+  where store_sales.ss_sold_date_sk = date_dim.d_date_sk
     and store_sales.ss_store_sk = store.s_store_sk
     and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk
-    -- and date_dim.d_dom between 1 and 2
+    and date_dim.d_dom between 1 and 2
     and (household_demographics.hd_buy_potential = '>10000'
-      or household_demographics.hd_buy_potential = 'unknown')
+      or household_demographics.hd_buy_potential = 'Unknown')
     and household_demographics.hd_vehicle_count > 0
-    and case when household_demographics.hd_vehicle_count > 0 then 
household_demographics.hd_dep_count / household_demographics.hd_vehicle_count 
else null end > 1
-    -- and date_dim.d_year in (1998, 1998 + 1, 1998 + 2)
-    and store.s_county in ('Saginaw County', 'Sumner County', 'Appanoose 
County', 'Daviess County')
-    -- partition key filter
-    -- and ss_sold_date_sk in (2450816, 2450846, 2450847, 2450874, 2450875, 
2450905, 2450906, 2450935, 2450936, 2450966, 2450967, 
-    --                         2450996, 2450997, 2451027, 2451028, 2451058, 
2451059, 2451088, 2451089, 2451119, 2451120, 2451149, 
-    --                         2451150, 2451180, 2451181, 2451211, 2451212, 
2451239, 2451240, 2451270, 2451271, 2451300, 2451301, 
-    --                         2451331, 2451332, 2451361, 2451362, 2451392, 
2451393, 2451423, 2451424, 2451453, 2451454, 2451484, 
-    --                         2451485, 2451514, 2451515, 2451545, 2451546, 
2451576, 2451577, 2451605, 2451606, 2451636, 2451637, 
-    --                         2451666, 2451667, 2451697, 2451698, 2451727, 
2451728, 2451758, 2451759, 2451789, 2451790, 2451819, 
-    --                         2451820, 2451850, 2451851, 2451880, 2451881)    
-    and ss_sold_date_sk between 2451180 and 2451269 -- partition key filter (3 
months)
-  group by
-    ss_ticket_number,
-    ss_customer_sk
-  ) dj,
+    and case when household_demographics.hd_vehicle_count > 0 then
+        household_demographics.hd_dep_count / 
household_demographics.hd_vehicle_count else null end > 1
+    and date_dim.d_year in (1999,1999+1,1999+2)
+    and store.s_county in ('Williamson County','Franklin Parish','Bronx 
County','Orange County')
+  group by ss_ticket_number,
+           ss_customer_sk) dj,
   customer
-where
-  ss_customer_sk = c_customer_sk
+where ss_customer_sk = c_customer_sk
   and cnt between 1 and 5
-order by
-  cnt desc
-limit 1000;
+order by cnt desc,  c_last_name asc;
 ---- RESULTS
+'Greene','Clarence','NULL','N',1541,5
+'Peterson','Chantell','Miss','N',47551,5
+'Scott','Anne','Dr.','N',86396,5
+'Wheeler','Ashley','Mrs.','N',174863,5
+'Dion','Alva','Mrs.','N',113766,4
 ---- TYPES
-STRING, STRING, STRING, STRING, INT, BIGINT
+STRING, STRING, STRING, STRING, BIGINT, BIGINT
 ====
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q79.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q79.test 
b/testdata/workloads/tpcds/queries/tpcds-q79.test
index eaccf59..662d7bc 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q79.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q79.test
@@ -23,26 +23,11 @@ from
     store_sales.ss_sold_date_sk = date_dim.d_date_sk
     and store_sales.ss_store_sk = store.s_store_sk
     and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk
-    and (household_demographics.hd_dep_count = 8
-      or household_demographics.hd_vehicle_count > 0)
-    -- and date_dim.d_dow = 1
-    -- and date_dim.d_year in (1998, 1998 + 1, 1998 + 2)
+    and (household_demographics.hd_dep_count = 6
+      or household_demographics.hd_vehicle_count > 2)
+    and date_dim.d_dow = 1
+    and date_dim.d_year in (1999, 1999 + 1, 1999 + 2)
     and store.s_number_employees between 200 and 295
-    -- partition key filter
-    -- and ss_sold_date_sk in (2450819, 2450826, 2450833, 2450840, 2450847, 
2450854, 2450861, 2450868, 2450875, 2450882, 2450889,
-    -- 2450896, 2450903, 2450910, 2450917, 2450924, 2450931, 2450938, 2450945, 
2450952, 2450959, 2450966, 2450973, 2450980, 2450987,
-    -- 2450994, 2451001, 2451008, 2451015, 2451022, 2451029, 2451036, 2451043, 
2451050, 2451057, 2451064, 2451071, 2451078, 2451085,
-    -- 2451092, 2451099, 2451106, 2451113, 2451120, 2451127, 2451134, 2451141, 
2451148, 2451155, 2451162, 2451169, 2451176, 2451183,
-    -- 2451190, 2451197, 2451204, 2451211, 2451218, 2451225, 2451232, 2451239, 
2451246, 2451253, 2451260, 2451267, 2451274, 2451281,
-    -- 2451288, 2451295, 2451302, 2451309, 2451316, 2451323, 2451330, 2451337, 
2451344, 2451351, 2451358, 2451365, 2451372, 2451379,
-    -- 2451386, 2451393, 2451400, 2451407, 2451414, 2451421, 2451428, 2451435, 
2451442, 2451449, 2451456, 2451463, 2451470, 2451477,
-    -- 2451484, 2451491, 2451498, 2451505, 2451512, 2451519, 2451526, 2451533, 
2451540, 2451547, 2451554, 2451561, 2451568, 2451575,
-    -- 2451582, 2451589, 2451596, 2451603, 2451610, 2451617, 2451624, 2451631, 
2451638, 2451645, 2451652, 2451659, 2451666, 2451673,
-    -- 2451680, 2451687, 2451694, 2451701, 2451708, 2451715, 2451722, 2451729, 
2451736, 2451743, 2451750, 2451757, 2451764, 2451771,
-    -- 2451778, 2451785, 2451792, 2451799, 2451806, 2451813, 2451820, 2451827, 
2451834, 2451841, 2451848, 2451855, 2451862, 2451869,
-    -- 2451876, 2451883, 2451890, 2451897, 2451904)    
-    and d_date between '1999-01-01' and '1999-03-31'
-    and ss_sold_date_sk between 2451180 and 2451269  -- partition key filter
   group by
     ss_ticket_number,
     ss_customer_sk,
@@ -59,106 +44,106 @@ order by
   profit
 limit 100;
 ---- RESULTS
-'','','Midway',9315,6637.96,-19053.01
-'','','Midway',185660,3594.46,-13505.77
-'','','Midway',82061,1343.62,-9218.88
-'','','Midway',78302,2371.41,-7625.25
-'','','Midway',110272,1671.17,-5792.10
-'','','Midway',100922,405.35,-3542.16
-'','','Midway',147115,1123.63,-2803.73
-'','','Midway',36631,15.24,5080.83
-'','','Midway',185660,0.00,NULL
-'','Aisha','Midway',105333,227.30,1235.42
-'','David','Midway',108460,3969.16,-17644.12
-'','Edward','Midway',62697,463.39,-3857.54
-'','John','Midway',145005,438.09,-2708.17
-'','Laura','Midway',42843,231.60,2662.77
-'','Lawrence','Midway',46950,32.63,1456.90
-'','Linda','Fairview',208936,0.00,-15585.85
-'','Malinda','Midway',55959,7606.17,-9597.49
-'','Marilyn','Fairview',31190,191.94,-7049.74
-'','Nydia','Midway',88008,1084.71,-1912.17
-'','Nydia','Midway',88008,0.00,NULL
-'','Randy','Midway',200913,0.00,-14249.78
-'','Robert','Midway',227572,0.00,-13903.87
-'','Wallace','Midway',6920,0.00,-4356.03
-'Acevedo','Grace','Midway',138006,167.17,-1954.45
-'Adair','David','Midway',99374,10343.38,-17501.58
+'Aaron','Guy','Midway',30633,8423.48,-7612.67
+'Abbott','James','Midway',19069,11829.58,-14596.44
+'Abbott','Robert','Midway',108183,2094.22,-11543.20
+'Abell','Tonya','Midway',11487,17.71,-7179.35
+'Abernathy','Verda','Midway',91981,2187.38,-6913.16
+'Abner','Eula','Midway',120315,1123.14,-10293.09
+'Abney','Anthony','Fairview',211863,299.87,-5224.94
+'Abraham','Michael','Fairview',101213,2759.54,-14160.33
+'Abraham','Robert','Midway',172751,122.64,-4104.67
+'Abraham','Travis','Midway',68579,1803.49,-10272.59
+'Abrams','Fannie','Midway',177397,222.18,-2529.63
+'Abreu','Jeffrey','Midway',188029,349.62,-8170.17
+'Acevedo','David','Midway',124592,550.41,-18324.80
+'Acevedo','Ellen','Midway',48390,0.00,-8873.13
+'Acevedo','Grace','Midway',103952,4245.63,-10161.12
+'Ackerman','Jeffrey','Midway',198943,977.78,-6460.69
+'Ackerman','Jeffrey','Midway',19260,3865.35,-1451.04
+'Adair','Evan','Fairview',117449,543.02,-2845.37
+'Adam','Paul','Fairview',161844,100.48,-13979.58
+'Adam','Paul','Fairview',161844,0.00,75.25
 'Adams','Beth','Midway',73934,2148.45,-9147.51
-'Aguilar','Douglas','Midway',79385,0.00,-8233.53
+'Adams','Betty','Midway',83966,3471.23,-11418.81
+'Adams','Dan','Midway',57271,4235.99,-9850.80
+'Adams','George','Midway',162011,7111.36,-23409.35
+'Adams','John','Midway',229336,342.06,-3441.34
+'Adams','Michael','Midway',37967,1645.84,-8363.98
+'Adams','Roy','Midway',164196,0.00,-10557.40
+'Adams','Tony','Midway',184799,0.00,-10143.02
+'Adkins','Evelyn','Midway',210368,14.36,-5619.27
+'Adkins','Kathleen','Midway',58726,8710.56,-16195.45
+'Adler','Charles','Midway',22973,0.00,-14430.54
+'Adler','Julian','Midway',221567,0.00,-7158.29
+'Agee','Anthony','Midway',90993,2119.00,-25648.52
+'Agee','Dora','Midway',217452,2097.93,-7874.59
+'Agnew','Elizabeth','Midway',92724,0.00,-585.34
+'Aguayo','Edwin','Midway',45528,0.00,-12991.97
+'Aguayo','John','Fairview',156381,538.39,444.42
+'Aguilar','Roxane','Midway',6855,2276.72,-8075.22
+'Aguilera','Gladys','Midway',30412,638.21,-3212.77
+'Ahern','Christine','Midway',872,2513.29,-18806.37
+'Ainsworth','John','Midway',12751,31.00,-16667.57
+'Akin','Sharon','Midway',11249,147.14,-6157.31
+'Alarcon','George','Midway',166192,1807.82,-678.04
+'Alarcon','Hazel','Midway',124475,31.54,-1761.42
+'Alarcon','Victoria','Midway',228661,459.41,-3937.68
+'Albert','Jaime','Midway',152168,2869.09,-7283.22
+'Albert','Jeffrey','Midway',238250,1927.20,-9322.37
+'Albright','Helen','Midway',59549,86.16,-6275.12
+'Aldrich','Evelyn','Midway',91580,1806.08,-5265.75
+'Aldridge','Nathanial','Midway',20206,154.62,-4794.76
 'Alexander','Annie','Midway',72228,798.98,-7804.33
-'Allen','Jack','Midway',58268,0.00,-3681.16
-'Allison','Elsie','Midway',201869,132.96,-3760.83
+'Alexander','Eddie','Midway',69977,0.00,-9618.25
+'Alexander','Kristen','Midway',55155,1034.24,-8816.85
+'Alexander','Victor','Midway',184075,4566.50,-16164.13
+'Alfonso','Paul','Midway',224079,2598.57,-3747.90
+'Alford','Roberta','Midway',15770,5271.15,-7286.77
+'Ali','Henry','Midway',72418,231.31,-6663.34
+'Alicea','Ramona','Midway',142193,601.85,-10567.32
+'Allard','John','Midway',20098,1.45,-16478.51
+'Allen','Anna','Midway',175145,21.61,-9271.32
+'Allen','Bill','Fairview',144210,351.66,-5655.63
+'Allen','Colleen','Midway',33031,4941.91,-7217.35
+'Allen','David','Fairview',46354,2987.79,-8400.65
+'Allen','Dianna','Midway',72135,3000.83,-5229.79
+'Allen','Earnestine','Midway',159660,1533.49,-16606.99
+'Allen','Earnestine','Midway',159660,NULL,NULL
+'Allen','Florence','Midway',6542,5405.58,-10287.74
+'Allen','Fred','Midway',122737,1188.63,-92.29
+'Allen','Janice','Midway',199800,11.54,-7276.73
+'Allen','Jason','Midway',111015,1074.54,-14891.59
+'Allen','John','Fairview',207020,3598.03,-13469.52
+'Allen','Lena','Midway',187155,10857.02,-12205.46
+'Allen','Leslie','Midway',11150,0.00,-10958.34
+'Allen','Marcia','Midway',190763,1661.52,-14020.72
+'Allen','Michael','Midway',143187,2446.13,-6376.82
+'Allen','Michael','Midway',43014,1774.16,-5814.87
+'Allen','Rocky','Midway',33844,2417.09,-7084.09
+'Allen','Ronald','Midway',80879,1836.27,-9603.40
+'Allen','Sarah','Midway',148147,3530.75,-17432.64
+'Allen','Teresita','Midway',2008,628.35,-5026.60
+'Allen','Teresita','Midway',2008,447.93,-2761.02
+'Allen','NULL','Midway',43827,844.35,-7012.34
+'Allison','Norma','Midway',82553,1922.94,-9307.16
+'Allison','Peggie','Midway',146780,6966.19,-7455.22
+'Allred','Deborah','Midway',193501,1832.66,-11177.35
+'Almeida','David','Fairview',168589,1172.09,-9778.60
+'Alonso','Anthony','Midway',208514,4090.00,-20066.44
+'Alonzo','Troy','Fairview',54936,0.00,-3939.58
+'Alston','Jenny','Midway',127544,3431.78,-6602.81
+'Alston','Ryan','Midway',214797,297.62,-5349.93
+'Altman','Alfred','Fairview',140764,7591.92,-12948.64
+'Alvarado','Richard','Fairview',81704,1547.83,-8473.98
+'Alvarez','Ana','Midway',225521,0.00,-8431.41
+'Alvarez','Eric','Midway',226554,0.00,-3912.23
+'Alvarez','Jennifer','Midway',119831,7409.63,-10587.25
+'Amador','Wilbur','Midway',225632,1355.65,-4691.06
+'Amaya','Christina','Midway',27102,290.84,-10993.57
+'Ambrose','Robert','Midway',91578,247.07,-6173.40
+'Ames','Perry','Fairview',5862,3975.41,-1347.02
 'Amundson','Ernest','Midway',228272,8218.46,-4039.62
-'Anderson','Alan','Midway',31774,3141.00,-3937.23
-'Anderson','Anabel','Fairview',173521,0.00,-8390.18
-'Anderson','Gerald','Midway',161201,0.00,-12656.37
-'Anderson','Louis','Midway',2413,2478.75,-15660.79
-'Andrews','Katrina','Midway',141027,949.61,-13883.30
-'Arnold','Sueann','Midway',236454,934.61,-9877.86
-'Ashby','Cody','Fairview',227058,2495.04,-14773.02
-'Atkins','Margaret','Midway',55771,2935.95,-14653.78
-'Austin','Jane','Midway',85459,0.00,-11628.79
-'Bailey','Noble','Fairview',166211,233.62,-8209.44
-'Bailey','Robert','Midway',234709,3214.38,-17040.31
-'Baker','Cynthia','Midway',211345,22.74,-358.84
-'Baker','Cynthia','Midway',211345,NULL,NULL
-'Banks','Bobby','Midway',89949,1314.29,-601.36
-'Banks','Max','Midway',219523,0.00,2428.84
-'Barnett','Ramiro','Midway',160660,0.00,-2120.12
-'Barrett','','Midway',209036,2318.80,-9957.73
-'Belcher','Kristina','Midway',185205,8.13,-6758.13
-'Bell','Allen','Midway',192379,413.91,-5402.12
-'Bell','Judith','Midway',214325,1703.86,-12327.70
-'Beltran','Scott','Midway',65875,6418.03,-25914.46
-'Bennett','Marvin','Midway',127326,0.00,-4824.98
-'Bernal','Nilda','Midway',163603,2896.71,-351.77
-'Bilodeau','Angela','Midway',140268,1334.34,-9793.02
-'Bishop','Gregg','Midway',214893,415.07,-15794.60
-'Boudreaux','John','Midway',99169,2028.15,-17410.67
-'Bradford','Joseph','Fairview',43264,495.19,-11751.05
-'Bradley','Eric','Fairview',43135,5818.09,-5982.45
-'Brill','Christina','Midway',232415,633.12,-11858.00
-'Brooks','Jeannie','Fairview',7310,1083.55,-7109.82
-'Brown','Dorothy','Midway',40763,4618.29,-3641.15
-'Brown','Many','Fairview',227538,4310.77,-9102.14
-'Brown','Terry','Midway',40734,0.00,-237.24
-'Bruce','Edward','Midway',57609,3006.20,-15319.86
-'Bullock','Kathryn','Midway',128851,0.00,201.86
-'Burger','Don','Midway',237223,2047.83,-859.12
-'Burgess','Andrew','Midway',24111,2946.86,2954.26
-'Burke','Molly','Fairview',128688,1935.13,-14460.08
-'Burns','Betsy','Midway',39637,209.56,-3769.66
-'Burns','Michell','Midway',31432,2705.13,-13436.18
-'Butler','Karen','Midway',204442,0.00,-2323.93
-'Byrd','Jason','Midway',81091,878.28,-8828.84
-'Byrne','Tamara','Midway',67601,2392.91,-8827.79
-'Calhoun','George','Midway',91645,3083.25,-18583.68
-'Call','Edward','Midway',116662,2367.80,-11636.17
-'Camp','Nancy','Midway',183894,2207.30,-7435.10
-'Cannon','Richard','Midway',118336,3498.36,-9718.32
-'Carr','Celeste','Midway',25783,1139.64,-2973.51
-'Chambers','Jerry','Midway',145476,613.96,-12989.09
-'Chapman','Daniel','Midway',206705,5262.84,-19608.12
-'Chavez','William','Midway',10161,5569.48,-10971.40
-'Chavez','William','Midway',10161,0.00,-2472.87
-'Chavis','Erik','Midway',141627,2261.49,-7108.67
-'Child','Emily','Midway',50297,1619.52,-15503.68
-'Clark','Melissa','Midway',27844,2832.50,-21105.37
-'Clay','Sally','Fairview',87955,2545.88,-19810.06
-'Clemons','Cesar','Midway',207603,6.29,1394.18
-'Clifford','Bessie','Midway',61376,6625.75,-11595.61
-'Collins','Virgie','Midway',124655,2334.07,-7378.08
-'Corona','Jose','Fairview',119316,223.26,-8779.22
-'Cortez','Stanley','Midway',82125,6180.70,-15051.41
-'Cox','Glenn','Midway',178104,3702.44,-16194.96
-'Crawford','Ralph','Fairview',184125,6848.91,-11875.36
-'Crouch','Vivian','Fairview',100177,8274.53,-15809.71
-'Cruz','Judy','Midway',158242,460.42,-21659.87
-'Culpepper','Karl','Midway',102332,2867.11,-4059.47
-'Curtis','Lori','Midway',11896,0.00,-9689.09
-'Damico','Zachary','Midway',77549,4091.29,-8512.92
-'Daniel','Denise','Midway',38236,7390.88,-18976.98
 ---- TYPES
-STRING, STRING, STRING, INT, DECIMAL, DECIMAL
+STRING, STRING, STRING, BIGINT, DECIMAL, DECIMAL
 ====
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q88.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q88.test 
b/testdata/workloads/tpcds/queries/tpcds-q88.test
index f04ed33..5bbf32f 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q88.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q88.test
@@ -9,9 +9,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 8
      and time_dim.t_minute >= 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s1,
  (select count(*) h9_to_9_30
  from store_sales, household_demographics , time_dim, store
@@ -20,9 +20,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 9
      and time_dim.t_minute < 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s2,
  (select count(*) h9_30_to_10
  from store_sales, household_demographics , time_dim, store
@@ -31,9 +31,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 9
      and time_dim.t_minute >= 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s3,
  (select count(*) h10_to_10_30
  from store_sales, household_demographics , time_dim, store
@@ -42,9 +42,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 10
      and time_dim.t_minute < 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s4,
  (select count(*) h10_30_to_11
  from store_sales, household_demographics , time_dim, store
@@ -53,9 +53,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 10
      and time_dim.t_minute >= 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s5,
  (select count(*) h11_to_11_30
  from store_sales, household_demographics , time_dim, store
@@ -64,9 +64,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 11
      and time_dim.t_minute < 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s6,
  (select count(*) h11_30_to_12
  from store_sales, household_demographics , time_dim, store
@@ -75,9 +75,9 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 11
      and time_dim.t_minute >= 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s7,
  (select count(*) h12_to_12_30
  from store_sales, household_demographics , time_dim, store
@@ -86,12 +86,12 @@ from
      and ss_store_sk = s_store_sk
      and time_dim.t_hour = 12
      and time_dim.t_minute < 30
-     and ((household_demographics.hd_dep_count = 1 and 
household_demographics.hd_vehicle_count<=1+2) or
-          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2) or
-          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2))
+     and ((household_demographics.hd_dep_count = 4 and 
household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 2 and 
household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 0 and 
household_demographics.hd_vehicle_count<=0+2))
      and store.s_store_name = 'ese') s8
 ---- RESULTS
-140,370,266,381,471,227,331,304
+2334,4726,4564,7538,7115,3960,4129,4533
 ---- TYPES
 BIGINT,BIGINT,BIGINT,BIGINT,BIGINT,BIGINT,BIGINT,BIGINT
 ====

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q89.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q89.test 
b/testdata/workloads/tpcds/queries/tpcds-q89.test
index 88b0672..a70e102 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q89.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q89.test
@@ -1,9 +1,7 @@
 ====
 ---- QUERY: TPCDS-Q89
-/* Modifications: Added Partition Key filter because Impala does not do 
dynamic partition
-   pruning.*/
-select * from (select  *
-from (
+select *
+from(
 select i_category, i_class, i_brand,
        s_store_name, s_company_name,
        d_moy,
@@ -15,120 +13,119 @@ from item, store_sales, date_dim, store
 where ss_item_sk = i_item_sk and
       ss_sold_date_sk = d_date_sk and
       ss_store_sk = s_store_sk and
-      d_year in (2000) and
-        ((i_category in ('Children','Music','Home') and
-          i_class in ('toddlers','pop','lighting')
+      d_year in (1999) and
+        ((i_category in ('Books','Electronics','Sports') and
+          i_class in ('computers','stereo','football')
          )
-      or (i_category in ('Jewelry','Books','Sports') and
-          i_class in ('costume','travel','football')
+      or (i_category in ('Men','Jewelry','Women') and
+          i_class in ('shirts','birdal','dresses')
         ))
-      and ss_sold_date_sk between 2451545 and 2451910  -- partition key filter
 group by i_category, i_class, i_brand,
          s_store_name, s_company_name, d_moy) tmp1
 where case when (avg_monthly_sales <> 0) then (abs(sum_sales - 
avg_monthly_sales) / avg_monthly_sales) else null end > 0.1
 order by sum_sales - avg_monthly_sales, s_store_name
-limit 100) tmp2;
+limit 100;
 ---- RESULTS
-'Music','pop','exportischolar #2','ation','Unknown',2,13.04,361.19
-'Music','pop','exportischolar #2','ought','Unknown',3,70.06,395.42
-'Music','pop','exportischolar #2','ation','Unknown',4,46.12,361.19
-'Music','pop','exportischolar #2','ese','Unknown',7,74.38,369.79
-'Music','pop','exportischolar #2','ought','Unknown',4,100.96,395.42
-'Music','pop','exportischolar #2','ought','Unknown',8,103.98,395.42
-'Music','pop','exportischolar #2','ese','Unknown',6,89.31,369.79
-'Children','toddlers','exportiexporti #2','ese','Unknown',6,4.78,269.23
-'Music','pop','exportischolar #2','ation','Unknown',1,106.77,361.19
-'Music','pop','exportischolar #1','ought','Unknown',5,14.47,265.85
-'Music','pop','exportischolar #1','able','Unknown',2,27.05,268.64
-'Music','pop','exportischolar #1','ought','Unknown',7,40.29,265.85
-'Children','toddlers','exportiexporti #2','able','Unknown',7,95.25,319.70
-'Children','toddlers','exportiexporti #2','eing','Unknown',3,23.47,247.92
-'Music','pop','exportischolar #2','ought','Unknown',2,176.36,395.42
-'Children','toddlers','exportiexporti #2','ought','Unknown',4,60.92,275.42
-'Children','toddlers','exportiexporti #1','ese','Unknown',7,4.54,218.23
-'Music','pop','exportischolar #2','bar','Unknown',4,52.93,261.16
-'Children','toddlers','exportiexporti #2','ation','Unknown',1,53.76,258.95
-'Children','toddlers','exportiexporti #1','ation','Unknown',5,31.71,235.07
-'Music','pop','exportischolar #2','bar','Unknown',6,58.25,261.16
-'Music','pop','exportischolar #2','able','Unknown',3,102.74,304.35
-'Children','toddlers','exportiexporti #1','ation','Unknown',2,41.38,235.07
-'Music','pop','exportischolar #1','able','Unknown',7,77.64,268.64
-'Children','toddlers','exportiexporti #2','ought','Unknown',6,86.89,275.42
-'Children','toddlers','exportiexporti #1','able','Unknown',6,31.31,218.77
-'Music','pop','exportischolar #1','bar','Unknown',4,63.03,250.45
-'Music','pop','exportischolar #2','ought','Unknown',7,209.35,395.42
-'Music','pop','exportischolar #2','eing','Unknown',6,133.69,317.78
-'Children','toddlers','exportiexporti #2','ese','Unknown',2,90.28,269.23
-'Children','toddlers','exportiexporti #1','bar','Unknown',5,19.05,197.74
-'Children','toddlers','exportiexporti #2','ought','Unknown',1,98.27,275.42
-'Children','toddlers','exportiexporti #2','bar','Unknown',6,72.12,249.00
-'Music','pop','exportischolar #1','eing','Unknown',7,13.19,187.60
-'Music','pop','exportischolar #2','eing','Unknown',7,143.53,317.78
-'Music','pop','exportischolar #2','ese','Unknown',12,197.89,369.79
-'Children','toddlers','exportiexporti #2','eing','Unknown',1,76.20,247.92
-'Music','pop','exportischolar #2','bar','Unknown',2,90.53,261.16
-'Music','pop','exportischolar #1','eing','Unknown',6,19.40,187.60
-'Music','pop','exportischolar #2','able','Unknown',5,136.19,304.35
-'Children','toddlers','exportiexporti #2','ation','Unknown',2,92.75,258.95
-'Music','pop','exportischolar #1','bar','Unknown',2,85.54,250.45
-'Children','toddlers','exportiexporti #2','bar','Unknown',4,85.58,249.00
-'Music','pop','exportischolar #2','able','Unknown',2,141.06,304.35
-'Children','toddlers','exportiexporti #2','ought','Unknown',3,114.37,275.42
-'Children','toddlers','exportiexporti #2','ese','Unknown',1,110.17,269.23
-'Music','pop','exportischolar #1','bar','Unknown',7,95.15,250.45
-'Music','pop','exportischolar #1','ought','Unknown',4,111.80,265.85
-'Music','pop','exportischolar #1','bar','Unknown',10,96.64,250.45
-'Children','toddlers','exportiexporti #1','able','Unknown',5,65.59,218.77
-'Children','toddlers','exportiexporti #1','able','Unknown',7,68.59,218.77
-'Music','pop','exportischolar #2','eing','Unknown',3,169.52,317.78
-'Music','pop','exportischolar #1','ought','Unknown',3,119.17,265.85
-'Music','pop','exportischolar #1','bar','Unknown',3,104.70,250.45
-'Music','pop','exportischolar #1','ese','Unknown',6,4.02,148.86
-'Children','toddlers','exportiexporti #1','able','Unknown',4,74.71,218.77
-'Music','pop','exportischolar #2','ought','Unknown',10,253.23,395.42
-'Children','toddlers','exportiexporti #1','ation','Unknown',7,92.93,235.07
-'Music','pop','exportischolar #2','eing','Unknown',4,175.79,317.78
-'Children','toddlers','exportiexporti #1','ought','Unknown',9,54.35,195.40
-'Children','toddlers','exportiexporti #2','bar','Unknown',5,108.39,249.00
-'Music','pop','exportischolar #2','ese','Unknown',3,230.34,369.79
-'Children','toddlers','exportiexporti #2','bar','Unknown',3,112.70,249.00
-'Children','toddlers','exportiexporti #2','ation','Unknown',3,124.76,258.95
-'Children','toddlers','exportiexporti #1','ese','Unknown',3,84.61,218.23
-'Children','toddlers','exportiexporti #1','ese','Unknown',5,88.62,218.23
-'Children','toddlers','exportiexporti #2','bar','Unknown',2,122.20,249.00
-'Children','toddlers','exportiexporti #2','bar','Unknown',1,122.23,249.00
-'Music','pop','exportischolar #2','bar','Unknown',3,134.61,261.16
-'Children','toddlers','exportiexporti #1','bar','Unknown',2,72.55,197.74
-'Music','pop','exportischolar #1','ought','Unknown',6,143.69,265.85
-'Music','pop','exportischolar #2','able','Unknown',1,182.70,304.35
-'Music','pop','exportischolar #1','ought','Unknown',8,145.06,265.85
-'Children','toddlers','exportiexporti #1','bar','Unknown',3,77.30,197.74
-'Children','toddlers','exportiexporti #1','ese','Unknown',6,98.33,218.23
-'Children','toddlers','exportiexporti #1','eing','Unknown',4,34.63,153.97
-'Children','toddlers','exportiexporti #2','eing','Unknown',7,129.87,247.92
-'Music','pop','exportischolar #1','able','Unknown',8,151.26,268.64
-'Books','travel','univunivamalg #3','able','Unknown',11,8.21,121.26
-'Music','pop','exportischolar #1','ese','Unknown',4,37.44,148.86
-'Music','pop','exportischolar #1','ese','Unknown',7,38.67,148.86
-'Children','toddlers','exportiexporti #1','bar','Unknown',6,87.68,197.74
-'Music','pop','exportischolar #1','ation','Unknown',2,13.36,122.75
-'Children','toddlers','exportiexporti #1','ought','Unknown',2,86.36,195.40
-'Music','pop','exportischolar #1','ation','Unknown',7,14.25,122.75
-'Music','pop','exportischolar #2','bar','Unknown',7,152.68,261.16
-'Children','toddlers','exportiexporti #2','ation','Unknown',6,150.97,258.95
-'Music','pop','exportischolar #1','ation','Unknown',3,14.87,122.75
-'Children','toddlers','exportiexporti #1','ought','Unknown',4,87.97,195.40
-'Music','pop','exportischolar #1','able','Unknown',4,162.28,268.64
-'Children','toddlers','exportiexporti #1','eing','Unknown',3,48.40,153.97
-'Children','toddlers','exportiexporti #2','ese','Unknown',4,163.79,269.23
-'Children','toddlers','exportiexporti #2','ese','Unknown',5,164.15,269.23
-'Music','pop','exportischolar #2','able','Unknown',7,199.42,304.35
-'Children','toddlers','exportiexporti #2','ought','Unknown',9,170.94,275.42
-'Music','pop','exportischolar #1','eing','Unknown',5,87.55,187.60
-'Children','toddlers','exportiexporti #2','able','Unknown',6,219.68,319.70
-'Children','toddlers','exportiexporti #2','eing','Unknown',4,149.85,247.92
-'Music','pop','exportischolar #1','ese','Unknown',3,51.01,148.86
-'Children','toddlers','exportiexporti #1','eing','Unknown',6,56.66,153.97
+'Men','shirts','importoimporto #1','ese','Unknown',3,2070.65,5492.81
+'Men','shirts','importoimporto #1','ought','Unknown',6,2152.15,5045.75
+'Men','shirts','importoimporto #1','able','Unknown',2,2333.43,5194.81
+'Men','shirts','importoimporto #1','ese','Unknown',6,2691.33,5492.81
+'Men','shirts','importoimporto #1','ought','Unknown',2,2253.70,5045.75
+'Women','dresses','amalgamalg #1','able','Unknown',6,1761.81,4507.24
+'Men','shirts','importoimporto #1','ation','Unknown',3,2672.68,5410.91
+'Men','shirts','importoimporto #1','ation','Unknown',5,2677.81,5410.91
+'Men','shirts','importoimporto #1','eing','Unknown',5,2356.88,5074.07
+'Men','shirts','importoimporto #1','ese','Unknown',4,2784.11,5492.81
+'Women','dresses','amalgamalg #1','ought','Unknown',7,1926.67,4619.70
+'Women','dresses','amalgamalg #1','ought','Unknown',1,2065.94,4619.70
+'Men','shirts','importoimporto #1','ation','Unknown',6,2881.34,5410.91
+'Men','shirts','importoimporto #1','able','Unknown',3,2674.91,5194.81
+'Women','dresses','amalgamalg #1','ation','Unknown',2,2192.31,4690.89
+'Men','shirts','importoimporto #1','bar','Unknown',5,2475.90,4973.50
+'Women','dresses','amalgamalg #1','ese','Unknown',2,2146.52,4642.99
+'Men','shirts','importoimporto #1','eing','Unknown',2,2588.02,5074.07
+'Women','dresses','amalgamalg #1','bar','Unknown',7,2428.75,4914.11
+'Women','dresses','amalgamalg #1','bar','Unknown',3,2451.51,4914.11
+'Men','shirts','importoimporto #1','ation','Unknown',7,2951.67,5410.91
+'Men','shirts','importoimporto #1','able','Unknown',1,2765.75,5194.81
+'Women','dresses','amalgamalg #1','able','Unknown',2,2082.54,4507.24
+'Men','shirts','importoimporto #1','ation','Unknown',4,2988.08,5410.91
+'Men','shirts','importoimporto #1','ought','Unknown',7,2667.92,5045.75
+'Women','dresses','amalgamalg #1','bar','Unknown',4,2549.27,4914.11
+'Women','dresses','amalgamalg #1','ese','Unknown',7,2307.00,4642.99
+'Women','dresses','amalgamalg #1','eing','Unknown',4,2204.15,4528.82
+'Men','shirts','importoimporto #1','able','Unknown',7,2880.34,5194.81
+'Men','shirts','importoimporto #1','ese','Unknown',5,3210.74,5492.81
+'Women','dresses','amalgamalg #1','ation','Unknown',4,2418.39,4690.89
+'Men','shirts','importoimporto #1','eing','Unknown',4,2833.40,5074.07
+'Women','dresses','amalgamalg #1','bar','Unknown',2,2692.79,4914.11
+'Men','shirts','importoimporto #1','eing','Unknown',6,2854.62,5074.07
+'Women','dresses','amalgamalg #1','eing','Unknown',6,2314.71,4528.82
+'Men','shirts','importoimporto #1','ought','Unknown',5,2834.94,5045.75
+'Women','dresses','amalgamalg #1','ation','Unknown',5,2480.25,4690.89
+'Women','dresses','amalgamalg #1','able','Unknown',7,2302.21,4507.24
+'Women','dresses','amalgamalg #1','ation','Unknown',6,2501.15,4690.89
+'Men','shirts','importoimporto #1','ese','Unknown',2,3307.78,5492.81
+'Men','shirts','importoimporto #1','able','Unknown',5,3016.43,5194.81
+'Men','shirts','importoimporto #1','able','Unknown',4,3040.23,5194.81
+'Women','dresses','amalgamalg #1','eing','Unknown',5,2420.31,4528.82
+'Women','dresses','amalgamalg #1','ese','Unknown',5,2535.80,4642.99
+'Women','dresses','amalgamalg #1','ought','Unknown',2,2521.70,4619.70
+'Men','shirts','importoimporto #1','bar','Unknown',3,2877.96,4973.50
+'Women','dresses','amalgamalg #1','ese','Unknown',3,2577.15,4642.99
+'Women','dresses','amalgamalg #1','ation','Unknown',7,2637.27,4690.89
+'Men','shirts','importoimporto #1','ation','Unknown',1,3380.16,5410.91
+'Women','dresses','amalgamalg #1','eing','Unknown',7,2524.32,4528.82
+'Men','shirts','importoimporto #1','bar','Unknown',4,2986.70,4973.50
+'Women','dresses','amalgamalg #1','ought','Unknown',4,2648.80,4619.70
+'Men','shirts','importoimporto #1','bar','Unknown',7,3026.41,4973.50
+'Women','dresses','amalgamalg #1','ation','Unknown',3,2751.11,4690.89
+'Men','shirts','importoimporto #1','bar','Unknown',2,3073.45,4973.50
+'Men','shirts','importoimporto #1','eing','Unknown',3,3179.96,5074.07
+'Women','dresses','amalgamalg #1','ation','Unknown',1,2797.07,4690.89
+'Women','dresses','amalgamalg #1','able','Unknown',1,2621.05,4507.24
+'Women','dresses','amalgamalg #1','ese','Unknown',4,2808.36,4642.99
+'Women','dresses','amalgamalg #2','bar','Unknown',6,680.47,2506.96
+'Men','shirts','importoimporto #1','ation','Unknown',2,3591.65,5410.91
+'Women','dresses','amalgamalg #1','able','Unknown',3,2706.15,4507.24
+'Women','dresses','amalgamalg #2','eing','Unknown',2,773.08,2569.34
+'Men','shirts','importoimporto #1','bar','Unknown',6,3199.08,4973.50
+'Men','shirts','importoimporto #1','ese','Unknown',7,3754.33,5492.81
+'Women','dresses','amalgamalg #1','bar','Unknown',5,3190.77,4914.11
+'Women','dresses','amalgamalg #1','eing','Unknown',2,2841.88,4528.82
+'Men','shirts','importoimporto #1','able','Unknown',6,3538.25,5194.81
+'Women','dresses','amalgamalg #1','ese','Unknown',6,3006.94,4642.99
+'Women','dresses','amalgamalg #1','bar','Unknown',1,3284.93,4914.11
+'Women','dresses','amalgamalg #2','bar','Unknown',5,878.42,2506.96
+'Women','dresses','amalgamalg #1','able','Unknown',5,2891.95,4507.24
+'Men','shirts','importoimporto #1','eing','Unknown',7,3465.77,5074.07
+'Women','dresses','amalgamalg #2','eing','Unknown',3,964.29,2569.34
+'Women','dresses','amalgamalg #1','bar','Unknown',6,3324.49,4914.11
+'Men','shirts','importoimporto #1','ought','Unknown',3,3467.09,5045.75
+'Women','dresses','amalgamalg #1','ought','Unknown',5,3049.25,4619.70
+'Women','dresses','amalgamalg #1','eing','Unknown',3,2978.07,4528.82
+'Men','shirts','importoimporto #1','ought','Unknown',4,3544.97,5045.75
+'Men','shirts','importoimporto #1','bar','Unknown',1,3490.62,4973.50
+'Men','shirts','importoimporto #2','able','Unknown',2,628.63,2095.47
+'Men','shirts','importoimporto #1','eing','Unknown',1,3628.21,5074.07
+'Women','dresses','amalgamalg #1','able','Unknown',4,3082.17,4507.24
+'Men','shirts','importoimporto #2','eing','Unknown',5,765.86,2137.65
+'Women','dresses','amalgamalg #2','ation','Unknown',4,1064.70,2431.22
+'Women','dresses','amalgamalg #2','ought','Unknown',3,991.89,2355.44
+'Women','dresses','amalgamalg #2','eing','Unknown',5,1211.13,2569.34
+'Women','dresses','amalgamalg #2','ation','Unknown',7,1078.41,2431.22
+'Men','shirts','importoimporto #2','ation','Unknown',4,807.67,2141.06
+'Women','dresses','amalgamalg #2','ation','Unknown',2,1102.89,2431.22
+'Women','dresses','amalgamalg #2','eing','Unknown',6,1247.86,2569.34
+'Women','dresses','amalgamalg #2','able','Unknown',4,1020.39,2337.27
+'Men','shirts','importoimporto #2','able','Unknown',7,780.91,2095.47
+'Women','dresses','amalgamalg #2','ese','Unknown',2,904.34,2200.82
+'Women','dresses','amalgamalg #2','ought','Unknown',7,1061.87,2355.44
+'Women','dresses','amalgamalg #2','able','Unknown',3,1054.94,2337.27
+'Men','shirts','importoimporto #2','ought','Unknown',6,633.96,1908.05
+'Men','shirts','importoimporto #2','ese','Unknown',6,853.37,2113.57
+'Women','dresses','amalgamalg #2','able','Unknown',5,1084.94,2337.27
+'Women','dresses','amalgamalg #2','eing','Unknown',4,1317.08,2569.34
 ---- TYPES
 STRING, STRING, STRING, STRING, STRING, INT, DECIMAL, DECIMAL
 ====
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f1558957/testdata/workloads/tpcds/queries/tpcds-q96.test
----------------------------------------------------------------------
diff --git a/testdata/workloads/tpcds/queries/tpcds-q96.test 
b/testdata/workloads/tpcds/queries/tpcds-q96.test
index 2dfb8fc..1b66de9 100644
--- a/testdata/workloads/tpcds/queries/tpcds-q96.test
+++ b/testdata/workloads/tpcds/queries/tpcds-q96.test
@@ -1,21 +1,21 @@
 ====
 ---- QUERY: TPCDS-Q96
-SELECT
-  COUNT(*) AS total
-FROM store_sales ss
-JOIN time_dim td
-  ON (ss.ss_sold_time_sk = td.t_time_sk)
-JOIN household_demographics hd
-  ON (ss.ss_hdemo_sk = hd.hd_demo_sk)
-JOIN store s
-  ON (ss.ss_store_sk = s.s_store_sk)
-WHERE
-  td.t_hour = 8
-  AND td.t_minute >= 30
-  AND hd.hd_dep_count = 5
-  AND s.s_store_name = 'ese';
+select count(*) as total
+from store_sales,
+     household_demographics,
+     time_dim,
+     store
+where ss_sold_time_sk = time_dim.t_time_sk
+    and ss_hdemo_sk = household_demographics.hd_demo_sk
+    and ss_store_sk = s_store_sk
+    and time_dim.t_hour = 20
+    and time_dim.t_minute >= 30
+    and household_demographics.hd_dep_count = 7
+    and store.s_store_name = 'ese'
+order by total
+limit 100;
 ---- RESULTS
-81
+870
 ---- TYPES
 BIGINT
 ====
\ No newline at end of file

Reply via email to