Add more fields to requests and responses (#4096)

Closes #153.
FerretDB · Feb 20, 2024 · a1dc6c7 · a1dc6c7
1 parent eb8f0b2
commit a1dc6c7
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/internal/handler/common/delete_params.go b/internal/handler/common/delete_params.go
@@ -36,6 +36,7 @@ type DeleteParams struct {
 
 	WriteConcern   *types.Document `ferretdb:"writeConcern,ignored"`
 	LSID           any             `ferretdb:"lsid,ignored"`
+	TxnNumber      int64           `ferretdb:"txnNumber,ignored"`
 	ClusterTime    any             `ferretdb:"$clusterTime,ignored"`
 	ReadPreference *types.Document `ferretdb:"$readPreference,ignored"`
 }

diff --git a/internal/handler/common/find.go b/internal/handler/common/find.go
@@ -46,14 +46,17 @@ type FindParams struct {
 	Collation *types.Document `ferretdb:"collation,unimplemented"`
 	Let       *types.Document `ferretdb:"let,unimplemented"`
 
-	AllowDiskUse   bool            `ferretdb:"allowDiskUse,ignored"`
-	ReadConcern    *types.Document `ferretdb:"readConcern,ignored"`
-	Max            *types.Document `ferretdb:"max,ignored"`
-	Min            *types.Document `ferretdb:"min,ignored"`
-	Hint           any             `ferretdb:"hint,ignored"`
-	LSID           any             `ferretdb:"lsid,ignored"`
-	ClusterTime    any             `ferretdb:"$clusterTime,ignored"`
-	ReadPreference *types.Document `ferretdb:"$readPreference,ignored"`
+	AllowDiskUse     bool            `ferretdb:"allowDiskUse,ignored"`
+	ReadConcern      *types.Document `ferretdb:"readConcern,ignored"`
+	Max              *types.Document `ferretdb:"max,ignored"`
+	Min              *types.Document `ferretdb:"min,ignored"`
+	Hint             any             `ferretdb:"hint,ignored"`
+	LSID             any             `ferretdb:"lsid,ignored"`
+	TxnNumber        int64           `ferretdb:"txnNumber,ignored"`
+	StartTransaction bool            `ferretdb:"startTransaction,ignored"`
+	Autocommit       bool            `ferretdb:"autocommit,ignored"`
+	ClusterTime      any             `ferretdb:"$clusterTime,ignored"`
+	ReadPreference   *types.Document `ferretdb:"$readPreference,ignored"`
 
 	ReturnKey           bool `ferretdb:"returnKey,unimplemented-non-default"`
 	OplogReplay         bool `ferretdb:"oplogReplay,ignored"`

diff --git a/internal/handler/common/findandmodify.go b/internal/handler/common/findandmodify.go
@@ -25,6 +25,8 @@ import (
 )
 
 // FindAndModifyParams represent parameters for the findAndModify command.
+//
+//nolint:vet // for readability
 type FindAndModifyParams struct {
 	DB                string          `ferretdb:"$db"`
 	Collection        string          `ferretdb:"findAndModify,collection"`
@@ -51,6 +53,7 @@ type FindAndModifyParams struct {
 	WriteConcern             *types.Document `ferretdb:"writeConcern,ignored"`
 	BypassDocumentValidation bool            `ferretdb:"bypassDocumentValidation,ignored"`
 	LSID                     any             `ferretdb:"lsid,ignored"`
+	TxnNumber                int64           `ferretdb:"txnNumber,ignored"`
 	ClusterTime              any             `ferretdb:"$clusterTime,ignored"`
 	ReadPreference           *types.Document `ferretdb:"$readPreference,ignored"`
 }

diff --git a/internal/handler/common/insert.go b/internal/handler/common/insert.go
@@ -26,6 +26,8 @@ import (
 )
 
 // InsertParams represents the parameters for an insert command.
+//
+//nolint:vet // for readability
 type InsertParams struct {
 	Docs       *types.Array `ferretdb:"documents,opt"`
 	DB         string       `ferretdb:"$db"`
@@ -36,6 +38,7 @@ type InsertParams struct {
 	BypassDocumentValidation bool   `ferretdb:"bypassDocumentValidation,ignored"`
 	Comment                  string `ferretdb:"comment,ignored"`
 	LSID                     any    `ferretdb:"lsid,ignored"`
+	TxnNumber                int64  `ferretdb:"txnNumber,ignored"`
 	ClusterTime              any    `ferretdb:"$clusterTime,ignored"`
 }
 

diff --git a/internal/handler/common/ismaster.go b/internal/handler/common/ismaster.go
@@ -39,7 +39,7 @@ func IsMaster(ctx context.Context, query *types.Document, tcpHost, name string)
 	return &reply, nil
 }
 
-// IsMasterDocuments returns isMaster's Documents field (identical for both OP_MSG and OP_QUERY).
+// IsMasterDocument returns isMaster's Documents field (identical for both OP_MSG and OP_QUERY).
 func IsMasterDocument(tcpHost, name string) *types.Document {
 	doc := must.NotFail(types.NewDocument(
 		"ismaster", true, // only lowercase
@@ -48,7 +48,7 @@ func IsMasterDocument(tcpHost, name string) *types.Document {
 		"maxMessageSizeBytes", int32(wire.MaxMsgLen),
 		"maxWriteBatchSize", int32(100000),
 		"localTime", time.Now(),
-		// logicalSessionTimeoutMinutes
+		"logicalSessionTimeoutMinutes", int32(30),
 		"connectionId", int32(42),
 		"minWireVersion", MinWireVersion,
 		"maxWireVersion", MaxWireVersion,

diff --git a/internal/handler/common/update_params.go b/internal/handler/common/update_params.go
@@ -30,14 +30,17 @@ type UpdateParams struct {
 
 	Updates []Update `ferretdb:"updates"`
 
-	Comment string `ferretdb:"comment,opt"`
+	Comment   string `ferretdb:"comment,opt"`
+	MaxTimeMS int64  `ferretdb:"maxTimeMS,ignored"`
 
 	Let *types.Document `ferretdb:"let,unimplemented"`
 
 	Ordered                  bool            `ferretdb:"ordered,ignored"`
 	BypassDocumentValidation bool            `ferretdb:"bypassDocumentValidation,ignored"`
 	WriteConcern             *types.Document `ferretdb:"writeConcern,ignored"`
 	LSID                     any             `ferretdb:"lsid,ignored"`
+	TxnNumber                int64           `ferretdb:"txnNumber,ignored"`
+	Autocommit               bool            `ferretdb:"autocommit,ignored"`
 	ClusterTime              any             `ferretdb:"$clusterTime,ignored"`
 	ReadPreference           *types.Document `ferretdb:"$readPreference,ignored"`
 }

diff --git a/internal/wire/op_msg.go b/internal/wire/op_msg.go
@@ -121,6 +121,7 @@ func (msg *OpMsg) Document() (*types.Document, error) {
 	}
 
 	if err := validateValue(res); err != nil {
+		res.Remove("lsid") // to simplify error message
 		return nil, newValidationError(fmt.Errorf("wire.OpMsg.Document: validation failed for %v with: %v",
 			types.FormatAnyValue(res),
 			err,