You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/03/28 22:18:34 UTC
[07/51] [partial] incubator-asterixdb git commit: ASTERIXDB-1226:
implement SQL++ core group-by semantics and syntatic sugars.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
index 796923a..24d2e96 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,22 +16,22 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=point
]
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=rec
]
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
index 94574c9..57740ac 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,22 +16,22 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=point
]
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=line1
]
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
index d597bb2..af19447 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=poly1
]
FunctionCall test.create-circle@2[
@@ -34,7 +34,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
index aa394ce..1daf590 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,22 +16,22 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=poly1
]
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=poly2
]
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
index a9fa6b2..0743d46 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,22 +16,22 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=poly1
]
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=rec
]
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
index fec7111..7c020d5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
@@ -1,6 +1,6 @@
DataverseUse test
Query:
-LetVariable [ Name=polygon ]
+Let Variable [ Name=$polygon ]
:=
FunctionCall test.create-polygon@1[
OrderedListConstructor [
@@ -14,15 +14,15 @@ LetVariable [ Name=polygon ]
LiteralExpr [DOUBLE] [4.0]
]
]
-LetVariable [ Name=polygon_list ]
+Let Variable [ Name=$polygon_list ]
:=
FunctionCall test.get-points@1[
- Variable [ Name=polygon ]
+ Variable [ Name=$polygon ]
]
SELECT ELEMENT [
-Variable [ Name=p ]
+Variable [ Name=$p ]
]
-FROM [ Variable [ Name=polygon_list ]
+FROM [ Variable [ Name=$polygon_list ]
AS
- Variable [ Name=p ]
+ Variable [ Name=$p ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
index 505572f..8589e06 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=rec
]
FunctionCall test.create-circle@2[
@@ -34,7 +34,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
index 5043ef9..24f8602 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=rec
]
FunctionCall test.create-rectangle@2[
@@ -37,7 +37,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
index c9af06a..8499f01 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
@@ -1,6 +1,6 @@
DataverseUse test
Query:
-LetVariable [ Name=rectangle ]
+Let Variable [ Name=$rectangle ]
:=
FunctionCall test.create-rectangle@2[
FunctionCall test.create-point@2[
@@ -12,15 +12,15 @@ LetVariable [ Name=rectangle ]
LiteralExpr [DOUBLE] [111.1]
]
]
-LetVariable [ Name=rectangle_list ]
+Let Variable [ Name=$rectangle_list ]
:=
FunctionCall test.get-points@1[
- Variable [ Name=rectangle ]
+ Variable [ Name=$rectangle ]
]
SELECT ELEMENT [
-Variable [ Name=p ]
+Variable [ Name=$p ]
]
-FROM [ Variable [ Name=rectangle_list ]
+FROM [ Variable [ Name=$rectangle_list ]
AS
- Variable [ Name=p ]
+ Variable [ Name=$p ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
index 3658912..e80c1d8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
@@ -1,6 +1,6 @@
DataverseUse test
Query:
-LetVariable [ Name=k ]
+Let Variable [ Name=$k ]
:=
OrderedListConstructor [
RecordConstructor [
@@ -42,21 +42,21 @@ SELECT ELEMENT [
FunctionCall test.string-concat@1[
OrderedListConstructor [
FieldAccessor [
- Variable [ Name=x ]
+ Variable [ Name=$x ]
Field=b
]
LiteralExpr [STRING] [ world]
]
]
]
-FROM [ Variable [ Name=k ]
+FROM [ Variable [ Name=$k ]
AS
- Variable [ Name=x ]
+ Variable [ Name=$x ]
]
Where
OperatorExpr [
FieldAccessor [
- Variable [ Name=x ]
+ Variable [ Name=$x ]
Field=a
]
=
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
index 8c4d21b..68da092 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
@@ -1,27 +1,27 @@
DataverseUse test
Query:
-LetVariable [ Name=a ]
+Let Variable [ Name=$a ]
:=
LiteralExpr [LONG] [1]
-LetVariable [ Name=b ]
+Let Variable [ Name=$b ]
:=
LiteralExpr [LONG] [2]
-LetVariable [ Name=c ]
+Let Variable [ Name=$c ]
:=
LiteralExpr [STRING] [c]
-LetVariable [ Name=d ]
+Let Variable [ Name=$d ]
:=
OrderedListConstructor [
- Variable [ Name=a ]
- Variable [ Name=b ]
- Variable [ Name=c ]
+ Variable [ Name=$a ]
+ Variable [ Name=$b ]
+ Variable [ Name=$c ]
]
SELECT ELEMENT [
FunctionCall test.string@1[
- Variable [ Name=x ]
+ Variable [ Name=$x ]
]
]
-FROM [ Variable [ Name=d ]
+FROM [ Variable [ Name=$d ]
AS
- Variable [ Name=x ]
+ Variable [ Name=$x ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
index 0d7d8d2..ae17f9b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
@@ -3,11 +3,11 @@ Query:
SELECT ELEMENT [
OrderedListConstructor [
FunctionCall test.contains@2[
- Variable [ Name=x ]
+ Variable [ Name=$x ]
LiteralExpr [STRING] [ofo]
]
FunctionCall test.contains@2[
- Variable [ Name=y ]
+ Variable [ Name=$y ]
LiteralExpr [STRING] [ofo]
]
]
@@ -16,11 +16,11 @@ FROM [ OrderedListConstructor [
LiteralExpr [STRING] [foofoo]
]
AS
- Variable [ Name=x ]
+ Variable [ Name=$x ]
,
OrderedListConstructor [
LiteralExpr [STRING] [barbar]
]
AS
- Variable [ Name=y ]
+ Variable [ Name=$y ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
index 5c4a2b3..94575ae 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
FunctionCall test.codepoint-to-string@1[
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=cpt
]
]
@@ -12,5 +12,5 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testds]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes02/escapes02.1.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes02/escapes02.1.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes02/escapes02.1.ast
index ffb8d5e..2933ff6 100644
Binary files a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes02/escapes02.1.ast and b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes02/escapes02.1.ast differ
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
index 0381cea..6e24f11 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Query:
SELECT ELEMENT [
FunctionCall test.string-length@1[
- Variable [ Name=x ]
+ Variable [ Name=$x ]
]
]
FROM [ OrderedListConstructor [
@@ -16,5 +16,5 @@ FROM [ OrderedListConstructor [
LiteralExpr [STRING] [ninety]
]
AS
- Variable [ Name=x ]
+ Variable [ Name=$x ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
index f8bfc44..ceff0d5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.matches@2[
@@ -57,5 +57,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
index 48f202f..afdde9e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.matches@2[
@@ -33,5 +33,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
index ea963e9..b76cf0e 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
@@ -1,28 +1,28 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testds1]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Where
FunctionCall test.matches@2[
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=fname
]
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=lname
]
]
Orderby
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
index 2bae6ae..4d54025 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.matches@2[
@@ -69,5 +69,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
index e7004ec..98a44a6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
LiteralExpr [NULL]
@@ -26,5 +26,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
index 7d1aceb..59d7802 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
@@ -8,11 +8,11 @@ RecordConstructor [
FunctionCall test.string-concat@1[
OrderedListConstructor [
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=fname
]
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=lname
]
]
@@ -24,11 +24,11 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testds]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Orderby
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
index 364d6f5..490cabd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.string-concat@1[
@@ -51,5 +51,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
index f1e9119..c4f3ca0 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.string-length@1[
@@ -23,5 +23,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
index 0d292a8..574e800 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
FunctionCall test.string-length@1[
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=name
]
]
@@ -12,11 +12,11 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testds]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Orderby
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=name
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
index 2d990a6..d27a6e9 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.substring@3[
@@ -58,5 +58,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
index 8857ab6..55bd101 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
@@ -3,14 +3,14 @@ Query:
SELECT ELEMENT [
FunctionCall test.substring@3[
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=name
]
LiteralExpr [LONG] [4]
OperatorExpr [
FunctionCall test.string-length@1[
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=name
]
]
@@ -23,11 +23,11 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
Orderby
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=name
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
index 0019ab6..be34cac 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
FunctionCall test.substring@2[
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=name
]
LiteralExpr [LONG] [4]
@@ -13,11 +13,11 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
Orderby
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=name
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
index 4443e58..7be3bf5 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Query:
SELECT ELEMENT [
FunctionCall test.substring@3[
- Variable [ Name=x ]
+ Variable [ Name=$x ]
LiteralExpr [LONG] [2]
LiteralExpr [LONG] [3]
]
@@ -11,5 +11,5 @@ FROM [ OrderedListConstructor [
LiteralExpr [STRING] [foobar]
]
AS
- Variable [ Name=x ]
+ Variable [ Name=$x ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
index a2e342b..59fe8b6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.lowercase@1[
@@ -44,5 +44,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
index 8c8e6cc..a53ef3f 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
@@ -3,7 +3,7 @@ Query:
SELECT ELEMENT [
FunctionCall test.lowercase@1[
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=name
]
]
@@ -12,11 +12,11 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testds]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Orderby
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=name
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
index 3876d22..a055e43 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
@@ -1,6 +1,6 @@
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ OrderedListConstructor [
FunctionCall null.lowercase@1[
@@ -45,5 +45,5 @@ FROM [ OrderedListConstructor [
]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
index fde6704..0d197c6 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Set import-private-functions=true
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall test.subset-collection@3[
OrderedListConstructor [
@@ -12,5 +12,5 @@ FROM [ FunctionCall test.subset-collection@3[
LiteralExpr [LONG] [1]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
index ec75921..12038e4 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Set import-private-functions=true
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall test.subset-collection@3[
OrderedListConstructor [
@@ -15,5 +15,5 @@ FROM [ FunctionCall test.subset-collection@3[
LiteralExpr [LONG] [2]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
index 81f5370..b78033c 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Set import-private-functions=true
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall test.subset-collection@3[
OrderedListConstructor [
@@ -15,5 +15,5 @@ FROM [ FunctionCall test.subset-collection@3[
LiteralExpr [LONG] [0]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
index b3f256c..ee12851 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Set import-private-functions=true
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall test.subset-collection@3[
OrderedListConstructor [
@@ -15,5 +15,5 @@ FROM [ FunctionCall test.subset-collection@3[
LiteralExpr [LONG] [2]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
index 9854a53..81c185b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Set import-private-functions=true
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall test.subset-collection@3[
OrderedListConstructor [
@@ -15,5 +15,5 @@ FROM [ FunctionCall test.subset-collection@3[
LiteralExpr [LONG] [2]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
index b390374..3eca14b 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
@@ -2,7 +2,7 @@ DataverseUse test
Set import-private-functions=true
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall test.subset-collection@3[
OrderedListConstructor [
@@ -15,5 +15,5 @@ FROM [ FunctionCall test.subset-collection@3[
LiteralExpr [LONG] [10]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
index 185b162..2ea0e43 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
@@ -1,18 +1,18 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS
- Variable [ Name=c ]
+ Variable [ Name=$c ]
]
Where
OperatorExpr [
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_suppkey
]
<
@@ -20,12 +20,12 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_orderkey
]
ASC
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_linenumber
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
index 55c7a87..93180bd 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
@@ -1,22 +1,22 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS
- Variable [ Name=c ]
+ Variable [ Name=$c ]
]
Orderby
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_orderkey
]
ASC
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_linenumber
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
index 81558b9..539d333 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
@@ -1,18 +1,18 @@
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [Metadata.Index]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Where
OperatorExpr [
OperatorExpr [
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=IsPrimary
]
=
@@ -21,7 +21,7 @@ Where
and
OperatorExpr [
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=DataverseName
]
=
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast
index de91ce6..6352064 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast
@@ -1,19 +1,19 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=a ]
+Variable [ Name=$a ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [t1]
]
AS
- Variable [ Name=a ]
+ Variable [ Name=$a ]
]
Where
OperatorExpr [
OperatorExpr [
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=unique1
]
>
@@ -22,7 +22,7 @@ Where
and
OperatorExpr [
FieldAccessor [
- Variable [ Name=a ]
+ Variable [ Name=$a ]
Field=stringu1
]
=
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast
index 125e278..2ab0040 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast
@@ -1,22 +1,22 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS
- Variable [ Name=c ]
+ Variable [ Name=$c ]
]
Orderby
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_orderkey
]
ASC
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=l_linenumber
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
index d3cf8a6..7839ec7 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
@@ -1,17 +1,17 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=l ]
+Variable [ Name=$l ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [test.employee]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Orderby
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
index c200c21..8d78a96 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
@@ -1,17 +1,17 @@
DataverseUse test
Query:
SELECT ELEMENT [
-Variable [ Name=c ]
+Variable [ Name=$c ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [myData]
]
AS
- Variable [ Name=c ]
+ Variable [ Name=$c ]
]
Orderby
FieldAccessor [
- Variable [ Name=c ]
+ Variable [ Name=$c ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
index 40474c7..cafd221 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
@@ -6,12 +6,12 @@ RecordConstructor [
(
LiteralExpr [STRING] [l_returnflag]
:
- Variable [ Name=l_returnflag ]
+ Variable [ Name=$l_returnflag ]
)
(
LiteralExpr [STRING] [l_linestatus]
:
- Variable [ Name=l_linestatus ]
+ Variable [ Name=$l_linestatus ]
)
(
LiteralExpr [STRING] [sum_qty]
@@ -20,13 +20,13 @@ RecordConstructor [
(
SELECT ELEMENT [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_quantity
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -38,13 +38,13 @@ RecordConstructor [
(
SELECT ELEMENT [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_extendedprice
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -57,7 +57,7 @@ RecordConstructor [
SELECT ELEMENT [
OperatorExpr [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_extendedprice
]
*
@@ -65,15 +65,15 @@ RecordConstructor [
LiteralExpr [LONG] [1]
-
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_discount
]
]
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -86,7 +86,7 @@ RecordConstructor [
SELECT ELEMENT [
OperatorExpr [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_extendedprice
]
*
@@ -94,7 +94,7 @@ RecordConstructor [
LiteralExpr [LONG] [1]
-
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_discount
]
]
@@ -103,15 +103,15 @@ RecordConstructor [
LiteralExpr [LONG] [1]
+
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_tax
]
]
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -123,13 +123,13 @@ RecordConstructor [
(
SELECT ELEMENT [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_quantity
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -141,13 +141,13 @@ RecordConstructor [
(
SELECT ELEMENT [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_extendedprice
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -159,13 +159,13 @@ RecordConstructor [
(
SELECT ELEMENT [
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=l_discount
]
]
- FROM [ Variable [ Name=l ]
+ FROM [ Variable [ Name=$l ]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
)
]
@@ -174,7 +174,18 @@ RecordConstructor [
LiteralExpr [STRING] [count_order]
:
FunctionCall tpch.count@1[
- Variable [ Name=l ]
+ (
+ SELECT ELEMENT [
+ FieldAccessor [
+ Variable [ Name=#2 ]
+ Field=l
+ ]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS
+ Variable [ Name=#2 ]
+ ]
+ )
]
)
]
@@ -183,36 +194,40 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS
- Variable [ Name=l ]
+ Variable [ Name=$l ]
]
Where
OperatorExpr [
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=l_shipdate
]
<=
LiteralExpr [STRING] [1998-09-02]
]
Groupby
- Variable [ Name=l_returnflag ]
+ Variable [ Name=$l_returnflag ]
:=
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=l_returnflag
]
- Variable [ Name=l_linestatus ]
+ Variable [ Name=$l_linestatus ]
:=
FieldAccessor [
- Variable [ Name=l ]
+ Variable [ Name=$l ]
Field=l_linestatus
]
- With
- Variable [ Name=l ]
+ GROUP AS
+ Variable [ Name=#1 ]
+ (
+ Variable [ Name=$l ]
+ AS l
+ )
Orderby
- Variable [ Name=l_returnflag ]
+ Variable [ Name=$l_returnflag ]
ASC
- Variable [ Name=l_linestatus ]
+ Variable [ Name=$l_linestatus ]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
index 613b78d..a8fb7a2 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=point
]
FunctionCall test.create-polygon@1[
@@ -39,7 +39,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast
index 1b0eba1..68e4dd8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=point
]
FunctionCall test.create-polygon@1[
@@ -39,7 +39,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
index 1b0eba1..68e4dd8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=point
]
FunctionCall test.create-polygon@1[
@@ -39,7 +39,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast
index 1b0eba1..68e4dd8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [id]
:
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
)
@@ -16,12 +16,12 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS
- Variable [ Name=o ]
+ Variable [ Name=$o ]
]
Where
FunctionCall test.spatial-intersect@2[
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=point
]
FunctionCall test.create-polygon@1[
@@ -39,7 +39,7 @@ Where
]
Orderby
FieldAccessor [
- Variable [ Name=o ]
+ Variable [ Name=$o ]
Field=id
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
index f3014f0..d915dd8 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
@@ -95,4 +95,4 @@ RecordConstructor [
]
]
)
-]
\ No newline at end of file
+]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
index 6d2d197..79baffb 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
@@ -50,4 +50,4 @@ RecordConstructor [
LiteralExpr [NULL]
]
)
-]
\ No newline at end of file
+]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
index 8fb6da7..28fcb19 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
@@ -134,4 +134,4 @@ RecordConstructor [
]
)
]
-]
\ No newline at end of file
+]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
index 7f10756..c8acabf 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
@@ -6,7 +6,7 @@ RecordConstructor [
LiteralExpr [STRING] [date]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=dateField
]
)
@@ -14,7 +14,7 @@ RecordConstructor [
LiteralExpr [STRING] [time]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=timeField
]
)
@@ -22,7 +22,7 @@ RecordConstructor [
LiteralExpr [STRING] [datetime]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=datetimeField
]
)
@@ -30,7 +30,7 @@ RecordConstructor [
LiteralExpr [STRING] [duration]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=durationField
]
)
@@ -38,7 +38,7 @@ RecordConstructor [
LiteralExpr [STRING] [interval]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=intervalField
]
)
@@ -46,7 +46,7 @@ RecordConstructor [
LiteralExpr [STRING] [ymduration]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=yearMonthDurationField
]
)
@@ -54,7 +54,7 @@ RecordConstructor [
LiteralExpr [STRING] [dtduration]
:
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=dayTimeDurationField
]
)
@@ -64,5 +64,5 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [testds]
]
AS
- Variable [ Name=r ]
+ Variable [ Name=$r ]
]
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
index dfa294f..d7fa604 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
@@ -1,17 +1,17 @@
DataverseUse timeTest
Query:
SELECT ELEMENT [
-Variable [ Name=r ]
+Variable [ Name=$r ]
]
FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [timeData]
]
AS
- Variable [ Name=r ]
+ Variable [ Name=$r ]
]
Orderby
FieldAccessor [
- Variable [ Name=r ]
+ Variable [ Name=$r ]
Field=date
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
index c511a53..2ba9eb4 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
@@ -5,13 +5,24 @@ RecordConstructor [
(
LiteralExpr [STRING] [tbin]
:
- Variable [ Name=d ]
+ Variable [ Name=$d ]
)
(
LiteralExpr [STRING] [count]
:
FunctionCall test.count@1[
- Variable [ Name=i ]
+ (
+ SELECT ELEMENT [
+ FieldAccessor [
+ Variable [ Name=#2 ]
+ Field=i
+ ]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS
+ Variable [ Name=#2 ]
+ ]
+ )
]
)
]
@@ -20,14 +31,14 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [tsdata]
]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
Groupby
- Variable [ Name=d ]
+ Variable [ Name=$d ]
:=
FunctionCall test.interval-bin@3[
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=timestamp
]
FunctionCall test.datetime@1[
@@ -37,12 +48,16 @@ Groupby
LiteralExpr [STRING] [P20Y]
]
]
- With
- Variable [ Name=i ]
+ GROUP AS
+ Variable [ Name=#1 ]
+ (
+ Variable [ Name=$i ]
+ AS i
+ )
Orderby
FunctionCall test.get-interval-start@1[
- Variable [ Name=d ]
+ Variable [ Name=$d ]
]
ASC
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/acc12a9b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
index 4f3fd53..cbd8716 100644
--- a/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
+++ b/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
@@ -5,13 +5,24 @@ RecordConstructor [
(
LiteralExpr [STRING] [tbin]
:
- Variable [ Name=d ]
+ Variable [ Name=$d ]
)
(
LiteralExpr [STRING] [count]
:
FunctionCall test.count@1[
- Variable [ Name=i ]
+ (
+ SELECT ELEMENT [
+ FieldAccessor [
+ Variable [ Name=#2 ]
+ Field=i
+ ]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS
+ Variable [ Name=#2 ]
+ ]
+ )
]
)
]
@@ -20,15 +31,15 @@ FROM [ FunctionCall Metadata.dataset@1[
LiteralExpr [STRING] [tsdata]
]
AS
- Variable [ Name=i ]
+ Variable [ Name=$i ]
]
Groupby
- Variable [ Name=d ]
+ Variable [ Name=$d ]
:=
FunctionCall test.interval-bin@3[
FunctionCall test.get-time-from-datetime@1[
FieldAccessor [
- Variable [ Name=i ]
+ Variable [ Name=$i ]
Field=timestamp
]
]
@@ -39,12 +50,16 @@ Groupby
LiteralExpr [STRING] [PT10M]
]
]
- With
- Variable [ Name=i ]
+ GROUP AS
+ Variable [ Name=#1 ]
+ (
+ Variable [ Name=$i ]
+ AS i
+ )
Orderby
FunctionCall test.get-interval-start@1[
- Variable [ Name=d ]
+ Variable [ Name=$d ]
]
ASC