Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 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/api-var-annot into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 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/api-var-annot into lp:zorba
Review: Needs Information Why not allow introspection for non external variables? Does it make sense to restrict it? -- https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 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/fix-boost-typedef into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-boost-typedef/+merge/217976 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/feature-setvar-typed into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 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/feature-setvar-typed into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 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/feature-setvar-typed--jdbc into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-setvar-typed--email into lp:zorba/email-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- 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/feature-setvar-typed--graphviz into lp:zorba/graphviz-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 Your team Zorba Coders is subscribed to branch lp:zorba/graphviz-module. -- 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/feature-function-caching into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-function-caching/+merge/217487 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 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/feature-sleep_module into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-sleep_module/+merge/216475 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/feature-sleep_module into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/feature-sleep_module into lp:zorba.
Commit message:
initial version of sleep module
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-sleep_module/+merge/216475
initial version of sleep module
--
https://code.launchpad.net/~zorba-coders/zorba/feature-sleep_module/+merge/216475
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt 2014-01-03 17:31:44 +
+++ modules/CMakeLists.txt 2014-04-18 18:30:22 +
@@ -27,6 +27,7 @@
ADD_SUBDIRECTORY(schema)
ADD_SUBDIRECTORY(sctx)
ADD_SUBDIRECTORY(sequence)
+ADD_SUBDIRECTORY(sleep)
ADD_SUBDIRECTORY(store)
ADD_SUBDIRECTORY(structured-items)
ADD_SUBDIRECTORY(uri)
=== added directory 'modules/sleep'
=== added file 'modules/sleep/CMakeLists.txt'
--- modules/sleep/CMakeLists.txt 1970-01-01 00:00:00 +
+++ modules/sleep/CMakeLists.txt 2014-04-18 18:30:22 +
@@ -0,0 +1,21 @@
+# Copyright 2006-2014 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DECLARE_ZORBA_MODULE(
+ FILE sleep.xq
+ URI http://zorba.io/modules/sleep;
+ VERSION 1.0
+)
+
+# vim:set et sw=2 ts=2:
=== added file 'modules/sleep/sleep.xq'
--- modules/sleep/sleep.xq 1970-01-01 00:00:00 +
+++ modules/sleep/sleep.xq 2014-04-18 18:30:22 +
@@ -0,0 +1,41 @@
+xquery version 3.0;
+
+(:
+ : Copyright 2006-2013 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the License);
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an AS IS BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+(:~
+ : This module provides a function to put the currently running query
+ : to sleep.
+ :
+ :)
+module namespace sleep = http://zorba.io/modules/sleep;;
+
+declare namespace an = http://zorba.io/annotations;;
+
+declare namespace ver = http://zorba.io/options/versioning;;
+declare option ver:module-version 1.0;
+
+(:~
+ : Puts the currently running query to sleep.
+ : This function is mainly useful in development e.g. to simulate the
+ : effects of long-running tasks wrt. the concurrent execution of
+ : requests.
+ :
+ : @param $millis the number of milliseconds to sleep
+ : @return the function is sequential and returns the empty sequence
+ :)
+declare %an:sequential function sleep:millis($millis as xs:integer)
+ as empty-sequence() external;
=== added directory 'modules/sleep/sleep.xq.src'
=== added file 'modules/sleep/sleep.xq.src/sleep.cpp'
--- modules/sleep/sleep.xq.src/sleep.cpp 1970-01-01 00:00:00 +
+++ modules/sleep/sleep.xq.src/sleep.cpp 2014-04-18 18:30:22 +
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2006-2014 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include sleep.h
+
+#ifdef WIN32
+# include windows.h
+#else
+# include time.h
+#endif
+#include stdlib.h
+#include limits
+#include zorba/item_factory.h
+#include zorba/empty_sequence.h
+#include zorba/user_exception.h
+
+namespace zorba { namespace sleep {
+
+MillisFunction::~MillisFunction()
+{}
+
+zorba::ItemSequence_t
+MillisFunction::evaluate(
+ const Arguments_t aArgs,
+ const zorba::StaticContext*,
+ const zorba::DynamicContext*) const
+{
+ // getIntegerValue is not available in Zorba
+ // = get the string, parse it, and check the limits
+ Item lRequestItem;
+ Iterator_t arg0_iter = aArgs[0]-getIterator();
+ arg0_iter-open();
+ arg0_iter-next(lRequestItem);
+ arg0_iter-close();
+
+ std::stringstream lStream;
+ unsigned int lMillis;
+
+ zorba
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/http-client-update into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/http-client-update/+merge/216204 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/fix-fncall-iterator into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-fncall-iterator/+merge/215934 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 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/xqdoc-improvements into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-improvements/+merge/204669 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/trim-http_status into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/trim-http_status
into lp:zorba.
Commit message:
fix bug causing an untrimmed status message in the result of an http request
Requested reviews:
Matthias Brantner (matthias-brantner)
William Candillon (wcandillon)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314
fix bug causing an untrimmed status message in the result of an http request
--
https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/http-client/json/http-client.xq.src/http_response_parser.cpp'
--- modules/http-client/json/http-client.xq.src/http_response_parser.cpp 2014-01-10 15:23:51 +
+++ modules/http-client/json/http-client.xq.src/http_response_parser.cpp 2014-04-04 17:28:32 +
@@ -30,6 +30,7 @@
#include zorba/item.h
#include zorba/item_factory.h
#include zorba/util/transcode_stream.h
+#include zorba/zorba_functions.h
#include zorba/xmldatamanager.h
#include zorba/xquery_exception.h
#include zorba/xquery_exception.h
@@ -286,12 +287,15 @@
void HttpResponseParser::parseStatusAndMessage(std::string const aHeader)
{
-std::string::size_type lPos = aHeader.find(' ');
-assert(lPos != std::string::npos);
-std::string lStatus = aHeader.substr(lPos, aHeader.find(' ', lPos + 1));
+zorba::String lHeader(aHeader);
+zfn::trim(lHeader);
+zorba::String::size_type lPos = aHeader.find(' ');
+assert(lPos != zorba::String::npos);
+zorba::String lStatus = aHeader.substr(lPos, aHeader.find(' ', lPos + 1));
theMessage = aHeader.substr(aHeader.find(' ', lPos + 1) + 1);
+
{
- std::string::size_type lPosition = theMessage.size() - 1;
+ zorba::String::size_type lPosition = theMessage.size() - 1;
while (true) {
if (lPosition != std::string::npos) {
break;
@@ -304,7 +308,7 @@
}
theMessage = theMessage.substr(0, lPosition + 1);
}
-std::stringstream lStream(lStatus);
+std::stringstream lStream(lStatus.c_str());
lStream theStatus;
// everything that is not a valid http status is an error
if (theStatus 100) {
--
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/bug1302240 into lp:zorba
Review: Needs Fixing Unfortunately, this doesn't work in the remote queue: -- Found cURL library -- /usr/lib/x86_64-linux-gnu/libcurl.so CMake Warning at modules/ftp-client/CMakeLists.txt:19 (FIND_PACKAGE): Could not find module FindCurl.cmake or a configuration file for package Curl. Adjust CMAKE_MODULE_PATH to find FindCurl.cmake or set Curl_DIR to the directory containing a CMake configuration file for Curl. The file will have one of the following names: CurlConfig.cmake curl-config.cmake CMake Error at modules/ftp-client/CMakeLists.txt:20 (INCLUDE_DIRECTORIES): include_directories given empty-string as include directory. -- Add library ftp-client.xq CMake Warning at modules/http-client/CMakeLists.txt:19 (FIND_PACKAGE): Could not find module FindCurl.cmake or a configuration file for package Curl. Adjust CMAKE_MODULE_PATH to find FindCurl.cmake or set Curl_DIR to the directory containing a CMake configuration file for Curl. The file will have one of the following names: CurlConfig.cmake curl-config.cmake CMake Error at modules/http-client/CMakeLists.txt:20 (INCLUDE_DIRECTORIES): include_directories given empty-string as include directory. -- https://code.launchpad.net/~zorba-coders/zorba/bug1302240/+merge/214137 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/213942 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 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/no_commas into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/no_commas/+merge/210707 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 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/feature-profile into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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/feature-profile into lp:zorba
Review: Needs Fixing ./bin/zorba -h Error: No value given for --debug-host option Use -h for help. -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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/feature-profile into lp:zorba
In addition. The timers would only be updated and checked if the query is in profile mode, right? -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 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/feature-profile into lp:zorba
Review: Needs Information What about showing elapsed time which seems more useful if making calls to the outside world (e.g. http). -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: Fixed attribute names with spaces in iterator printer. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Needs Fixing It's actually not pure JSON or pure XML. JSON doesn't support a sequence of objects. This would need to become an array. Same for XML, where we would need introduce an artificial root element. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207332 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Needs Fixing zorba -q '1+1' --iterator-tree doesn't work but the help says there was a default. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Is the removal of setPrintIteratorTree backwards incompatible? -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/206087 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/jdbc_connect-scripting-bug into lp:zorba/jdbc-module
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/jdbc_connect-scripting-bug into lp:zorba/jdbc-module.
Commit message:
fix [SQL08003] There is no connection to any valid source bug that occurrs
when
not binding a connection to a scripting variable.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jdbc_connect-scripting-bug/+merge/205686
--
https://code.launchpad.net/~zorba-coders/zorba/jdbc_connect-scripting-bug/+merge/205686
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== modified file 'include/jdbc.h'
--- include/jdbc.h 2013-06-11 20:47:52 +
+++ include/jdbc.h 2014-02-11 03:58:32 +
@@ -22,7 +22,7 @@
#include JavaVMSingleton.h
#include sqltypes.h
-#define JDBC_MODULE_NAMESPACE http://www.zorba-xquery.com/modules/jdbc;
+#define JDBC_MODULE_NAMESPACE http://zorba.io/modules/jdbc;
#define INSTANCE_MAP_CONNECTIONS JdbcInstanceMapConnections
#define INSTANCE_MAP_STATEMENTS JdbcInstanceMapStatements
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-11-23 00:45:06 +
+++ src/CMakeLists.txt 2014-02-11 03:58:32 +
@@ -27,7 +27,7 @@
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
DECLARE_ZORBA_MODULE (
- URI http://www.zorba-xquery.com/modules/jdbc;
+ URI http://zorba.io/modules/jdbc;
VERSION 1.0
FILE jdbc.xq
LINK_LIBRARIES ${JAVA_JVM_LIBRARY} ${zorba_util-jvm_module_LIBRARIES})
=== modified file 'src/jdbc.xq'
--- src/jdbc.xq 2013-08-09 09:37:05 +
+++ src/jdbc.xq 2014-02-11 03:58:32 +
@@ -1,7 +1,7 @@
-xquery version 3.0;
+jsoniq version 1.0;
(:
- : Copyright 2006-2012 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
:
: Licensed under the Apache License, Version 2.0 (the License);
: you may not use this file except in compliance with the License.
@@ -17,14 +17,19 @@
:)
(:~
- : This module contains functions to connect to any JDBC datasource
- : using jvm-util module to handle Java interaction.
+ : This module provides functions to communicate to JDBC datasources.
+ : For example, it provides functions to execute queries or updates
+ : using SQL.
+ : p/
+ : Results of queries are returned as sequences of JSON objects,
+ : one object per row. Basic SQL types are mapped to JSONiq types.
+ : All other types are mapped to string or base64Binary.
:
: @author Rodolfo Ochoa
: @project DB Drivers/JDBC
:)
-module namespace jdbc = http://www.zorba-xquery.com/modules/jdbc;;
+module namespace jdbc = http://zorba.io/modules/jdbc;;
declare namespace err = http://www.w3.org/2005/xqt-errors;;
declare namespace ver = http://zorba.io/options/versioning;;
@@ -32,38 +37,61 @@
declare option ver:module-version 1.0;
(:~
- : This variable represents the NOT-SUPPORTED level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the NOT-SUPPORTED level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:NOT-SUPPORTED:= NOT-SUPPORTED;
+
(:~
- : This variable represents the READ-COMMITTED level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the READ-COMMITTED level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:READ-COMMITTED := READ-COMMITTED;
+
(:~
- : This variable represents the READ-UNCOMMITTED level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the READ-UNCOMMITTED level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:READ-UNCOMMITTED := READ-UNCOMMITTED;
+
(:~
- : This variable represents the REPEATABLE-READ level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the REPEATABLE-READ level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:REPEATABLE-READ := REPEATABLE-READ;
+
(:~
- : This variable represents the SERIALIZABLE level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the SERIALIZABLE level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:SERIALIZABLE := SERIALIZABLE;
-(:
- : 2 CONNECTION HANDLING
- :)
-
(:~
- : Opens a connection to a database.
- : Returns a URI identifying the connection that has been opened. The implementing code determines from the $connection-config either explicitly (interpreting the driver attribute) or implicitly (using the type attribute) which driver it has to load.
- :
- : @param $connection-config json object that has the host and user informations.
- : @option url URL of the server, this option must be specified and should be declared according to JDBC specification.
- : @option user username for the server
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc_connect-scripting-bug into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jdbc_connect-scripting-bug/+merge/205686 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/205515 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/205515 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 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:~paul-lucas/zorba/pjl-misc2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/203436 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:~paul-lucas/zorba/pjl-misc2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/202392 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/pub_iter_imp into lp:zorba
Review: Approve Why are there plain english error messages in there? For example, sequence of more than one item. -- https://code.launchpad.net/~zorba-coders/zorba/pub_iter_imp/+merge/201708 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/201882 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/csv-fixes into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/csv-fixes/+merge/202007 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/csv-fixes into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/csv-fixes/+merge/202019 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/fix-variable_error_msg into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/fix-variable_error_msg into lp:zorba. Commit message: fix broken output of variable name Requested reviews: Cristian Dumitru (cdumitru) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-variable_error_msg/+merge/202029 -- https://code.launchpad.net/~zorba-coders/zorba/fix-variable_error_msg/+merge/202029 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/pub_iter_imp into lp:zorba
The problem is that there is a TreatIterator put in place checking the return type of the function. FnCountIterator id=0x1926410 TreatIterator type=[JSONXQType object] quant=* id=0x191d1e0 ExtFunctionCallIterator id=0x193e380 TreatIterator type=xs:anyURI quant= id=0x191cf20 ExtFunctionCallIterator id=0x191e490 SingletonIterator value=xs:string(127.0.0.1) id=0x1927400/ JSONObjectIterator id=0x19264f0/ /ExtFunctionCallIterator /TreatIterator SingletonIterator value=xs:string(/) id=0x19730c0/ /ExtFunctionCallIterator /TreatIterator /FnCountIterator The TreatIterator doesn't override count and, hence, the count call never gets executed on the ExtFunctionCallIterator. Could you please look at the implementation of the TreatIterator. I don't think this can easily be done but maybe you have an idea. -- https://code.launchpad.net/~zorba-coders/zorba/pub_iter_imp/+merge/201708 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/fix-external_func_exceptions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/201262 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/fix-external_func_exceptions into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/fix-external_func_exceptions into lp:zorba.
Commit message:
also intercept ZorbaException such that it's not wrapped into a general dynamic
exception
Requested reviews:
Matthias Brantner (matthias-brantner)
Cristian Dumitru (cdumitru)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/201262
--
https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/201262
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp 2014-01-08 21:49:13 +
+++ src/runtime/core/fncall_iterator.cpp 2014-01-10 22:35:31 +
@@ -911,6 +911,11 @@
set_source( e, loc );
throw;
}
+ catch (ZorbaException e)
+ {
+set_source( e, loc );
+throw;
+ }
catch (std::exception e)
{
throw XQUERY_EXCEPTION(
--
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/feature-ftp-client into lp:zorba
Review: Needs Fixing
- I tried
import module namespace ftp = http://zorba.io/modules/ftp-client;;
ftp:list(ftp:connect(ftp://192.168.1.18;, {user: brantner,
password : XXX}), /)
doesn't list anything on the default os x ftp server
- Nothing seems to happen if I provide a wrong password.
- Remove the disconnect function.
- Can you make the connect, get-*, and list functions nonsequential (i.e.
deterministic)
- Also add new functions signatures connect-nondeterministc,
get-*-nondeterministic, and list-nondeterministic. The implementation for those
functions can be the same but they should be annotated as nondeterministic.
--
https://code.launchpad.net/~zorba-coders/zorba/feature-ftp-client/+merge/201082
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/feature-ftp-client into lp:zorba
declare function
ftp:connect( $uri as string, $options as object )
as anyURI external;
declare %an:nondeterministic function
ftp:connect-nondeterministic( $uri as string, $options as object )
as anyURI external;
declare %an:sequential function
ftp:delete( $conn as string, $remote-path as string )
external;
declare function
ftp:get-binary( $conn as anyURI, $remote-path as string )
as base64Binary external;
declare %an:nondeterministic function
ftp:get-binary-nondeterministic( $conn as anyURI, $remote-path as string )
as base64Binary external;
declare function
ftp:get-text( $conn as anyURI, $remote-path as string, $encoding as string )
as string external;
declare %an:nondeterministic function
ftp:get-text-nondeterministic( $conn as anyURI, $remote-path as string,
$encoding as string )
as string external;
declare function
ftp:get-text( $conn as anyURI, $remote-path as string )
as string
{
ftp:get-text( $conn, $remote-path, UTF-8 )
};
declare %an:nondeterministic function
ftp:get-text-nondeterministic( $conn as anyURI, $remote-path as string )
as string
{
ftp:get-text( $conn, $remote-path, UTF-8 )
};
declare function
ftp:list( $conn as anyURI, $remote-path as string )
as object* external;
declare %an:nondeterministic function
ftp:list-nondeterministic( $conn as anyURI, $remote-path as string )
as object* external;
declare %an:sequential function
ftp:mkdir( $conn as string, $remote-path as string )
external;
declare %an:sequential function
ftp:put-binary( $conn as anyURI, $binary as base64Binary,
$remote-path as string )
external;
declare %an:sequential function
ftp:put-text( $conn as anyURI, $text as string, $remote-path as string,
$encoding as string )
external;
declare %an:sequential function
ftp:put-text( $conn as anyURI, $text as string, $remote-path as string )
{
ftp:put-text( $conn, $text, $remote-path, UTF-8 )
};
declare %an:sequential function
ftp:rename( $conn as string, $remote-from-path as string,
$remote-to-path as string )
external;
declare %an:sequential function
ftp:rmdir( $conn as string, $remote-path as string )
external;
--
https://code.launchpad.net/~zorba-coders/zorba/feature-ftp-client/+merge/201082
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/feature-ftp-client into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-ftp-client/+merge/201082 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/201083 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/fix-external_func_exceptions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/200922 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/fix-external_func_exceptions into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/fix-external_func_exceptions into lp:zorba.
Commit message:
allow arbitrary exceptions raised by external functions to be caught by
try-catch
Requested reviews:
Matthias Brantner (matthias-brantner)
Federico Cavalieri (fcavalieri)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/200922
--
https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/200922
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp 2013-09-26 09:38:51 +
+++ src/runtime/core/fncall_iterator.cpp 2014-01-08 22:01:01 +
@@ -908,9 +908,17 @@
}
catch (XQueryException e)
{
- set_source( e, loc );
- throw;
- }
+set_source( e, loc );
+throw;
+ }
+ catch (std::exception e)
+ {
+throw XQUERY_EXCEPTION(
+ zerr::ZXQP0001_DYNAMIC_RUNTIME_ERROR,
+ ERROR_PARAMS(e.what()),
+ ERROR_LOC(loc));
+ }
+
if(state-theResult.get() != NULL)
{
=== modified file 'test/unit/CMakeLists.txt'
--- test/unit/CMakeLists.txt 2013-05-31 23:44:41 +
+++ test/unit/CMakeLists.txt 2014-01-08 22:01:01 +
@@ -34,6 +34,7 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ext_main.xq ${CMAKE_CURRENT_BINARY_DIR}/ext_main.xq)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ext_main2.xq ${CMAKE_CURRENT_BINARY_DIR}/ext_main2.xq)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ext_main3.xq ${CMAKE_CURRENT_BINARY_DIR}/ext_main3.xq)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ext_main4.xq ${CMAKE_CURRENT_BINARY_DIR}/ext_main4.xq)
#belongs to test no_folding.cpp
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/fold_mod1.xq ${CMAKE_CURRENT_BINARY_DIR}/fold_mod1.xq)
=== added file 'test/unit/ext_main4.xq'
--- test/unit/ext_main4.xq 1970-01-01 00:00:00 +
+++ test/unit/ext_main4.xq 2014-01-08 22:01:01 +
@@ -0,0 +1,22 @@
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the License);
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an AS IS BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+
+import module namespace ext = http://www.zorba-xquery.com/m; at file:///${CMAKE_CURRENT_BINARY_DIR}/ext_mod2.xq;
+
+
+ext:bar5()
+
=== modified file 'test/unit/ext_mod2.xq'
--- test/unit/ext_mod2.xq 2013-02-07 17:24:36 +
+++ test/unit/ext_mod2.xq 2014-01-08 22:01:01 +
@@ -17,3 +17,5 @@
module namespace ext = http://www.zorba-xquery.com/m;;
declare function ext:bar4($s as item()*) as item()* external;
+
+declare function ext:bar5() external;
=== modified file 'test/unit/external_function.cpp'
--- test/unit/external_function.cpp 2013-05-28 00:58:27 +
+++ test/unit/external_function.cpp 2014-01-08 22:01:01 +
@@ -138,6 +138,19 @@
}
};
+class MySimpleExternalFunction5 : public NonContextualExternalFunction
+{
+public:
+ String getURI() const { return http://www.zorba-xquery.com/m;; }
+
+ String getLocalName() const { return bar5; }
+
+ ItemSequence_t evaluate(const ExternalFunction::Arguments_t args) const
+ {
+throw std::exception();
+ }
+};
+
class MyExternalModule : public ExternalModule
{
protected:
@@ -145,6 +158,7 @@
MySimpleExternalFunction2 bar2;
MySimpleExternalFunction3 bar3;
MySimpleExternalFunction4 bar4;
+ MySimpleExternalFunction5 bar5;
public:
String getURI() const { return http://www.zorba-xquery.com/m;; }
@@ -157,6 +171,8 @@
return const_castMySimpleExternalFunction3*(bar3);
else if (aLocalname == bar4)
return const_castMySimpleExternalFunction4*(bar4);
+else if (aLocalname == bar5)
+return const_castMySimpleExternalFunction5*(bar5);
else
return const_castMySimpleExternalFunction2*(bar2);
}
@@ -378,6 +394,42 @@
return true;
}
+bool
+external_function_test_5(Zorba* aZorba)
+{
+ try
+ {
+std::ifstream lIn(ext_main4.xq);
+assert(lIn.good());
+std::ostringstream lOut;
+MyExternalModule lMod;
+
+StaticContext_t lSctx = aZorba-createStaticContext();
+lSctx-registerModule(lMod);
+
+{
+ XQuery_t lQuery = aZorba-compileQuery(lIn, lSctx);
+
+ std::cout lQuery std::endl;
+}
+ }
+ catch (XQueryException qe)
+ {
+if (std::string(ZXQP0001) == qe.diagnostic().qname().localname())
+{
+ std::cerr qe std::endl;
+ return true;
+} else {
+ std::cerr qe std::endl;
+ return false;
+}
+ }
+ catch (...)
+ {
+return false
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-accesses-dyn-ctx into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-accesses-dyn-ctx/+merge/200322 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/fix-dbedit-parse-xml-segfault into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-dbedit-parse-xml-segfault/+merge/199707 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/bug-1262732 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1262732/+merge/199785 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/bug-1262732 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-1262732 into
lp:zorba.
Commit message:
patch for bug #1262732 'error [zerr:ZXQP0002]: false: assertion failed'
Requested reviews:
Matthias Brantner (matthias-brantner)
William Candillon (wcandillon)
Related bugs:
Bug #1262732 in Zorba: error [zerr:ZXQP0002]: false: assertion failed
https://bugs.launchpad.net/zorba/+bug/1262732
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1262732/+merge/199785
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1262732/+merge/199785
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2013-09-17 21:12:49 +
+++ src/store/naive/node_items.cpp 2013-12-20 10:36:38 +
@@ -411,6 +411,9 @@
}
assert(ite != end);
+} else if (relPos == OrdPath::SELF)
+{
+ return 1;
}
else
{
--
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/fix-random-annotation into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-random-annotation/+merge/199706 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205 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/feature-jsonml_object into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-jsonml_object/+merge/198858 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/feature-jsoniqpp into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-jsoniqpp/+merge/197991 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/deadlinks into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/deadlinks/+merge/197836 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/deadlinks into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/deadlinks into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/deadlinks/+merge/197836 -- https://code.launchpad.net/~zorba-coders/zorba/deadlinks/+merge/197836 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/196806 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/zorba-30_ChangeLog into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/zorba-30_ChangeLog into lp:zorba. Commit message: improved changelog Requested reviews: Chris Hillery (ceejatec) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-30_ChangeLog/+merge/194947 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-30_ChangeLog/+merge/194947 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2013-10-01 22:39:42 + +++ ChangeLog 2013-11-12 21:48:25 + @@ -9,84 +9,83 @@ to http://zorba.io/ . New Features: - * 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 + * The grouping variable in a group by clause is now optional. + * JSONiq extension: New syntax for JSONiq array lookup: expr1[[expr2]]. + * JSONiq extension: 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 + * 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, + * 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 + * JSONiq extension: EBV on jsoniq items now returns true (instead of raising an error). + * JSONiq extension: jn:analyze-string and jn:serializeFixed (#1192246). + * New CSV-to-JSON converter module (#1189840). + * Support XQuery 3.0 item-separator serialization parameter (#1217140). Optimizations: * Implemented hoisting optimization for general FLWOR. * Implemented flwor-merge optimization for general FLWOR. * Implemented document-ordering elimination for general FLWOR. * Applied count optimization to the return clause of general FLWORs. - * Optimized implementation of fn:deep-equal + * Optimized implementation of fn:deep-equal. * No need to apply document ordering on the domain expression of a FOR clause if the FOR clause is followed by an orderby or groupby clause. * Replaced use of create_value_type() in runtime with getTypeCode(). - * Optimized switch expression + * Optimized switch expression. * Optimized implementation of function caching and removed the restriction on the return type. * No node ordering/distinct required for self axis. - * More aggressive eliminationof unused LET variables + * More aggressive elimination of unused LET variables. + * Improved performance of castable as expression (#1194720). Bug Fixes/Other Changes: - * Fixed bug #1117952 (Improve XML error output format) - * Fixed bug #1188084 (fn-replace-42 failing) - * Fixed bug #1194720 (castable as performance) - * Fixed bug #1189636 (transcoding hexBinary streambuf) - * Fixed bug in hoisting through try-catch expr - * Fixed bug #1192246 (bring fn:analyze-string and fn:serialize to jsoniq) - * Fixed bug #1162631 (format-integer 'w' format of negative numbers) - * Fixed bug #1189840 (Need JSONiq CSV module) - * Fixed bug #1217140 (Support XQuery 3.0 item-separator serialization parameter) - * Fixed bug #942171 (file module to allow for arbitrary encodings) - * Fixed bug #1192285 (Have JSON token know number subtype) - * Fixed bug #1210628 (file:last-modified returns wrong month) - * Fixed bug #1190261 (relative paths bug in file module) - * Fixed bug #1189798 (Update core module errors) - * Fixed bug #1187537 (Eliminate (or at least reduce) use of MAX_PATH) - * Fixed bug #1058398 (set-based sequence operations) - * Fixed bug #1180220 (Consolidate redundant path/file public APIs) - * Fixed bug #1158052 (createBase64Binary() API too subtle) - * Fixed bug #1103115 (Timezone units as hours are wrong) - * Fixed bug #1188280 (casting xs:id to xs:ncname) - * Fixed bug in casting to xs:NCName + * Fixed bug #1117952 (Improve XML error output format). + * Fixed bug #1188084 (fn-replace-42 failing). + * Fixed bug #1189636 (transcoding hexBinary streambuf). + * Fixed bug #1162631 (format-integer 'w' format of negative numbers). + * Fixed bug #942171 (file module to allow for arbitrary encodings). + * Fixed bug #1192285 (Have JSON token know number subtype). + * Fixed bug #1210628 (file:last-modified returns wrong month). + * Fixed bug #1190261 (relative paths bug in file module). + * Fixed
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xpath_xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xpath_xqdoc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xpath_xqdoc/+merge/193484 -- https://code.launchpad.net/~zorba-coders/zorba/xpath_xqdoc/+merge/193484 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/xpath_xqdoc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xpath_xqdoc/+merge/193484 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/192822 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/bug-1189862-stack into lp:zorba/stack-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-stack/+merge/190412 Your team Zorba Coders is subscribed to branch lp:zorba/stack-module. -- 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/bug-1189862-queue into lp:zorba/queue-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862-queue/+merge/190414 Your team Zorba Coders is subscribed to branch lp:zorba/queue-module. -- 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/bug-1189862 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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/bug-1189862 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189862/+merge/190266 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/object-lookup-context-item into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/object-lookup-context-item/+merge/190115 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/bug-1189792 into lp:zorba
Review: Needs Fixing Can you provide a test return the function information with an annotation? -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189792/+merge/188504 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/bug-1189792 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189792/+merge/188504 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/bug-1058398 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/188480 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/187605 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/bug-1058398 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-1058398 into lp:zorba. Commit message: Bug #1058398: set-based sequence operations Requested reviews: Matthias Brantner (matthias-brantner) Related bugs: Bug #1058398 in Zorba: set-based sequence operations https://bugs.launchpad.net/zorba/+bug/1058398 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2013-09-22 17:52:24 + +++ ChangeLog 2013-09-27 03:33:21 + @@ -54,6 +54,7 @@ * Fixed bug #1190261 (relative paths bug in file module) * Fixed bug #1189798 (Update core module errors) * Fixed bug #1187537 (Eliminate (or at least reduce) use of MAX_PATH) + * Fixed bug #1058398 (set-based sequence operations) * Fixed bug #1180220 (Consolidate redundant path/file public APIs) * Fixed bug #1158052 (createBase64Binary() API too subtle) * Fixed bug #1103115 (Timezone units as hours are wrong) === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-09-09 23:47:17 + +++ modules/CMakeLists.txt 2013-09-27 03:33:21 + @@ -13,18 +13,19 @@ # limitations under the License. ADD_SUBDIRECTORY(atomic) -ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(com) -ADD_SUBDIRECTORY(org) +ADD_SUBDIRECTORY(full-text) ADD_SUBDIRECTORY(functx) -ADD_SUBDIRECTORY(zorba-query) -ADD_SUBDIRECTORY(w3c) -ADD_SUBDIRECTORY(full-text) -ADD_SUBDIRECTORY(xml) ADD_SUBDIRECTORY(http-client) +ADD_SUBDIRECTORY(item) ADD_SUBDIRECTORY(json) +ADD_SUBDIRECTORY(org) +ADD_SUBDIRECTORY(sequence) +ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(structured-items) -ADD_SUBDIRECTORY(item) +ADD_SUBDIRECTORY(w3c) +ADD_SUBDIRECTORY(xml) +ADD_SUBDIRECTORY(zorba-query) # Add external module projects - any subdirectories of a directory === added directory 'modules/sequence' === added file 'modules/sequence/CMakeLists.txt' --- modules/sequence/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/sequence/CMakeLists.txt 2013-09-27 03:33:21 + @@ -0,0 +1,18 @@ +# Copyright 2013 The FLWOR Foundation. +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DECLARE_ZORBA_MODULE(FILE sequence.xq VERSION 1.0 + URI http://zorba.io/modules/sequence;) + +# vim:set et sw=2 ts=2: === added file 'modules/sequence/sequence.xq' --- modules/sequence/sequence.xq 1970-01-01 00:00:00 + +++ modules/sequence/sequence.xq 2013-09-27 03:33:21 + @@ -0,0 +1,73 @@ +xquery version 3.0; + +(: + : Copyright 2006-2013 The FLWOR Foundation. + : + : Licensed under the Apache License, Version 2.0 (the License); + : you may not use this file except in compliance with the License. + : You may obtain a copy of the License at + : + : http://www.apache.org/licenses/LICENSE-2.0 + : + : Unless required by applicable law or agreed to in writing, software + : distributed under the License is distributed on an AS IS BASIS, + : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + : See the License for the specific language governing permissions and + : limitations under the License. + :) + +(:===:) + +(:~ + : This module provides an XQuery API to perform set operations on sequences. + : + : @author Paul J. Lucas + : @project Zorba/Sequence + :) + +module namespace seq = http://zorba.io/modules/sequence;; + +declare namespace ver = http://zorba.io/options/versioning;; +declare option ver:module-version 1.0; + +(:===:) + +(:~ + : Performs an intersection of two sequences. + : + : @param $seq1 The first sequence. + : @param $seq2 The second sequence. + : @return a sequence only containing items from code$seq1/code that are + : also in code$seq2/code + :) +declare function seq:set-intersect( $seq1 as xs:anyAtomicType*, +$seq2 as xs:anyAtomicType* ) + as xs:anyAtomicType* external; + +(:~ + : Performs a union of two sequences. + : + : @param $seq1 The first sequence. + : @param $seq2 The second sequence. + : @return a sequence containing all items from code$seq1/code + : and codeseq2$/code but without duplicates. + :) +declare function seq:set-union( $seq1 as xs:anyAtomicType*, +$seq2 as xs:anyAtomicType* ) + as xs:anyAtomicType* external
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1058398 into lp:zorba
Review: Needs Fixing documentation in Performs TODO -- https://code.launchpad.net/~zorba-coders/zorba/bug-1058398/+merge/187965 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/bug-1192246 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 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/jdbc_module-bug-1188050 into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jdbc_module-bug-1188050/+merge/182757 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/disable_assert-invariant into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/disable_assert-invariant into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/disable_assert-invariant/+merge/182971 -- https://code.launchpad.net/~zorba-coders/zorba/disable_assert-invariant/+merge/182971 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/feature-no-mat-setVariable into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-no-mat-setVariable into lp:zorba has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-no-mat-setVariable/+merge/179831 -- https://code.launchpad.net/~zorba-coders/zorba/feature-no-mat-setVariable/+merge/179831 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/dataguide into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/dataguide into lp:zorba has been updated. Status: Approved = Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026 -- https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026 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/dataguide into lp:zorba
Superseded by use-dataguide merge proposal. -- https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/186402 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/diagnostic-namespaces into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/diagnostic-namespaces/+merge/185610 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
