Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189804 into lp:zorba
Review: Needs Fixing Looks good! Here are some comments: - Did you check that the invalid option type error does not exist already? Will it be consistent also in all other modules? - Should JSONiq modules not be suffixed as .jq (but it's only cosmetics of course). - empty-sequence() - () - array() - array - Why remove variadic=true? I forgot what the semantics for this attribute are. - In the implementation of map:key: why not reserve the vector size at the beginning (unless you cannot get the size of an ItemVector in constant time?). -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 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-1188035-csv into lp:zorba/csv-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1188035-csv into lp:zorba/csv-module. Commit message: Updated module URI. Requested reviews: Paul J. Lucas (paul-lucas) Related bugs: Bug #1188035 in Zorba: Update non-core module csv https://bugs.launchpad.net/zorba/+bug/1188035 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Updated module URI. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. === modified file 'src/CMakeLists.txt' --- src/CMakeLists.txt 2012-08-06 08:08:04 + +++ src/CMakeLists.txt 2013-08-28 14:20:59 + @@ -14,8 +14,8 @@ # csv DECLARE_ZORBA_SCHEMA (FILE csv-options.xsd - URI http://www.zorba-xquery.com/modules/converters/csv-options;) -DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/converters/csv; VERSION 1.0 FILE csv.xq) + URI http://zorba.io/modules/csv-options;) +DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/csv; VERSION 1.0 FILE csv.xq) # add unit test for streambuf implementation in csv, related to streamable strings CREATE_TEST_SOURCELIST ( === modified file 'src/csv-options.xsd' --- src/csv-options.xsd 2012-08-04 00:19:55 + +++ src/csv-options.xsd 2013-08-28 14:20:59 + @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=utf-8? schema - targetNamespace=http://www.zorba-xquery.com/modules/converters/csv-options; - xmlns:csv=http://www.zorba-xquery.com/modules/converters/csv-options; + targetNamespace=http://zorba.io/modules/csv-options; + xmlns:csv=http://zorba.io/modules/csv-options; xmlns=http://www.w3.org/2001/XMLSchema; version=1.0.0 !-- @@ -110,4 +110,4 @@ element name=options type=csv:optionsType/ -/schema \ No newline at end of file +/schema === modified file 'src/csv.xq' --- src/csv.xq 2013-08-09 09:37:05 + +++ src/csv.xq 2013-08-28 14:20:59 + @@ -23,7 +23,7 @@ : @author Daniel Turcanu : @project Zorba/Data Converters/CSV :) -module namespace csv = http://www.zorba-xquery.com/modules/converters/csv;; +module namespace csv = http://zorba.io/modules/csv;; (:~ : Import module for checking if csv options element is validated. @@ -33,7 +33,7 @@ (:~ : Contains the definitions of the csv options element. :) -import schema namespace csv-options = http://www.zorba-xquery.com/modules/converters/csv-options;; +import schema namespace csv-options = http://zorba.io/modules/csv-options;; declare namespace ver = http://zorba.io/options/versioning;; declare option ver:module-version 1.0; @@ -68,7 +68,7 @@ :lt;/csv-options:optionsbr/ :br/ :All the parameters are optional and can appear in any order.br/ - :All the parameters are case sensitive. The namespace used is http://www.zorba-xquery.com/modules/converters/csv-options;.br/ + :All the parameters are case sensitive. The namespace used is http://zorba.io/modules/csv-options;.br/ :All strings must have UTF-8 encoding.br/ :Parameters csv, column-widths, column-positions are mutually exclusive. If none is specified, :the input string is assumed to be csv.br/ @@ -180,7 +180,7 @@ : /dd :/dl : @param $csv the string containing the csv or fixed size text. - : @param $options this parameter is validated against http://www.zorba-xquery.com/modules/converters/csv-options; schema. + : @param $options this parameter is validated against http://zorba.io/modules/csv-options; schema. :If this parameter is not specified, the row name is by default row and the column name is by default column. : @return a sequence of row elements, one for each line in csv : @error csv:CSV001 if the input string is streamable string and cannot be rewinded @@ -250,7 +250,7 @@ : /pre : : All the parameters are optional and can appear in any order.br/ - : All the parameters are case sensitive. The namespace used is http://www.zorba-xquery.com/modules/converters/csv-options;.br/ + : All the parameters are case sensitive. The namespace used is http://zorba.io/modules/csv-options;.br/ : All strings must have UTF-8 encoding.br/ : Parameters csv, column-widths, column-positions are mutually exclusive. : If none is specified, the xml is converted to csv. @@ -334,7 +334,7 @@ : @param $xml a sequence of elements, each element representing a row. The name of each row element is ignored. : The childs of each row are the column fields. : @param $options The options parameter. See the function description for details. - : This parameter is validated against http://www.zorba-xquery.com/modules/converters/csv-options; schema. + : This parameter is validated against http://zorba.io/modules/csv-options; schema. : @return the csv or fixed size text as string containing all the lines : @error csv:CSV003 if the serialize output is streamable string and cannot be reset : @error csv:ForeignInput if there are input elements in
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188035-csv into lp:zorba/csv-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 :
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655
Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188035-csv into lp:zorba/csv-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/144/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1189804 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 https://code.launchpad.net/~zorba-coders/zorba/html-module-bug-1189804/+merge/182529 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 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-1189804 into lp:zorba
Looks good! Here are some comments: - Did you check that the invalid option type error does not exist already? Will it be consistent also in all other modules? Yes, I did. This will become consistent as soon as the JSound implementation is there. - Should JSONiq modules not be suffixed as .jq (but it's only cosmetics of course). That's not possible at the moment (see bug #1192043) - empty-sequence() - () done - array() - array done - Why remove variadic=true? I forgot what the semantics for this attribute are. Variadic was only required in the previous version to be able to deal with an arbitrary number of keys. Now that we have arrays, we can make the function non-variadic. Arrays make this much easier to use. - In the implementation of map:key: why not reserve the vector size at the beginning (unless you cannot get the size of an ItemVector in constant time?). Fixed. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 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-1189804 into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 :
Votes: {'Pending': 1, 'Needs Fixing': 1, 'Needs commit message': 1}
https://code.launchpad.net/~zorba-coders/zorba/html-module-bug-1189804/+merge/182529
:
Votes: {'Pending': 2}
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973
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-1188035-csv into lp:zorba/csv-module
Review: Needs Fixing - use p/P tags between paragraphs - use pre for blocks of code (e.g. for $options in csv:parse#2) - the namespace of the nodes that are created by the parse function is still http://www.zorba-xquery...; (e.g. test7:row xmlns:test7=http://www.zorba-xquery/modules/csv;) -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1189804 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/145/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189804/+merge/181973 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-1188035-csv into lp:zorba/csv-module
- use p/P tags between paragraphs - use pre for blocks of code (e.g. for $options in csv:parse#2) - the namespace of the nodes that are created by the parse function is still http://www.zorba-xquery...; (e.g. test7:row xmlns:test7=http://www.zorba- xquery/modules/csv) Done. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/jdbc_module-bug-1188050 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/jdbc_module-bug-1188050 into lp:zorba/jdbc-module has been updated. Commit Message changed to: renamed module and improved documentation For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jdbc_module-bug-1188050/+merge/182757 -- 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/jdbc_module-bug-1188050 into lp:zorba/jdbc-module
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/jdbc_module-bug-1188050 into lp:zorba/jdbc-module.
Commit message:
renamed module and improved documentation
Requested reviews:
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #1188050 in Zorba: Update non-core module jdbc
https://bugs.launchpad.net/zorba/+bug/1188050
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jdbc_module-bug-1188050/+merge/182757
--
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.
=== modified file 'include/jdbc.h'
--- include/jdbc.h 2013-06-11 20:47:52 +
+++ include/jdbc.h 2013-08-28 20:36:22 +
@@ -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 2013-08-28 20:36:22 +
@@ -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 2013-08-28 20:36:22 +
@@ -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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc_module-bug-1188050 into lp:zorba/jdbc-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/jdbc_module-bug-1188050/+merge/182757 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- 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/jdbc_module-bug-1188050 into lp:zorba/jdbc-module
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/jdbc_module-bug-1188050/+merge/182757
:
Votes: {'Pending': 1}
--
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/jdbc_module-bug-1188050 into lp:zorba/jdbc-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/jdbc_module-bug-1188050/+merge/182757 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/146/console to view the results. -- 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/couchbase_module-bug-1188063 into lp:zorba/couchbase-module
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/couchbase_module-bug-1188063 into
lp:zorba/couchbase-module.
Commit message:
renamed to zorba.io and adapted documentation
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781
--
https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.
=== modified file 'src/couchbase.xq'
--- src/couchbase.xq 2013-08-09 09:37:05 +
+++ src/couchbase.xq 2013-08-28 23:18:04 +
@@ -1,7 +1,7 @@
-xquery version 3.0;
+jsoniq version 1.0;
(:
- : Copyright 2012 The FLWOR Foundation.
+ : 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.
@@ -19,9 +19,9 @@
(:~
: This module provides minimal functionality to interact with the
: Couchbase NoSQL database.
- :
+ : p/
: The module is built using the libcouchbase C client library and
- : exposes most of its functionality in XQuery with JSONiq extensions.
+ : exposes most of its functionality.
: Beyond just allowing for basic key-value store operations (e.g.
: put-/get-text or put-/get-binary, this module also allows to work
: with Couchbase views in order to allow for complex JSON query
@@ -31,9 +31,8 @@
: @project DB Drivers/Couchbase
:
:)
-module namespace cb = http://www.zorba-xquery.com/modules/couchbase;;
+module namespace cb = http://zorba.io/modules/couchbase;;
-declare namespace jn = http://jsoniq.org/functions;;
declare namespace an = http://zorba.io/annotations;;
declare namespace ver = http://zorba.io/options/versioning;;
@@ -55,11 +54,11 @@
:)
declare %an:sequential function cb:connect(
- $host as xs:string,
- $username as xs:string?,
- $password as xs:string?,
- $bucket as xs:string)
-as xs:anyURI
+ $host as string,
+ $username as string?,
+ $password as string?,
+ $bucket as string)
+as anyURI
{
cb:connect({host : $host,
username : $username,
@@ -71,13 +70,8 @@
: Connect to the Couchbase server and return an opaque identifier
: representing the established connection.
:
- : @param $options a JSONiq object that contains the host, bucket,
- : and user information.
- :
- : @option host endpoint of the Couchbase server (mandatory)
- : @option username username used for the connection (optional)
- : @option password password used for the connection (optional)
- : @option bucket name of an existing bucket (mandatory)
+ : @param $options an object that contains the host (mandatory),
+ : bucket (mandatory), username, and password.
:
: @error cb:LCB0001 if the connection to the given host/bucket
: could not be established.
@@ -85,22 +79,12 @@
: @error cb:CB0007 if a given option is not supported.
:
: @return an identifier for the established connection.
- :
- : Example:
- : code
- : {
- : host: localhost:8091,
- : username : null,
- : password : null,
- : bucket : default
- : }
- : /code
:)
-declare %an:sequential function cb:connect($options as object())
-as xs:anyURI external;
+declare %an:sequential function cb:connect($options as object)
+as anyURI external;
(:~
- : Return the values of the given keys (type xs:string) as string.
+ : Return the values of the given keys as string.
:
: @param $db connection reference
: @param $key the requested keys
@@ -108,43 +92,39 @@
: @error cb:LCB0002 if any error occurs in the communication with
: the server.
:
- : @return A sequence of string Items corresponding to the key
+ : @return A sequence of strings.
:)
declare %an:sequential function cb:get-text(
- $db as xs:anyURI,
- $key as xs:string*)
-as xs:string* external;
+ $db as anyURI,
+ $key as string*)
+as string* external;
(:~
- : Return the values of the given keys (type xs:string) as string.
+ : Return the values of the given keys as string.
:
: @param $db connection reference
: @param $key the requested keys
- : @param $options JSONiq object with additional options
+ : @param $options an object specifying the expiration-time (integer)
+ : or encoding (string; default is UTF-8).
:
- : @option expiration-time xs:integer value for refreshing the expiration
- : time in seconds.
- : @option encoding string with the name of the encoding of the returned
- : string (if not UTF-8).
- :
: @error cb:LCB0002 if any error occurs in the communication with
: the server.
: @error cb:CB0006 if the given encoding is not supported.
: @error cb:CB0007 if any of the options is not supported.
- : @error cb:CB0009 if the given expiration time is not an xs:integer.
+ : @error cb:CB0009 if the given expiration time is not an integer.
:
: @return a sequence of strings for the given keys.
:)
declare %an:sequential
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/couchbase_module-bug-1188063 into lp:zorba/couchbase-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/couchbase_module-bug-1188063 into lp:zorba/couchbase-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781 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/couchbase_module-bug-1188063 into lp:zorba/couchbase-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781 Stage TestZorbaUbuntu failed. 20 tests failed (8409 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/253/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/couchbase_module-bug-1188063/+merge/182781 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188035-csv into lp:zorba/csv-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/csv2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/csv2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 -- https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 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/csv2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 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-1188035-csv into lp:zorba/csv-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Stage TestZorbaUbuntu failed. 2 tests failed (8409 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/254/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188056 into lp:zorba/security-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1188056 into
lp:zorba/security-module.
Requested reviews:
Zorba Coders (zorba-coders)
Related bugs:
Bug #1188056 in Zorba: Update non-core module security
https://bugs.launchpad.net/zorba/+bug/1188056
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/bug-1188056 into lp:zorba/security-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-07-20 16:13:37 +
+++ src/CMakeLists.txt 2013-08-29 00:28:25 +
@@ -13,14 +13,14 @@
# limitations under the License.
DECLARE_ZORBA_MODULE (
- URI http://www.zorba-xquery.com/modules/cryptography/hmac;
- VERSION 2.0
+ URI http://zorba.io/modules/hmac;
+ VERSION 1.0
FILE hmac.xq
LINK_LIBRARIES ${OPENSSL_LIBRARIES}
)
DECLARE_ZORBA_MODULE (
- URI http://www.zorba-xquery.com/modules/cryptography/hash;
- VERSION 2.0
+ URI http://zorba.io/modules/hash;
+ VERSION 1.0
FILE hash.xq
LINK_LIBRARIES ${OPENSSL_LIBRARIES}
)
=== modified file 'src/hash.xq'
--- src/hash.xq 2013-08-09 09:37:05 +
+++ src/hash.xq 2013-08-29 00:28:25 +
@@ -1,4 +1,4 @@
-xquery version 1.0;
+xquery version 3.0;
(:
: Copyright 2006-2012 The FLWOR Foundation.
@@ -24,10 +24,10 @@
: @author Gabriel Petrovay, Markus Pilman, Matthias Brantner
: @project Zorba/Cryptography/Hash
:)
-module namespace hash = http://www.zorba-xquery.com/modules/cryptography/hash;;
+module namespace hash = http://zorba.io/modules/hash;;
declare namespace ver = http://zorba.io/options/versioning;;
-declare option ver:module-version 2.0;
+declare option ver:module-version 1.0;
(:~
: Computes the MD5 hash of the string provided as parameter.
=== modified file 'src/hash.xq.src/hash.h'
--- src/hash.xq.src/hash.h 2013-07-30 18:47:17 +
+++ src/hash.xq.src/hash.h 2013-08-29 00:28:25 +
@@ -49,7 +49,7 @@
virtual ~HashModule();
virtual String
-getURI() const { return http://www.zorba-xquery.com/modules/cryptography/hash;; }
+getURI() const { return http://zorba.io/modules/hash;; }
virtual ExternalFunction*
getExternalFunction(const String aLocalname);
@@ -120,16 +120,17 @@
{
if (aMessage.getTypeCode() == store::XS_BASE64BINARY)
{
- String lTmpDecodedBuf;
size_t lLen;
const char* lTmp = aMessage.getBase64BinaryValue(lLen);
+ char *lTmpDecodedBuf;
if (aDecode)
{
-String lTmpEncoded;
// lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
-base64::decode(lTmp, lLen, lTmpDecodedBuf);
-lTmp = lTmpDecodedBuf.c_str();
-lLen = lTmpDecodedBuf.size();
+lTmpDecodedBuf = (char *)malloc(lLen*sizeof(char)+1);
+base64::decode(lTmp, lLen, lTmpDecodedBuf);
+lTmp = lTmpDecodedBuf;
+lLen = strlen(lTmpDecodedBuf);
+free(lTmpDecodedBuf);
}
(*hash)(
reinterpret_castconst unsigned char*(lTmp),
=== modified file 'src/hmac.xq'
--- src/hmac.xq 2013-08-09 09:37:05 +
+++ src/hmac.xq 2013-08-29 00:28:25 +
@@ -1,4 +1,4 @@
-xquery version 1.0;
+xquery version 3.0;
(:
: Copyright 2006-2012 The FLWOR Foundation.
@@ -28,10 +28,10 @@
: @project Zorba/Cryptography/HMAC
:
:)
-module namespace hmac = http://www.zorba-xquery.com/modules/cryptography/hmac;;
+module namespace hmac = http://zorba.io/modules/hmac;;
declare namespace ver = http://zorba.io/options/versioning;;
-declare option ver:module-version 2.0;
+declare option ver:module-version 1.0;
(:~
: Calculate the HMAC for the given message and secret-key involving
=== modified file 'src/hmac.xq.src/hmac.cpp'
--- src/hmac.xq.src/hmac.cpp 2013-07-30 18:36:20 +
+++ src/hmac.xq.src/hmac.cpp 2013-08-29 00:28:25 +
@@ -120,7 +120,7 @@
lMsg aAlg : unsupported hash algorithm;
throw USER_EXCEPTION(
HMACModule::getItemFactory()-createQName(
-http://www.zorba-xquery.com/modules/cryptography/hmac;, unsupported-algorithm),
+http://zorba.io/modules/hmac;, unsupported-algorithm),
lMsg.str());
}
}
@@ -213,16 +213,17 @@
}
else
{
-String lTmpDecodedBuf;
size_t lSize;
const char* lMsg = lItem.getBase64BinaryValue(lSize);
+char *lTmpDecodedBuf;
if (lItem.isEncoded())
{
- String lTmpEncoded;
// lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
- base64::decode(lMsg, lSize, lTmpDecodedBuf);
- lMsg = lTmpDecodedBuf.c_str();
- lSize = lTmpDecodedBuf.size();
+ lTmpDecodedBuf = (char *)malloc(lSize*sizeof(char)+1);
+ base64::decode(lMsg, lSize, lTmpDecodedBuf);
+ lMsg = lTmpDecodedBuf;
+ lSize =
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188056 into lp:zorba/security-module
Review: Needs Fixing 1. sha256 test failures. 2. There are error codes thrown like hmac:unsupported-algorithm; they should be like hmac:UNSUPPORTED_ALGORITHM, and the XQDoc should be updated accordingly. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790 Your team Zorba Coders is subscribed to branch lp:zorba/security-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/bug-1188035-csv into lp:zorba/csv-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/bug-1188035-csv into lp:zorba/csv-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188035-csv into lp:zorba/csv-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655 Your team Zorba Coders is subscribed to branch lp:zorba/csv-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/csv2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 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/csv2 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 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/csv2 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 Stage TestZorbaUbuntu failed. 7 tests failed (8452 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/256/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/csv2/+merge/182786 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
