Fixed issues in SqlQueryGenerator and rollback unnecessary change in …

…SortRewriter
almostchristian · Oct 19, 2023 · 3ee3f57 · 3ee3f57
1 parent 82c33ec
commit 3ee3f57
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Microsoft.Health.Fhir.Core/Configs/CoreFeatureConfiguration.cs b/src/Microsoft.Health.Fhir.Core/Configs/CoreFeatureConfiguration.cs
@@ -85,6 +85,6 @@ public class CoreFeatureConfiguration
         /// <summary>
         /// Gets or sets a value indicating whether the sql generator should use OFFSET for paging search results.
         /// </summary>
-        public bool SupportsIndexedPaging { get; set; } = true;
+        public bool SupportsIndexedPaging { get; set; }
     }
 }
diff --git a/src/Microsoft.Health.Fhir.Shared.Web/appsettings.json b/src/Microsoft.Health.Fhir.Shared.Web/appsettings.json
@@ -30,6 +30,7 @@
             "ProfileValidationOnUpdate": false,
             "SupportsResourceChangeCapture": false,
             "SupportsBulkDelete": true,
+            "SupportsIndexedPaging": false,
             "Versioning": {
                 "Default": "versioned",
                 "ResourceTypeOverrides": null

diff --git a/....Fhir.SqlServer/Features/Search/Expressions/Visitors/QueryGenerators/SqlQueryGenerator.cs b/....Fhir.SqlServer/Features/Search/Expressions/Visitors/QueryGenerators/SqlQueryGenerator.cs
@@ -153,7 +153,7 @@ public override object VisitSqlRoot(SqlRootExpression expression, SearchOptions
                 // DISTINCT is used since different ctes may return the same resources due to _include and _include:iterate search parameters
                 StringBuilder.Append("SELECT DISTINCT ");
 
-                if (!context.UseIndexedPaging && expression.SearchParamTableExpressions.Count == 0)
+                if (!searchOptions.UseIndexedPaging && expression.SearchParamTableExpressions.Count == 0)
                 {
                     StringBuilder.Append("TOP (").Append(Parameters.AddParameter(context.MaxItemCount + 1, includeInHash: false)).Append(") ");
                 }
@@ -792,7 +792,7 @@ private void HandleTableKindInclude(
 
             StringBuilder.Append("SELECT DISTINCT ");
 
-            if (includeExpression.Reversed && context.UseIndexedPaging)
+            if (includeExpression.Reversed)
             {
                 // In case its revinclude, we limit the number of returned items as the resultset size is potentially
                 // unbounded. we ask for +1 so in the limit expression we know if to mark at truncated...

diff --git a/src/Microsoft.Health.Fhir.SqlServer/Features/Search/Expressions/Visitors/SortRewriter.cs b/src/Microsoft.Health.Fhir.SqlServer/Features/Search/Expressions/Visitors/SortRewriter.cs
@@ -108,8 +108,7 @@ public override Expression VisitSqlRoot(SqlRootExpression expression, SqlSearchO
                     // for resources that have a value for the _sort parameter. So we will generate
                     // the appropriate Sort expression below.
                 }
-                else if ((continuationToken != null && continuationToken.SortValue == null) ||
-                    (continuationToken == null && context.Sort[0].sortOrder == SortOrder.Ascending))
+                else if (continuationToken != null && continuationToken.SortValue == null)
                 {
                     // We have a ct for resourceid but not for the sort value.
                     // This means we are paging through resources that do not have values for the _sort parameter.