Repository: asterixdb Updated Branches: refs/heads/master bebe109bf -> 66d13f7b0
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 b8ef4a5..0eac7c6 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 @@ -37,12 +37,12 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] , FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [deptDataset] + LiteralExpr [STRING] [test.deptDataset] ] AS Variable [ Name=$dept ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 d54b9ea..43449d9 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 @@ -37,12 +37,12 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] , FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [deptDataset] + LiteralExpr [STRING] [test.deptDataset] ] AS Variable [ Name=$dept ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 0284f07..53739dc 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 @@ -37,12 +37,12 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] , FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [deptDataset] + LiteralExpr [STRING] [test.deptDataset] ] AS Variable [ Name=$dept ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 492bf5c..bceb286 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 @@ -29,12 +29,12 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] , FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [deptDataset] + LiteralExpr [STRING] [test.deptDataset] ] AS Variable [ Name=$dept ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 8f8c6e6..d3f9a59 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 603ee37..02a69df 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 c8d3336..d2fddef 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 b189ed1..f0a7742 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 46eec0e..dfbe5db 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 35dac74..38e4915 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 e1f1e1f..bc47181 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 5a7a8ce..b6ab37e 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 @@ -21,7 +21,7 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 25868db..25134ae 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 @@ -29,12 +29,12 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] , FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [deptDataset] + LiteralExpr [STRING] [test.deptDataset] ] AS Variable [ Name=$dept ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 f000f53..886501c 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 @@ -29,12 +29,12 @@ RecordConstructor [ ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [empDataset] + LiteralExpr [STRING] [test.empDataset] ] AS Variable [ Name=$emp ] , FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [deptDataset] + LiteralExpr [STRING] [test.deptDataset] ] AS Variable [ Name=$dept ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 1ed42fa..84c0b39 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 @@ -4,7 +4,7 @@ SELECT ELEMENT [ Variable [ Name=$i ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [Int64Test] + LiteralExpr [STRING] [TestVerse.Int64Test] ] AS Variable [ Name=$i ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 e2451f5..b911309 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 @@ -4,7 +4,7 @@ SELECT ELEMENT [ Variable [ Name=$i ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [TestSet] + LiteralExpr [STRING] [TestDataverse.TestSet] ] AS Variable [ Name=$i ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/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 c2bbdf2..192188b 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 @@ -4,7 +4,7 @@ SELECT ELEMENT [ Variable [ Name=$l ] ] FROM [ FunctionCall asterix.dataset@1[ - LiteralExpr [STRING] [t2] + LiteralExpr [STRING] [test.t2] ] AS Variable [ Name=$l ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index 9ce7eb3..789d41f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -5417,6 +5417,11 @@ <output-dir compare="Text">groupby_rename_with_sugar</output-dir> </compilation-unit> </test-case> + <test-case FilePath="resolution"> + <compilation-unit name="function_dataverse"> + <output-dir compare="Text">function_dataverse</output-dir> + </compilation-unit> + </test-case> </test-group> <test-group name="scan"> <test-case FilePath="scan"> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index 7f0c303..1fc0f54 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java @@ -139,6 +139,7 @@ public class ErrorCode { public static final int WITH_FIELD_MUST_BE_OF_TYPE = 1060; public static final int WITH_FIELD_MUST_CONTAIN_SUB_FIELD = 1061; public static final int MERGE_POLICY_PARAMETER_INVALID_TYPE = 1062; + public static final int NO_DATAVERSE_WITH_NAME = 1063; // Feed errors public static final int DATAFLOW_ILLEGAL_STATE = 3001; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index 7384d14..3ad7fd5 100644 --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@ -125,6 +125,7 @@ 1060 = Field \"%1$s\" in the with clause must be of type %2$s 1061 = Field \"%1$s\" in the with clause must contain sub field \"%2$s\" 1062 = Merge policy parameters cannot be of type %1$s +1063 = There is no dataverse with name %1$s # Feed Errors 3001 = Illegal state. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java index 61617ec..7d8c11e 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.List; import org.apache.asterix.common.exceptions.CompilationException; +import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.lang.common.base.Expression; import org.apache.asterix.lang.common.base.Expression.Kind; @@ -56,6 +57,8 @@ import org.apache.asterix.lang.common.struct.QuantifiedPair; import org.apache.asterix.lang.common.struct.VarIdentifier; import org.apache.asterix.lang.common.visitor.base.AbstractQueryExpressionVisitor; import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.metadata.entities.Dataverse; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.common.utils.Pair; public abstract class AbstractInlineUdfsVisitor extends AbstractQueryExpressionVisitor<Boolean, List<FunctionDecl>> { @@ -274,7 +277,7 @@ public abstract class AbstractInlineUdfsVisitor extends AbstractQueryExpressionV } else { // Rewrite the function body itself (without setting unbounded variables to dataset access). // TODO(buyingyi): throw an exception for recursive function definition or limit the stack depth. - implem.setFuncBody(rewriteFunctionBody(implem.getFuncBody(), implem.getParamList())); + implem.setFuncBody(rewriteFunctionBody(implem)); // it's one of the functions we want to inline List<LetClause> clauses = new ArrayList<>(); Iterator<VarIdentifier> paramIter = implem.getParamList().iterator(); @@ -321,16 +324,34 @@ public abstract class AbstractInlineUdfsVisitor extends AbstractQueryExpressionV return new Pair<>(changed, newList); } - protected Expression rewriteFunctionBody(Expression expr, List<VarIdentifier> paramList) - throws CompilationException { + private Expression rewriteFunctionBody(FunctionDecl fnDecl) throws CompilationException { Query wrappedQuery = new Query(false); - wrappedQuery.setBody(expr); + wrappedQuery.setBody(fnDecl.getFuncBody()); wrappedQuery.setTopLevel(false); - wrappedQuery.setExternalVars(paramList); + wrappedQuery.setExternalVars(fnDecl.getParamList()); + + String fnNamespace = fnDecl.getSignature().getNamespace(); + Dataverse defaultDataverse = metadataProvider.getDefaultDataverse(); - IQueryRewriter queryRewriter = rewriterFactory.createQueryRewriter(); - queryRewriter.rewrite(declaredFunctions, wrappedQuery, metadataProvider, context); - return wrappedQuery.getBody(); + Dataverse fnDataverse; + if (fnNamespace == null || fnNamespace.equals(defaultDataverse.getDataverseName())) { + fnDataverse = defaultDataverse; + } else { + try { + fnDataverse = metadataProvider.findDataverse(fnNamespace); + } catch (AlgebricksException e) { + throw new CompilationException(ErrorCode.NO_DATAVERSE_WITH_NAME, e, fnNamespace); + } + } + + metadataProvider.setDefaultDataverse(fnDataverse); + try { + IQueryRewriter queryRewriter = rewriterFactory.createQueryRewriter(); + queryRewriter.rewrite(declaredFunctions, wrappedQuery, metadataProvider, context); + return wrappedQuery.getBody(); + } finally { + metadataProvider.setDefaultDataverse(defaultDataverse); + } } protected static FunctionDecl findFuncDeclaration(FunctionSignature fid, List<FunctionDecl> sequence) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java index 7a37f94..c28029a 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java @@ -86,7 +86,7 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi @Override public Expression visit(VariableExpr varExpr, ILangExpression parent) throws CompilationException { - return resolve(varExpr, null /* Resolves within the default dataverse. */, + return resolve(varExpr, metadataProvider.getDefaultDataverseName(), SqlppVariableUtil.toUserDefinedVariableName(varExpr.getVar().getValue()).getValue(), varExpr, parent); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java index 0398f1a..2b34182 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java @@ -144,10 +144,10 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> private final IStorageComponentProvider storageComponentProvider; private final StorageProperties storageProperties; private final IFunctionManager functionManager; - private final Dataverse defaultDataverse; private final LockList locks; private final Map<String, String> config; + private Dataverse defaultDataverse; private MetadataTransactionContext mdTxnCtx; private boolean isWriteTransaction; private IAWriterFactory writerFactory; @@ -161,7 +161,7 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> public MetadataProvider(ICcApplicationContext appCtx, Dataverse defaultDataverse) { this.appCtx = appCtx; - this.defaultDataverse = defaultDataverse == null ? MetadataBuiltinEntities.DEFAULT_DATAVERSE : defaultDataverse; + setDefaultDataverse(defaultDataverse); this.storageComponentProvider = appCtx.getStorageComponentProvider(); storageProperties = appCtx.getStorageProperties(); functionManager = ((IFunctionExtensionManager) appCtx.getExtensionManager()).getFunctionManager(); @@ -190,12 +190,16 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> this.txnId = txnId; } + public void setDefaultDataverse(Dataverse defaultDataverse) { + this.defaultDataverse = defaultDataverse == null ? MetadataBuiltinEntities.DEFAULT_DATAVERSE : defaultDataverse; + } + public Dataverse getDefaultDataverse() { return defaultDataverse; } public String getDefaultDataverseName() { - return defaultDataverse == null ? null : defaultDataverse.getDataverseName(); + return defaultDataverse.getDataverseName(); } public void setWriteTransaction(boolean writeTransaction) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/66d13f7b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java index e38894c..16f5b0b 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java @@ -550,15 +550,16 @@ public class DatasetUtil { // This doesn't work if the dataset or the dataverse name contains a '.' public static Pair<String, String> getDatasetInfo(MetadataProvider metadata, String datasetArg) { - String[] nameComponents = datasetArg.split("\\."); String first; String second; - if (nameComponents.length == 1) { + int i = datasetArg.indexOf('.'); + if (i > 0 && i < datasetArg.length() - 1) { + first = datasetArg.substring(0, i); + second = datasetArg.substring(i + 1); + } + else { first = metadata.getDefaultDataverse() == null ? null : metadata.getDefaultDataverse().getDataverseName(); - second = nameComponents[0]; - } else { - first = nameComponents[0]; - second = nameComponents[1]; + second = datasetArg; } return new Pair<>(first, second); }
