You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by dl...@apache.org on 2017/09/19 17:52:16 UTC

[6/7] asterixdb git commit: [ASTERIXDB-2078][SQL] DISTINCT modifier for aggregate functions

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/count_distinct/count_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/count_distinct/count_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/count_distinct/count_distinct.1.adm
new file mode 100644
index 0000000..445924e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/count_distinct/count_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 3, "t2": 0, "t3": 2, "t4": 0 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/max_distinct/max_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/max_distinct/max_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/max_distinct/max_distinct.1.adm
new file mode 100644
index 0000000..c974ed2
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/max_distinct/max_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 30, "t2": null, "t3": 50, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/min_distinct/min_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/min_distinct/min_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/min_distinct/min_distinct.1.adm
new file mode 100644
index 0000000..aa09030
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/min_distinct/min_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 10, "t2": null, "t3": 40, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_distinct/sum_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_distinct/sum_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_distinct/sum_distinct.1.adm
new file mode 100644
index 0000000..afbe3eb
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_distinct/sum_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 60, "t2": null, "t3": 90, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/avg_distinct/avg_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/avg_distinct/avg_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/avg_distinct/avg_distinct.1.adm
new file mode 100644
index 0000000..64d2407
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/avg_distinct/avg_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 20, "t2": null, "t3": null, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/count_distinct/count_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/count_distinct/count_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/count_distinct/count_distinct.1.adm
new file mode 100644
index 0000000..d30ac1d
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/count_distinct/count_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 3, "t2": 2, "t3": 4, "t4": 0 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/max_distinct/max_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/max_distinct/max_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/max_distinct/max_distinct.1.adm
new file mode 100644
index 0000000..a4ffdd2
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/max_distinct/max_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 30, "t2": null, "t3": null, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/min_distinct/min_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/min_distinct/min_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/min_distinct/min_distinct.1.adm
new file mode 100644
index 0000000..00ae7b2
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/min_distinct/min_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 10, "t2": null, "t3": null, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_distinct/sum_distinct.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_distinct/sum_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_distinct/sum_distinct.1.adm
new file mode 100644
index 0000000..8366796
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_distinct/sum_distinct.1.adm
@@ -0,0 +1 @@
+{ "t1": 60, "t2": null, "t3": null, "t4": null }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.3.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.3.adm
new file mode 100644
index 0000000..bb7e8f4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.3.adm
@@ -0,0 +1,4 @@
+[ 1, 2 ]
+[ 2, 2 ]
+[ 3, 1 ]
+[ 4, 0 ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.4.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.4.adm
new file mode 100644
index 0000000..b42c458
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.4.adm
@@ -0,0 +1,4 @@
+[ 1, 5000 ]
+[ 2, 9000 ]
+[ 3, 6000 ]
+[ 4, null ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.5.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.5.adm
new file mode 100644
index 0000000..0385e23
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.5.adm
@@ -0,0 +1,4 @@
+[ 1, 2500 ]
+[ 2, 4500 ]
+[ 3, 6000 ]
+[ 4, null ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.6.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.6.adm
new file mode 100644
index 0000000..0e1e38c
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.6.adm
@@ -0,0 +1,4 @@
+[ 1, 3000 ]
+[ 2, 5000 ]
+[ 3, 6000 ]
+[ 4, null ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.7.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.7.adm
new file mode 100644
index 0000000..1549912
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.7.adm
@@ -0,0 +1,4 @@
+[ 1, 2000 ]
+[ 2, 4000 ]
+[ 3, 6000 ]
+[ 4, null ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.8.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.8.adm
new file mode 100644
index 0000000..b42c458
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/sugar-06-distinct/sugar-06-distinct.8.adm
@@ -0,0 +1,4 @@
+[ 1, 5000 ]
+[ 2, 9000 ]
+[ 3, 6000 ]
+[ 4, null ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null/agg_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null/agg_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null/agg_null.3.ast
index e8ff6f9..cde56f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null/agg_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null/agg_null.3.ast
@@ -3,7 +3,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count1]
     :
-    FunctionCall null.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -12,7 +12,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average1]
     :
-    FunctionCall null.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -21,7 +21,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum1]
     :
-    FunctionCall null.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -30,7 +30,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min1]
     :
-    FunctionCall null.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -39,7 +39,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max1]
     :
-    FunctionCall null.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -48,7 +48,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count2]
     :
