[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
implicit iteration for jsoniq rename exprs
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246
implicit iteration for jsoniq rename exprs
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-08-14 16:34:05 +
+++ ChangeLog 2013-08-21 10:29:13 +
@@ -12,6 +12,16 @@
* The grouping variable in a group by clause is now optional
* New syntax for array lookup: expr1[[expr2]]
* New jsoniq functions: jn:trim() and libjn:descendant-arrays()
+ * jsoniq extension: Object/array navigation allows item()* as the type of the
+input sequence (doing implicit iteration over the input sequence and skipping
+items that are not objects/arrays).
+ * jsoniq extension: Several of the jsoniq functions now allow item()* as the
+type of the input sequence (doing implicit iteration over the input sequence
+and skipping or simply propagating items that are not objects/arrays).
+ * jsoniq extension: implicit iteration is also done for jsoniq delete, renames,
+and value replacements.
+ * jsoniq extension: EBV on jsoniq items now returns true (instead of raising
+an error).
Optimizations:
* Implemented hoisting optimization for general FLWOR.
@@ -66,16 +76,9 @@
* jn:keys function takes item()* as aparameter (instead of item())
* Fixed bug #1189996 (Relocate some public API headers to util)
* Fixed bug #1189790 (Update core module full-text)
- * Object/array navigation allows item()* as the type of the input sequence
-(doing implicit iteration over the input sequence and skipping items
- that are not objects/arrays).
- * Several of the jsoniq functions now allow item()* as the type of the input
-sequence (doing implicit iteration over the input sequence and skipping or
-simply propagating items that are not objects/arrays).
* Bug fix: selector value in object/array navigation is always cast to
string/integer
* The function jn:is-null() has been removed.
- * EBV on jsoniq items now returns true (instead of raising an error).
* Removed from libjn module the functions that existed in the jn module as well.
* Renamed xqxq module to zorba-query module(zq module).
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-08-19 13:00:41 +
+++ src/compiler/translator/translator.cpp 2013-08-21 10:29:13 +
@@ -15291,19 +15291,19 @@
std::vectorexpr* args(3);
- args[0] = wrap_in_type_match(targetExpr,
- theRTM.JSON_OBJECT_TYPE_ONE,
- loc,
- TREAT_JSONIQ_OBJECT_UPDATE_TARGET, // JNUP0008
- NULL);
-
- args[1] = wrap_in_type_promotion(nameExpr,
- theRTM.STRING_TYPE_ONE,
- PROMOTE_TYPE_PROMOTION);
-
- args[2] = wrap_in_type_promotion(newNameExpr,
- theRTM.STRING_TYPE_ONE,
- PROMOTE_JSONIQ_OBJECT_SELECTOR); // JNUP0007
+ args[0] = targetExpr;
+
+ args[1] = create_cast_expr(nameExpr-get_loc(),
+ nameExpr,
+ theRTM.STRING_TYPE_ONE,
+ true,
+ true);
+
+ args[2] = create_cast_expr(newNameExpr-get_loc(),
+ newNameExpr,
+ theRTM.STRING_TYPE_ONE,
+ false,
+ true);
fo_expr* updExpr = CREATE(fo)(theRootSctx,
theUDF,
=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp 2013-08-19 13:00:41 +
+++ src/functions/pregenerated/func_jsoniq_functions.cpp 2013-08-21 10:29:13 +
@@ -504,8 +504,8 @@
{
DECL_WITH_KIND(sctx, op_zorba_json_rename,
(createQName(http://zorba.io/internal/zorba-ops,,json-rename;),
-GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE,
-GENV_TYPESYSTEM.STRING_TYPE_ONE,
+GENV_TYPESYSTEM.ITEM_TYPE_STAR,
+GENV_TYPESYSTEM.STRING_TYPE_QUESTION,
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.EMPTY_TYPE),
FunctionConsts::OP_ZORBA_JSON_RENAME_3);
=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp 2013-08-19 13:00:41 +
+++ src/runtime/json/jsoniq_functions_impl.cpp 2013-08-21 10:29:13 +
@@ -1871,8 +1871,8 @@
/***
updating function
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Stage TestZorbaUbuntu failed. 1 tests failed (8407 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/233/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/181246 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/website_integration into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/website_integration/+merge/181200
:
Votes: {'Pending': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/website_integration/+merge/181200
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/website_integration into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/website_integration/+merge/181200 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/136/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/website_integration/+merge/181200 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Commit Message changed to: Fixed bugs #1210320 and #1212423 - misplaced compiler error For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 :
Votes: {'Approve': 1, 'Pending': 1}
--
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
Validation queue result for https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/137/console to view the results. -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/181327 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
