Merge pull request #109 from hyperledger/sql-logging

Fix propagation of `blockNumber` to EVMConnect (and batch logging tweak)
hyperledger · Feb 14, 2024 · 9e50b94 · 9e50b94
2 parents a085feb + 26834f1
commit 9e50b94
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/internal/persistence/postgres/transaction_writer.go b/internal/persistence/postgres/transaction_writer.go
@@ -78,6 +78,7 @@ type transactionWriter struct {
 
 type transactionWriterBatch struct {
 	id             string
+	opened         time.Time
 	ops            []*transactionOperation
 	timeoutContext context.Context
 	timeoutCancel  func()
@@ -207,7 +208,8 @@ func (tw *transactionWriter) worker(i int) {
 			}
 			if batch == nil {
 				batch = &transactionWriterBatch{
-					id: fmt.Sprintf("%.4d_%.9d", i, batchCount),
+					id:     fmt.Sprintf("%.4d_%.9d", i, batchCount),
+					opened: time.Now(),
 				}
 				batch.timeoutContext, batch.timeoutCancel = context.WithTimeout(ctx, tw.batchTimeout)
 				batchCount++
@@ -226,7 +228,7 @@ func (tw *transactionWriter) worker(i int) {
 
 		if batch != nil && (timedOut || (len(batch.ops) >= tw.batchMaxSize)) {
 			batch.timeoutCancel()
-			l.Debugf("Running batch %s (len=%d)", batch.id, len(batch.ops))
+			l.Debugf("Running batch %s (len=%d,timeout=%t,age=%dms)", batch.id, len(batch.ops), timedOut, time.Since(batch.opened).Milliseconds())
 			tw.runBatch(ctx, batch)
 			batch = nil
 		}

diff --git a/pkg/apitypes/query_request.go b/pkg/apitypes/query_request.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -24,6 +24,7 @@ import (
 type QueryRequest struct {
 	Headers RequestHeaders `json:"headers"`
 	ffcapi.TransactionInput
+	BlockNumber *string `json:"blockNumber,omitempty"`
 }
 
 // QueryResponse is the response payload for a query

diff --git a/pkg/ffcapi/method_call.go b/pkg/ffcapi/method_call.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -28,7 +28,7 @@ import (
 // detected by the back-end connector.
 type QueryInvokeRequest struct {
 	TransactionInput
-	BlockNumber *fftypes.FFBigInt `json:"blockNumber,omitempty"`
+	BlockNumber *string `json:"blockNumber,omitempty"`
 }
 
 type QueryInvokeResponse struct {

diff --git a/pkg/fftm/route__root_command.go b/pkg/fftm/route__root_command.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -101,6 +101,7 @@ var postRootCommand = func(m *manager) *ffapi.Route {
 				}
 				res, _, err := m.connector.QueryInvoke(r.Req.Context(), &ffcapi.QueryInvokeRequest{
 					TransactionInput: tReq.TransactionInput,
+					BlockNumber:      tReq.BlockNumber,
 				})
 				if err != nil {
 					return nil, err