Zorba

Merge lp:~zorba-coders/zorba/couchbase-trunk into lp:zorba

  1. couchbase-trunk
  2. Merge into trunk
Proposed by Juan Zacarias
Status: Merged
Approved by: Chris Hillery
Approved revision: 11137
Merged at revision: 11170
Proposed branch: lp:~zorba-coders/zorba/couchbase-trunk
Merge into: lp:zorba
Diff against target: 28 lines (+4/-1)
2 files modified
ChangeLog (+3/-0)
modules/ExternalModules.conf (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/couchbase-trunk
Reviewer Review Type Date Requested Status
Cezar Andrei Approve
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+135779@code.launchpad.net

Commit message

Adds couchbase module as a new external module.
Updates Changelog and ExternalModules.conf

Description of the change

Adds couchbase module as a new external module.

Needs lp:~zorba-coders/zorba/couchbase-module tagged as lp:zorba/couchbase-module

To post a comment you must log in.
Revision history for this message
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.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/couchbase-trunk-2012-12-18T12-42-47.275Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/couchbase-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 couchbase-trunk-2012-12-18T12-42-47.275Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Chris Hillery (ceejatec) wrote :

The XQDoc needs fleshing out to please the remote queue.

http://zorbatest.lambda.nu:8080/cdash/testDetails.php?test=65369477&build=31197

------------------------------------------------
ERROR COUNT: 11
------------------------------------------------

    ERROR: Missing module description
    Module: http://www.zorba-xquery.com/modules/couchbase
    ERROR: Missing module author name
    Module: http://www.zorba-xquery.com/modules/couchbase
    ERROR: Missing explicit XQuery version declaration in prolog
    Module: http://www.zorba-xquery.com/modules/couchbase
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:remove
    Arity: 2
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-text
    Arity: 3
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-text
    Arity: 4
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-binary
    Arity: 3
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-binary
    Arity: 4
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:flush
    Arity: 1
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:touch
    Arity: 3
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:disconnect
    Arity: 1

review: Needs Fixing
Revision history for this message
Chris Hillery (ceejatec) wrote :

Comment from Matthias:

I think the return values of the view functions should be object()* instead of xs:string* .

review: Needs Fixing
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/couchbase-trunk-2012-12-23T09-06-55.865Z/log.html

Revision history for this message
Chris Hillery (ceejatec) wrote :

I believe Matthias is correct, with the possible exception that if the output from the Couchbase API itself is a literal JSON *string*, we may want to have an API to pass that string through to module clients. However, even in that case, I think there should be another form that parses the JSON into JSONiq objects.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/couchbase-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 couchbase-trunk-2012-12-23T09-06-55.865Z is finished.
  The final status was:

  21 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/couchbase-trunk-2012-12-23T10-03-48.68Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/couchbase-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 couchbase-trunk-2012-12-23T10-03-48.68Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Chris Hillery (ceejatec) wrote :

FYI, return values are still not documented:

    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:disconnect
    Arity: 1
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:remove
    Arity: 2
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-text
    Arity: 3
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-text
    Arity: 4
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-binary
    Arity: 3
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:put-binary
    Arity: 4
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:flush
    Arity: 1
    ERROR: Return value not documented;
    Module: http://www.zorba-xquery.com/modules/couchbase
    Function: cb:touch
    Arity: 3

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog

Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog
text conflict in modules/ExternalModules.conf

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/couchbase-trunk-2013-01-10T01-53-50.942Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/couchbase-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 couchbase-trunk-2013-01-10T01-53-50.942Z is finished.
  The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/couchbase-trunk-2013-01-10T08-10-43.928Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job couchbase-trunk-2013-01-10T08-10-43.928Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-01-10 00:00:11 +0000
3+++ ChangeLog 2013-01-10 01:31:20 +0000
4@@ -5,10 +5,13 @@
5
6 New Features:
7 * (bug #1039284) Implemented jn:json-doc().
8+ * (bug #867363) Added http-uri-resolution feature to disable HTTP
9+ when resolving URIs.
10 * (bug #867363) Added http-uri-resolution feature to disable HTTP when
11 resolving URIs.
12 * Can now specify jsoniq-strip-top-level-array option to parse-json() to
13 strip the top-level array from JSON streams.
14+ * New external module client for Couchbase Server.
15 * New external module client for SQLite Database.
16 * New external module client for Oracle NoSQL Database.
17 * New info-extraction module for querying concepts and entities in
18
19=== modified file 'modules/ExternalModules.conf'
20--- modules/ExternalModules.conf 2013-01-10 00:00:11 +0000
21+++ modules/ExternalModules.conf 2013-01-10 01:31:20 +0000
22@@ -50,5 +50,5 @@
23 schema-tools bzr lp:zorba/schema-tools-module zorba-2.7
24 stack bzr lp:zorba/stack-module zorba-2.7
25 queue bzr lp:zorba/queue-module zorba-2.7
26+couchbase bzr lp:zorba/couchbase-module
27 sqlite bzr lp:zorba/sqlite-module
28-

Subscribers

People subscribed via source and target branches