This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 5e7d3ae223a65104f6ea949ae098ec0065351c70 Author: Shin <[email protected]> AuthorDate: Thu Oct 8 10:53:45 2026 +0900 GH-4300: Compare SPARQL strings by Unicode code point --- .../org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java | 15 ++++++++++++++- .../org/apache/jena/sparql/expr/TestExpressions2.java | 7 +++++++ .../jena/sparql/expr/nodevalue/TestNodeValueSortKey.java | 8 ++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java index dad5316add..849efd069e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java @@ -1149,7 +1149,20 @@ public class XSDFuncOp // langMatch public static int compareString(NodeValue nv1, NodeValue nv2) { - return calcReturn(nv1.getString().compareTo(nv2.getString())); + String s1 = nv1.getString(); + String s2 = nv2.getString(); + int i1 = 0; + int i2 = 0; + // SPARQL uses Unicode code point order, not UTF-16 code unit order. + while ( i1 < s1.length() && i2 < s2.length() ) { + int cp1 = s1.codePointAt(i1); + int cp2 = s2.codePointAt(i2); + if ( cp1 != cp2 ) + return calcReturn(Integer.compare(cp1, cp2)); + i1 += Character.charCount(cp1); + i2 += Character.charCount(cp2); + } + return calcReturn(Integer.compare(s1.length() - i1, s2.length() - i2)); } // -------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java index 6d637c278d..0ce7d2acfc 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java @@ -259,6 +259,13 @@ public class TestExpressions2 @Test public void xsd_cast_12() { assertThrows(ExprEvalException.class, ()-> eval("xsd:double(' 1.0e0')") ); } @Test public void xsd_cast_13() { assertThrows(ExprEvalException.class, ()-> eval("xsd:double(' 1.0e0')") ); } + @Test public void string_codepoint_order_01() { + String bmp = Character.toString(0xFFFD); + String astral = Character.toString(0x1D11E); + eval("'"+bmp+"' < '"+astral+"'", true); + eval("'"+bmp+"'^^xsd:string < '"+astral+"'^^xsd:string", true); + } + // Dynamic Function Calls @Test public void dynamic_call_01() { assertThrows(QueryParseException.class, ()-> eval("CALL()", false) ); } @Test public void dynamic_call_02() { eval("CALL(xsd:double, '1') = 1"); } diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/nodevalue/TestNodeValueSortKey.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/nodevalue/TestNodeValueSortKey.java index b16f014541..50c3a5fdfe 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/nodevalue/TestNodeValueSortKey.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/nodevalue/TestNodeValueSortKey.java @@ -95,4 +95,12 @@ public class TestNodeValueSortKey { assertEquals(1, nv.compareTo(new NodeValueSortKey("Bonita", "es"))); assertEquals(0, nv.compareTo(new NodeValueSortKey("Bonito", "es"))); } + + @Test + public void testCompareToUnicodeCodePointOrder() { + NodeValueSortKey bmp = new NodeValueSortKey(Character.toString(0xFFFD), null); + NodeValueSortKey astral = new NodeValueSortKey(Character.toString(0x1D11E), null); + assertTrue(bmp.compareTo(astral) < 0); + assertTrue(astral.compareTo(bmp) > 0); + } }
