ip

Author: g31pranjal

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/Ordering.java

@@ -59,6 +59,7 @@
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * This class captures an ordering property.
@@ -292,7 +293,29 @@ public Set<RequestedOrdering> deriveRequestedOrderings(@Nonnull final RequestedO
     }
 
     public boolean satisfies(@Nonnull RequestedOrdering requestedOrdering) {
-        return !Iterables.isEmpty(enumerateCompatibleRequestedOrderings(requestedOrdering));
+        if (requestedOrdering.isDistinct() && !isDistinct()) {
+            return false;
+        }
+
+        final var eligibleElements = orderingSet.eligibleSet().eligibleElements();
+        var isFirst = true;
+        for (final var requestedOrderingPart : requestedOrdering.getOrderingParts()) {
+            if (!bindingMap.containsKey(requestedOrderingPart.getValue())) {
+                return false;
+            }
+            if (isFirst) {
+                if (!eligibleElements.contains(requestedOrderingPart.getValue())) {
+                    return false;
+                }
+                isFirst = false;
+            }
+            final var bindings = bindingMap.get(requestedOrderingPart.getValue());
+            final var sortOrder = sortOrder(bindings);
+            if (!sortOrder.isCompatibleWithRequestedSortOrder(requestedOrderingPart.getSortOrder())) {
+                return false;
+            }
+        }
+        return satisfiesGroupingValues(requestedOrdering.getOrderingParts().stream().map(OrderingPart::getValue).collect(Collectors.toSet()));
     }
 
     /**
@@ -326,7 +349,6 @@ public Iterable<List<RequestedOrderingPart>> enumerateCompatibleRequestedOrderin
             return ImmutableList.of();
         }
 
-        final var requestedOrderingValuesBuilder = ImmutableList.<Value>builder();
         final var requestedOrderingValuesMapBuilder = ImmutableMap.<Value, RequestedOrderingPart>builder();
         for (final var requestedOrderingPart : requestedOrdering.getOrderingParts()) {
             if (!bindingMap.containsKey(requestedOrderingPart.getValue())) {
@@ -337,8 +359,6 @@ public Iterable<List<RequestedOrderingPart>> enumerateCompatibleRequestedOrderin
             if (!sortOrder.isCompatibleWithRequestedSortOrder(requestedOrderingPart.getSortOrder())) {
                 return ImmutableList.of();
             }
-
-            requestedOrderingValuesBuilder.add(requestedOrderingPart.getValue());
             requestedOrderingValuesMapBuilder.put(requestedOrderingPart.getValue(), requestedOrderingPart);
         }
         final var requestedOrderingValuesMap = requestedOrderingValuesMapBuilder.build();
@@ -371,6 +391,11 @@ public boolean satisfiesGroupingValues(@Nonnull final Set<Value> requestedGroupi
             return false;
         }
 
+        final var eligibleElements = orderingSet.eligibleSet().eligibleElements();
+        if (requestedGroupingValues.stream().noneMatch(eligibleElements::contains)) {
+            return false;
+        }
+
         if (requestedGroupingValues
                 .stream()
                 .anyMatch(requestedGroupingValue -> {
@@ -383,7 +408,7 @@ public boolean satisfiesGroupingValues(@Nonnull final Set<Value> requestedGroupi
             return false;
         }
 
-        final var permutations = TopologicalSort.topologicalOrderPermutations(orderingSet);
+        final var permutations = TopologicalSort.topologicalOrderPermutations(requestedGroupingValues, orderingSet.getTransitiveClosure());
         for (final var permutation : permutations) {
             final var containsAll =
                     requestedGroupingValues.containsAll(permutation.subList(0, requestedGroupingValues.size()));

yaml-tests/src/test/resources/orderby.yamsql

@@ -27,6 +27,7 @@ schema_template:
     create table t2(p bigint, q st_1, primary key(p))
     create function t2_func() as select q as "nesting", q.a as "ordered" from t2
     create function t2_func_2() as select q as "nesting", q.a as "ordered", q.b as "ordered" from t2
+    create function t2_func_3() as select q as "nesting", q.a as "ordered1", q.b as "ordered2" from t2
     create index i4 as select q.b, q.a from t2 order by q.a
     create index i5 as select q.b, q.a from t2 order by q.b, q.a
     create table t3(a bigint, b bigint, c bigint, d bigint, p bigint, primary key(p))
@@ -296,4 +297,8 @@ test_block:
       - query: select (q as "nested", q.a as "ordered") as "st" from t2 order by "st"."ordered"
       - supported_version: !current_version
       - error: "42703"
+    -
+      # Ordering by a column in table function that has been projected in multiple ways
+      - query: select (*) from t2_func_3() order by "ordered2", "ordered1"
+      - result: [ {{{2, 1}, 2, 1}}, {{{4, 1}, 4, 1}}, {{{6, 1}, 6, 1}}, {{{8, 1}, 8, 1}}, {{{1, 2}, 1, 2}}, {{{3, 2}, 3, 2}}, {{{5, 2}, 5, 2}}, {{{7, 2}, 7, 2}} ]
 ...