-    FunctionCall null.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -58,7 +58,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average2]
     :
-    FunctionCall null.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -68,7 +68,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum2]
     :
-    FunctionCall null.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -78,7 +78,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min2]
     :
-    FunctionCall null.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -88,7 +88,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max2]
     :
-    FunctionCall null.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
index 89d8623..0d84c5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count]
     :
-    FunctionCall test.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -23,7 +23,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -42,7 +42,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum]
     :
-    FunctionCall test.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -61,7 +61,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min]
     :
-    FunctionCall test.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -80,7 +80,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max]
     :
-    FunctionCall test.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
index 61d7014..dbd02c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count]
     :
-    FunctionCall test.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       (
         SELECT ELEMENT [
         Variable [ Name=$t ]
@@ -20,7 +20,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -46,7 +46,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum]
     :
-    FunctionCall test.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -72,7 +72,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min]
     :
-    FunctionCall test.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -98,7 +98,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max]
     :
-    FunctionCall test.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
index 126ceba..14ac395 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
@@ -3,7 +3,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count1]
     :
-    FunctionCall null.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -19,7 +19,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average1]
     :
-    FunctionCall null.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -35,7 +35,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum1]
     :
-    FunctionCall null.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -51,7 +51,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min1]
     :
-    FunctionCall null.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -67,7 +67,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max1]
     :
-    FunctionCall null.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -83,7 +83,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count2]
     :
-    FunctionCall null.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -99,7 +99,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average2]
     :
-    FunctionCall null.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -115,7 +115,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum2]
     :
-    FunctionCall null.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -131,7 +131,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min2]
     :
-    FunctionCall null.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -147,7 +147,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max2]
     :
-    FunctionCall null.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
index 89d8623..0d84c5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count]
     :
-    FunctionCall test.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -23,7 +23,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -42,7 +42,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum]
     :
-    FunctionCall test.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -61,7 +61,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min]
     :
-    FunctionCall test.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -80,7 +80,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max]
     :
