You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/12/22 01:04:26 UTC

[2/8] asterixdb git commit: Supports flexible degree of parallelism.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-like/query-issue785/query-issue785.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-like/query-issue785/query-issue785.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-like/query-issue785/query-issue785.1.adm
index 7324d3c..3ecdc03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-like/query-issue785/query-issue785.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-like/query-issue785/query-issue785.1.adm
@@ -1,24 +1,24 @@
-{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
-{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
-{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
-{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
+{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
+{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
+{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
+{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
+{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
+{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
+{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
+{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
 { "nation_key": 13, "sum_price": [ { "orderdate": "1998-02-08", "sum_price": 223537.09 }, { "orderdate": "1993-11-24", "sum_price": 222392.53 }, { "orderdate": "1995-09-13", "sum_price": 197031.52 } ] }
+{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
 { "nation_key": 15, "sum_price": [ { "orderdate": "1998-05-31", "sum_price": 366291.52 }, { "orderdate": "1994-04-24", "sum_price": 228054.01 }, { "orderdate": "1993-01-29", "sum_price": 223995.46 } ] }
 { "nation_key": 16, "sum_price": [ { "orderdate": "1994-09-20", "sum_price": 231012.22 }, { "orderdate": "1992-06-30", "sum_price": 221320.76 }, { "orderdate": "1993-05-14", "sum_price": 207291.83 } ] }
+{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
+{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
-{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
-{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
-{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
-{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
-{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
-{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue601/query-issue601.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue601/query-issue601.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue601/query-issue601.1.adm
index 7d83268..4c3d838 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue601/query-issue601.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue601/query-issue601.1.adm
@@ -1,7 +1,7 @@
-{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 1, "count_order": 1500 }
 { "l_linenumber": 2, "count_order": 1291 }
-{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 3, "count_order": 1077 }
+{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 5, "count_order": 632 }
+{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 7, "count_order": 211 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.adm
index c6a683d..3d98aaf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.adm
@@ -1,10 +1,10 @@
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22d }, { "orderdate": "1992-07-07", "sum_price": 180692.9d }, { "orderdate": "1996-06-28", "sum_price": 139915.23d } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05d }, { "orderdate": "1995-12-07", "sum_price": 153048.74d }, { "orderdate": "1994-08-22", "sum_price": 147071.86d } ] }
-{ "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31d }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002d }, { "orderdate": "1993-12-24", "sum_price": 211925.95d } ] }
-{ "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85d }, { "orderdate": "1996-08-13", "sum_price": 217709.03d }, { "orderdate": "1992-08-21", "sum_price": 207364.8d } ] }
-{ "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66d }, { "orderdate": "1992-03-04", "sum_price": 219709.6d }, { "orderdate": "1996-01-06", "sum_price": 190490.78d } ] }
-{ "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87d }, { "orderdate": "1997-08-04", "sum_price": 244636.7d }, { "orderdate": "1996-11-20", "sum_price": 222274.54d } ] }
-{ "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69d }, { "orderdate": "1998-07-17", "sum_price": 187156.38d }, { "orderdate": "1993-03-25", "sum_price": 167017.39d } ] }
-{ "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29d }, { "orderdate": "1993-04-11", "sum_price": 221636.83d }, { "orderdate": "1993-05-07", "sum_price": 220715.14d } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88d }, { "orderdate": "1997-01-21", "sum_price": 240284.95d }, { "orderdate": "1997-08-24", "sum_price": 231831.35d } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996d }, { "orderdate": "1995-11-13", "sum_price": 242588.87d }, { "orderdate": "1993-07-15", "sum_price": 214494.39d } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
+{ "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
+{ "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
+{ "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
+{ "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
+{ "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
+{ "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785/query-issue785.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785/query-issue785.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785/query-issue785.1.adm
index 216a8f6..3ecdc03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785/query-issue785.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql-sugar/query-issue785/query-issue785.1.adm
@@ -1,24 +1,24 @@
-{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33d }, { "orderdate": "1997-05-26", "sum_price": 216826.73d }, { "orderdate": "1996-04-30", "sum_price": 180054.29d } ] }
-{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42d }, { "orderdate": "1996-12-24", "sum_price": 237947.61d }, { "orderdate": "1992-12-01", "sum_price": 218116.21d } ] }
-{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06d }, { "orderdate": "1997-02-17", "sum_price": 225518.72d }, { "orderdate": "1996-08-20", "sum_price": 220636.82d } ] }
-{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45d }, { "orderdate": "1992-04-26", "sum_price": 134333.33d }, { "orderdate": "1997-03-09", "sum_price": 132838.49d } ] }
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22d }, { "orderdate": "1992-07-07", "sum_price": 180692.9d }, { "orderdate": "1996-06-28", "sum_price": 139915.23d } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05d }, { "orderdate": "1995-12-07", "sum_price": 153048.74d }, { "orderdate": "1994-08-22", "sum_price": 147071.86d } ] }
-{ "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31d }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002d }, { "orderdate": "1993-12-24", "sum_price": 211925.95d } ] }
-{ "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85d }, { "orderdate": "1996-08-13", "sum_price": 217709.03d }, { "orderdate": "1992-08-21", "sum_price": 207364.8d } ] }
-{ "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66d }, { "orderdate": "1992-03-04", "sum_price": 219709.6d }, { "orderdate": "1996-01-06", "sum_price": 190490.78d } ] }
-{ "nation_key": 13, "sum_price": [ { "orderdate": "1998-02-08", "sum_price": 223537.09d }, { "orderdate": "1993-11-24", "sum_price": 222392.53d }, { "orderdate": "1995-09-13", "sum_price": 197031.52d } ] }
-{ "nation_key": 15, "sum_price": [ { "orderdate": "1998-05-31", "sum_price": 366291.52d }, { "orderdate": "1994-04-24", "sum_price": 228054.01d }, { "orderdate": "1993-01-29", "sum_price": 223995.46d } ] }
-{ "nation_key": 16, "sum_price": [ { "orderdate": "1994-09-20", "sum_price": 231012.22d }, { "orderdate": "1992-06-30", "sum_price": 221320.76d }, { "orderdate": "1993-05-14", "sum_price": 207291.83d } ] }
-{ "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87d }, { "orderdate": "1997-08-04", "sum_price": 244636.7d }, { "orderdate": "1996-11-20", "sum_price": 222274.54d } ] }
-{ "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69d }, { "orderdate": "1998-07-17", "sum_price": 187156.38d }, { "orderdate": "1993-03-25", "sum_price": 167017.39d } ] }
-{ "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29d }, { "orderdate": "1993-04-11", "sum_price": 221636.83d }, { "orderdate": "1993-05-07", "sum_price": 220715.14d } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88d }, { "orderdate": "1997-01-21", "sum_price": 240284.95d }, { "orderdate": "1997-08-24", "sum_price": 231831.35d } ] }
-{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23d }, { "orderdate": "1994-12-03", "sum_price": 234763.73d }, { "orderdate": "1994-09-09", "sum_price": 228002.51d } ] }
-{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56d }, { "orderdate": "1995-03-02", "sum_price": 228136.49d }, { "orderdate": "1992-07-30", "sum_price": 226314.91d } ] }
-{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74d }, { "orderdate": "1997-01-03", "sum_price": 219920.62d }, { "orderdate": "1992-01-02", "sum_price": 210713.88d } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996d }, { "orderdate": "1995-11-13", "sum_price": 242588.87d }, { "orderdate": "1993-07-15", "sum_price": 214494.39d } ] }
-{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02d }, { "orderdate": "1998-07-20", "sum_price": 209155.48d }, { "orderdate": "1994-04-27", "sum_price": 202917.72d } ] }
-{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83d }, { "orderdate": "1992-03-15", "sum_price": 206742.11d }, { "orderdate": "1992-05-10", "sum_price": 203904.8d } ] }
-{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09d }, { "orderdate": "1993-10-31", "sum_price": 224724.11d }, { "orderdate": "1996-04-18", "sum_price": 220727.97d } ] }
-{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74d }, { "orderdate": "1992-06-03", "sum_price": 233161.66d }, { "orderdate": "1996-09-20", "sum_price": 219707.84d } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
+{ "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
+{ "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
+{ "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
+{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
+{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
+{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
+{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
+{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
+{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
+{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
+{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
+{ "nation_key": 13, "sum_price": [ { "orderdate": "1998-02-08", "sum_price": 223537.09 }, { "orderdate": "1993-11-24", "sum_price": 222392.53 }, { "orderdate": "1995-09-13", "sum_price": 197031.52 } ] }
+{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
+{ "nation_key": 15, "sum_price": [ { "orderdate": "1998-05-31", "sum_price": 366291.52 }, { "orderdate": "1994-04-24", "sum_price": 228054.01 }, { "orderdate": "1993-01-29", "sum_price": 223995.46 } ] }
+{ "nation_key": 16, "sum_price": [ { "orderdate": "1994-09-20", "sum_price": 231012.22 }, { "orderdate": "1992-06-30", "sum_price": 221320.76 }, { "orderdate": "1993-05-14", "sum_price": 207291.83 } ] }
+{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
+{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
+{ "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
+{ "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
+{ "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue601/query-issue601.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue601/query-issue601.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue601/query-issue601.1.adm
index 7d83268..4c3d838 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue601/query-issue601.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue601/query-issue601.1.adm
@@ -1,7 +1,7 @@
-{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 1, "count_order": 1500 }
 { "l_linenumber": 2, "count_order": 1291 }
-{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 3, "count_order": 1077 }
+{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 5, "count_order": 632 }
+{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 7, "count_order": 211 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785-2/query-issue785-2.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785-2/query-issue785-2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785-2/query-issue785-2.1.adm
index 360adf4..3d98aaf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785-2/query-issue785-2.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785-2/query-issue785-2.1.adm
@@ -1,10 +1,10 @@
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785/query-issue785.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785/query-issue785.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785/query-issue785.1.adm
index 7324d3c..3ecdc03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785/query-issue785.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-sql/query-issue785/query-issue785.1.adm
@@ -1,24 +1,24 @@
-{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
-{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
-{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
-{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
+{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
+{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
+{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
+{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
+{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
+{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
+{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
+{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
 { "nation_key": 13, "sum_price": [ { "orderdate": "1998-02-08", "sum_price": 223537.09 }, { "orderdate": "1993-11-24", "sum_price": 222392.53 }, { "orderdate": "1995-09-13", "sum_price": 197031.52 } ] }
+{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
 { "nation_key": 15, "sum_price": [ { "orderdate": "1998-05-31", "sum_price": 366291.52 }, { "orderdate": "1994-04-24", "sum_price": 228054.01 }, { "orderdate": "1993-01-29", "sum_price": 223995.46 } ] }
 { "nation_key": 16, "sum_price": [ { "orderdate": "1994-09-20", "sum_price": 231012.22 }, { "orderdate": "1992-06-30", "sum_price": 221320.76 }, { "orderdate": "1993-05-14", "sum_price": 207291.83 } ] }
+{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
+{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
-{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
-{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
-{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
-{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
-{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
-{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue601/query-issue601.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue601/query-issue601.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue601/query-issue601.1.adm
index 7d83268..4c3d838 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue601/query-issue601.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue601/query-issue601.1.adm
@@ -1,7 +1,7 @@
-{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 1, "count_order": 1500 }
 { "l_linenumber": 2, "count_order": 1291 }
-{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 3, "count_order": 1077 }
+{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 5, "count_order": 632 }
+{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 7, "count_order": 211 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785-2/query-issue785-2.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785-2/query-issue785-2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785-2/query-issue785-2.1.adm
index 360adf4..3d98aaf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785-2/query-issue785-2.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785-2/query-issue785-2.1.adm
@@ -1,10 +1,10 @@
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785/query-issue785.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785/query-issue785.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785/query-issue785.1.adm
index 7324d3c..3ecdc03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785/query-issue785.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch-with-index/query-issue785/query-issue785.1.adm
@@ -1,24 +1,24 @@
-{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
-{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
-{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
-{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
+{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
+{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
+{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
+{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
+{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
+{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
+{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
+{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
 { "nation_key": 13, "sum_price": [ { "orderdate": "1998-02-08", "sum_price": 223537.09 }, { "orderdate": "1993-11-24", "sum_price": 222392.53 }, { "orderdate": "1995-09-13", "sum_price": 197031.52 } ] }
+{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
 { "nation_key": 15, "sum_price": [ { "orderdate": "1998-05-31", "sum_price": 366291.52 }, { "orderdate": "1994-04-24", "sum_price": 228054.01 }, { "orderdate": "1993-01-29", "sum_price": 223995.46 } ] }
 { "nation_key": 16, "sum_price": [ { "orderdate": "1994-09-20", "sum_price": 231012.22 }, { "orderdate": "1992-06-30", "sum_price": 221320.76 }, { "orderdate": "1993-05-14", "sum_price": 207291.83 } ] }
+{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
+{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
-{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
-{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
-{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
-{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
-{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
-{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue601/query-issue601.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue601/query-issue601.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue601/query-issue601.1.adm
index 7d83268..4c3d838 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue601/query-issue601.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue601/query-issue601.1.adm
@@ -1,7 +1,7 @@
-{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 1, "count_order": 1500 }
 { "l_linenumber": 2, "count_order": 1291 }
-{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 3, "count_order": 1077 }
+{ "l_linenumber": 4, "count_order": 862 }
 { "l_linenumber": 5, "count_order": 632 }
+{ "l_linenumber": 6, "count_order": 432 }
 { "l_linenumber": 7, "count_order": 211 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785-2/query-issue785-2.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785-2/query-issue785-2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785-2/query-issue785-2.1.adm
index 360adf4..3d98aaf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785-2/query-issue785-2.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785-2/query-issue785-2.1.adm
@@ -1,10 +1,10 @@
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785/query-issue785.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785/query-issue785.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785/query-issue785.1.adm
index 7324d3c..3ecdc03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785/query-issue785.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpch/query-issue785/query-issue785.1.adm
@@ -1,24 +1,24 @@
-{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
-{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
-{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
-{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
-{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
-{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }
+{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
 { "nation_key": 1, "sum_price": [ { "orderdate": "1993-05-26", "sum_price": 221036.31 }, { "orderdate": "1992-03-20", "sum_price": 216230.27000000002 }, { "orderdate": "1993-12-24", "sum_price": 211925.95 } ] }
 { "nation_key": 2, "sum_price": [ { "orderdate": "1996-03-01", "sum_price": 218697.85 }, { "orderdate": "1996-08-13", "sum_price": 217709.03 }, { "orderdate": "1992-08-21", "sum_price": 207364.8 } ] }
+{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
 { "nation_key": 4, "sum_price": [ { "orderdate": "1993-09-20", "sum_price": 226806.66 }, { "orderdate": "1992-03-04", "sum_price": 219709.6 }, { "orderdate": "1996-01-06", "sum_price": 190490.78 } ] }
+{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
+{ "nation_key": 6, "sum_price": [ { "orderdate": "1992-05-28", "sum_price": 335178.33 }, { "orderdate": "1997-05-26", "sum_price": 216826.73 }, { "orderdate": "1996-04-30", "sum_price": 180054.29 } ] }
+{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
+{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
+{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
+{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
+{ "nation_key": 11, "sum_price": [ { "orderdate": "1994-12-15", "sum_price": 249900.42 }, { "orderdate": "1996-12-24", "sum_price": 237947.61 }, { "orderdate": "1992-12-01", "sum_price": 218116.21 } ] }
+{ "nation_key": 12, "sum_price": [ { "orderdate": "1995-05-01", "sum_price": 245388.06 }, { "orderdate": "1997-02-17", "sum_price": 225518.72 }, { "orderdate": "1996-08-20", "sum_price": 220636.82 } ] }
 { "nation_key": 13, "sum_price": [ { "orderdate": "1998-02-08", "sum_price": 223537.09 }, { "orderdate": "1993-11-24", "sum_price": 222392.53 }, { "orderdate": "1995-09-13", "sum_price": 197031.52 } ] }
+{ "nation_key": 14, "sum_price": [ { "orderdate": "1993-12-27", "sum_price": 230949.45 }, { "orderdate": "1992-04-26", "sum_price": 134333.33 }, { "orderdate": "1997-03-09", "sum_price": 132838.49 } ] }
 { "nation_key": 15, "sum_price": [ { "orderdate": "1998-05-31", "sum_price": 366291.52 }, { "orderdate": "1994-04-24", "sum_price": 228054.01 }, { "orderdate": "1993-01-29", "sum_price": 223995.46 } ] }
 { "nation_key": 16, "sum_price": [ { "orderdate": "1994-09-20", "sum_price": 231012.22 }, { "orderdate": "1992-06-30", "sum_price": 221320.76 }, { "orderdate": "1993-05-14", "sum_price": 207291.83 } ] }
+{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
+{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
 { "nation_key": 19, "sum_price": [ { "orderdate": "1993-12-29", "sum_price": 328959.87 }, { "orderdate": "1997-08-04", "sum_price": 244636.7 }, { "orderdate": "1996-11-20", "sum_price": 222274.54 } ] }
 { "nation_key": 20, "sum_price": [ { "orderdate": "1993-01-31", "sum_price": 190960.69 }, { "orderdate": "1998-07-17", "sum_price": 187156.38 }, { "orderdate": "1993-03-25", "sum_price": 167017.39 } ] }
+{ "nation_key": 21, "sum_price": [ { "orderdate": "1994-02-27", "sum_price": 198360.22 }, { "orderdate": "1992-07-07", "sum_price": 180692.9 }, { "orderdate": "1996-06-28", "sum_price": 139915.23 } ] }
 { "nation_key": 22, "sum_price": [ { "orderdate": "1998-02-27", "sum_price": 263411.29 }, { "orderdate": "1993-04-11", "sum_price": 221636.83 }, { "orderdate": "1993-05-07", "sum_price": 220715.14 } ] }
-{ "nation_key": 0, "sum_price": [ { "orderdate": "1997-01-13", "sum_price": 241837.88 }, { "orderdate": "1997-01-21", "sum_price": 240284.95 }, { "orderdate": "1997-08-24", "sum_price": 231831.35 } ] }
-{ "nation_key": 8, "sum_price": [ { "orderdate": "1995-07-26", "sum_price": 244704.23 }, { "orderdate": "1994-12-03", "sum_price": 234763.73 }, { "orderdate": "1994-09-09", "sum_price": 228002.51 } ] }
-{ "nation_key": 9, "sum_price": [ { "orderdate": "1992-08-19", "sum_price": 240457.56 }, { "orderdate": "1995-03-02", "sum_price": 228136.49 }, { "orderdate": "1992-07-30", "sum_price": 226314.91 } ] }
-{ "nation_key": 10, "sum_price": [ { "orderdate": "1992-08-15", "sum_price": 232194.74 }, { "orderdate": "1997-01-03", "sum_price": 219920.62 }, { "orderdate": "1992-01-02", "sum_price": 210713.88 } ] }
-{ "nation_key": 3, "sum_price": [ { "orderdate": "1997-04-23", "sum_price": 351762.82999999996 }, { "orderdate": "1995-11-13", "sum_price": 242588.87 }, { "orderdate": "1993-07-15", "sum_price": 214494.39 } ] }
-{ "nation_key": 5, "sum_price": [ { "orderdate": "1997-04-04", "sum_price": 258779.02 }, { "orderdate": "1998-07-20", "sum_price": 209155.48 }, { "orderdate": "1994-04-27", "sum_price": 202917.72 } ] }
-{ "nation_key": 7, "sum_price": [ { "orderdate": "1995-03-19", "sum_price": 207925.83 }, { "orderdate": "1992-03-15", "sum_price": 206742.11 }, { "orderdate": "1992-05-10", "sum_price": 203904.8 } ] }
-{ "nation_key": 17, "sum_price": [ { "orderdate": "1997-07-05", "sum_price": 233874.09 }, { "orderdate": "1993-10-31", "sum_price": 224724.11 }, { "orderdate": "1996-04-18", "sum_price": 220727.97 } ] }
-{ "nation_key": 18, "sum_price": [ { "orderdate": "1995-10-03", "sum_price": 245976.74 }, { "orderdate": "1992-06-03", "sum_price": 233161.66 }, { "orderdate": "1996-09-20", "sum_price": 219707.84 } ] }
+{ "nation_key": 23, "sum_price": [ { "orderdate": "1993-06-08", "sum_price": 161307.05 }, { "orderdate": "1995-12-07", "sum_price": 153048.74 }, { "orderdate": "1994-08-22", "sum_price": 147071.86 } ] }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.3.ast
index d9d1e6e..cd20331 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.3.ast
@@ -31,47 +31,51 @@ FROM [  (
       (
         LiteralExpr [STRING] [partkey]
         :
-        Variable [ Name=$partkey ]
+        FieldAccessor [
+          Variable [ Name=$i ]
+          Field=l_partkey
+        ]
       )
       (
         LiteralExpr [STRING] [i]
         :
-        Variable [ Name=$i ]
-      )
-    ]
-    ]
-    FROM [      (
-        SELECT ELEMENT [
-        Variable [ Name=$l ]
-        ]
-        FROM [          FunctionCall Metadata.dataset@1[
-            LiteralExpr [STRING] [LineItem]
-          ]
-          AS Variable [ Name=$l ]
-        ]
-        Orderby
+        (
+          SELECT ELEMENT [
           FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_partkey
+            Variable [ Name=$x ]
+            Field=i
           ]
-          ASC
-          FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_shipdate
           ]
-          ASC
+          FROM [            Variable [ Name=$g ]
+            AS Variable [ Name=$x ]
+          ]
+          Orderby
+            FieldAccessor [
+              FieldAccessor [
+                Variable [ Name=$x ]
+                Field=i
+              ]
+              Field=l_shipdate
+            ]
+            ASC
 
+        )
       )
+    ]
+    ]
+    FROM [      FunctionCall Metadata.dataset@1[
+        LiteralExpr [STRING] [LineItem]
+      ]
       AS Variable [ Name=$i ]
     ]
     Groupby
-      Variable [ Name=$partkey ]
+      Variable [ Name=$l_partkey ]
       :=
       FieldAccessor [
         Variable [ Name=$i ]
         Field=l_partkey
       ]
-      GROUP AS Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=$g ]
       (
         i:=Variable [ Name=$i ]
       )
@@ -93,3 +97,15 @@ Where
     <
     LiteralExpr [LONG] [4]
   ]
+Orderby
+  FieldAccessor [
+    Variable [ Name=$gen0 ]
+    Field=partkey
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$j ]
+    Field=l_shipdate
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.4.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.4.ast
index d9d1e6e..cd20331 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.4.ast
@@ -31,47 +31,51 @@ FROM [  (
       (
         LiteralExpr [STRING] [partkey]
         :
-        Variable [ Name=$partkey ]
+        FieldAccessor [
+          Variable [ Name=$i ]
+          Field=l_partkey
+        ]
       )
       (
         LiteralExpr [STRING] [i]
         :
-        Variable [ Name=$i ]
-      )
-    ]
-    ]
-    FROM [      (
-        SELECT ELEMENT [
-        Variable [ Name=$l ]
-        ]
-        FROM [          FunctionCall Metadata.dataset@1[
-            LiteralExpr [STRING] [LineItem]
-          ]
-          AS Variable [ Name=$l ]
-        ]
-        Orderby
+        (
+          SELECT ELEMENT [
           FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_partkey
+            Variable [ Name=$x ]
+            Field=i
           ]
-          ASC
-          FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_shipdate
           ]
-          ASC
+          FROM [            Variable [ Name=$g ]
+            AS Variable [ Name=$x ]
+          ]
+          Orderby
+            FieldAccessor [
+              FieldAccessor [
+                Variable [ Name=$x ]
+                Field=i
+              ]
+              Field=l_shipdate
+            ]
+            ASC
 
+        )
       )
+    ]
+    ]
+    FROM [      FunctionCall Metadata.dataset@1[
+        LiteralExpr [STRING] [LineItem]
+      ]
       AS Variable [ Name=$i ]
     ]
     Groupby
-      Variable [ Name=$partkey ]
+      Variable [ Name=$l_partkey ]
       :=
       FieldAccessor [
         Variable [ Name=$i ]
         Field=l_partkey
       ]
-      GROUP AS Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=$g ]
       (
         i:=Variable [ Name=$i ]
       )
@@ -93,3 +97,15 @@ Where
     <
     LiteralExpr [LONG] [4]
   ]
+Orderby
+  FieldAccessor [
+    Variable [ Name=$gen0 ]
+    Field=partkey
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$j ]
+    Field=l_shipdate
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.5.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.5.ast
index d9d1e6e..cd20331 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at00/at00.5.ast
@@ -31,47 +31,51 @@ FROM [  (
       (
         LiteralExpr [STRING] [partkey]
         :
-        Variable [ Name=$partkey ]
+        FieldAccessor [
+          Variable [ Name=$i ]
+          Field=l_partkey
+        ]
       )
       (
         LiteralExpr [STRING] [i]
         :
-        Variable [ Name=$i ]
-      )
-    ]
-    ]
-    FROM [      (
-        SELECT ELEMENT [
-        Variable [ Name=$l ]
-        ]
-        FROM [          FunctionCall Metadata.dataset@1[
-            LiteralExpr [STRING] [LineItem]
-          ]
-          AS Variable [ Name=$l ]
-        ]
-        Orderby
+        (
+          SELECT ELEMENT [
           FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_partkey
+            Variable [ Name=$x ]
+            Field=i
           ]
-          ASC
-          FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_shipdate
           ]
-          ASC
+          FROM [            Variable [ Name=$g ]
+            AS Variable [ Name=$x ]
+          ]
+          Orderby
+            FieldAccessor [
+              FieldAccessor [
+                Variable [ Name=$x ]
+                Field=i
+              ]
+              Field=l_shipdate
+            ]
+            ASC
 
+        )
       )
+    ]
+    ]
+    FROM [      FunctionCall Metadata.dataset@1[
+        LiteralExpr [STRING] [LineItem]
+      ]
       AS Variable [ Name=$i ]
     ]
     Groupby
-      Variable [ Name=$partkey ]
+      Variable [ Name=$l_partkey ]
       :=
       FieldAccessor [
         Variable [ Name=$i ]
         Field=l_partkey
       ]
-      GROUP AS Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=$g ]
       (
         i:=Variable [ Name=$i ]
       )
@@ -93,3 +97,15 @@ Where
     <
     LiteralExpr [LONG] [4]
   ]
+Orderby
+  FieldAccessor [
+    Variable [ Name=$gen0 ]
+    Field=partkey
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$j ]
+    Field=l_shipdate
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
index dfeebe0..d913c8b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
@@ -39,42 +39,41 @@ FROM [  (
       (
         LiteralExpr [STRING] [i]
         :
-        Variable [ Name=$i ]
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            Variable [ Name=$x ]
+            Field=i
+          ]
+          ]
+          FROM [            Variable [ Name=$g ]
+            AS Variable [ Name=$x ]
+          ]
+        )
       )
       (
         LiteralExpr [STRING] [partkey]
         :
-        Variable [ Name=$partkey ]
+        FieldAccessor [
+          Variable [ Name=$i ]
+          Field=l_partkey
+        ]
       )
     ]
     ]
-    FROM [      (
-        SELECT ELEMENT [
-        Variable [ Name=$l ]
-        ]
-        FROM [          FunctionCall Metadata.dataset@1[
-            LiteralExpr [STRING] [LineItem]
-          ]
-          AS Variable [ Name=$l ]
-        ]
-        Orderby
-          FieldAccessor [
-            Variable [ Name=$l ]
-            Field=l_partkey
-          ]
-          ASC
-
-      )
+    FROM [      FunctionCall Metadata.dataset@1[
+        LiteralExpr [STRING] [LineItem]
+      ]
       AS Variable [ Name=$i ]
     ]
     Groupby
-      Variable [ Name=$partkey ]
+      Variable [ Name=$l_partkey ]
       :=
       FieldAccessor [
         Variable [ Name=$i ]
         Field=l_partkey
       ]
-      GROUP AS Variable [ Name=#1 ]
+      GROUP AS Variable [ Name=$g ]
       (
         i:=Variable [ Name=$i ]
       )
@@ -98,6 +97,11 @@ FROM [  (
         Field=l_shipdate
       ]
       ASC
+      FieldAccessor [
+        Variable [ Name=$ii ]
+        Field=l_orderkey
+      ]
+      ASC
 
   )
   AS Variable [ Name=$j ]
@@ -110,3 +114,20 @@ Where
     <
     LiteralExpr [LONG] [4]
   ]
+Orderby
+  FieldAccessor [
+    Variable [ Name=$gen0 ]
+    Field=partkey
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$j ]
+    Field=l_shipdate
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$j ]
+    Field=l_orderkey
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
index 1dc9f40..1113fa8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
@@ -2,7 +2,10 @@ DataverseUse test
 Query:
 SELECT ELEMENT [
 OrderedListConstructor [
-  Variable [ Name=$m ]
+  FieldAccessor [
+    Variable [ Name=$x ]
+    Field=int_m
+  ]
   FunctionCall test.sql-count@1[
     (
       SELECT ELEMENT [
@@ -29,7 +32,7 @@ Let Variable [ Name=$id ]
     Field=id
   ]
 Groupby
-  Variable [ Name=$m ]
+  Variable [ Name=$int_m ]
   :=
   FieldAccessor [
     Variable [ Name=$x ]
@@ -40,3 +43,10 @@ Groupby
     x:=Variable [ Name=$x ]
   )
 
+Orderby
+  FieldAccessor [
+    Variable [ Name=$x ]
+    Field=int_m
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
index 16e5ee8..f94d3dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
@@ -1,7 +1,10 @@
 DataverseUse TinySocial
 Query:
 SELECT [
-Variable [ Name=$org ]
+FieldAccessor [
+  Variable [ Name=$employment ]
+  Field=organization-name
+]
 organization
 FunctionCall TinySocial.sql-avg@1[
   (
@@ -105,7 +108,7 @@ FROM [  FunctionCall Metadata.dataset@1[
   AS Variable [ Name=$employment ]
 ]
 Groupby
-  Variable [ Name=$org ]
+  Variable [ Name=$organization-name ]
   :=
   FieldAccessor [
     Variable [ Name=$employment ]
@@ -117,3 +120,10 @@ Groupby
     employment:=Variable [ Name=$employment ]
   )
 
+Orderby
+  FieldAccessor [
+    Variable [ Name=$employment ]
+    Field=organization-name
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
index 758fd5a..6da2337 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
@@ -33,3 +33,7 @@ Groupby
     l:=Variable [ Name=$l ]
   )
 
+Orderby
+  Variable [ Name=$l_linenumber ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
index 991c38a..b56a7bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
@@ -148,7 +148,10 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [nation_key]
     :
-    Variable [ Name=$nation_key ]
+    FieldAccessor [
+      Variable [ Name=$x ]
+      Field=nation_key
+    ]
   )
   (
     LiteralExpr [STRING] [sum_price]
@@ -205,3 +208,10 @@ Groupby
     x:=Variable [ Name=$x ]
   )
 
+Orderby
+  FieldAccessor [
+    Variable [ Name=$x ]
+    Field=nation_key
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
index 61e0ca4..59669e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
@@ -5,7 +5,10 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [nation_key]
     :
-    Variable [ Name=$nation_key ]
+    FieldAccessor [
+      Variable [ Name=$x ]
+      Field=nation_key
+    ]
   )
   (
     LiteralExpr [STRING] [sum_price]
@@ -173,3 +176,10 @@ Groupby
     x:=Variable [ Name=$x ]
   )
 
+Orderby
+  FieldAccessor [
+    Variable [ Name=$x ]
+    Field=nation_key
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
index ed17476..35785dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
@@ -5,7 +5,10 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [l_linenumber]
     :
-    Variable [ Name=$l_linenumber ]
+    FieldAccessor [
+      Variable [ Name=$l ]
+      Field=l_linenumber
+    ]
   )
   (
     LiteralExpr [STRING] [count_order]
@@ -43,3 +46,10 @@ Groupby
     l:=Variable [ Name=$l ]
   )
 
+Orderby
+  FieldAccessor [
+    Variable [ Name=$l ]
+    Field=l_linenumber
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
index 991c38a..4ff201e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
@@ -205,3 +205,7 @@ Groupby
     x:=Variable [ Name=$x ]
   )
 
+Orderby
+  Variable [ Name=$nation_key ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
index 61e0ca4..066626b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
@@ -173,3 +173,7 @@ Groupby
     x:=Variable [ Name=$x ]
   )
 
+Orderby
+  Variable [ Name=$nation_key ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/03e940a7/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
index 14cf70b..4e18bde 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
@@ -18,12 +18,13 @@
  */
 package org.apache.asterix.common.config;
 
-import org.apache.hyracks.util.StorageUtil;
-
 import static org.apache.hyracks.util.StorageUtil.StorageUnit.KILOBYTE;
 import static org.apache.hyracks.util.StorageUtil.StorageUnit.MEGABYTE;
 
+import org.apache.hyracks.util.StorageUtil;
+
 public class CompilerProperties extends AbstractProperties {
+
     private static final String COMPILER_SORTMEMORY_KEY = "compiler.sortmemory";
     private static final long COMPILER_SORTMEMORY_DEFAULT = StorageUtil.getSizeInBytes(32, MEGABYTE);
 
@@ -36,6 +37,9 @@ public class CompilerProperties extends AbstractProperties {
     private static final String COMPILER_FRAMESIZE_KEY = "compiler.framesize";
     private static final int COMPILER_FRAMESIZE_DEFAULT = StorageUtil.getSizeInBytes(32, KILOBYTE);
 
+    private static final String COMPILER_PARALLELISM_KEY = "compiler.parallelism";
+    public static final int COMPILER_PARALLELISM_AS_STORAGE = 0;
+
     private static final String COMPILER_PREGELIX_HOME = "compiler.pregelix.home";
     private static final String COMPILER_PREGELIX_HOME_DEFAULT = "~/pregelix";
 
@@ -67,6 +71,12 @@ public class CompilerProperties extends AbstractProperties {
                 PropertyInterpreters.getIntegerBytePropertyInterpreter());
     }
 
+    @PropertyKey(COMPILER_PARALLELISM_KEY)
+    public int getParallelism() {
+        return accessor.getProperty(COMPILER_PARALLELISM_KEY, COMPILER_PARALLELISM_AS_STORAGE,
+                PropertyInterpreters.getIntegerPropertyInterpreter());
+    }
+
     @PropertyKey(COMPILER_PREGELIX_HOME)
     public String getPregelixHome() {
         return accessor.getProperty(COMPILER_PREGELIX_HOME, COMPILER_PREGELIX_HOME_DEFAULT,