wip

FerretDB · rumyantseva · May 3, 2023 · Apr 24, 2023 · Apr 25, 2023 · Apr 25, 2023
commit 5b9789136f92809050c248c0f1d4b3bc9c950e5a
diff --git a/cmd/ferretdb/main.go b/cmd/ferretdb/main.go
@@ -340,7 +340,7 @@ func run() {
 
 		TestOpts: registry.TestOpts{
 			DisableFilterPushdown: cli.Test.DisableFilterPushdown,
-			NativeSort:            cli.Test.EnableSortingPushdown,
+			EnableSortPushdown:    cli.Test.EnableSortingPushdown,
 			EnableCursors:         cli.Test.EnableCursors,
 		},
 	})

diff --git a/internal/handlers/pg/msg_find.go b/internal/handlers/pg/msg_find.go
@@ -74,7 +74,7 @@ func (h *Handler) MsgFind(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, er
 		qp.Filter = params.Filter
 	}
 
-	if h.NativeSort {
+	if h.EnableSortPushdown {
 		qp.Sort = params.Sort
 	}
 

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

diff --git a/internal/handlers/pg/pgdb/query.go b/internal/handlers/pg/pgdb/query.go
@@ -234,6 +234,8 @@ func prepareSortClause(p *Placeholder, sort *types.Document) (string, []any, err
 		if err != nil {
 			return "", nil, err
 		}
+
+		key = k
 	}
 
 	// Skip sorting dot notation

diff --git a/internal/handlers/registry/registry.go b/internal/handlers/registry/registry.go
@@ -62,7 +62,7 @@ type NewHandlerOpts struct {
 // TestOpts represents experimental configuration options.
 type TestOpts struct {
 	DisableFilterPushdown bool
-	NativeSort            bool
+	EnableSortPushdown    bool
 	EnableCursors         bool
 }
 
@@ -102,7 +102,7 @@ func init() {
 			StateProvider: opts.StateProvider,
 
 			DisableFilterPushdown: opts.DisableFilterPushdown,
-			NativeSort:            opts.NativeSort,
+			EnableSortPushdown:    opts.EnableSortPushdown,
 			EnableCursors:         opts.EnableCursors,
 		}
 		return pg.New(handlerOpts)
-Original file line number
+Diff line change
@@ Expand Up @@
     		if err != nil {
     			return "", nil, err
     		}
+    		key = k
     	}
     	// Skip sorting dot notation
@@ Expand Down @@