Merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba
- f-nosql-db-trunk
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Cezar Andrei | ||||
Approved revision: | 11102 | ||||
Merged at revision: | 11168 | ||||
Proposed branch: | lp:~zorba-coders/zorba/f-nosql-db-trunk | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
23 lines (+2/-0) 2 files modified
ChangeLog (+1/-0) modules/ExternalModules.conf (+1/-0) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/f-nosql-db-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Chris Hillery | Approve | ||
Juan Zacarias | Approve | ||
Review via email: mp+136215@code.launchpad.net |
This proposal supersedes a proposal from 2012-11-08.
Commit message
Add new oracle-nosql-db module.
This has been renamed and it also contains multi-get and multi-delete functions.
Description of the change
Add new oracle-nosql-db module.
Cezar Andrei (cezar-andrei) wrote : Posted in a previous version of this proposal | # |
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal | # |
Validation queue starting for merge proposal.
Log at: http://
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal | # |
I don't like the name nosqldb-module because it's confusing/
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal | # |
Validation queue job f-nosql-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job f-nosql-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.
Juan Zacarias (juan457) : | # |
Chris Hillery (ceejatec) wrote : | # |
The oracle-nosql-db module test cases have no expected results, so they don't pass.
Chris Hillery (ceejatec) wrote : | # |
Also, should add a mention of the new module to the ChangeLog.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
2 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Chris Hillery (ceejatec) wrote : | # |
I've fixed one XQDoc problem (un-terminated <pre> elements), but now there are a number of documentation issues to clean up to please the RQ. Run "ctest -R moduleDocumentation -V" to see them.
665: processing module: http://
665: ERROR: Missing module description
665: Module: http://
665: ERROR: Missing module author name
665: Module: http://
665: ERROR: Missing explicit XQuery version declaration in prolog
665: Module: http://
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:remove
665: Arity: 2
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:put-text
665: Arity: 3
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:put-text
665: Arity: 4
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:put-binary
665: Arity: 3
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:put-binary
665: Arity: 4
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:flush
665: Arity: 1
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:touch
665: Arity: 3
665: ERROR: Return value not documented;
665: Module: http://
665: Function: cb:disconnect
665: Arity: 1
Chris Hillery (ceejatec) wrote : | # |
Comment from Matthias:
- rename delete-value function to remove to be consistent with Couchbase
- document errors that may be raised by the functions
- can we make the get and put functions take sequences of keys and values, respectively
(e.g. nosql:get-text($db as xs:anyURI, $keys as object()* ) as object()*)
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
1 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Chris Hillery (ceejatec) wrote : | # |
According to Cezar:
> Comment from Matthias:
>
> - rename delete-value function to remove to be consistent with Couchbase
> - document errors that may be raised by the functions
Both done.
> - can we make the get and put functions take sequences of keys and values,
> respectively
> (e.g. nosql:get-text($db as xs:anyURI, $keys as object()* ) as object()*)
There are 3 kinds of functions in this module:
- convenience functions for working with strings as keys, just like a java Map.
- raw that gives access to major and minor key components
- and advanced called multi-* that gives access to sub-ranges of keys.
I rather not add the $keys as object()* to avoid confusion with the multi-* functions that use sub-ranges.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
5 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.
Chris Hillery (ceejatec) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job f-nosql-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending.
Matthias Brantner (matthias-brantner) wrote : | # |
I like the module a lot. There are only a couple of minor things that need fixing:
- There are a bunch of typos in the documentation. Could you please run it through a spell-checker?
For example,
s/corespond/
s/initiaized/
s/corectly/
- the jsoniq functions module doesn't need to be included
- variable names and errors should not use camel-case but dashes, e.g. subRange => sub-range
Cezar Andrei (cezar-andrei) wrote : | # |
> I like the module a lot. There are only a couple of minor things that need
> fixing:
>
> - There are a bunch of typos in the documentation. Could you please run it
> through a spell-checker?
>
> For example,
>
> s/corespond/
> s/initiaized/
> s/corectly/
Fixed.
>
> - the jsoniq functions module doesn't need to be included
Yes it does, it's used at line 67: jn:members(
> - variable names and errors should not use camel-case but dashes, e.g.
> subRange => sub-range
Done.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
1 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
1 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Chris Hillery (ceejatec) wrote : | # |
> > - the jsoniq functions module doesn't need to be included
> Yes it does, it's used at line 67: jn:members(
My understanding is that the JSONiq functions module never needs to be included. Those functions are built-in to Zorba, like the F&O functions are. The .xq file for the module is included only for reference. Importing it explicitly just uses extra CPU cycles at compile time.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job f-nosql-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Needs Fixing.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job f-nosql-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Needs Fixing.
Matthias Brantner (matthias-brantner) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
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/
Validation queue job f-nosql-
The final status was:
2 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job f-nosql-
All tests succeeded!
Preview Diff
1 | === modified file 'ChangeLog' | |||
2 | --- ChangeLog 2013-01-03 20:25:05 +0000 | |||
3 | +++ ChangeLog 2013-01-04 16:25:28 +0000 | |||
4 | @@ -9,6 +9,7 @@ | |||
5 | 9 | when resolving URIs. | 9 | when resolving URIs. |
6 | 10 | * Can now specify jsoniq-strip-top-level-array option to parse-json() to | 10 | * Can now specify jsoniq-strip-top-level-array option to parse-json() to |
7 | 11 | strip the top-level array from JSON streams. | 11 | strip the top-level array from JSON streams. |
8 | 12 | * New external module client for Oracle NoSQL Database. | ||
9 | 12 | * New info-extraction module for querying concepts and entities in | 13 | * New info-extraction module for querying concepts and entities in |
10 | 13 | natural language text. | 14 | natural language text. |
11 | 14 | * Extended cast and castable expression to allow any simple target type | 15 | * Extended cast and castable expression to allow any simple target type |
12 | 15 | 16 | ||
13 | === modified file 'modules/ExternalModules.conf' | |||
14 | --- modules/ExternalModules.conf 2012-12-26 07:31:06 +0000 | |||
15 | +++ modules/ExternalModules.conf 2013-01-04 16:25:28 +0000 | |||
16 | @@ -39,6 +39,7 @@ | |||
17 | 39 | http-client bzr lp:zorba/http-client-module zorba-2.7 | 39 | http-client bzr lp:zorba/http-client-module zorba-2.7 |
18 | 40 | image bzr lp:zorba/image-module | 40 | image bzr lp:zorba/image-module |
19 | 41 | languages bzr lp:zorba/languages-module zorba-2.7 | 41 | languages bzr lp:zorba/languages-module zorba-2.7 |
20 | 42 | oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module | ||
21 | 42 | oauth bzr lp:zorba/oauth-module zorba-2.7 | 43 | oauth bzr lp:zorba/oauth-module zorba-2.7 |
22 | 43 | process bzr lp:zorba/process-module zorba-2.7 | 44 | process bzr lp:zorba/process-module zorba-2.7 |
23 | 44 | read-pdf bzr lp:zorba/read-pdf-module zorba-2.7 | 45 | read-pdf bzr lp:zorba/read-pdf-module zorba-2.7 |
Please review the code in https:/ /code.launchpad .net/~zorba- coders/ zorba/f- nosqldb- module for the new nosql-db module.