[FAB-4455] Change location of queryLimit in core.yaml

Since the queryLimit setting only applies to couchDB,
the value in core.yaml ledger.state.queryLimit should
change to ledger.state.couchDBConfig.queryLimit.

This is an administrative change and does not impact
any functionality visible to the user.

Change-Id: I5924bc4adec89959518b4a282bbcc1797c3a1b7f
Signed-off-by: Chris Elder <[email protected]>

Author: Chris Elder

core/chaincode/chaincodetest.yaml

@@ -446,9 +446,9 @@ ledger:
        maxRetriesOnStartup: 10
        # CouchDB request timeout (unit: duration, e.g. 20s)
        requestTimeout: 35s
+       # Limit on the number of records to return per query
+       queryLimit: 10000
 
-    # Limit on the number of records to return per query
-    queryLimit: 10000
 
   history:
     # enableHistoryDatabase - options are true or false

core/ledger/ledgerconfig/ledger_config.go

@@ -66,9 +66,9 @@ func GetMaxBlockfileSize() int {
 
 //GetQueryLimit exposes the queryLimit variable
 func GetQueryLimit() int {
-	queryLimit := viper.GetInt("ledger.state.queryLimit")
+	queryLimit := viper.GetInt("ledger.state.couchDBConfig.queryLimit")
 	// if queryLimit was unset, default to 10000
-	if queryLimit == 0 {
+	if !viper.IsSet("ledger.state.couchDBConfig.queryLimit") {
 		queryLimit = 10000
 	}
 	return queryLimit

sampleconfig/core.yaml

@@ -370,9 +370,9 @@ ledger:
        maxRetriesOnStartup: 10
        # CouchDB request timeout (unit: duration, e.g. 20s)
        requestTimeout: 35s
+       # Limit on the number of records to return per query
+       queryLimit: 10000
 
-    # Limit on the number of records to return per query
-    queryLimit: 10000
 
   history:
     # enableHistoryDatabase - options are true or false