split

FerretDB · AlekSi · Nov 20, 2023 · Nov 9, 2023 · Nov 9, 2023 · Nov 9, 2023
commit 2adeed3b62f118ebeb12f7e2c6fb3798bc3ebf9b
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -9,7 +9,6 @@ vars:
   SHARD_INDEX: 1
   SHARD_TOTAL: 1
   DISABLE_FILTER_PUSHDOWN: false
-  ENABLE_SORT_PUSHDOWN: false
   ENABLE_UNSAFE_SORT_PUSHDOWN: false
   TEST_RUN: ""
   TEST_TIMEOUT: 35m
@@ -219,7 +218,6 @@ tasks:
         -postgresql-url='postgres://username@127.0.0.1:5432/ferretdb?search_path='
         -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
         -disable-filter-pushdown={{.DISABLE_FILTER_PUSHDOWN}}
-        -enable-sort-pushdown={{.ENABLE_SORT_PUSHDOWN}}
         -enable-unsafe-sort-pushdown={{.ENABLE_UNSAFE_SORT_PUSHDOWN}}
 
   test-integration-sqlite:
@@ -246,7 +244,6 @@ tasks:
         -target-tls
         -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
         -disable-filter-pushdown={{.DISABLE_FILTER_PUSHDOWN}}
-        -enable-sort-pushdown={{.ENABLE_SORT_PUSHDOWN}}
         -enable-unsafe-sort-pushdown={{.ENABLE_UNSAFE_SORT_PUSHDOWN}}
 
   test-integration-hana:
@@ -273,7 +270,6 @@ tasks:
         -hana-url=$FERRETDB_HANA_URL
         -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
         -disable-filter-pushdown={{.DISABLE_FILTER_PUSHDOWN}}
-        -enable-sort-pushdown={{.ENABLE_SORT_PUSHDOWN}}
         -enable-unsafe-sort-pushdown={{.ENABLE_UNSAFE_SORT_PUSHDOWN}}
 
   test-integration-mongodb:

