Make listIndexes return a sorted list (#3602)

Closes #3589.
FerretDB · Oct 20, 2023 · 05a2ee3 · 05a2ee3
1 parent 19c361a
commit 05a2ee3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/integration/indexes_command_compat_test.go b/integration/indexes_command_compat_test.go
@@ -416,7 +416,7 @@ func TestDropIndexesCommandCompat(tt *testing.T) {
 						targetList := FetchAll(t, ctx, targetCursor)
 						compatList := FetchAll(t, ctx, compatCursor)
 
-						require.Equal(t, compatList, targetList)
+						require.ElementsMatch(t, compatList, targetList)
 					}
 
 					targetCommand := bson.D{
@@ -451,7 +451,7 @@ func TestDropIndexesCommandCompat(tt *testing.T) {
 						require.Nil(t, compatRes)
 					}
 
-					require.Equal(t, compatRes, targetRes)
+					require.ElementsMatch(t, compatRes, targetRes)
 
 					if compatErr == nil {
 						nonEmptyResults = true
@@ -474,7 +474,7 @@ func TestDropIndexesCommandCompat(tt *testing.T) {
 					targetList := FetchAll(t, ctx, targetCursor)
 					compatList := FetchAll(t, ctx, compatCursor)
 
-					assert.Equal(t, compatList, targetList)
+					assert.ElementsMatch(t, compatList, targetList)
 				})
 			}
 

diff --git a/integration/indexes_compat_test.go b/integration/indexes_compat_test.go
@@ -285,7 +285,7 @@ func TestCreateIndexesCompat(tt *testing.T) {
 					targetIndexes := FetchAll(t, ctx, targetCursor)
 					compatIndexes := FetchAll(t, ctx, compatCursor)
 
-					assert.Equal(t, compatIndexes, targetIndexes)
+					assert.ElementsMatch(t, compatIndexes, targetIndexes)
 
 					// List specifications to check they are identical after creation.
 					targetSpec, targetErr := targetCollection.Indexes().ListSpecifications(ctx)
@@ -295,7 +295,7 @@ func TestCreateIndexesCompat(tt *testing.T) {
 					require.NoError(t, targetErr)
 
 					require.NotEmpty(t, compatSpec)
-					assert.Equal(t, compatSpec, targetSpec)
+					assert.ElementsMatch(t, compatSpec, targetSpec)
 				})
 			}
 

diff --git a/internal/backends/collection.go b/internal/backends/collection.go
@@ -15,7 +15,9 @@
 package backends
 
 import (
+	"cmp"
 	"context"
+	"slices"
 	"time"
 
 	"github.com/FerretDB/FerretDB/internal/types"
@@ -319,12 +321,11 @@ func (cc *collectionContract) ListIndexes(ctx context.Context, params *ListIndex
 	res, err := cc.c.ListIndexes(ctx, params)
 	checkError(err, ErrorCodeCollectionDoesNotExist)
 
-	// TODO https://github.com/FerretDB/FerretDB/issues/3589
-	// if res != nil && len(res.Indexes) > 0 {
-	// 	must.BeTrue(slices.IsSortedFunc(res.Indexes, func(a, b IndexInfo) int {
-	// 		return cmp.Compare(a.Name, b.Name)
-	// 	}))
-	// }
+	if res != nil && len(res.Indexes) > 0 {
+		must.BeTrue(slices.IsSortedFunc(res.Indexes, func(a, b IndexInfo) int {
+			return cmp.Compare(a.Name, b.Name)
+		}))
+	}
 
 	return res, err
 }

diff --git a/internal/backends/postgresql/collection.go b/internal/backends/postgresql/collection.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/jackc/pgerrcode"
@@ -527,10 +528,9 @@ func (c *collection) ListIndexes(ctx context.Context, params *backends.ListIndex
 		}
 	}
 
-	// TODO https://github.com/FerretDB/FerretDB/issues/3589
-	// slices.SortFunc(res.Indexes, func(a, b backends.IndexInfo) int {
-	// 	return cmp.Compare(a.Name, b.Name)
-	// })
+	sort.Slice(res.Indexes, func(i, j int) bool {
+		return res.Indexes[i].Name < res.Indexes[j].Name
+	})
 
 	return &res, nil
 }

diff --git a/internal/backends/sqlite/collection.go b/internal/backends/sqlite/collection.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"strings"
 
 	sqlite3 "modernc.org/sqlite"
@@ -468,10 +469,9 @@ func (c *collection) ListIndexes(ctx context.Context, params *backends.ListIndex
 		}
 	}
 
-	// TODO https://github.com/FerretDB/FerretDB/issues/3589
-	// slices.SortFunc(res.Indexes, func(a, b backends.IndexInfo) int {
-	// 	return cmp.Compare(a.Name, b.Name)
-	// })
+	sort.Slice(res.Indexes, func(i, j int) bool {
+		return res.Indexes[i].Name < res.Indexes[j].Name
+	})
 
 	return &res, nil
 }