[Zorba-coders] [Merge] lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/f-nosql-db-trunk-2013-01-04T08-01-50.372Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job f-nosql-db-trunk-2013-01-04T08-01-50.372Z is finished. The final status was: 5 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/add-jdbc-module into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. Commit message: Add JDBC module. Requested reviews: Zorba Coders (zorba-coders) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2013-01-03 20:25:05 + +++ ChangeLog 2013-01-04 08:45:31 + @@ -11,6 +11,7 @@ strip the top-level array from JSON streams. * New info-extraction module for querying concepts and entities in natural language text. + * New JDBC module for manipulating SQL relational databases. * Extended cast and castable expression to allow any simple target type (as specified by XQuery 3.0) === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2012-12-26 07:31:06 + +++ modules/ExternalModules.conf 2013-01-04 08:45:31 + @@ -38,6 +38,7 @@ htmlbzr lp:zorba/html-module zorba-2.7 http-client bzr lp:zorba/http-client-module zorba-2.7 image bzr lp:zorba/image-module +jdbcbzr lp:zorba/jdbc-module languages bzr lp:zorba/languages-modulezorba-2.7 oauth bzr lp:zorba/oauth-modulezorba-2.7 process bzr lp:zorba/process-module zorba-2.7 -- 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/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Commit Message changed to: Add JDBC module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-jdbc-module-2013-01-04T08-48-45.761Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1049378-jvm into lp:zorba/util-jvm-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/bug1049378-jvm into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/bug1049378-jvm into lp:zorba/util-jvm-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/add-jdbc-module into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job add-jdbc-module-2013-01-04T08-48-45.761Z is finished. The final status was: 9 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1049378-jvm into lp:zorba/util-jvm-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1049378-jvm-2013-01-04T09-14-41.11Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/bug1049378-jvm into lp:zorba/util-jvm-module
The attempt to merge lp:~zorba-coders/zorba/bug1049378-jvm into lp:zorba/util-jvm-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1049378-jvm-2013-01-04T09-14-41.11Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/bug1049378-jvm into lp:zorba/util-jvm-module
The proposal to merge lp:~zorba-coders/zorba/bug1049378-jvm into lp:zorba/util-jvm-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/bug1049378-jvm into lp:zorba/util-jvm-module
FYI: ../../../../../zorba_modules/util-jvm/src/JavaVMSingleton.cpp: In static member function 'static zorba::String zorba::jvm::JavaVMSingleton::computeClassPath(const zorba::StaticContext*)': ../../../../../zorba_modules/util-jvm/src/JavaVMSingleton.cpp:195: error: 'env_var_name' was not declared in this scope make[2]: *** [zorba_modules/zorba_util-jvm_module/src/CMakeFiles/util-jvm.dir/JavaVMSingleton.cpp.o] Error 1 -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/bug1049378-jvm into lp:zorba/util-jvm-module
Review: Needs Fixing Must fix the else branch. -- https://code.launchpad.net/~zorba-coders/zorba/bug1049378-jvm/+merge/141692 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/f-nosql-db-trunk-2013-01-04T16-13-43.369Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
1. Improved catch() for unit tests.
2. Improved bpackfail() for streambufs.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949
1. Improved catch() for unit tests.
2. Improved bpackfail() for streambufs.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/internal/streambuf.h'
--- include/zorba/internal/streambuf.h 2012-06-15 17:01:01 +
+++ include/zorba/internal/streambuf.h 2013-01-04 16:16:32 +
@@ -20,12 +20,15 @@
#include streambuf
#include zorba/config.h
+#include zorba/internal/proxy.h
namespace zorba {
namespace internal {
///
+typedef ztd::proxystd::streambuf proxy_streambuf;
+
ZORBA_DLL_PUBLIC
void dealloc_streambuf( std::streambuf* );
=== modified file 'include/zorba/transcode_stream.h'
--- include/zorba/transcode_stream.h 2012-09-19 21:16:15 +
+++ include/zorba/transcode_stream.h 2013-01-04 16:16:32 +
@@ -17,18 +17,11 @@
#ifndef ZORBA_TRANSCODE_STREAM_API_H
#define ZORBA_TRANSCODE_STREAM_API_H
-#include stdexcept
-#include streambuf
-
#include zorba/config.h
-#include zorba/internal/proxy.h
#include zorba/internal/streambuf.h
#include zorba/internal/unique_ptr.h
namespace zorba {
-
-typedef internal::ztd::proxystd::streambuf proxy_streambuf;
-
namespace transcode {
///
@@ -108,7 +101,7 @@
std::streamsize xsputn( char_type const*, std::streamsize );
private:
- std::unique_ptrproxy_streambuf proxy_buf_;
+ std::unique_ptrinternal::proxy_streambuf proxy_buf_;
// forbid
streambuf( streambuf const );
=== modified file 'modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp'
--- modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp 2012-09-19 21:16:15 +
+++ modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp 2013-01-04 16:16:32 +
@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#include cassert
#include cstring
+#include iostream
+#include sstream
+#include stdexcept
#include string
-#include sstream
-#include assert.h
-#include iostream
#include zorba/base64.h
#include zorba/config.h
=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp 2012-09-19 21:16:15 +
+++ modules/org/expath/ns/file.xq.src/file.cpp 2013-01-04 16:16:32 +
@@ -16,9 +16,10 @@
#include file.h
+#include fstream
#include memory
-#include fstream
#include sstream
+#include stdexcept
#include zorba/base64.h
#include zorba/empty_sequence.h
=== modified file 'src/api/base64_streambuf.cpp'
--- src/api/base64_streambuf.cpp 2012-06-15 23:02:52 +
+++ src/api/base64_streambuf.cpp 2013-01-04 16:16:32 +
@@ -110,9 +110,14 @@
}
streambuf::int_type streambuf::pbackfail( int_type c ) {
- if ( gptr() eback() )
-gbump( -1 );
- return orig_buf_-sputbackc( traits_type::to_char_type( c ) );
+ if ( !traits_type::eq_int_type( c, traits_type::eof() )
+ gptr() eback() ) {
+c = orig_buf_-sputbackc( traits_type::to_char_type( c ) );
+if ( !traits_type::eq_int_type( c, traits_type::eof() ) )
+ gbump( -1 );
+return c;
+ }
+ return traits_type::eof();
}
streambuf::int_type streambuf::underflow() {
=== modified file 'src/api/transcode_streambuf.cpp'
--- src/api/transcode_streambuf.cpp 2012-09-19 21:16:15 +
+++ src/api/transcode_streambuf.cpp 2013-01-04 16:16:32 +
@@ -66,7 +66,8 @@
}
streambuf::int_type streambuf::pbackfail( int_type c ) {
- return proxy_buf_-sputbackc( traits_type::to_char_type( c ) );
+ return traits_type::eq_int_type( c, traits_type::eof() ) ?
+ c : proxy_buf_-sputbackc( traits_type::to_char_type( c ) );
}
streambuf::int_type streambuf::uflow() {
=== modified file 'src/unit_tests/memory_manager.cpp'
--- src/unit_tests/memory_manager.cpp 2012-09-19 21:16:15 +
+++ src/unit_tests/memory_manager.cpp 2013-01-04 16:16:32 +
@@ -39,20 +39,20 @@
#define ASSERT_TRUE( EXPR ) assert_true( #EXPR, testName, !!(EXPR) )
#define ASSERT_EXCEPTION( EXPR, EXCEPTION ) \
- try { EXPR; assert_true( #EXPR, testName, false); } \
+ try { EXPR; assert_true( #EXPR, testName, false ); } \
catch (EXCEPTION const ) { } \
- catch ( std::exception const e ){ print_exception( #EXPR, testName, e ); } \
- catch ( ... ) { assert_true ( #EXPR, testName, false ); }
+ catch ( std::exception const e ) { print_exception( #EXPR, testName, e ); } \
+ catch ( ... ) { assert_true( #EXPR, testName, false ); }
#define
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/141949 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/f-nosql-db-trunk into lp:zorba
Validation queue job f-nosql-db-trunk-2013-01-04T16-13-43.369Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/couchbase-view-changes into lp:zorba/couchbase-module
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/couchbase-view-changes into lp:zorba/couchbase-module.
Commit message:
Changed the return type of the view function from xs:string to object()
Requested reviews:
Matthias Brantner (matthias-brantner)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/couchbase-view-changes/+merge/141968
Changed the return type of the view function from xs:string to object()
--
https://code.launchpad.net/~zorba-coders/zorba/couchbase-view-changes/+merge/141968
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.
=== modified file 'examples/example.xq'
--- examples/example.xq 2012-11-07 17:08:47 +
+++ examples/example.xq 2013-01-04 19:28:23 +
@@ -7,7 +7,7 @@
password : null,
bucket : default});
variable $view-name := cb:create-view($instance, zip, zip, {key : doc.state, values : doc.pop});
-variable $data := jn:parse-json(cb:view($instance, $view-name))(rows);
+variable $data := cb:view($instance, $view-name)(rows);
for $d in jn:members($data)
let $state := $d(key)
group by $state
=== modified file 'examples/example2.xq'
--- examples/example2.xq 2012-11-07 17:08:47 +
+++ examples/example2.xq 2013-01-04 19:28:23 +
@@ -8,7 +8,7 @@
bucket : default});
variable $view-name := cb:create-view($instance, zip, zip, {key : doc.state, values : doc.pop});
-variable $data := jn:parse-json(cb:view($instance, $view-name))(rows);
+variable $data := cb:view($instance, $view-name)(rows);
for $d in jn:members($data)
let $state := $d(key)
group by $state
=== modified file 'examples/example3.xq'
--- examples/example3.xq 2012-11-07 17:08:47 +
+++ examples/example3.xq 2013-01-04 19:28:23 +
@@ -8,7 +8,7 @@
bucket : default});
variable $view-name := cb:create-view($instance, zip, zip, {key : doc.state, values : doc.pop});
-variable $data := jn:parse-json(cb:view($instance, $view-name))(rows);
+variable $data := cb:view($instance, $view-name)(rows);
for $d in jn:members($data)
let $state := $d(key)
group by $state
=== modified file 'examples/example4.xq'
--- examples/example4.xq 2012-11-07 19:33:40 +
+++ examples/example4.xq 2013-01-04 19:28:23 +
@@ -8,7 +8,7 @@
bucket : default});
variable $view-name := cb:create-view($instance, zip, zip, {key : doc.state, values : [doc.pop, doc.city]});
-variable $data := jn:parse-json(cb:view($instance, $view-name))(rows);
+variable $data := cb:view($instance, $view-name)(rows);
let $city-pop :=
=== modified file 'src/couchbase.xq'
--- src/couchbase.xq 2012-12-23 09:46:07 +
+++ src/couchbase.xq 2013-01-04 19:28:23 +
@@ -346,8 +346,14 @@
:
: @return a sequence of strings (as JSON) containing information of the views.
:)
+declare %fn:private %an:sequential function cb:view-text($db as xs:anyURI, $path as xs:string*)
+ as xs:string* external;
+
declare %an:sequential function cb:view($db as xs:anyURI, $path as xs:string*)
- as xs:string* external;
+ as object()*
+{
+ jn:parse-json(cb:view-text($db, $path))
+};
(:~
: Retrieve the content of existing views.
@@ -366,11 +372,20 @@
:
: @return a sequence of strings (as JSON) containing information of the views.
:)
+declare %fn:private %an:sequential function cb:view-text(
+ $db as xs:anyURI,
+ $path as xs:string*,
+ $options as object())
+as xs:string* external;
+
declare %an:sequential function cb:view(
$db as xs:anyURI,
$path as xs:string*,
$options as object())
-as xs:string* external;
+as object()*
+{
+ jn:parse-json(cb:view-text($db, $path, $options))
+};
(:~
: Create a document/view.
=== modified file 'src/couchbase.xq.src/couchbase.cpp'
--- src/couchbase.xq.src/couchbase.cpp 2012-12-18 09:15:12 +
+++ src/couchbase.xq.src/couchbase.cpp 2013-01-04 19:28:23 +
@@ -85,7 +85,7 @@
{
lFunc = new TouchFunction(this);
}
-else if (localname == view)
+else if (localname == view-text)
{
lFunc = new ViewFunction(this);
}
=== modified file 'src/couchbase.xq.src/couchbase.h'
--- src/couchbase.xq.src/couchbase.h 2012-11-06 19:59:19 +
+++ src/couchbase.xq.src/couchbase.h 2013-01-04 19:28:23 +
@@ -552,7 +552,7 @@
virtual ~ViewFunction(){}
virtual zorba::String
- getLocalName() const { return view; }
+ getLocalName() const { return view-text; }
virtual zorba::ItemSequence_t
evaluate( const Arguments_t,
=== modified file 'test/Queries/couchbase_module/connect2.xq'
--- test/Queries/couchbase_module/connect2.xq 2012-10-19 21:11:28 +
+++ test/Queries/couchbase_module/connect2.xq 2013-01-04 19:28:23 +
@@ -1,7 +1,7 @@
import module namespace cb = http://www.zorba-xquery.com/modules/couchbase;;
variable $instance := cb:connect({
- host: none,
+ host: 12492873009,
username : null,
password : null,
bucket : default});
=== modified file 'test/Queries/couchbase_module/view.xq'
--- test/Queries/couchbase_module/view.xq
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1053113 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1053113 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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-1053113 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1053113-2013-01-04T23-41-03.967Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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-1053113 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1053113 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-1053113-2013-01-04T23-41-03.967Z is finished. The final status was: 4 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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/feature-unordered_map into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~paul-lucas/zorba/feature-unordered_map/+merge/117498 -- https://code.launchpad.net/~paul-lucas/zorba/feature-unordered_map/+merge/117498 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/couchbase-view-changes into lp:zorba/couchbase-module
The proposal to merge lp:~zorba-coders/zorba/couchbase-view-changes into lp:zorba/couchbase-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/couchbase-view-changes/+merge/141968 -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-view-changes/+merge/141968 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-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/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-jdbc-module-2013-01-05T00-53-45.32Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~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: 1. Improved catch() for unit tests. 2. Improved bpackfail() for streambufs. 3. locale template function additions. 4. aton() end pointer additions. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 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. Description changed to: 1. Improved catch() for unit tests. 2. Improved bpackfail() for streambufs. 3. locale template function additions. 4. aton() end pointer additions. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 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. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 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/add-jdbc-module into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job add-jdbc-module-2013-01-05T00-53-45.32Z is finished. The final status was: 9 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-05T01-20-58.058Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 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
The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job pjl-misc-2013-01-05T01-20-58.058Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 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. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141949 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/zorba-for-sqlite into lp:zorba
A new SQLite module version is now uploaded. I fixed most of the problems but I'm still testing out things. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-for-sqlite/+merge/139108 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
