From 2d5980729c4c48f60446f79be362dc4f53c128dc Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Tue, 25 Jun 2024 20:48:28 -0400
Subject: [PATCH 1/2] Improve error message for unsupported nested comparison

---
 arrow-ord/src/cmp.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arrow-ord/src/cmp.rs b/arrow-ord/src/cmp.rs
index e1f54ca13e37..b6bb6e5311b1 100644
--- a/arrow-ord/src/cmp.rs
+++ b/arrow-ord/src/cmp.rs
@@ -232,7 +232,11 @@ fn compare_op(op: Op, lhs: &dyn Datum, rhs: &dyn Datum) -> Result<BooleanArray,
     let r = r_v.map(|x| x.values().as_ref()).unwrap_or(r);
     let r_t = r.data_type();
 
-    if l_t != r_t || l_t.is_nested() {
+    if r_t.is_nested() || l_t.is_nested() {
+        return Err(ArrowError::InvalidArgumentError(format!(
+            "Nested comparison: {l_t} {op} {r_t} (hint: use make_comparator instead)"
+        )));
+    } else if l_t != r_t || l_t.is_nested() {
         return Err(ArrowError::InvalidArgumentError(format!(
             "Invalid comparison operation: {l_t} {op} {r_t}"
         )));

From e5270c013aa34ea8c5b8c37f8922deb068de832a Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Tue, 25 Jun 2024 23:55:49 -0400
Subject: [PATCH 2/2] Update arrow-ord/src/cmp.rs

Co-authored-by: Jay Zhan <jayzhan211@gmail.com>
---
 arrow-ord/src/cmp.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arrow-ord/src/cmp.rs b/arrow-ord/src/cmp.rs
index b6bb6e5311b1..26eb0d8d6e41 100644
--- a/arrow-ord/src/cmp.rs
+++ b/arrow-ord/src/cmp.rs
@@ -236,7 +236,7 @@ fn compare_op(op: Op, lhs: &dyn Datum, rhs: &dyn Datum) -> Result<BooleanArray,
         return Err(ArrowError::InvalidArgumentError(format!(
             "Nested comparison: {l_t} {op} {r_t} (hint: use make_comparator instead)"
         )));
-    } else if l_t != r_t || l_t.is_nested() {
+    } else if l_t != r_t {
         return Err(ArrowError::InvalidArgumentError(format!(
             "Invalid comparison operation: {l_t} {op} {r_t}"
         )));