Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81480 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:~danielturcanu/zorba/plan-serializer into lp:zorba
Review: Approve -- https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528 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:~danielturcanu/zorba/mytrunk into lp:zorba
The proposal to merge lp:~danielturcanu/zorba/mytrunk into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 -- https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 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:~danielturcanu/zorba/mytrunk into lp:zorba
Review: Approve -- https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 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:~danielturcanu/zorba/mytrunk into lp:zorba
> Sorry, I still don't understand why you added the zorba/config.h include. I > was able to fix the included test case locally by doing only the change in > strings_impl.cpp; it doesn't seem like the dict_XX_cpp.xq change is related at > all. And I still think that adding that #include is a bad idea unless it's > vitally necessary, because Zorba already has far too many header dependencies. Chris, I agree with Daniel that the include is necessary. For example, dict_en.cpp uses guards such as ZORBA_NO_FULL_TEXT to enable or disabled certain errors. Those guards are only available if config.h is included. -- https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing
into lp:zorba.
Requested reviews:
William Candillon (wcandillon)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX"
https://bugs.launchpad.net/zorba/+bug/867133
For more details, see:
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347
- cleanup
- ChangeLog preparations for 2.1 release
- fix for bug #867133 (SWIG PHP build failure on Mac OSX ). With this fix, the
PHP binding for Mac is re-enabled.
--
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-11-15 08:23:20 +
+++ ChangeLog 2011-11-16 04:14:32 +
@@ -1,11 +1,10 @@
Zorba - The XQuery Processor
-version 2.x
+version 2.1
* Modified C++ API to add isSequential, getExternalVariables, and
isBoundExternalVariable Functions
* Custom Full-text thesaurus using Zorba URI resolver mechanism.
- * Fixed bug #3401971 (node-by-reference on dynamic collections)
* Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a
sequence of integers)
* documentation improvements
@@ -17,7 +16,6 @@
* Fixed bug #3404689 (assignment problem in flwor)
* Fix for bug #3404450 (testdriver_mt problem: caching and validation of docs)
* Fixed installation bug to not install the .so for test modules
- * Fix for running ctest on Windows
* Fixed bug #3390410 (Adding a node to a collection causes out of bound in vector)
* Fixed bug #3406200 (node types were not being moved to new tree during node detach)
* Fixed bug #3406191 (Namespace bindings lost after update due to bug in node detach)
@@ -44,7 +42,6 @@
* Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
* Implemented the probe-index-range-value for general indexes
* Removed ZSTR0005 and ZSTR0006 error codes
- * Fixed bug #867662 ("nullptr" warning)
* Fixed bug #868258 (Assertion failure with two delete collection)
* Fixed bug #871623 and #871629 (assertion failures with insertions in dynamic collections)
* Fixed bug #867262 (allow reuse of iterator over ExtFuncArgItemSequence)
@@ -57,6 +54,7 @@
xs:anyAtomicType or xs:untypedAtomic.
* Added undo for node revalidation
* Optimization for count(collection()) expressions
+ * Fixed bug #867133 (SWIG PHP build failure on Mac OSX)
* Fixed bug #872796 (validate-in-place can interfere with other update primitives)
* Fixed bug #872799 (validate-in-place can set incorrect types)
* Fixed bug #855715 (Invalid escaped characters in regex not caught)
@@ -67,6 +65,18 @@
* Fixed bug #872502 (validation of the JSON module xqdoc fails)
* Fixed bug #867107 (xqdoc dependency to zorba is wrong)
+version 2.0.3
+ * Fixed bug #867662 ("nullptr" warning)
+ * documentation improvements
+
+version 2.0.2
+ * Fixed bug #3401971 (node-by-reference on dynamic collections)
+ * documentation improvements
+ * installer improvements
+ * Fixed bug #3403291 (build for Fedora 15)
+ * Don't install the .so for test modules
+ * Fix for running ctest on Windows
+
version 2.0.1
* Custom Full-text stemming.
=== modified file 'cmake_modules/FindPHP5.cmake'
--- cmake_modules/FindPHP5.cmake 2011-08-19 00:03:31 +
+++ cmake_modules/FindPHP5.cmake 2011-11-16 04:14:32 +
@@ -97,6 +97,11 @@
_zend_rsrc_list_get_rsrc_type
_zend_wrong_param_count
_zval_used_for_init
+_zval_is_true
+_zend_lookup_class
+__object_init
+__zend_hash_add_or_update
+_php_strtolower
)
SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS},-U,${symbol}")
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2011-11-15 08:23:20 +
+++ src/compiler/translator/translator.cpp 2011-11-16 04:14:32 +
@@ -2154,7 +2154,8 @@
{
TRACE_VISIT();
- if (!utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$"))
+ if (v.get_encoding().length() != 0 &&
+ !utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$"))
RAISE_ERROR(err::XQST0087, loc, ERROR_PARAMS(v.get_encoding()));
std::string versionStr = v.get_version().str();
=== modified file 'src/store/naive/nsbindings.h'
--- src/store/naive/nsbindings.h 2011-06-14 17:26:33 +
+++ src/store/naive/nsbindings.h 2011-11-16 04:14:32 +
@@ -18,8 +18,9 @@
#include
+#include "zorbatypes/rchandle.h"
#include "zorbamisc/config/platform.h"
-#include "store/api/item.h"
+#include "store/api/shared_types.h"
namespace zorba { namespace simplestore {
=== modified file 'src/store/naive/pul_primitives.h'
--- src/store/naive/pul_primitives.h 2011-10-13 19:44:33 +
+++ src/store/naive/pul_primitives.h 2011-11-16 04:14:32 +
@@ -29,7 +29,11 @@
#include "store/api/index.h" // for index spec obj
#in
[Zorba-coders] [Bug 867133] Re: SWIG PHP build failure on Mac OSX
** Branch linked: lp:~matthias-brantner/zorba/bug-fixing -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867133 Title: SWIG PHP build failure on Mac OSX Status in Zorba - The XQuery Processor: New Bug description: See the zorba coders topic under: "Still SWIG problems..." Linking CXX shared module libzorba_api.so Undefined symbols: "_zval_is_true", referenced from: _wrap_swig_zorba_api_alter_newobject(int, _zval_struct*, _zval_struct**, _zval_struct*, int)in zorba_apiPHP5_wrap.cxx.o "_zend_lookup_class", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o "__object_init", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o (maybe you meant: __object_init_ex) "__zend_hash_add_or_update", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o "_php_strtolower", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o ld: symbol(s) not found collect2: ld returned 1 exit status make[2]: *** [swig/php/libzorba_api.so] Error 1 make[1]: *** [swig/php/CMakeFiles/zorba_api.dir/all] Error 2 make: *** [all] Error 2 To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867133/+subscriptions -- 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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] [Bug 867133] Re: SWIG PHP build failure on Mac OSX
** Changed in: zorba Milestone: None => 2.1 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867133 Title: SWIG PHP build failure on Mac OSX Status in Zorba - The XQuery Processor: New Bug description: See the zorba coders topic under: "Still SWIG problems..." Linking CXX shared module libzorba_api.so Undefined symbols: "_zval_is_true", referenced from: _wrap_swig_zorba_api_alter_newobject(int, _zval_struct*, _zval_struct**, _zval_struct*, int)in zorba_apiPHP5_wrap.cxx.o "_zend_lookup_class", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o "__object_init", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o (maybe you meant: __object_init_ex) "__zend_hash_add_or_update", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o "_php_strtolower", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o ld: symbol(s) not found collect2: ld returned 1 exit status make[2]: *** [swig/php/libzorba_api.so] Error 1 make[1]: *** [swig/php/CMakeFiles/zorba_api.dir/all] Error 2 make: *** [all] Error 2 To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867133/+subscriptions -- 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/substring-intopt into lp:zorba
xs:integer has infinite precision. zstring's size_t is usually much smaller. Hence, I think we have to cast down to size_t and do range checking. If the integer is too big, the raised exception should be caught and a query location of the corresponding argument should be added. -- https://code.launchpad.net/~zorba-coders/zorba/substring-intopt/+merge/81949 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/substring-intopt into lp:zorba
Did the changes, though the use of xs_integer instead of xs_int didn't work as elegantly as I expected. Can be easily undone though. -- https://code.launchpad.net/~zorba-coders/zorba/substring-intopt/+merge/81949 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 => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/82301 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/82301 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/82301 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
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/82301 Restored changes made in r10538 and overwritten in r10541. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/82301 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/substring-intopt into lp:zorba
Some cleanup is needed: 1. The specialize method on the fn:substring function is not needed anymore 2. In the translator, the code that handles fn:subsequence and fn:substring is almost the same, and the 2 cases should be unified (like it is done in type_rules.cpp). Also, SubstringIntOptIterator::nextImp() should use xs_integer, instead of xs_int, for start and len. -- https://code.launchpad.net/~zorba-coders/zorba/substring-intopt/+merge/81949 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] [Bug 867133] Re: SWIG PHP build failure on Mac OSX
Hello, Indeed this fix the bug. Please find the patch enclosed. ** Patch added: "php.patch" https://bugs.launchpad.net/zorba/+bug/867133/+attachment/2597640/+files/php.patch -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867133 Title: SWIG PHP build failure on Mac OSX Status in Zorba - The XQuery Processor: New Bug description: See the zorba coders topic under: "Still SWIG problems..." Linking CXX shared module libzorba_api.so Undefined symbols: "_zval_is_true", referenced from: _wrap_swig_zorba_api_alter_newobject(int, _zval_struct*, _zval_struct**, _zval_struct*, int)in zorba_apiPHP5_wrap.cxx.o "_zend_lookup_class", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o "__object_init", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o (maybe you meant: __object_init_ex) "__zend_hash_add_or_update", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o "_php_strtolower", referenced from: SWIG_ZTS_SetPointerZval(_zval_struct*, void*, swig_type_info*, int)in zorba_apiPHP5_wrap.cxx.o ld: symbol(s) not found collect2: ld returned 1 exit status make[2]: *** [swig/php/libzorba_api.so] Error 1 make[1]: *** [swig/php/CMakeFiles/zorba_api.dir/all] Error 2 make: *** [all] Error 2 To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867133/+subscriptions -- 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/xqxq-api-changes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqxq-api-changes into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 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/xqxq-api-changes into lp:zorba
Validation queue job xqxq-api-changes-2011-11-15T09-05-13.592Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 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/xqxq-api-changes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-api-changes-2011-11-15T09-05-13.592Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 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/xqxq-api-changes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqxq-api-changes into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 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/xqxq-api-changes into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 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