-    FunctionCall test.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
index f369b18..ddb57dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
index 83cf6ef..344de1f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
index c8a2795..f70d26a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
index 2f96b47..f17fad0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
index a9f805f..15229e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
index bf526f8..c82659b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
index 9d6f304..ca94dfe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
index 7fe4c90..896af7a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
index 6f0431d..7958cad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
index 114973d..2293707 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
index dc8d43c..582834c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
index 4edcfa4..4107b9a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
index 122ead6..784cd52 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
index 6a7beba..210917c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
index 27e8113..034df11 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
index 603ea9b..0d7a2e4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_01/count_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-count@1[
+FunctionCall asterix.sql-count@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
index 6482820..69e1c5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.sql-count@1[
+FunctionCall asterix.sql-count@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
index e4fb920..2ccd958 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-count@1[
+FunctionCall asterix.sql-count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
index 3990ca7..619729a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count]
     :
-    FunctionCall test.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
index 4d546cf..56c8c0a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-count@1[
+FunctionCall asterix.sql-count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_0/issue412_0.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_0/issue412_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_0/issue412_0.3.ast
index 31974e0..684e457 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_0/issue412_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_0/issue412_0.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sql-count@1[
+FunctionCall asterix.sql-count@1[
   OrderedListConstructor [
     LiteralExpr [STRING] [ASTERIX]
     LiteralExpr [STRING] [Hyracks]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_1/issue412_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_1/issue412_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_1/issue412_1.3.ast
index 4c5af72..14e5c79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_1/issue412_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue412_1/issue412_1.3.ast
@@ -3,7 +3,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-count]
     :
-    FunctionCall null.sql-count@1[
+    FunctionCall asterix.sql-count@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -14,7 +14,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall null.sql-avg@1[
+    FunctionCall asterix.sql-avg@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -25,7 +25,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-sum]
     :
-    FunctionCall null.sql-sum@1[
+    FunctionCall asterix.sql-sum@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -36,7 +36,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min]
     :
-    FunctionCall null.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -47,7 +47,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max]
     :
-    FunctionCall null.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
index fbe0b62..03f82af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sql-min@1[
+FunctionCall asterix.sql-min@1[
   OrderedListConstructor [
     LiteralExpr [LONG] [23]
     LiteralExpr [LONG] [748374857483]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
index 465ed26..efe47da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sql-min@1[
+FunctionCall asterix.sql-min@1[
   OrderedListConstructor [
     LiteralExpr [LONG] [748374857483]
     LiteralExpr [LONG] [23]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
index a1b6a6e..968bfd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sql-sum@1[
+FunctionCall asterix.sql-sum@1[
   OrderedListConstructor [
     LiteralExpr [LONG] [23]
     LiteralExpr [LONG] [748374857483]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
index 200d11c..0bf6869 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sql-sum@1[
+FunctionCall asterix.sql-sum@1[
   OrderedListConstructor [
     LiteralExpr [LONG] [748374857483]
     LiteralExpr [LONG] [23]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
index 29240da..5ed4c7b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
@@ -5,7 +5,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-min]
     :
-    FunctionCall test.sql-min@1[
+    FunctionCall asterix.sql-min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -24,7 +24,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sql-max]
     :
-    FunctionCall test.sql-max@1[
+    FunctionCall asterix.sql-max@1[
       (
         SELECT ELEMENT [
         FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
index d3c89c9..7870b00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-max@1[
+FunctionCall asterix.sql-max@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
index d7bf8ab..524082e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-max@1[
+FunctionCall asterix.sql-max@1[
   (
     SELECT ELEMENT [
     FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
index 825bbf4..9f473db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-min@1[
+FunctionCall asterix.sql-min@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
index 799e5e1..03bb24f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-min@1[
+FunctionCall asterix.sql-min@1[
   (
     SELECT ELEMENT [
     FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
index 0bbf1c4..27e0619 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.sql-min@1[
+FunctionCall asterix.sql-min@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
index bc444a9..b3706d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/query-issue400/query-issue400.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sql-count@1[
+FunctionCall asterix.sql-count@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$i ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
index c8b53ac..46f9fd5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.ast
index 7da8ba1..fcb6b8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.sql-avg@1[
+FunctionCall asterix.sql-avg@1[
   OrderedListConstructor [
   ]
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
index 5f25851..a06070c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-avg@1[
+  FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
index fa5ab75..f1abf16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -92,7 +92,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [a]
       LiteralExpr [STRING] [b]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.ast
index 863c3a2..efbbc0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-count@1[
+FunctionCall asterix.sql-count@1[
   OrderedListConstructor [
   ]
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
index 3e49edf..12d3e6f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -98,7 +98,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.sql-count@1[
+  FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [a]
       LiteralExpr [STRING] [b]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
index 8e4e110..c75afa6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -92,7 +92,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -101,7 +101,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.ast
index 549ce92..e5ce701 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-max@1[
+FunctionCall asterix.sql-max@1[
   OrderedListConstructor [
   ]
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
index 2b025b8..eb42b80 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -98,7 +98,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -108,7 +108,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.sql-max@1[
+  FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
       FunctionCall test.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
index 51aba85..2827888 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -92,7 +92,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -101,7 +101,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.ast
index 541c673..22048df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-min@1[
+FunctionCall asterix.sql-min@1[
   OrderedListConstructor [
   ]
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
index add7c0f..6237a07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -98,7 +98,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -108,7 +108,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.sql-min@1[
+  FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
       FunctionCall test.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
index 94e3c4d..812e172 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.ast
index 36b9790..397cd71 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-sum@1[
+FunctionCall asterix.sql-sum@1[
   OrderedListConstructor [
   ]
 ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
index 969685f..94722a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sql-sum@1[
+  FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
index c0731ec..7591a62 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double/sum_double.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-sum@1[
+FunctionCall asterix.sql-sum@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
index 0cb3ae4..f5e525e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-sum@1[
+FunctionCall asterix.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7a4b5681/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
index ee24758..e5ea392 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sql-sum@1[
+FunctionCall asterix.sql-sum@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]