asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [10/34] incubator-asterixdb git commit: SQL++ support in AsterixDB: 1. implemented SQL++ expression to logical plan translator; 2. refactored REST API to be agnostic of query languages; 3. disabled fuzzy join queries for SQL++ runtime tests; 4. fixed sev
Date Tue, 17 Nov 2015 00:56:42 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm
index 05deeeb..f6b9984 100644
--- a/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/cross-dataverse/cross-dv15/cross-dv15.1.adm
@@ -1,3 +1,3 @@
-{ "DataverseName": "testdv1", "Name": "fun01", "Arity": "0", "Params": [  ], "ReturnType": "VOID", "Definition": "100", "Language": "AQL", "Kind": "SCALAR" }
-{ "DataverseName": "testdv1", "Name": "fun02", "Arity": "1", "Params": [ "$a" ], "ReturnType": "VOID", "Definition": "\"function 02\"", "Language": "AQL", "Kind": "SCALAR" }
-{ "DataverseName": "testdv1", "Name": "fun03", "Arity": "2", "Params": [ "$b", "$c" ], "ReturnType": "VOID", "Definition": "$b+$c", "Language": "AQL", "Kind": "SCALAR" }
+{ "DataverseName": "testdv1", "Name": "fun01", "Arity": "0", "ReturnType": "VOID", "Language": "AQL" }
+{ "DataverseName": "testdv1", "Name": "fun02", "Arity": "1", "ReturnType": "VOID", "Language": "AQL" }
+{ "DataverseName": "testdv1", "Name": "fun03", "Arity": "2", "ReturnType": "VOID", "Language": "AQL" }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results/tpch/nest_aggregate/nest_aggregate.1.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results/tpch/nest_aggregate/nest_aggregate.1.adm b/asterix-app/src/test/resources/runtimets/results/tpch/nest_aggregate/nest_aggregate.1.adm
index 69ac8ee..428af08 100644
--- a/asterix-app/src/test/resources/runtimets/results/tpch/nest_aggregate/nest_aggregate.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/tpch/nest_aggregate/nest_aggregate.1.adm
@@ -1,11 +1,11 @@
-{ "nation_key": 21, "name": "VIETNAM", "aggregates": [ { "order_date": "1994-02-17", "sum_price": 1984.14d }, { "order_date": "1995-08-05", "sum_price": 16922.51d }, { "order_date": "1994-06-01", "sum_price": 21088.59d } ] }
-{ "nation_key": 23, "name": "UNITED KINGDOM", "aggregates": [ { "order_date": "1997-12-18", "sum_price": 10934.84d }, { "order_date": "1995-05-26", "sum_price": 11474.95d }, { "order_date": "1997-05-13", "sum_price": 18307.45d } ] }
+{ "nation_key": 0, "name": "ALGERIA", "aggregates": [ { "order_date": "1994-05-27", "sum_price": 1051.15d }, { "order_date": "1994-05-08", "sum_price": 4819.91d }, { "order_date": "1993-08-27", "sum_price": 10500.27d } ] }
 { "nation_key": 1, "name": "ARGENTINA", "aggregates": [ { "order_date": "1997-08-14", "sum_price": 16763.95d }, { "order_date": "1997-11-26", "sum_price": 18653.09d }, { "order_date": "1998-04-20", "sum_price": 24637.96d } ] }
 { "nation_key": 2, "name": "BRAZIL", "aggregates": [ { "order_date": "1993-03-05", "sum_price": 8225.96d }, { "order_date": "1994-08-31", "sum_price": 19056.99d }, { "order_date": "1997-05-04", "sum_price": 23984.88d } ] }
+{ "nation_key": 3, "name": "CANADA", "aggregates": [ { "order_date": "1992-02-22", "sum_price": 1084.38d }, { "order_date": "1992-11-28", "sum_price": 4766.19d }, { "order_date": "1995-02-17", "sum_price": 4913.06d } ] }
 { "nation_key": 4, "name": "EGYPT", "aggregates": [ { "order_date": "1998-04-19", "sum_price": 3089.42d }, { "order_date": "1996-03-12", "sum_price": 3892.77d }, { "order_date": "1997-07-25", "sum_price": 11405.4d } ] }
 { "nation_key": 19, "name": "ROMANIA", "aggregates": [ { "order_date": "1994-07-05", "sum_price": 7108.12d }, { "order_date": "1994-11-17", "sum_price": 13282.23d }, { "order_date": "1997-02-07", "sum_price": 16689.19d } ] }
 { "nation_key": 20, "name": "SAUDI ARABIA", "aggregates": [ { "order_date": "1994-04-30", "sum_price": 6406.29d }, { "order_date": "1992-05-10", "sum_price": 45695.84d }, { "order_date": "1994-01-31", "sum_price": 62316.61d } ] }
