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:15 UTC

[5/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_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
index 72f2f5a..6371498 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.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_float/sum_float.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
index 6004dcc..c21fa1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.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_float_null/sum_float_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
index 1d5e7f4..62ea3b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_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_int16/sum_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
index c499b25..62fc04f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.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_int16_null/sum_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
index 027fe91..4c7bf75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_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_int32/sum_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
index 828aa87..402f257 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.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_int32_null/sum_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
index 338a7ff..b77dbf4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_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_int64/sum_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
index 4510cc7..1e4a755 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.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_int64_null/sum_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
index c5036ae..4bbfacc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_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_int8/sum_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
index 8e99a7e..350605d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.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_int8_null/sum_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
index 121675e..77c987d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_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_mixed/sum_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
index 73ed370..eb44b3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.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_null-with-pred/sum_null-with-pred.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
index 44972f8..f185de3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.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_numeric_null/sum_numeric_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
index c3fe254..3c424ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_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/agg_null/agg_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null/agg_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null/agg_null.3.ast
index bae05c7..d5ab72c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null/agg_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null/agg_null.3.ast
@@ -3,7 +3,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count1]
     :
-    FunctionCall null.count@1[
+    FunctionCall asterix.count@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -12,7 +12,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average1]
     :
-    FunctionCall null.avg@1[
+    FunctionCall asterix.avg@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -21,7 +21,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum1]
     :
-    FunctionCall null.sum@1[
+    FunctionCall asterix.sum@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -30,7 +30,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min1]
     :
-    FunctionCall null.min@1[
+    FunctionCall asterix.min@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -39,7 +39,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max1]
     :
-    FunctionCall null.max@1[
+    FunctionCall asterix.max@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -48,7 +48,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count2]
     :
-    FunctionCall null.count@1[
+    FunctionCall asterix.count@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -58,7 +58,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average2]
     :
-    FunctionCall null.avg@1[
+    FunctionCall asterix.avg@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -68,7 +68,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum2]
     :
-    FunctionCall null.sum@1[
+    FunctionCall asterix.sum@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -78,7 +78,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min2]
     :