diff --git a/cmd/ferretdb/main.go b/cmd/ferretdb/main.go
@@ -87,7 +87,6 @@ var cli struct {
 		RecordsDir string `default:"" help:"Testing: directory for record files."`
 
 		DisableFilterPushdown    bool `default:"false" help:"Experimental: disable filter pushdown."`
-		EnableSortPushdown       bool `default:"false" help:"Experimental: enable sort pushdown."`
 		EnableUnsafeSortPushdown bool `default:"false" help:"Experimental: enable unsafe sort pushdown."`
 		EnableOplog              bool `default:"false" help:"Experimental: enable capped collections, tailable cursors and OpLog." hidden:""`
 
@@ -383,7 +382,6 @@ func run() {
 
 		TestOpts: registry.TestOpts{
 			DisableFilterPushdown:    cli.Test.DisableFilterPushdown,
-			EnableSortPushdown:       cli.Test.EnableSortPushdown,
 			EnableUnsafeSortPushdown: cli.Test.EnableUnsafeSortPushdown,
 			EnableOplog:              cli.Test.EnableOplog,
 		},

diff --git a/integration/setup/listener.go b/integration/setup/listener.go
@@ -160,7 +160,6 @@ func setupListener(tb testtb.TB, ctx context.Context, logger *zap.Logger) string
 
 		TestOpts: registry.TestOpts{
 			DisableFilterPushdown:    *disableFilterPushdownF,
-			EnableSortPushdown:       *enableSortPushdownF,
 			EnableUnsafeSortPushdown: *enableUnsafeSortPushdownF,
 			EnableOplog:              true,
 		},
@@ -187,10 +186,6 @@ func setupListener(tb testtb.TB, ctx context.Context, logger *zap.Logger) string
 		tb.Fatal("Both -target-tls and -target-unix-socket are set.")
 	}
 
-	if *enableSortPushdownF && *enableUnsafeSortPushdownF {
-		tb.Fatal("Both -enable-sort-pushdown and -enable-unsafe-sort-pushdown are set.")
-	}
-
 	switch {
 	case *targetTLSF:
 		listenerOpts.TLS = "127.0.0.1:0"

diff --git a/integration/setup/setup.go b/integration/setup/setup.go
@@ -60,7 +60,6 @@ var (
 	logLevelF   = zap.LevelFlag("log-level", zap.DebugLevel, "log level for tests")
 
 	disableFilterPushdownF    = flag.Bool("disable-filter-pushdown", false, "disable filter pushdown")
-	enableSortPushdownF       = flag.Bool("enable-sort-pushdown", false, "enable sort pushdown")
 	enableUnsafeSortPushdownF = flag.Bool("enable-unsafe-sort-pushdown", false, "enable unsafe sort pushdown")
 )
 

diff --git a/integration/setup/test_helpers.go b/integration/setup/test_helpers.go
@@ -86,7 +86,7 @@ func FilterPushdownDisabled() bool {
 	return *disableFilterPushdownF
 }
 
-// SortPushdownEnabled returns true if sort pushdown is enabled.
-func SortPushdownEnabled() bool {
-	return *enableSortPushdownF
+// UnsafeSortPushdownEnabled returns true if unsafe sort pushdown is enabled.
+func UnsafeSortPushdownEnabled() bool {
+	return *enableUnsafeSortPushdownF
 }
diff --git a/internal/handlers/registry/hana.go b/internal/handlers/registry/hana.go
@@ -44,7 +44,6 @@ func init() {
 			StateProvider: opts.StateProvider,
 
 			DisableFilterPushdown:    opts.DisableFilterPushdown,
-			EnableSortPushdown:       opts.EnableSortPushdown,
 			EnableUnsafeSortPushdown: opts.EnableUnsafeSortPushdown,
 			EnableOplog:              opts.EnableOplog,
 		}

diff --git a/internal/handlers/registry/postgresql.go b/internal/handlers/registry/postgresql.go
@@ -40,7 +40,6 @@ func init() {
 			StateProvider: opts.StateProvider,
 
 			DisableFilterPushdown:    opts.DisableFilterPushdown,
-			EnableSortPushdown:       opts.EnableSortPushdown,
 			EnableUnsafeSortPushdown: opts.EnableUnsafeSortPushdown,
 			EnableOplog:              opts.EnableOplog,
 		}

diff --git a/internal/handlers/registry/registry.go b/internal/handlers/registry/registry.go
@@ -59,7 +59,6 @@ type NewHandlerOpts struct {
 // TestOpts represents experimental configuration options.
 type TestOpts struct {
 	DisableFilterPushdown    bool
-	EnableSortPushdown       bool
 	EnableUnsafeSortPushdown bool
 	EnableOplog              bool
 }

diff --git a/internal/handlers/registry/sqlite.go b/internal/handlers/registry/sqlite.go
@@ -40,7 +40,6 @@ func init() {
 			StateProvider: opts.StateProvider,
 
 			DisableFilterPushdown:    opts.DisableFilterPushdown,
-			EnableSortPushdown:       opts.EnableSortPushdown,
 			EnableUnsafeSortPushdown: opts.EnableUnsafeSortPushdown,
 			EnableOplog:              opts.EnableOplog,
 		}

@@ -269,7 +269,7 @@
 		}
 
 		// Skip sorting if there are more than one sort parameters
-		if (h.EnableSortPushdown || h.EnableUnsafeSortPushdown) && sort.Len() == 1 {
+		if h.EnableUnsafeSortPushdown && sort.Len() == 1 {
 			var order types.SortType
 
 			k := sort.Keys()[0]
@@ -277,7 +277,7 @@

 			order, err = common.GetSortType(k, v)
 			if err != nil {
 				closer.Close()
 				return nil, err
 			}


@@ -88,7 +88,7 @@
 	}
 
 	// Skip sorting if there are more than one sort parameters
-	if (h.EnableSortPushdown || h.EnableUnsafeSortPushdown) && params.Sort.Len() == 1 {
+	if h.EnableUnsafeSortPushdown && params.Sort.Len() == 1 {
 		var order types.SortType
 
 		k := params.Sort.Keys()[0]
@@ -107,20 +107,18 @@
 
 	// Limit pushdown is not applied if:
 	//  - `filter` is set, it must fetch all documents to filter them in memory;
-	//  - `sort` is set but sort pushdown is not enabled, it must fetch all documents
+	//  - `sort` is set but `UnsafeSortPushdown` is not set, it must fetch all documents
 	//  and sort them in memory;
 	//  - `skip` is non-zero value, skip pushdown is not supported yet.
-	if params.Filter.Len() == 0 &&
-		(params.Sort.Len() == 0 || h.EnableSortPushdown || h.EnableUnsafeSortPushdown) &&
-		params.Skip == 0 {
+	if params.Filter.Len() == 0 && (params.Sort.Len() == 0 || h.EnableUnsafeSortPushdown) && params.Skip == 0 {
 		qp.Limit = params.Limit
 	}
 
 	if h.DisableFilterPushdown {
 		qp.Filter = nil
 	}
 
-	if !h.EnableSortPushdown {
+	if !h.EnableUnsafeSortPushdown {
 		qp.Sort = nil
 	}
 
@@ -139,9 +137,9 @@

 			// our extensions
 			// TODO https://github.com/FerretDB/FerretDB/issues/3235
 			"pushdown", res.FilterPushdown,
 			"sortingPushdown", res.SortPushdown,
 			"limitPushdown", res.LimitPushdown,

 			"ok", float64(1),
 		))},

diff --git a/internal/handlers/sqlite/msg_find.go b/internal/handlers/sqlite/msg_find.go
@@ -113,7 +113,7 @@ func (h *Handler) MsgFind(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, er
 	}
 
 	// Skip sorting if there are more than one sort parameters
-	if (h.EnableSortPushdown || h.EnableUnsafeSortPushdown) && params.Sort.Len() == 1 {
+	if h.EnableUnsafeSortPushdown && params.Sort.Len() == 1 {
 		var order types.SortType
 
 		k := params.Sort.Keys()[0]
@@ -132,12 +132,10 @@ func (h *Handler) MsgFind(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, er
 
 	// Limit pushdown is not applied if:
 	//  - `filter` is set, it must fetch all documents to filter them in memory;
-	//  - `sort` is set but sort pushdown is not enabled, it must fetch all documents
+	//  - `sort` is set but `UnsafeSortPushdown` is not set, it must fetch all documents
 	//  and sort them in memory;
 	//  - `skip` is non-zero value, skip pushdown is not supported yet.
-	if params.Filter.Len() == 0 &&
-		(params.Sort.Len() == 0 || h.EnableSortPushdown || h.EnableUnsafeSortPushdown) &&
-		params.Skip == 0 {
+	if params.Filter.Len() == 0 && (params.Sort.Len() == 0 || h.EnableUnsafeSortPushdown) && params.Skip == 0 {
 		qp.Limit = params.Limit
 	}
 

diff --git a/internal/handlers/sqlite/sqlite.go b/internal/handlers/sqlite/sqlite.go
@@ -50,7 +50,6 @@ type NewOpts struct {
 
 	// test options
 	DisableFilterPushdown    bool
-	EnableSortPushdown       bool
 	EnableUnsafeSortPushdown bool
 	EnableOplog              bool
 }