+{ "nation_key": 21, "name": "VIETNAM", "aggregates": [ { "order_date": "1994-02-17", "sum_price": 1984.14d }, { "order_date": "1995-08-05", "sum_price": 16922.51d }, { "order_date": "1994-06-01", "sum_price": 21088.59d } ] }
 { "nation_key": 22, "name": "RUSSIA", "aggregates": [ { "order_date": "1993-11-16", "sum_price": 7471.75d }, { "order_date": "1996-01-11", "sum_price": 8720.45d }, { "order_date": "1995-07-15", "sum_price": 27016.74d } ] }
+{ "nation_key": 23, "name": "UNITED KINGDOM", "aggregates": [ { "order_date": "1997-12-18", "sum_price": 10934.84d }, { "order_date": "1995-05-26", "sum_price": 11474.95d }, { "order_date": "1997-05-13", "sum_price": 18307.45d } ] }
 { "nation_key": 24, "name": "UNITED STATES", "aggregates": [  ] }
-{ "nation_key": 0, "name": "ALGERIA", "aggregates": [ { "order_date": "1994-05-27", "sum_price": 1051.15d }, { "order_date": "1994-05-08", "sum_price": 4819.91d }, { "order_date": "1993-08-27", "sum_price": 10500.27d } ] }
-{ "nation_key": 3, "name": "CANADA", "aggregates": [ { "order_date": "1992-02-22", "sum_price": 1084.38d }, { "order_date": "1992-11-28", "sum_price": 4766.19d }, { "order_date": "1995-02-17", "sum_price": 4913.06d } ] }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
index e69de29..99938b6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
@@ -0,0 +1,26 @@
+Query:
+FunctionCall null.sql-count@1[
+  (
+    SELECT ELEMENT [
+    Variable [ Name=i ]
+    ]
+    FROM [      OrderedListConstructor [
+        OrderedListConstructor [
+          LiteralExpr [LONG] [1]
+          LiteralExpr [LONG] [2]
+          LiteralExpr [LONG] [3]
+          LiteralExpr [LONG] [4]
+          LiteralExpr [LONG] [5]
+        ]
+        OrderedListConstructor [
+          LiteralExpr [LONG] [6]
+          LiteralExpr [LONG] [7]
+          LiteralExpr [LONG] [8]
+          LiteralExpr [LONG] [9]
+        ]
+      ]
+      AS
+      Variable [ Name=i ]
+    ]
+  )
+]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
index e69de29..3ab430c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
@@ -0,0 +1,26 @@
+Query:
+FunctionCall null.count@1[
+  (
+    SELECT ELEMENT [
+    Variable [ Name=i ]
+    ]
+    FROM [      OrderedListConstructor [
+        OrderedListConstructor [
+          LiteralExpr [LONG] [1]
+          LiteralExpr [LONG] [2]
+          LiteralExpr [LONG] [3]
+          LiteralExpr [LONG] [4]
+          LiteralExpr [LONG] [5]
+        ]
+        OrderedListConstructor [
+          LiteralExpr [LONG] [6]
+          LiteralExpr [LONG] [7]
+          LiteralExpr [LONG] [8]
+          LiteralExpr [LONG] [9]
+        ]
+      ]
+      AS
+      Variable [ Name=i ]
+    ]
+  )
+]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ast
index e69de29..5556ac7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ast
@@ -0,0 +1,49 @@
+DataverseUse test
+TypeDecl LineType [
+  closed RecordType {
+    l_orderkey : int32,
+    l_partkey : int32,
+    l_suppkey : int32,
+    l_linenumber : int32,
+    l_quantity : double,
+    l_extendedprice : double,
+    l_discount : double,
+    l_tax : double,
+    l_returnflag : string,
+    l_linestatus : string,
+    l_shipdate : string,
+    l_commitdate : string,
+    l_receiptdate : string,
+    l_shipinstruct : string,
+    l_shipmode : string,
+    l_comment : string
+  }
+]
+TypeDecl OrderType [
+  closed RecordType {
+    o_orderkey : int32,
+    o_custkey : int32,
+    o_orderstatus : string,
+    o_totalprice : double,
+    o_orderdate : string,
+    o_orderpriority : string,
+    o_clerk : string,
+    o_shippriority : int32,
+    o_comment : string
+  }
+]
+TypeDecl CustomerType [
+  closed RecordType {
+    c_custkey : int32,
+    c_name : string,
+    c_address : string,
+    c_nationkey : int32,
+    c_phone : string,
+    c_acctbal : double,
+    c_mktsegment : string,
+    c_comment : string
+  }
+]
+DatasetDecl Line(LineType)is an external dataset
+DatasetDecl Order(OrderType)is an external dataset
+DatasetDecl Customer(CustomerType)is an external dataset

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
index e69de29..cb72b70 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
@@ -0,0 +1,55 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+RecordConstructor [
+  (
+    LiteralExpr [STRING] [id]
+    :
+    Variable [ Name=id ]
+  )
+  (
+    LiteralExpr [STRING] [length]
+    :
+    FunctionCall test.string-length@1[
+      Variable [ Name=comment ]
+    ]
+  )
+  (
+    LiteralExpr [STRING] [comment]
+    :
+    Variable [ Name=comment ]
+  )
+]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Line]
+  ]
+  AS
+  Variable [ Name=i ]
+]
+Groupby
+  Variable [ Name=comment ]
+  :=
+  FieldAccessor [
+    Variable [ Name=i ]
+    Field=l_comment
+  ]
+  Variable [ Name=id ]
+  :=
+  FieldAccessor [
+    Variable [ Name=i ]
+    Field=l_orderkey
+  ]
+  With
+  Variable [ Name=i ]
+
+Orderby
+  Variable [ Name=id ]
+  ASC
+  FunctionCall test.string-length@1[
+    Variable [ Name=comment ]
+  ]
+  ASC
+  Variable [ Name=comment ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ast
index e69de29..5556ac7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ast
@@ -0,0 +1,49 @@
+DataverseUse test
+TypeDecl LineType [
+  closed RecordType {
+    l_orderkey : int32,
+    l_partkey : int32,
+    l_suppkey : int32,
+    l_linenumber : int32,
+    l_quantity : double,
+    l_extendedprice : double,
+    l_discount : double,
+    l_tax : double,
+    l_returnflag : string,
+    l_linestatus : string,
+    l_shipdate : string,
+    l_commitdate : string,
+    l_receiptdate : string,
+    l_shipinstruct : string,
+    l_shipmode : string,
+    l_comment : string
+  }
+]
+TypeDecl OrderType [
+  closed RecordType {
+    o_orderkey : int32,
+    o_custkey : int32,
+    o_orderstatus : string,
+    o_totalprice : double,
+    o_orderdate : string,
+    o_orderpriority : string,
+    o_clerk : string,
+    o_shippriority : int32,
+    o_comment : string
+  }
+]
+TypeDecl CustomerType [
+  closed RecordType {
+    c_custkey : int32,
+    c_name : string,
+    c_address : string,
+    c_nationkey : int32,
+    c_phone : string,
+    c_acctbal : double,
+    c_mktsegment : string,
+    c_comment : string
+  }
+]
+DatasetDecl Line(LineType)is an external dataset
+DatasetDecl Order(OrderType)is an external dataset
+DatasetDecl Customer(CustomerType)is an external dataset

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
index e69de29..7d82c98 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
@@ -0,0 +1,36 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+RecordConstructor [
+  (
+    LiteralExpr [STRING] [partkey]
+    :
+    Variable [ Name=partkey ]
+  )
+  (
+    LiteralExpr [STRING] [lines]
+    :
+    Variable [ Name=i ]
+  )
+]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Line]
+  ]
+  AS
+  Variable [ Name=i ]
+]
+Groupby
+  Variable [ Name=partkey ]
+  :=
+  FieldAccessor [
+    Variable [ Name=i ]
+    Field=l_partkey
+  ]
+  With
+  Variable [ Name=i ]
+
+Orderby
+  Variable [ Name=partkey ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.1.ast
index e69de29..5556ac7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.1.ast
@@ -0,0 +1,49 @@
+DataverseUse test
+TypeDecl LineType [
+  closed RecordType {
+    l_orderkey : int32,
+    l_partkey : int32,
+    l_suppkey : int32,
+    l_linenumber : int32,
+    l_quantity : double,
+    l_extendedprice : double,
+    l_discount : double,
+    l_tax : double,
+    l_returnflag : string,
+    l_linestatus : string,
+    l_shipdate : string,
+    l_commitdate : string,
+    l_receiptdate : string,
+    l_shipinstruct : string,
+    l_shipmode : string,
+    l_comment : string
+  }
+]
+TypeDecl OrderType [
+  closed RecordType {
+    o_orderkey : int32,
+    o_custkey : int32,
+    o_orderstatus : string,
+    o_totalprice : double,
+    o_orderdate : string,
+    o_orderpriority : string,
+    o_clerk : string,
+    o_shippriority : int32,
+    o_comment : string
+  }
+]
+TypeDecl CustomerType [
+  closed RecordType {
+    c_custkey : int32,
+    c_name : string,
+    c_address : string,
+    c_nationkey : int32,
+    c_phone : string,
+    c_acctbal : double,
+    c_mktsegment : string,
+    c_comment : string
+  }
+]
+DatasetDecl Line(LineType)is an external dataset
+DatasetDecl Order(OrderType)is an external dataset
+DatasetDecl Customer(CustomerType)is an external dataset

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
index e69de29..0e8cdce 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
@@ -0,0 +1,74 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+RecordConstructor [
+  (
+    LiteralExpr [STRING] [c_custkey]
+    :
+    FieldAccessor [
+      Variable [ Name=c ]
+      Field=c_custkey
+    ]
+  )
+  (
+    LiteralExpr [STRING] [o_orderkey]
+    :
+    FieldAccessor [
+      Variable [ Name=o ]
+      Field=o_orderkey
+    ]
+  )
+  (
+    LiteralExpr [STRING] [len_c_comment]
+    :
+    FunctionCall test.string-length@1[
+      FieldAccessor [
+        Variable [ Name=c ]
+        Field=c_comment
+      ]
+    ]
+  )
+  (
+    LiteralExpr [STRING] [len_o_comment]
+    :
+    FunctionCall test.string-length@1[
+      FieldAccessor [
+        Variable [ Name=o ]
+        Field=o_comment
+      ]
+    ]
+  )
+  (
+    LiteralExpr [STRING] [c_comment]
+    :
+    FieldAccessor [
+      Variable [ Name=c ]
+      Field=c_comment
+    ]
+  )
+]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Customer]
+  ]
+  AS
+  Variable [ Name=c ]
+,
+  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Order]
+  ]
+  AS
+  Variable [ Name=o ]
+]
+Where
+  OperatorExpr [
+    FieldAccessor [
+      Variable [ Name=c ]
+      Field=c_custkey
+    ]
+    =
+    FieldAccessor [
+      Variable [ Name=o ]
+      Field=o_custkey
+    ]
+  ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.1.ast
index e69de29..5556ac7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.1.ast
@@ -0,0 +1,49 @@
+DataverseUse test
+TypeDecl LineType [
+  closed RecordType {
+    l_orderkey : int32,
+    l_partkey : int32,
+    l_suppkey : int32,
+    l_linenumber : int32,
+    l_quantity : double,
+    l_extendedprice : double,
+    l_discount : double,
+    l_tax : double,
+    l_returnflag : string,
+    l_linestatus : string,
+    l_shipdate : string,
+    l_commitdate : string,
+    l_receiptdate : string,
+    l_shipinstruct : string,
+    l_shipmode : string,
+    l_comment : string
+  }
+]
+TypeDecl OrderType [
+  closed RecordType {
+    o_orderkey : int32,
+    o_custkey : int32,
+    o_orderstatus : string,
+    o_totalprice : double,
+    o_orderdate : string,
+    o_orderpriority : string,
+    o_clerk : string,
+    o_shippriority : int32,
+    o_comment : string
+  }
+]
+TypeDecl CustomerType [
+  closed RecordType {
+    c_custkey : int32,
+    c_name : string,
+    c_address : string,
+    c_nationkey : int32,
+    c_phone : string,
+    c_acctbal : double,
+    c_mktsegment : string,
+    c_comment : string
+  }
+]
+DatasetDecl Line(LineType)is an external dataset
+DatasetDecl Order(OrderType)is an external dataset
+DatasetDecl Customer(CustomerType)is an external dataset

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
index e69de29..4d0117e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
@@ -0,0 +1,58 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+RecordConstructor [
+  (
+    LiteralExpr [STRING] [custkey]
+    :
+    FieldAccessor [
+      Variable [ Name=o ]
+      Field=o_custkey
+    ]
+  )
+  (
+    LiteralExpr [STRING] [orderkey]
+    :
+    FieldAccessor [
+      Variable [ Name=o ]
+      Field=o_orderkey
+    ]
+  )
+  (
+    LiteralExpr [STRING] [len-comment]
+    :
+    FunctionCall test.string-length@1[
+      FieldAccessor [
+        Variable [ Name=o ]
+        Field=o_comment
+      ]
+    ]
+  )
+  (
+    LiteralExpr [STRING] [comment]
+    :
+    FieldAccessor [
+      Variable [ Name=o ]
+      Field=o_comment
+    ]
+  )
+]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Order]
+  ]
+  AS
+  Variable [ Name=o ]
+]
+Orderby
+  FieldAccessor [
+    Variable [ Name=o ]
+    Field=o_custkey
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=o ]
+    Field=o_orderkey
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
index d7a8788..cd2f25c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
@@ -2,105 +2,97 @@ DataverseUse test
 Query:
 OrderedListConstructor [
   OperatorExpr [
-    OperatorExpr [
-      FunctionCall test.find-binary@2[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] []
-        ]
-      ]
-      =
-      LiteralExpr [LONG] [1]
+    FunctionCall test.find-binary@2[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] []
+      ]
+    ]
+    =
+    LiteralExpr [LONG] [1]
+  ]
+  OperatorExpr [
+    FunctionCall test.find-binary@2[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aa]
+      ]
     ]
