From 09c9c54de134f9d9be421614e23b1dfbf3388970 Mon Sep 17 00:00:00 2001
From: Youssef Hatem <y_hatem@apple.com>
Date: Thu, 2 Oct 2025 12:29:44 +0100
Subject: [PATCH] Fix Debugger sanity check.

---
 .../record/query/plan/cascades/RequestedOrdering.java  |  2 +-
 yaml-tests/src/test/resources/uuid.yamsql              | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/RequestedOrdering.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/RequestedOrdering.java
index 583c719463..f228503924 100644
--- a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/RequestedOrdering.java
+++ b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/RequestedOrdering.java
@@ -305,7 +305,7 @@ public static RequestedOrdering ofPrimitiveParts(@Nonnull final List<RequestedOr
         Debugger.sanityCheck(() -> Verify.verify(
                 requestedOrderingParts.stream()
                         .allMatch(requestedOrderingPart -> requestedOrderingPart.getValue()
-                                .getResultType().isPrimitive())));
+                                .getResultType().isPrimitive() || requestedOrderingPart.getValue().getResultType().isUuid())));
         return new RequestedOrdering(requestedOrderingParts, distinctness, isExhaustive);
     }
 
diff --git a/yaml-tests/src/test/resources/uuid.yamsql b/yaml-tests/src/test/resources/uuid.yamsql
index 79dbc4b179..02ceac66d4 100644
--- a/yaml-tests/src/test/resources/uuid.yamsql
+++ b/yaml-tests/src/test/resources/uuid.yamsql
@@ -230,6 +230,16 @@ test_block:
 test_block:
   name: uuid-in-index-definition
   tests:
+    -
+      - query: select b, c from tc order by b
+      - debugger: insane
+      - explain: "COVERING(TC1 <,> -> [A: KEY[2], B: KEY[0], C: VALUE[0]]) | MAP (_.B AS B, _.C AS C)"
+      - result: [{!uuid '0920df1c-be81-4ec1-8a06-2180226f051d', 6},
+                 {!uuid '5394a912-aa8e-40fc-a4bb-ddf3f89ac45b', 3},
+                 {!uuid '64120112-4e39-40c3-94b9-2cc88a52e8df', 5},
+                 {!uuid '99e8e8b1-ac34-4f4d-9f01-1f4a7debf4d6', 1},
+                 {!uuid 'a8708750-d70f-4800-8c3b-13700d5b369f', 2},
+                 {!uuid 'c35ba01f-f8fc-47d7-bb00-f077e8a75682', 4}]
     -
       - query: select b, c from tc order by b
       - explain: "COVERING(TC1 <,> -> [A: KEY[2], B: KEY[0], C: VALUE[0]]) | MAP (_.B AS B, _.C AS C)"