Skip to content

Commit

Permalink
Bump CouchDB to 3.2.2 (#3369)
Browse files Browse the repository at this point in the history
Update CouchDB to 3.2.2.

Update CouchDB doc links to 3.2.2.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart authored and manish-sethi committed May 18, 2022
1 parent c8f83e4 commit 4c6ef91
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ BASE_VERSION = 2.4.3

# 3rd party image version
# These versions are also set in the runners in ./integration/runners/
COUCHDB_VER ?= 3.1.1
COUCHDB_VER ?= 3.2.2
KAFKA_VER ?= 5.3.1
ZOOKEEPER_VER ?= 5.3.1

Expand Down
6 changes: 3 additions & 3 deletions docs/source/couchdb_as_state_database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ can be utilized with either LevelDB or CouchDB state database, e.g. ``GetState``
``GetStateByRange``, ``GetStateByPartialCompositeKey``. Additionally when you utilize CouchDB as
the state database and model assets as JSON in chaincode, you can perform JSON queries against
the data in the state database by using the ``GetQueryResult`` API and passing a CouchDB query string.
The query string follows the `CouchDB JSON query syntax <http://docs.couchdb.org/en/2.1.1/api/database/find.html>`__.
The query string follows the `CouchDB JSON query syntax <http://docs.couchdb.org/en/3.2.2/api/database/find.html>`__.

The `asset transfer Fabric sample <https://github.com/hyperledger/fabric-samples/blob/main/asset-transfer-ledger-queries/chaincode-go/asset_transfer_ledger_chaincode.go>`__
demonstrates use of CouchDB queries from chaincode. It includes a ``queryAssetsByOwner()`` function
Expand Down Expand Up @@ -132,7 +132,7 @@ any JSON query with a sort. Indexes enable you to query data from chaincode when
a large amount of data on your ledger. Indexes can be packaged alongside chaincode
in a ``/META-INF/statedb/couchdb/indexes`` directory. Each index must be defined in
its own text file with extension ``*.json`` with the index definition formatted in JSON
following the `CouchDB index JSON syntax <http://docs.couchdb.org/en/3.1.1/api/database/find.html#db-index>`__.
following the `CouchDB index JSON syntax <http://docs.couchdb.org/en/3.2.2/api/database/find.html#db-index>`__.
For example, to support the above marble query, a sample index on the ``docType`` and ``owner``
fields is provided:

Expand Down Expand Up @@ -227,7 +227,7 @@ variables using Docker Compose scripting.
For CouchDB installations outside of the docker images supplied with Fabric,
the
`local.ini file of that installation
<http://docs.couchdb.org/en/3.1.1/config/intro.html#configuration-files>`__
<http://docs.couchdb.org/en/3.2.2/config/intro.html#configuration-files>`__
must be edited to set the admin username and password.

Docker compose scripts only set the username and password at the creation of
Expand Down
6 changes: 3 additions & 3 deletions docs/source/couchdb_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ the CouchDB recommended practice.
In general, you should model index fields to match the fields that will be used
in query filters and sorts. For more details on building an index in JSON
format refer to the `CouchDB documentation <http://docs.couchdb.org/en/latest/api/database/find.html#db-index>`__.
format refer to the `CouchDB documentation <http://docs.couchdb.org/en/3.2.2/api/database/find.html#db-index>`__.

.. _cdb-add-index:

Expand Down Expand Up @@ -369,7 +369,7 @@ includes two JSON query functions:
where a selector JSON query string can be passed into the function. This query
would be useful to client applications that need to dynamically build
their own queries at runtime. For more information on query selectors refer
to `CouchDB selector syntax <http://docs.couchdb.org/en/latest/api/database/find.html#find-selectors>`__.
to `CouchDB selector syntax <http://docs.couchdb.org/en/3.2.2/api/database/find.html#find-selectors>`__.


* **QueryAssetsByOwner**
Expand Down Expand Up @@ -728,7 +728,7 @@ Iterating on your index definition
If you have access to your peer's CouchDB state database in a development
environment, you can iteratively test various indexes in support of
your chaincode queries. Any changes to chaincode though would require
redeployment. Use the `CouchDB Fauxton interface <http://docs.couchdb.org/en/latest/fauxton/index.html>`__ or a command
redeployment. Use the `CouchDB Fauxton interface <http://docs.couchdb.org/en/3.2.2/fauxton/index.html>`__ or a command
line curl utility to create and update indexes.

.. note:: The Fauxton interface is a web UI for the creation, update, and
Expand Down
3 changes: 1 addition & 2 deletions integration/chaincode/marbles/marbles_chaincode.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
// any JSON query with a sort. As of Hyperledger Fabric 1.1, indexes may be packaged alongside
// chaincode in a META-INF/statedb/couchdb/indexes directory. Each index must be defined in its own
// text file with extension *.json with the index definition formatted in JSON following the
// CouchDB index JSON syntax as documented at:
// http://docs.couchdb.org/en/2.1.1/api/database/find.html#db-index
// CouchDB index JSON syntax.
//
// This marbles02 example chaincode demonstrates a packaged
// index which you can find in META-INF/statedb/couchdb/indexes/indexOwner.json.
Expand Down
2 changes: 1 addition & 1 deletion integration/nwo/runner/couchdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

const (
CouchDBDefaultImage = "couchdb:3.1.1"
CouchDBDefaultImage = "couchdb:3.2.2"
CouchDBUsername = "admin"
CouchDBPassword = "adminpw"
)
Expand Down

0 comments on commit 4c6ef91

Please sign in to comment.