-    and
-    OperatorExpr [
-      FunctionCall test.find-binary@2[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aa]
-        ]
-      ]
-      =
+    =
+    LiteralExpr [LONG] [1]
+  ]
+  OperatorExpr [
+    FunctionCall test.find-binary@3[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aa]
+      ]
       LiteralExpr [LONG] [1]
     ]
-    and
-    OperatorExpr [
-      FunctionCall test.find-binary@3[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aa]
-        ]
-        LiteralExpr [LONG] [1]
-      ]
-      =
-      LiteralExpr [LONG] [5]
+    =
+    LiteralExpr [LONG] [5]
+  ]
+  OperatorExpr [
+    FunctionCall test.find-binary@3[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabb]
+      ]
+      LiteralExpr [LONG] [0]
     ]
-    and
-    OperatorExpr [
-      FunctionCall test.find-binary@3[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabb]
-        ]
-        LiteralExpr [LONG] [0]
-      ]
-      =
-      FunctionCall test.find-binary@2[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabb]
-        ]
+    =
+    FunctionCall test.find-binary@2[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabb]
       ]
     ]
-    and
-    OperatorExpr [
-      FunctionCall test.find-binary@2[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [11]
-        ]
-      ]
-      =
-      LiteralExpr [LONG] [0]
+  ]
+  OperatorExpr [
+    FunctionCall test.find-binary@2[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [11]
+      ]
     ]
