[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bump-module-versions
into lp:zorba.
Commit message:
Bump certain non-core modules to zorba-2.9.1 tag.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978
--
https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-05-07 08:39:33 +
+++ CMakeLists.txt 2013-05-28 07:47:28 +
@@ -479,7 +479,7 @@
# zorba versioning
SET(ZORBA_MAJOR_NUMBER 2)
SET(ZORBA_MINOR_NUMBER 9)
-SET(ZORBA_PATCH_NUMBER 0)
+SET(ZORBA_PATCH_NUMBER 1)
SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
MESSAGE(STATUS Zorba version number: ${ZORBA_VERSION})
=== modified file 'NOTICE.txt'
--- NOTICE.txt 2013-05-07 08:39:33 +
+++ NOTICE.txt 2013-05-28 07:47:28 +
@@ -1,5 +1,5 @@
---
-Zorba 2.9.0
+Zorba 2.9.1
---
(Note: This file is generated automatically from NOTICE.xml.
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf 2013-05-22 07:01:40 +
+++ modules/ExternalModules.conf 2013-05-28 07:47:28 +
@@ -29,7 +29,7 @@
archive bzr lp:zorba/archive-module zorba-2.9
csv bzr lp:zorba/csv-module zorba-2.9
data-cleaning bzr lp:zorba/data-cleaning-modulezorba-2.9
-data-formatting bzr lp:zorba/data-formatting-module zorba-2.9
+data-formatting bzr lp:zorba/data-formatting-module zorba-2.9.1
excel bzr lp:zorba/excel-modulezorba-2.9
info-extraction bzr lp:zorba/info-extraction-module zorba-2.9
geo bzr lp:zorba/geo-module zorba-2.9
@@ -43,15 +43,13 @@
oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module zorba-2.9
oauth bzr lp:zorba/oauth-modulezorba-2.9
process bzr lp:zorba/process-module zorba-2.9
-read-pdfbzr lp:zorba/read-pdf-module zorba-2.9
+read-pdfbzr lp:zorba/read-pdf-module zorba-2.9.1
securitybzr lp:zorba/security-module zorba-2.9
system bzr lp:zorba/system-module zorba-2.9
email bzr lp:zorba/email-modulezorba-2.9
-util-jvmbzr lp:zorba/util-jvm-module zorba-2.9
-schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9
+util-jvmbzr lp:zorba/util-jvm-module zorba-2.9.1
+schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9.1
stack bzr lp:zorba/stack-modulezorba-2.9
queue bzr lp:zorba/queue-modulezorba-2.9
couchbase bzr lp:zorba/couchbase-modulezorba-2.9
sqlite bzr lp:zorba/sqlite-module zorba-2.9
-
-
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-05-25 15:15:30 +
+++ src/compiler/translator/translator.cpp 2013-05-28 07:47:28 +
@@ -12655,6 +12655,7 @@
break;
}
+ TREE
case FunctionConsts::FN_MAP_2:
case FunctionConsts::FN_FILTER_2:
{
@@ -12668,6 +12669,21 @@
body = flworBody;
break;
}
+===
+ case FunctionConsts::FN_MAP_2:
+ case FunctionConsts::FN_FILTER_2:
+ {
+flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc, false);
+
+let_clause* lc = wrap_in_letclause(foArgs[0]);
+flworBody-add_clause(lc);
+foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc-get_var());
+
+flworBody-set_return_expr(generate_fn_body(f, foArgs, loc));
+body = flworBody;
+break;
+ }
+ MERGE-SOURCE
case FunctionConsts::FN_FUNCTION_LOOKUP_2:
{
bool varAdded = false;
=== modified file 'src/runtime/api/plan_iterator_wrapper.cpp'
=== modified file 'src/runtime/api/plan_iterator_wrapper.h'
--
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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Commit Message changed to: Bump certain non-core modules to zorba-2.9.1 tag. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Review: Disapprove The merge got mangled somehow, I will try again. -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 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/bump-module-versions into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bump-module-versions into lp:zorba. Commit message: Bump all tagged modules to zorba-2.9. Requested reviews: Juan Zacarias (juan457) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 Forgot to do this prior to tagging Zorba 2.9 trunk. However, it does not require re-creating installers as this file is not shipped by the installers. I have included the updated version in the source downloads. -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-03-22 18:26:29 + +++ modules/ExternalModules.conf 2013-05-22 08:10:39 + @@ -26,31 +26,32 @@ # tag is the VCS tag to check out (optional - defaults to HEAD; # currently only works for bzr, since svn tags are just different URLS) -archive bzr lp:zorba/archive-module zorba-2.8 -csv bzr lp:zorba/csv-module zorba-2.8 -data-cleaning bzr lp:zorba/data-cleaning-modulezorba-2.8 -data-formatting bzr lp:zorba/data-formatting-module zorba-2.8 -excel bzr lp:zorba/excel-modulezorba-2.8 -info-extraction bzr lp:zorba/info-extraction-module zorba-2.8 -geo bzr lp:zorba/geo-module zorba-2.8 -geoproj bzr lp:zorba/geoproj-module zorba-2.8 -graphvizbzr lp:zorba/graphviz-module zorba-2.8 -htmlbzr lp:zorba/html-module zorba-2.8 -http-client bzr lp:zorba/http-client-module zorba-2.8 -image bzr lp:zorba/image-modulezorba-2.8 -jdbcbzr lp:zorba/jdbc-module zorba-2.8 -languages bzr lp:zorba/languages-modulezorba-2.8 -oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module -oauth bzr lp:zorba/oauth-modulezorba-2.8 -process bzr lp:zorba/process-module zorba-2.8 -read-pdfbzr lp:zorba/read-pdf-module zorba-2.8 -securitybzr lp:zorba/security-module zorba-2.8 -system bzr lp:zorba/system-module zorba-2.8 -email bzr lp:zorba/email-modulezorba-2.8 -util-jvmbzr lp:zorba/util-jvm-module zorba-2.8 -schema-toolsbzr lp:zorba/schema-tools-module zorba-2.8 -stack bzr lp:zorba/stack-modulezorba-2.8 -queue bzr lp:zorba/queue-modulezorba-2.8 -couchbase bzr lp:zorba/couchbase-module -sqlite bzr lp:zorba/sqlite-module +archive bzr lp:zorba/archive-module zorba-2.9 +csv bzr lp:zorba/csv-module zorba-2.9 +data-cleaning bzr lp:zorba/data-cleaning-modulezorba-2.9 +data-formatting bzr lp:zorba/data-formatting-module zorba-2.9 +excel bzr lp:zorba/excel-modulezorba-2.9 +info-extraction bzr lp:zorba/info-extraction-module zorba-2.9 +geo bzr lp:zorba/geo-module zorba-2.9 +geoproj bzr lp:zorba/geoproj-module zorba-2.9 +graphvizbzr lp:zorba/graphviz-module zorba-2.9 +htmlbzr lp:zorba/html-module zorba-2.9 +http-client bzr lp:zorba/http-client-module zorba-2.9 +image bzr lp:zorba/image-modulezorba-2.9 +jdbcbzr lp:zorba/jdbc-module zorba-2.9 +languages bzr lp:zorba/languages-modulezorba-2.9 +oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module zorba-2.9 +oauth bzr lp:zorba/oauth-modulezorba-2.9 +process bzr lp:zorba/process-module zorba-2.9 +read-pdfbzr lp:zorba/read-pdf-module zorba-2.9 +securitybzr lp:zorba/security-module zorba-2.9 +system bzr lp:zorba/system-module zorba-2.9 +email bzr lp:zorba/email-modulezorba-2.9 +util-jvmbzr lp:zorba/util-jvm-module zorba-2.9 +schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9 +stack bzr lp:zorba/stack-modulezorba-2.9 +queue bzr lp:zorba/queue-modulezorba-2.9 +couchbase bzr lp:zorba/couchbase-modulezorba-2.9 +sqlite bzr lp:zorba/sqlite-module zorba-2.9 + -- 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Commit Message changed to: Bump all tagged modules to zorba-2.9. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Description changed to: Forgot to do this prior to tagging Zorba 2.9 trunk. However, it does not require re-creating installers as this file is not shipped by the installers. I have included the updated version in the source downloads. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump-module-versions-2013-05-22T08-10-57.611Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
Validation queue job bump-module-versions-2013-05-22T08-10-57.611Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump-module-versions-2013-05-22T15-28-56.05Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
Validation queue job bump-module-versions-2013-05-22T15-28-56.05Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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
