fabric batch operations

Signed-off-by: Fedor Partanskiy <[email protected]>
scientificideas · Oct 6, 2024 · 81d6455 · 81d6455
1 parent 02e04e2
commit 81d6455
Show file tree

Hide file tree

Showing 67 changed files with 2,990 additions and 342 deletions.
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        INTEGRATION_TEST_SUITE: ["raft","pvtdata","pvtdatapurge","ledger","lifecycle","e2e smartbft","discovery gossip devmode pluggable","gateway idemix pkcs11 configtx configtxlator","sbe nwo msp"]
+        INTEGRATION_TEST_SUITE: ["raft","pvtdata","pvtdatapurge smartbft","ledger","lifecycle","e2e","discovery gossip devmode pluggable","gateway idemix pkcs11 configtx configtxlator","sbe nwo msp"]
     runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
     steps:
       - uses: actions/checkout@v4

diff --git a/core/chaincode/chaincode_support.go b/core/chaincode/chaincode_support.go
@@ -73,6 +73,8 @@ type ChaincodeSupport struct {
 	Runtime                Runtime
 	TotalQueryLimit        int
 	UserRunsCC             bool
+	UsePutStateBatch       bool
+	MaxSizePutStateBatch   uint32
 }
 
 // Launch starts executing chaincode if it is not already running. This method
@@ -126,6 +128,8 @@ func (cs *ChaincodeSupport) HandleChaincodeStream(stream ccintf.ChaincodeStream)
 		AppConfig:              cs.AppConfig,
 		Metrics:                cs.HandlerMetrics,
 		TotalQueryLimit:        cs.TotalQueryLimit,
+		UsePutStateBatch:       cs.UsePutStateBatch,
+		MaxSizePutStateBatch:   cs.MaxSizePutStateBatch,
 	}
 
 	return handler.ProcessStream(stream)

diff --git a/core/chaincode/config.go b/core/chaincode/config.go
@@ -16,21 +16,24 @@ import (
 )
 
 const (
-	defaultExecutionTimeout = 30 * time.Second
-	minimumStartupTimeout   = 5 * time.Second
+	defaultExecutionTimeout     = 30 * time.Second
+	minimumStartupTimeout       = 5 * time.Second
+	defaultMaxSizePutStateBatch = 1000
 )
 
 type Config struct {
-	TotalQueryLimit int
-	TLSEnabled      bool
-	Keepalive       time.Duration
-	ExecuteTimeout  time.Duration
-	InstallTimeout  time.Duration
-	StartupTimeout  time.Duration
-	LogFormat       string
-	LogLevel        string
-	ShimLogLevel    string
-	SCCAllowlist    map[string]bool
+	TotalQueryLimit      int
+	TLSEnabled           bool
+	Keepalive            time.Duration
+	ExecuteTimeout       time.Duration
+	InstallTimeout       time.Duration
+	StartupTimeout       time.Duration
+	LogFormat            string
+	LogLevel             string
+	ShimLogLevel         string
+	SCCAllowlist         map[string]bool
+	UsePutStateBatch     bool
+	MaxSizePutStateBatch uint32
 }
 
 func GlobalConfig() *Config {
@@ -71,6 +74,13 @@ func (c *Config) load() {
 	if viper.IsSet("ledger.state.totalQueryLimit") {
 		c.TotalQueryLimit = viper.GetInt("ledger.state.totalQueryLimit")
 	}
+	if viper.IsSet("chaincode.additionalParams.usePutStateBatch") {
+		c.UsePutStateBatch = viper.GetBool("chaincode.additionalParams.usePutStateBatch")
+	}
+	c.MaxSizePutStateBatch = viper.GetUint32("ledger.state.maxSizePutStateBatch")
+	if c.MaxSizePutStateBatch <= 0 {
+		c.MaxSizePutStateBatch = defaultMaxSizePutStateBatch
+	}
 }
 
 func parseBool(s string) bool {