Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more fields to requests and responses #4096

Merged
merged 10 commits into from
Feb 20, 2024
+25 −11
Merged

Add more fields to requests and responses #4096

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e3b2821
Add logicalSessionTimeoutMinutes to isMaster response
rumyantseva Feb 19, 2024
cedf227
wip
rumyantseva Feb 19, 2024
3afd7d5
Merge branch 'main' into logicalSessionTimeoutMinutes
Feb 19, 2024
00c1a3f
wip
rumyantseva Feb 19, 2024
24fd256
wip
rumyantseva Feb 19, 2024
24ff71d
wip
rumyantseva Feb 19, 2024
0356104
wip
rumyantseva Feb 19, 2024
4bdda45
wip
rumyantseva Feb 19, 2024
ce34d38
wip
rumyantseva Feb 19, 2024
eb25b42
Merge branch 'main' into logicalSessionTimeoutMinutes
Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@rumyantseva
rumyantseva committed Feb 19, 2024
commit cedf22731ac7d54ccd98d355a983ab6fd971193b
1 change: 1 addition & 0 deletions internal/handler/common/delete_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down
19 changes: 11 additions & 8 deletions internal/handler/common/find.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
1 change: 1 addition & 0 deletions internal/handler/common/findandmodify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
)

// FindAndModifyParams represent parameters for the findAndModify command.
type FindAndModifyParams struct {

Check failure on line 28 in internal/handler/common/findandmodify.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

fieldalignment: struct of size 232 could be 216 (govet)
DB string `ferretdb:"$db"`
Collection string `ferretdb:"findAndModify,collection"`
Comment string `ferretdb:"comment,opt"`
Expand All @@ -51,6 +51,7 @@
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"`
}
Expand Down
1 change: 1 addition & 0 deletions internal/handler/common/insert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
)

// InsertParams represents the parameters for an insert command.
type InsertParams struct {

Check failure on line 29 in internal/handler/common/insert.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

fieldalignment: struct of size 128 could be 120 (govet)
Docs *types.Array `ferretdb:"documents,opt"`
DB string `ferretdb:"$db"`
Collection string `ferretdb:"insert,collection"`
Expand All @@ -36,6 +36,7 @@
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"`
}

Expand Down
5 changes: 4 additions & 1 deletion internal/handler/common/update_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,opt,wholePositiveNumber"`

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"`
}
Expand Down
Loading