Merge pull request #2632 from JKamsker/feat/composite-sorting

Feat/composite sorting

Author: JKamsker

LiteDB.Tests/Engine/Collation_Tests.cs

@@ -33,7 +33,10 @@ public void Culture_Ordinal_Sort()
                 e.Insert("col1", names.Select(x => new BsonDocument { ["name"] = x }), BsonAutoId.Int32);
 
                 // sort by merge sort
-                var sortByOrderByName = e.Query("col1", new Query { OrderBy = "name" })
+                var orderQuery = new Query();
+                orderQuery.OrderBy.Add(new QueryOrder("name", Query.Ascending));
+
+                var sortByOrderByName = e.Query("col1", orderQuery)
                     .ToEnumerable()
                     .Select(x => x["name"].AsString)
                     .ToArray();
@@ -53,8 +56,11 @@ public void Culture_Ordinal_Sort()
                 // index test
                 e.EnsureIndex("col1", "idx_name", "name", false);
 
+                var indexOrderQuery = new Query();
+                indexOrderQuery.OrderBy.Add(new QueryOrder("name", Query.Ascending));
+
                 // sort by index
-                var sortByIndexName = e.Query("col1", new Query { OrderBy = "name" })
+                var sortByIndexName = e.Query("col1", indexOrderQuery)
                     .ToEnumerable()
                     .Select(x => x["name"].AsString)
                     .ToArray();

LiteDB.Tests/Internals/Sort_Tests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
@@ -24,7 +24,7 @@ public void Sort_String_Asc()
             pragmas.Set(Pragmas.COLLATION, Collation.Binary.ToString(), false);
 
             using (var tempDisk = new SortDisk(_factory, 10 * 8192, pragmas))
-            using (var s = new SortService(tempDisk, Query.Ascending, pragmas))
+            using (var s = new SortService(tempDisk, new[] { Query.Ascending }, pragmas))
             {
                 s.Insert(source);
 
@@ -52,7 +52,7 @@ public void Sort_Int_Desc()
             pragmas.Set(Pragmas.COLLATION, Collation.Binary.ToString(), false);
 
             using (var tempDisk = new SortDisk(_factory, 8192, pragmas))
-            using (var s = new SortService(tempDisk, Query.Descending, pragmas))
+            using (var s = new SortService(tempDisk, [Query.Descending], pragmas))
             {
                 s.Insert(source);