-    and
-    OperatorExpr [
-      FunctionCall test.find-binary@2[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [ccddaa]
-        ]
-      ]
-      =
-      LiteralExpr [LONG] [3]
+    =
+    LiteralExpr [LONG] [0]
+  ]
+  OperatorExpr [
+    FunctionCall test.find-binary@2[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [ccddaa]
+      ]
     ]
-    and
-    OperatorExpr [
-      FunctionCall test.find-binary@2[
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [aabbccddaa]
-        ]
-        FunctionCall test.hex@1[
-          LiteralExpr [STRING] [ccddaabb]
-        ]
-      ]
-      =
-      LiteralExpr [LONG] [0]
+    =
+    LiteralExpr [LONG] [3]
+  ]
+  OperatorExpr [
+    FunctionCall test.find-binary@2[
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [aabbccddaa]
+      ]
+      FunctionCall test.hex@1[
+        LiteralExpr [STRING] [ccddaabb]
+      ]
     ]
+    =
+    LiteralExpr [LONG] [0]
   ]
   FunctionCall test.find-binary@2[
     FunctionCall test.hex@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
index af550bc..79aa35a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-OperatorExpr [
+OrderedListConstructor [
   OperatorExpr [
     FunctionCall test.sub-binary@2[
       FunctionCall test.hex@1[
@@ -13,7 +13,6 @@ OperatorExpr [
       LiteralExpr [STRING] []
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@2[
       FunctionCall test.hex@1[
@@ -26,7 +25,6 @@ OperatorExpr [
       LiteralExpr [STRING] []
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@2[
       FunctionCall test.hex@1[
@@ -39,7 +37,6 @@ OperatorExpr [
       LiteralExpr [STRING] []
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -57,7 +54,6 @@ OperatorExpr [
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -71,7 +67,6 @@ OperatorExpr [
       LiteralExpr [STRING] [bb]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@2[
       FunctionCall test.hex@1[
@@ -84,7 +79,6 @@ OperatorExpr [
       LiteralExpr [STRING] [bbccdd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -98,7 +92,6 @@ OperatorExpr [
       LiteralExpr [STRING] []
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -112,7 +105,6 @@ OperatorExpr [
       LiteralExpr [STRING] [dd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -126,7 +118,6 @@ OperatorExpr [
       LiteralExpr [STRING] [bbcc]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@2[
       FunctionCall test.hex@1[
@@ -139,7 +130,6 @@ OperatorExpr [
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@2[
       FunctionCall test.hex@1[
@@ -152,7 +142,6 @@ OperatorExpr [
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -166,7 +155,6 @@ OperatorExpr [
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[
@@ -180,7 +168,6 @@ OperatorExpr [
       LiteralExpr [STRING] [bbccdd]
     ]
   ]
-  and
   OperatorExpr [
     FunctionCall test.sub-binary@3[
       FunctionCall test.hex@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
index 6146ab9..85aa549 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
@@ -1,21 +1,11 @@
 DataverseUse test
 Query:
-SELECT ELEMENT [
 OperatorExpr [
-  Variable [ Name=x ]
-  and
-  Variable [ Name=y ]
-]
-]
-FROM [  OrderedListConstructor [
+  FunctionCall test.boolean@1[
     LiteralExpr [STRING] [true]
   ]
-  AS
-  Variable [ Name=x ]
-,
-  OrderedListConstructor [
+  and
+  FunctionCall test.boolean@1[
     LiteralExpr [STRING] [false]
   ]
-  AS
-  Variable [ Name=y ]
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.3.ast
index 3dae925..9ab8ffb 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.3.ast
@@ -13,9 +13,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -27,9 +25,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall test.hex@1[
@@ -49,9 +45,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -63,9 +57,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall test.hex@1[
@@ -85,9 +77,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -99,9 +89,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall test.hex@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.3.ast
index 346f8f1..cafbcbb 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.3.ast
@@ -13,9 +13,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -27,9 +25,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall test.double@1[
@@ -49,9 +45,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -63,9 +57,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall test.double@1[
@@ -85,9 +77,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -99,9 +89,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall test.double@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.3.ast
index 4cc0876..576da34 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.3.ast
@@ -13,9 +13,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -27,9 +25,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall test.float@1[
@@ -49,9 +45,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -63,9 +57,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall test.float@1[
@@ -85,9 +77,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -99,9 +89,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall test.float@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.3.ast
index 30c32d2..1a83a4a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.3.ast
@@ -13,9 +13,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -27,9 +25,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall test.int16@1[
@@ -49,9 +45,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -63,9 +57,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall test.int16@1[
@@ -85,9 +77,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -99,9 +89,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall test.int16@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.3.ast
index 82f94f1..c3937bf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.3.ast
@@ -12,9 +12,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -26,9 +24,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall null.int32@1[
@@ -48,9 +44,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -62,9 +56,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall null.int32@1[
@@ -84,9 +76,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -98,9 +88,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall null.int32@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.3.ast
index d599378..8a4a713 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.3.ast
@@ -13,9 +13,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -27,9 +25,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall test.int64@1[
@@ -49,9 +45,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -63,9 +57,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall test.int64@1[
@@ -85,9 +77,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -99,9 +89,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall test.int64@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.3.ast
index 671e5e5..2671116 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.3.ast
@@ -13,9 +13,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -27,9 +25,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       FunctionCall test.int8@1[
@@ -49,9 +45,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -63,9 +57,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       FunctionCall test.int8@1[
@@ -85,9 +77,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -99,9 +89,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       FunctionCall test.int8@1[

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/string_null/string_null.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/string_null/string_null.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/string_null/string_null.3.ast
index b4b5079..e80e881 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/string_null/string_null.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/string_null/string_null.3.ast
@@ -11,9 +11,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -25,9 +23,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       >=
       LiteralExpr [STRING] [AA]
@@ -43,9 +39,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -57,9 +51,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       <=
       LiteralExpr [STRING] [AA]
@@ -75,9 +67,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
     ]
   )
@@ -89,9 +79,7 @@ RecordConstructor [
         OrderedListConstructor [
           LiteralExpr [LONG] [1]
         ]
-        Index:         OrderedListConstructor [
-          LiteralExpr [LONG] [1]
-        ]
+        Index:         LiteralExpr [LONG] [1]
       ]
       !=
       LiteralExpr [STRING] [AA]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
index b6b1bb4..6732c8a 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
@@ -1,6 +1,47 @@
 Query:
 SELECT ELEMENT [
-Variable [ Name=l ]
+RecordConstructor [
+  (
+    LiteralExpr [STRING] [DataverseName]
+    :
+    FieldAccessor [
+      Variable [ Name=l ]
+      Field=DataverseName
+    ]
+  )
+  (
+    LiteralExpr [STRING] [Name]
+    :
+    FieldAccessor [
+      Variable [ Name=l ]
+      Field=Name
+    ]
+  )
+  (
+    LiteralExpr [STRING] [Arity]
+    :
+    FieldAccessor [
+      Variable [ Name=l ]
+      Field=Arity
+    ]
+  )
+  (
+    LiteralExpr [STRING] [ReturnType]
+    :
+    FieldAccessor [
+      Variable [ Name=l ]
+      Field=ReturnType
+    ]
+  )
+  (
+    LiteralExpr [STRING] [Language]
+    :
+    FieldAccessor [
+      Variable [ Name=l ]
+      Field=Language
+    ]
+  )
+]
 ]
 FROM [  FunctionCall Metadata.dataset@1[
     LiteralExpr [STRING] [Metadata.Function]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
index 641bb90..85d9c0c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
@@ -50,10 +50,10 @@ LetVariable [ Name=n ]
     ]
     IndexAccessor [
       Variable [ Name=m ]
-      Index:       Variable [ Name=m ]
+      Index:       LiteralExpr [LONG] [1]
     ]
     IndexAccessor [
       Variable [ Name=m ]
-      Index:       Variable [ Name=m ]
+      Index:       LiteralExpr [LONG] [4]
     ]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
index 578f555..79cca47 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
@@ -50,10 +50,10 @@ LetVariable [ Name=n ]
     ]
     IndexAccessor [
       Variable [ Name=m ]
-      Index:       Variable [ Name=m ]
+      Index:       LiteralExpr [LONG] [1]
     ]
     IndexAccessor [
       Variable [ Name=m ]
-      Index:       Variable [ Name=m ]
+      Index:       LiteralExpr [LONG] [4]
     ]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
index ca77585..fd77802 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
@@ -33,7 +33,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=ol ]
-      Index:       Variable [ Name=ol ]
+      Index:       LiteralExpr [LONG] [0]
     ]
   )
   (
@@ -41,7 +41,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=ol ]
-      Index:       Variable [ Name=ol ]
+      Index:       LiteralExpr [LONG] [1]
     ]
   )
   (
@@ -49,7 +49,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=ol ]
-      Index:       Variable [ Name=ol ]
+      Index:       LiteralExpr [LONG] [4]
     ]
   )
   (

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
index e69de29..a47942b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
@@ -0,0 +1,64 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+RecordConstructor [
+  (
+    LiteralExpr [STRING] [cust_name]
+    :
+    FieldAccessor [
+      Variable [ Name=c ]
+      Field=name
+    ]
+  )
+  (
+    LiteralExpr [STRING] [order_ids]
+    :
+    (
+      SELECT ELEMENT [
+      FieldAccessor [
+        Variable [ Name=o ]
+        Field=oid
+      ]
+      ]
+      FROM [        FunctionCall Metadata.dataset@1[
+          LiteralExpr [STRING] [Orders]
+        ]
+        AS
+        Variable [ Name=o ]
+      ]
+      Where
+        OperatorExpr [
+          FieldAccessor [
+            Variable [ Name=c ]
+            Field=cid
+          ]
+          =
+          FieldAccessor [
+            Variable [ Name=o ]
+            Field=cid
+          ]
+        ]
+      Orderby
+        FieldAccessor [
+          Variable [ Name=o ]
+          Field=oid
+        ]
+        ASC
+
+    )
+  )
+]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Customers]
+  ]
+  AS
+  Variable [ Name=c ]
+]
+Orderby
+  FieldAccessor [
+    Variable [ Name=c ]
+    Field=name
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
index 2431b79..326ec5d 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
@@ -28,7 +28,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c1 ]
-      Index:       Variable [ Name=c1 ]
+      Index:       LiteralExpr [LONG] [0]
     ]
   )
   (
@@ -36,7 +36,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c1 ]
-      Index:       Variable [ Name=c1 ]
+      Index:       LiteralExpr [LONG] [1]
     ]
   )
   (
@@ -44,7 +44,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c1 ]
-      Index:       Variable [ Name=c1 ]
+      Index:       LiteralExpr [LONG] [2]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
index 29368a4..1a26176 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
@@ -28,7 +28,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c3 ]
-      Index:       Variable [ Name=c3 ]
+      Index:       LiteralExpr [LONG] [0]
     ]
   )
   (
@@ -36,7 +36,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c3 ]
-      Index:       Variable [ Name=c3 ]
+      Index:       LiteralExpr [LONG] [1]
     ]
   )
   (
@@ -44,7 +44,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c3 ]
-      Index:       Variable [ Name=c3 ]
+      Index:       LiteralExpr [LONG] [5]
     ]
   )
   (
@@ -52,7 +52,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c3 ]
-      Index:       Variable [ Name=c3 ]
+      Index:       LiteralExpr [LONG] [10]
     ]
   )
 ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
index 9b46c2b..8a9b1ee 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
@@ -33,7 +33,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c1 ]
-      Index:       Variable [ Name=c1 ]
+      Index:       LiteralExpr [LONG] [0]
     ]
   )
   (
@@ -41,7 +41,7 @@ RecordConstructor [
     :
     IndexAccessor [
       Variable [ Name=c1 ]
-      Index:       Variable [ Name=c1 ]
+      Index:       LiteralExpr [LONG] [4]
     ]
   )
   (

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
index ac677df..8158af7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
@@ -98,11 +98,11 @@ LetVariable [ Name=by_chapter ]
       ]
       With
       Variable [ Name=e ]
-      Variable [ Name=by_chapter ]
       Variable [ Name=sig_sponsorship_count ]
-      Variable [ Name=es ]
       Variable [ Name=sponsor ]
+      Variable [ Name=sig_id ]
       Variable [ Name=event ]
+      Variable [ Name=es ]
 
   )
 Orderby

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443-2/query-issue443-2.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443-2/query-issue443-2.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443-2/query-issue443-2.1.ast
index 4073865..4f89fc4 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443-2/query-issue443-2.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443-2/query-issue443-2.1.ast
@@ -24,7 +24,7 @@ FROM [  OrderedListConstructor [
       (
         LiteralExpr [STRING] [g]
         :
-        LiteralExpr [LONG] [2]
+        LiteralExpr [LONG] [4]
       )
     ]
     RecordConstructor [

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443/query-issue443.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443/query-issue443.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443/query-issue443.1.ast
index e69de29..3bccb41 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443/query-issue443.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/distinct/query-issue443/query-issue443.1.ast
@@ -0,0 +1,44 @@
+Query:
+SELECT ELEMENT [
+Variable [ Name=a ]
+]
+FROM [  OrderedListConstructor [
+    RecordConstructor [
+      (
+        LiteralExpr [STRING] [f]
+        :
+        LiteralExpr [LONG] [19]
+      )
+    ]
+    RecordConstructor [
+      (
+        LiteralExpr [STRING] [f]
+        :
+        LiteralExpr [LONG] [12]
+      )
+    ]
+    RecordConstructor [
+      (
+        LiteralExpr [STRING] [f]
+        :
+        LiteralExpr [LONG] [10]
+      )
+    ]
+    RecordConstructor [
+      (
+        LiteralExpr [STRING] [f]
+        :
+        LiteralExpr [LONG] [17]
+      )
+    ]
+    RecordConstructor [
+      (
+        LiteralExpr [STRING] [f]
+        :
+        LiteralExpr [LONG] [12]
+      )
+    ]
+  ]
+  AS
+  Variable [ Name=a ]
+]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ast
index e69de29..894f97c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ast
@@ -0,0 +1,8 @@
+DataverseUse test
+TypeDecl myDataType [
+  open RecordType {
+    id : int64
+  }
+]
+DatasetDecl myData(myDataType) partitioned by [[id]]
+DatasetDecl myData2(myDataType) partitioned by [[id]]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.2.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.2.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.2.ast
index e69de29..916a59e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.2.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.2.ast
@@ -0,0 +1 @@
+DataverseUse test

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
index e69de29..c200c21 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
@@ -0,0 +1,18 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+Variable [ Name=c ]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [myData]
+  ]
+  AS
+  Variable [ Name=c ]
+]
+Orderby
+  FieldAccessor [
+    Variable [ Name=c ]
+    Field=id
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
index 0009875..744a345 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
index 996effe..e8fa4dd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.1.ast
index e69de29..e824e26 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.1.ast
@@ -0,0 +1,15 @@
+DataverseUse test
+TypeDecl EmployeeStat [
+  open RecordType {
+    age : int64,
+    salary : int64
+  }
+]
+TypeDecl EmployeeType [
+  closed RecordType {
+    id : string,
+    stat : EmployeeStat,
+    deptCode : int64
+  }
+]
+DatasetDecl Employees(EmployeeType) partitioned by [[id]]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.2.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.2.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.2.ast
index e69de29..916a59e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.2.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.2.ast
@@ -0,0 +1 @@
+DataverseUse test

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
index e69de29..52568ce 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
@@ -0,0 +1,11 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+Variable [ Name=l ]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [Employees]
+  ]
+  AS
+  Variable [ Name=l ]
+]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.1.ast
index e69de29..a3a6877 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.1.ast
@@ -0,0 +1,10 @@
+DataverseUse test
+TypeDecl LineIDType [
+  closed RecordType {
+    l_orderkey : int64,
+    l_linenumber : int64,
+    l_suppkey : int64
+  }
+]
+DatasetDecl LineID(LineIDType) partitioned by [[l_orderkey], [l_linenumber]]
+DatasetDecl LineID2(LineIDType) partitioned by [[l_orderkey], [l_linenumber]]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.2.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.2.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.2.ast
index e69de29..916a59e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.2.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.2.ast
@@ -0,0 +1 @@
+DataverseUse test

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.3.ast
index e69de29..916a59e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.3.ast
@@ -0,0 +1 @@
+DataverseUse test

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.4.ast
index e69de29..916a59e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.4.ast
@@ -0,0 +1 @@
+DataverseUse test

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
index e69de29..2cc3f9b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
@@ -0,0 +1,20 @@
+DataverseUse test
+Query:
+SELECT ELEMENT [
+Variable [ Name=c ]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [LineID2]
+  ]
+  AS
+  Variable [ Name=c ]
+]
+Where
+  OperatorExpr [
+    FieldAccessor [
+      Variable [ Name=c ]
+      Field=l_linenumber
+    ]
+    =
+    LiteralExpr [LONG] [2]
+  ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.1.ast
index e69de29..c52821e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.1.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.1.ast
@@ -0,0 +1,16 @@
+DataverseUse insertIssue
+TypeDecl subElem [
+  closed RecordType {
+    n : string,
+    e : int64?
+  }
+]
+TypeDecl elem [
+  closed RecordType {
+    id : int64,
+    name : string,
+    sub : OrderedList [subElem]
+
+  }
+]
+DatasetDecl myDataset(elem) partitioned by [[id]]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.2.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.2.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.2.ast
index e69de29..0ed60b8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.2.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.2.ast
@@ -0,0 +1 @@
+DataverseUse insertIssue

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
index e69de29..5698d73 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
@@ -0,0 +1,18 @@
+DataverseUse insertIssue
+Query:
+SELECT ELEMENT [
+Variable [ Name=d ]
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [myDataset]
+  ]
+  AS
+  Variable [ Name=d ]
+]
+Orderby
+  FieldAccessor [
+    Variable [ Name=d ]
+    Field=id
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
index 996effe..e8fa4dd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
index 0009875..744a345 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
index 996effe..e8fa4dd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
index f175f19..0025905 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
index 0009875..744a345 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
index f175f19..0025905 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
@@ -26,5 +26,5 @@ LetVariable [ Name=jacc ]
 Where
   IndexAccessor [
     Variable [ Name=jacc ]
-    Index:     Variable [ Name=jacc ]
+    Index:     LiteralExpr [LONG] [0]
   ]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/caea8f0e/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
index 742e574..b0ddf39 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
@@ -51,10 +51,7 @@ LetVariable [ Name=m ]
             Variable [ Name=e ]
             Field=children
           ]
-          Index:           FieldAccessor [
-            Variable [ Name=e ]
-            Field=children
-          ]
+          Index:           LiteralExpr [LONG] [1]
         ]
       )
     ]



Mime
View raw message