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/11/08 21:51:41 UTC
[02/24] asterixdb git commit: [NO ISSUE][COMP] Function references
cleanup
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
index 177f281..c740bc5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
@@ -57,7 +57,7 @@ FROM [ (
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -115,7 +115,7 @@ FROM [ (
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -181,7 +181,7 @@ FROM [ (
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -268,12 +268,12 @@ FROM [ (
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -293,7 +293,7 @@ FROM [ (
)
AS Variable [ Name=$s1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
index 3681810..1a141d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
@@ -23,12 +23,12 @@ Let Variable [ Name=$t ]
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
@@ -71,12 +71,12 @@ Let Variable [ Name=$X ]
FROM [ Variable [ Name=$t ]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
index 9d44d8f..1154826 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
@@ -109,17 +109,17 @@ FROM [ (
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
index 9302eb3..96ee1bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
@@ -113,12 +113,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
index 4f8a868..d13281a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
@@ -28,7 +28,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
index bc03eae..ffae08a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
@@ -42,7 +42,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -85,7 +85,7 @@ Let Variable [ Name=$expensives ]
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linestatus ]
@@ -116,7 +116,7 @@ Let Variable [ Name=$cheaps ]
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$expensives ]
Variable [ Name=$g ]
@@ -171,7 +171,7 @@ Let Variable [ Name=$charges ]
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$expensives ]
Variable [ Name=$g ]
@@ -209,7 +209,7 @@ Let Variable [ Name=$disc_prices ]
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$expensives ]
Variable [ Name=$g ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
index 6a25433..a8b2d61 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
@@ -28,7 +28,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
index 13647f7..e234584 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
@@ -12,7 +12,7 @@ RecordConstructor [
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -40,7 +40,7 @@ RecordConstructor [
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -70,7 +70,7 @@ RecordConstructor [
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -109,7 +109,7 @@ RecordConstructor [
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -128,7 +128,7 @@ RecordConstructor [
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -156,7 +156,7 @@ RecordConstructor [
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -175,7 +175,7 @@ RecordConstructor [
Field=l_discount
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -191,7 +191,7 @@ RecordConstructor [
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
index c970c9f..f5ffaca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
@@ -12,7 +12,7 @@ RecordConstructor [
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -35,7 +35,7 @@ RecordConstructor [
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
index 3bfb16d..3d2cbf0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
index 0213ef7..86ddc40 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
index 64df8db..fc6ccd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
@@ -40,12 +40,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
index 94a96b3..e1e0b78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
index 7f64ba5..5bc6017 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
index a2dace8..9cf343f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
index 9c92b73..5341518 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
index dc2d65e..c79f8f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
index ce149e5..61b7783 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
index bb6e108..7fbded9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
index 9c09b76..723b645 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
index bb6e108..7fbded9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
index f72fe79..5c2eaea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
index 6d9aeb1..1c2da31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
index c9bb1db..fb316d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
index ba64cdb..9a851e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
index 2b34755..8e9097e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
index ba51a7d..b8ef4a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
index bd77024..d54b9ea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
index b98cf75..0284f07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
@@ -36,12 +36,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
index c35de65..492bf5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
@@ -28,12 +28,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
index d9b7e47..8f8c6e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
index 3a70fcd..603ee37 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
index 2a43942..c8d3336 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
index 280cc68..b189ed1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
index b3157c6..46eec0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
index d75525e..35dac74 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
index 2fec640..e1f1e1f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
index eeeaaf0..5a7a8ce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
@@ -20,7 +20,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
index 7e17d14..25868db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
@@ -28,12 +28,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
index 5230c60..f000f53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
@@ -28,12 +28,12 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
index 60d0074..1ed42fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Int64Test]
]
AS Variable [ Name=$i ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
index 98f9e80..e2451f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$i ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
index f1655e7..c2bbdf2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
index d5b9c31..96ef965 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
@@ -5,7 +5,7 @@ FunctionCall asterix.count@1[
SELECT ELEMENT [
Variable [ Name=$x ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$x ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
index d5b9c31..96ef965 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
@@ -5,7 +5,7 @@ FunctionCall asterix.count@1[
SELECT ELEMENT [
Variable [ Name=$x ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$x ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
index 4965a73..11f6429 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
@@ -6,7 +6,7 @@ FunctionCall test.readDataset@1[
SELECT ELEMENT [
Variable [ Name=$a ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test.t1]
]
AS Variable [ Name=$a ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
index c95a811..5c55550 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
@@ -1,6 +1,6 @@
DataverseUse test
Query:
-FunctionCall null.not@1[
+FunctionCall algebricks.not@1[
FunctionCall test.fn06@0[
]
]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
index 6280700..cf9ed5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Dataset]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
index 17e46ec..a6b4c63 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
@@ -43,7 +43,7 @@ RecordConstructor [
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$l ]
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
index 5f9294c..646fafc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
@@ -5,7 +5,7 @@ FunctionDecl abc([$y]) {
Query:
Let Variable [ Name=$z ]
:=
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [y]
]
SELECT ELEMENT [
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
index 736aff6..d4b4215 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
@@ -28,6 +28,10 @@ public class FunctionSignature implements Serializable {
private String name;
private int arity;
+ public FunctionSignature(FunctionIdentifier fi) {
+ this(fi.getNamespace(), fi.getName(), fi.getArity());
+ }
+
public FunctionSignature(String namespace, String name, int arity) {
this.namespace = namespace;
this.name = name;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
index f42c030..e2fa6db 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
@@ -18,13 +18,12 @@
*/
package org.apache.asterix.external.util;
-import org.apache.asterix.common.functions.FunctionConstants;
-import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
public class FeedConstants {
- public static final FunctionSignature FEED_COLLECT_FUN_SIGNATURE =
- new FunctionSignature(FunctionConstants.ASTERIX_NS, "feed_collect", 6);
+ public static final FunctionIdentifier FEED_COLLECT_FUN = BuiltinFunctions.FEED_COLLECT;
public final static String FEEDS_METADATA_DV = "feeds_metadata";
public final static String FAILED_TUPLE_DATASET = "failed_tuple";
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
index 481dea7..8d84dbc 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
@@ -55,6 +55,7 @@ import org.apache.asterix.lang.common.statement.DeleteStatement;
import org.apache.asterix.lang.common.statement.InsertStatement;
import org.apache.asterix.lang.common.statement.Query;
import org.apache.asterix.lang.common.struct.Identifier;
+import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.common.struct.VarIdentifier;
import org.apache.asterix.lang.common.visitor.FormatPrintVisitor;
import org.apache.hyracks.algebricks.common.utils.Pair;
@@ -584,7 +585,7 @@ public class AQLToSQLPPPrintVisitor extends FormatPrintVisitor implements IAQLVi
newWhereExpr.setExprList(expressions);
newWhereExpr.setCurrentop(true);
for (int operatorIndex = 0; operatorIndex < expressions.size(); ++operatorIndex) {
- newWhereExpr.addOperator("and");
+ newWhereExpr.addOperator(OperatorType.AND);
}
results.add(new WhereClause(newWhereExpr));
} else {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
index 57370c5..e90f9a9 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
@@ -36,6 +36,7 @@ import org.apache.asterix.lang.common.literal.StringLiteral;
import org.apache.asterix.lang.common.statement.DeleteStatement;
import org.apache.asterix.lang.common.statement.Query;
import org.apache.asterix.lang.common.struct.Identifier;
+import org.apache.asterix.om.functions.BuiltinFunctions;
public class AqlDeleteRewriteVisitor extends AbstractAqlAstVisitor<Void, Void> {
@@ -48,8 +49,7 @@ public class AqlDeleteRewriteVisitor extends AbstractAqlAstVisitor<Void, Void> {
: dataverseName.getValue() + "." + datasetName.getValue();
LiteralExpr argumentLiteral = new LiteralExpr(new StringLiteral(arg));
arguments.add(argumentLiteral);
- CallExpr callExpression =
- new CallExpr(new FunctionSignature(FunctionConstants.ASTERIX_NS, "dataset", 1), arguments);
+ CallExpr callExpression = new CallExpr(new FunctionSignature(BuiltinFunctions.DATASET), arguments);
List<Clause> clauseList = new ArrayList<>();
VariableExpr var = deleteStmt.getVariableExpr();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
index 30b7297..ebdaac7 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.ObjectUtils;
public class CallExpr extends AbstractExpression {
private FunctionSignature functionSignature;
private List<Expression> exprList;
- private boolean isBuiltin;
public CallExpr(FunctionSignature functionSignature, List<Expression> exprList) {
this.functionSignature = functionSignature;
@@ -45,10 +44,6 @@ public class CallExpr extends AbstractExpression {
return exprList;
}
- public boolean isBuiltin() {
- return isBuiltin;
- }
-
@Override
public Kind getKind() {
return Kind.CALL_EXPRESSION;
@@ -74,7 +69,7 @@ public class CallExpr extends AbstractExpression {
@Override
public int hashCode() {
- return ObjectUtils.hashCodeMulti(exprList, functionSignature, isBuiltin);
+ return ObjectUtils.hashCodeMulti(exprList, functionSignature);
}
@Override
@@ -87,6 +82,6 @@ public class CallExpr extends AbstractExpression {
}
CallExpr target = (CallExpr) object;
return ObjectUtils.equals(exprList, target.exprList)
- && ObjectUtils.equals(functionSignature, target.functionSignature) && isBuiltin == target.isBuiltin;
+ && ObjectUtils.equals(functionSignature, target.functionSignature);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
index 954f715..ff10895 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
@@ -92,12 +92,18 @@ public class OperatorExpr extends AbstractExpression {
}
public void addOperator(String strOp) throws CompilationException {
- Optional<OperatorType> op = OperatorType.fromSymbol(strOp);
- if (op.isPresent()) {
- opList.add(op.get());
- } else {
+ OperatorType op = OperatorType.fromSymbol(strOp);
+ if (op == null) {
throw new CompilationException("Unsupported operator: " + strOp);
}
+ addOperator(op);
+ }
+
+ public void addOperator(OperatorType op) throws CompilationException {
+ if (op == null) {
+ throw new NullPointerException();
+ }
+ opList.add(op);
}
@Override
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
index f00d3ca..e11f169 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
@@ -18,9 +18,6 @@
*/
package org.apache.asterix.lang.common.struct;
-import java.util.Arrays;
-import java.util.Optional;
-
public enum OperatorType {
OR("or"),
AND("and"),
@@ -47,6 +44,8 @@ public enum OperatorType {
BETWEEN("between"),
NOT_BETWEEN("not_between");
+ private static final OperatorType[] VALUES = values();
+
private final String symbol;
OperatorType(String s) {
@@ -58,7 +57,12 @@ public enum OperatorType {
return symbol;
}
- public static Optional<OperatorType> fromSymbol(String symbol) {
- return Arrays.stream(OperatorType.values()).filter(o -> o.symbol.equals(symbol)).findFirst();
+ public static OperatorType fromSymbol(String symbol) {
+ for (OperatorType opType : VALUES) {
+ if (opType.symbol.equals(symbol)) {
+ return opType;
+ }
+ }
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
index 8d8ab73..6ac9436 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
@@ -33,6 +33,7 @@ import org.apache.asterix.metadata.MetadataTransactionContext;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Function;
import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
@@ -101,8 +102,9 @@ public class FunctionUtil {
}
String namespace = signature.getNamespace();
// Checks the existence of the referred dataverse.
- if (metadataProvider.findDataverse(namespace) == null
- && !namespace.equals(FunctionConstants.ASTERIX_NS)) {
+ if (!namespace.equals(FunctionConstants.ASTERIX_NS)
+ && !namespace.equals(AlgebricksBuiltinFunctions.ALGEBRICKS_NS)
+ && metadataProvider.findDataverse(namespace) == null) {
throw new CompilationException("In function call \"" + namespace + "." + signature.getName()
+ "(...)\", the dataverse \"" + namespace + "\" cannot be found!");
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
index aa337e3..43e62d1 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.functions.FunctionConstants;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
@@ -35,13 +36,13 @@ import org.apache.asterix.lang.common.expression.VariableExpr;
import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.common.struct.QuantifiedPair;
+import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppExpressionScopingVisitor;
+import org.apache.asterix.om.functions.BuiltinFunctions;
import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVisitor {
- private static final String CONCAT = "concat";
-
public OperatorExpressionVisitor(LangRewritingContext context) {
super(context);
}
@@ -75,12 +76,17 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
}
private Expression processLikeOperator(OperatorExpr operatorExpr, OperatorType opType) {
- Expression likeExpr = new CallExpr(new FunctionSignature(null, "like", 2), operatorExpr.getExprList());
- if (opType == OperatorType.LIKE) {
- return likeExpr;
+ Expression likeExpr =
+ new CallExpr(new FunctionSignature(BuiltinFunctions.STRING_LIKE), operatorExpr.getExprList());
+ switch (opType) {
+ case LIKE:
+ return likeExpr;
+ case NOT_LIKE:
+ return new CallExpr(new FunctionSignature(BuiltinFunctions.NOT),
+ new ArrayList<>(Collections.singletonList(likeExpr)));
+ default:
+ throw new IllegalArgumentException(String.valueOf(opType));
}
- return new CallExpr(new FunctionSignature(null, "not", 1),
- new ArrayList<>(Collections.singletonList(likeExpr)));
}
private Expression processInOperator(OperatorExpr operatorExpr, OperatorType opType) throws CompilationException {
@@ -92,11 +98,11 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
comparison.addOperand(bindingVar);
comparison.setCurrentop(true);
if (opType == OperatorType.IN) {
- comparison.addOperator("=");
+ comparison.addOperator(OperatorType.EQ);
return new QuantifiedExpression(Quantifier.SOME, new ArrayList<>(
Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), comparison);
} else {
- comparison.addOperator("!=");
+ comparison.addOperator(OperatorType.NEQ);
return new QuantifiedExpression(Quantifier.EVERY, new ArrayList<>(
Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), comparison);
}
@@ -104,7 +110,8 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
private Expression processConcatOperator(OperatorExpr operatorExpr) {
// All operators have to be "||"s (according to the grammar).
- return new CallExpr(new FunctionSignature(null, CONCAT, 1), operatorExpr.getExprList());
+ return new CallExpr(new FunctionSignature(FunctionConstants.ASTERIX_NS, FunctionMapUtil.CONCAT, 1),
+ operatorExpr.getExprList());
}
private Expression processBetweenOperator(OperatorExpr operatorExpr, OperatorType opType)
@@ -121,9 +128,9 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
OperatorExpr andExpr = new OperatorExpr();
andExpr.addOperand(leftComparison);
andExpr.addOperand(rightComparison);
- andExpr.addOperator("and");
- return opType == OperatorType.BETWEEN ? andExpr :
- new CallExpr(new FunctionSignature(null, "not", 1),
+ andExpr.addOperator(OperatorType.AND);
+ return opType == OperatorType.BETWEEN ? andExpr
+ : new CallExpr(new FunctionSignature(BuiltinFunctions.NOT),
new ArrayList<>(Collections.singletonList(andExpr)));
}
@@ -132,7 +139,7 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
OperatorExpr comparison = new OperatorExpr();
comparison.addOperand(lhs);
comparison.addOperand(rhs);
- comparison.addOperator("<=");
+ comparison.addOperator(OperatorType.LE);
if (hints != null) {
for (IExpressionAnnotation hint : hints) {
comparison.addHint(hint);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
index f168ebd..8d59a3b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
@@ -29,12 +29,12 @@ import org.apache.asterix.lang.common.expression.CallExpr;
import org.apache.asterix.lang.common.expression.LiteralExpr;
import org.apache.asterix.lang.common.expression.OperatorExpr;
import org.apache.asterix.lang.common.literal.TrueLiteral;
+import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import org.apache.asterix.lang.sqlpp.util.SqlppRewriteUtil;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
-import org.apache.asterix.metadata.utils.MetadataConstants;
-import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.asterix.om.functions.BuiltinFunctions;
public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpressionVisitor {
@@ -63,8 +63,7 @@ public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpre
return newCaseExpr;
}
// If the CASE expression does not contain a subquery, we rewrite it to a switch-case function call.
- FunctionSignature functionSignature = new FunctionSignature(MetadataConstants.METADATA_DATAVERSE_NAME,
- "switch-case", FunctionIdentifier.VARARGS);
+ FunctionSignature functionSignature = new FunctionSignature(BuiltinFunctions.SWITCH_CASE);
List<Expression> whenExprList = newCaseExpr.getWhenExprs();
List<Expression> thenExprList = newCaseExpr.getThenExprs();
List<Expression> newExprList = new ArrayList<>();
@@ -90,7 +89,7 @@ public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpre
OperatorExpr operatorExpr = new OperatorExpr();
operatorExpr.addOperand((Expression) SqlppRewriteUtil.deepCopy(expr));
operatorExpr.addOperand(caseExpr.getConditionExpr());
- operatorExpr.addOperator("=");
+ operatorExpr.addOperator(OperatorType.EQ);
normalizedWhenExprs.add(operatorExpr);
}
return new CaseExpression(trueLiteral, normalizedWhenExprs, caseExpr.getThenExprs(), caseExpr.getElseExpr());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7c53fcf4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
index c56bb9d..fd50c8e 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
@@ -72,8 +72,7 @@ public class SqlppDistinctAggregationSugarVisitor extends AbstractSqlppSimpleExp
Expression newExpr = rewriteArgument(expr);
newExprList.add(newExpr.accept(this, arg));
}
- callExpr.setFunctionSignature(
- new FunctionSignature(newAggFn.getNamespace(), newAggFn.getName(), newAggFn.getArity()));
+ callExpr.setFunctionSignature(new FunctionSignature(newAggFn));
callExpr.setExprList(newExprList);
return callExpr;
}