-    FunctionCall null.min@1[
+    FunctionCall asterix.min@1[
       UnorderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [NULL]
@@ -88,7 +88,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max2]
     :
-    FunctionCall null.max@1[
+    FunctionCall asterix.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/agg_null_rec/agg_null_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
index 035396d..77482fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall asterix.count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -23,7 +23,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -42,7 +42,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum]
     :
-    FunctionCall test.sum@1[
+    FunctionCall asterix.sum@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -61,7 +61,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min]
     :
-    FunctionCall test.min@1[
+    FunctionCall asterix.min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -80,7 +80,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max]
     :
-    FunctionCall test.max@1[
+    FunctionCall asterix.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/agg_null_rec_1/agg_null_rec_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
index 426089f..efbacd2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall asterix.count@1[
       (
         SELECT ELEMENT [
         Variable [ Name=$t ]
@@ -20,7 +20,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -46,7 +46,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum]
     :
-    FunctionCall test.sum@1[
+    FunctionCall asterix.sum@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -72,7 +72,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min]
     :
-    FunctionCall test.min@1[
+    FunctionCall asterix.min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -98,7 +98,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max]
     :
-    FunctionCall test.max@1[
+    FunctionCall asterix.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/agg_number/agg_number.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast
index 9400e91..7a0b73c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast
@@ -3,7 +3,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count1]
     :
-    FunctionCall null.count@1[
+    FunctionCall asterix.count@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -19,7 +19,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average1]
     :
-    FunctionCall null.avg@1[
+    FunctionCall asterix.avg@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -35,7 +35,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum1]
     :
-    FunctionCall null.sum@1[
+    FunctionCall asterix.sum@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -51,7 +51,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min1]
     :
-    FunctionCall null.min@1[
+    FunctionCall asterix.min@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -67,7 +67,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max1]
     :
-    FunctionCall null.max@1[
+    FunctionCall asterix.max@1[
       OrderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -83,7 +83,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count2]
     :
-    FunctionCall null.count@1[
+    FunctionCall asterix.count@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -99,7 +99,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average2]
     :
-    FunctionCall null.avg@1[
+    FunctionCall asterix.avg@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -115,7 +115,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum2]
     :
-    FunctionCall null.sum@1[
+    FunctionCall asterix.sum@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -131,7 +131,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min2]
     :
-    FunctionCall null.min@1[
+    FunctionCall asterix.min@1[
       UnorderedListConstructor [
         FunctionCall null.float@1[
           LiteralExpr [STRING] [2.0]
@@ -147,7 +147,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max2]
     :
-    FunctionCall null.max@1[
+    FunctionCall asterix.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/agg_number_rec/agg_number_rec.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
index 035396d..77482fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall asterix.count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -23,7 +23,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.avg@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -42,7 +42,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum]
     :
-    FunctionCall test.sum@1[
+    FunctionCall asterix.sum@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -61,7 +61,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min]
     :
-    FunctionCall test.min@1[
+    FunctionCall asterix.min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -80,7 +80,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max]
     :
-    FunctionCall test.max@1[
+    FunctionCall asterix.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/avg_double/avg_double.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast
index 240b5a0..028db6b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.avg@1[
+FunctionCall asterix.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/avg_double_null/avg_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
index 4d4bbbf..9efb867 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.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/avg_empty_01/avg_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
index ec85e19..4355ee7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_empty_02/avg_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
index a8ce8c9..6940efa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_float/avg_float.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast
index 7bcc0b5..3d12de5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_float_null/avg_float_nu.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
index 0f382fe..6654f36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.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/avg_int16/avg_int16.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast
index 6019b99..7854b3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_int16_null/avg_int16_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
index 7f2fbc7..3852800 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.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/avg_int32/avg_int32.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast
index ae9ef12..4ad8587 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_int32_null/avg_int32_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
index 7a0525b..35574bd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.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/avg_int64/avg_int64.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast
index b8b6535..f47c1ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_int64_null/avg_int64_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
index 265a61f..5e11c78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.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/avg_int8/avg_int8.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast
index 664587d..71e2d1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.avg@1[
+FunctionCall asterix.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/avg_int8_null/avg_int8_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
index 1f3e356..dc177ee 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall test.avg@1[
+    FunctionCall asterix.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/avg_mixed/avg_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
index 89bf677..750ac9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.avg@1[
+FunctionCall asterix.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/count_01/count_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast
index 4a6fa5f..036d289 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_01/count_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.count@1[
+FunctionCall asterix.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/count_empty_01/count_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast
index 5912641..99a5c90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_01/count_empty_01.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.count@1[
+FunctionCall asterix.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/count_empty_02/count_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
index fca2bf6..ccf8f0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.count@1[
+FunctionCall asterix.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/count_null/count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
index d86a192..93a2b72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
@@ -4,7 +4,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall asterix.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/issue395/issue395.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
index 4d200e4..98a5343 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.count@1[
+FunctionCall asterix.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/issue412_0/issue412_0.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_0/issue412_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_0/issue412_0.3.ast
index ade42d1..aa0edf7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_0/issue412_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_0/issue412_0.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.count@1[
+FunctionCall asterix.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/issue412_1/issue412_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_1/issue412_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_1/issue412_1.3.ast
index e89f061..d345896 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_1/issue412_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue412_1/issue412_1.3.ast
@@ -3,7 +3,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall null.count@1[
+    FunctionCall asterix.count@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -14,7 +14,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [average]
     :
-    FunctionCall null.avg@1[
+    FunctionCall asterix.avg@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -25,7 +25,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [sum]
     :
-    FunctionCall null.sum@1[
+    FunctionCall asterix.sum@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -36,7 +36,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min]
     :
-    FunctionCall null.min@1[
+    FunctionCall asterix.min@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [1]
         LiteralExpr [LONG] [60]
@@ -47,7 +47,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max]
     :
-    FunctionCall null.max@1[
+    FunctionCall asterix.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/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
index f3c68f1..69ddc7a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.min@1[
+FunctionCall asterix.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/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/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
index 247d659..210dff8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.min@1[
+FunctionCall asterix.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/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
index 187b626..847bca4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sum@1[
+FunctionCall asterix.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/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/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
index 95a4b40..172e730 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.sum@1[
+FunctionCall asterix.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/issue531_string_min_max/issue531_string_min_max.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
index f45eb74..39e4ae9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
@@ -5,7 +5,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [min]
     :
-    FunctionCall test.min@1[
+    FunctionCall asterix.min@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
@@ -24,7 +24,7 @@ RecordConstructor [
   (
     LiteralExpr [STRING] [max]
     :
-    FunctionCall test.max@1[
+    FunctionCall asterix.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/max_empty_01/max_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast
index 75f0c4f..5787511 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_01/max_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.max@1[
+FunctionCall asterix.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/max_empty_02/max_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
index 08d23dd..7a363e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.max@1[
+FunctionCall asterix.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/min_empty_01/min_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast
index e5ad077..9313377 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_01/min_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.min@1[
+FunctionCall asterix.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/min_empty_02/min_empty_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
index d799d4c..472d7f6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.min@1[
+FunctionCall asterix.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/min_mixed/min_mixed.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
index eecf3eb..802040d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.min@1[
+FunctionCall asterix.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/query-issue400/query-issue400.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
index 2f3778c..2220ed2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/query-issue400/query-issue400.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.count@1[
+FunctionCall asterix.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/scalar_avg/scalar_avg.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
index 701fe21..1049f33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.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/scalar_avg_empty/scalar_avg_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.ast
index 19122cd..55b341c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.avg@1[
+FunctionCall asterix.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/scalar_avg_null/scalar_avg_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
index 3a0e4fb..7e062bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.avg@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.avg@1[
+  FunctionCall asterix.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/scalar_count/scalar_count.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
index 88efa93..bbd01a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -92,7 +92,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.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/scalar_count_empty/scalar_count_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.ast
index b283e27..7406807 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.count@1[
+FunctionCall asterix.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/scalar_count_null/scalar_count_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
index 8f57e33..56e6061 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.count@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -98,7 +98,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall asterix.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/scalar_max/scalar_max.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
index 2e71b2a..ccc7579 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -92,7 +92,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -101,7 +101,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.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/scalar_max_empty/scalar_max_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.ast
index 897ca40..165260f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.max@1[
+FunctionCall asterix.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/scalar_max_null/scalar_max_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
index 33a6a4b..de3f4ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -98,7 +98,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.max@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -108,7 +108,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.max@1[
+  FunctionCall asterix.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/scalar_min/scalar_min.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
index 819797f..0aa087f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -92,7 +92,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -101,7 +101,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.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/scalar_min_empty/scalar_min_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.ast
index f0b1423..b40a969 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.min@1[
+FunctionCall asterix.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/scalar_min_null/scalar_min_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
index 4d6f373..3346789 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       FunctionCall test.double@1[
         LiteralExpr [STRING] [1]
@@ -98,7 +98,7 @@ Let Variable [ Name=$d ]
   ]
 Let Variable [ Name=$s ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.min@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [foo]
       LiteralExpr [STRING] [bar]
@@ -108,7 +108,7 @@ Let Variable [ Name=$s ]
   ]
 Let Variable [ Name=$dt ]
   :=
-  FunctionCall test.min@1[
+  FunctionCall asterix.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/scalar_sum/scalar_sum.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
index 5e157ed..58bb3ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -17,7 +17,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -32,7 +32,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -47,7 +47,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -62,7 +62,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -77,7 +77,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.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/scalar_sum_empty/scalar_sum_empty.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.3.ast
index 43d6854..b919e8e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sum@1[
+FunctionCall asterix.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/scalar_sum_null/scalar_sum_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
index 2a66bea..30cccae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
 Query:
 Let Variable [ Name=$i8 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int8@1[
         LiteralExpr [STRING] [1]
@@ -18,7 +18,7 @@ Let Variable [ Name=$i8 ]
   ]
 Let Variable [ Name=$i16 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int16@1[
         LiteralExpr [STRING] [1]
@@ -34,7 +34,7 @@ Let Variable [ Name=$i16 ]
   ]
 Let Variable [ Name=$i32 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int32@1[
         LiteralExpr [STRING] [1]
@@ -50,7 +50,7 @@ Let Variable [ Name=$i32 ]
   ]
 Let Variable [ Name=$i64 ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.int64@1[
         LiteralExpr [STRING] [1]
@@ -66,7 +66,7 @@ Let Variable [ Name=$i64 ]
   ]
 Let Variable [ Name=$f ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.sum@1[
     OrderedListConstructor [
       FunctionCall test.float@1[
         LiteralExpr [STRING] [1]
@@ -82,7 +82,7 @@ Let Variable [ Name=$f ]
   ]
 Let Variable [ Name=$d ]
   :=
-  FunctionCall test.sum@1[
+  FunctionCall asterix.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/sum_double/sum_double.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast
index 9b1d608..a3c5fd8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double/sum_double.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sum@1[
+FunctionCall asterix.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/sum_double_null/sum_double_null.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
index 524dddc..59dad88 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sum@1[
+FunctionCall asterix.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/sum_empty_01/sum_empty_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
index d646ceb..6179931 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.sum@1[
+FunctionCall asterix.sum@1[
   (
     SELECT ELEMENT [
     Variable [ Name=$x ]