wip

FerretDB · rumyantseva · May 3, 2023 · Apr 24, 2023 · Apr 25, 2023 · Apr 25, 2023
commit 00d97d972001983e5cac50564fe8082efe07a1b2
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -279,6 +279,20 @@ tasks:
         --postgresql-url=postgres://username@127.0.0.1:5432/ferretdb
         --test-records-dir=tmp/records
 
+  run-sort:
+    desc: "Run FerretDB with `pg` handler"
+    deps: [build-host]
+    cmds:
+      - >
+        bin/ferretdb{{exeExt}} -test.coverprofile=cover.txt --
+        --listen-addr=:27017
+        --proxy-addr=127.0.0.1:47017
+        --mode=diff-normal
+        --handler=pg
+        --postgresql-url=postgres://username@127.0.0.1:5432/ferretdb
+        --test-records-dir=tmp/records
+        --test-enable-sorting-pushdown
+
   run-tigris:
     desc: "Run FerretDB with `tigris` handler"
     deps: [build-host]

diff --git a/cmd/ferretdb/main.go b/cmd/ferretdb/main.go
@@ -82,6 +82,7 @@ var cli struct {
 	Test struct {
 		RecordsDir            string `default:"" help:"Experimental: directory for record files."`
 		DisableFilterPushdown bool   `default:"false" help:"Experimental: disable filter pushdown."`
+		EnableSortingPushdown bool   `default:"false" help:"Experimental: enable sorting pushdown."`
 		EnableCursors         bool   `default:"false" help:"Experimental: enable cursors."`
 
 		//nolint:lll // for readability
@@ -339,6 +340,7 @@ func run() {
 
 		TestOpts: registry.TestOpts{
 			DisableFilterPushdown: cli.Test.DisableFilterPushdown,
+			NativeSort:            cli.Test.EnableSortingPushdown,
 			EnableCursors:         cli.Test.EnableCursors,
 		},
 	})

@@ -63,7 +63,7 @@ func (h *Handler) MsgExplain(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 
 	qp.Explain = true
 
-	qp.NativeSort = true
+	qp.NativeSort = h.NativeSort
 
 	explain, err := common.GetRequiredParam[*types.Document](document, "explain")
 	if err != nil {

diff --git a/internal/handlers/pg/msg_find.go b/internal/handlers/pg/msg_find.go
@@ -61,7 +61,7 @@ func (h *Handler) MsgFind(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, er
 		DB:         params.DB,
 		Collection: params.Collection,
 		Comment:    params.Comment,
-		NativeSort: true,
+		NativeSort: h.NativeSort,
 	}
 
 	// get comment from query, e.g. db.collection.find({$comment: "test"})

diff --git a/internal/handlers/pg/pg.go b/internal/handlers/pg/pg.go
@@ -54,6 +54,7 @@ type NewOpts struct {
 
 	// test options
 	DisableFilterPushdown bool
+	NativeSort            bool
 	EnableCursors         bool
 }
 

diff --git a/internal/handlers/registry/registry.go b/internal/handlers/registry/registry.go
@@ -62,6 +62,7 @@ type NewHandlerOpts struct {
 // TestOpts represents experimental configuration options.
 type TestOpts struct {
 	DisableFilterPushdown bool
+	NativeSort            bool
 	EnableCursors         bool
 }
 
@@ -101,6 +102,7 @@ func init() {
 			StateProvider: opts.StateProvider,
 
 			DisableFilterPushdown: opts.DisableFilterPushdown,
+			NativeSort:            opts.NativeSort,
 			EnableCursors:         opts.EnableCursors,
 		}
 		return pg.New(handlerOpts)