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 141922c9502b93b4dfacf27aedd22756e24f1a3f
Author: Shin <[email protected]>
AuthorDate: Fri Oct 23 08:14:29 2026 +0900

    GH-4300: Preserve code point order with faster string comparisons
    
    Signed-off-by: Shin <[email protected]>
---
 .../org/apache/jena/sparql/expr/NVCompare.java     |  2 +-
 .../jena/sparql/expr/nodevalue/XSDFuncOp.java      | 26 ++++++++++++++++++++++
 .../java/org/apache/jena/sparql/expr/TS_Expr.java  |  4 ++--
 ...0LangString.java => TestCompareLangString.java} |  4 ++--
 .../jena/sparql/expr/TestCompareStrings.java       | 21 +++++++++++++++--
 .../apache/jena/sparql/expr/TestExpressions2.java  |  2 +-
 .../expr/nodevalue/TestNodeValueSortKey.java       |  2 +-
 7 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NVCompare.java 
b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NVCompare.java
index 5a351b345a..6f6a6af3c9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NVCompare.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NVCompare.java
@@ -89,7 +89,7 @@ class NVCompare {
             }
 
             case VSPACE_STRING :
-                return XSDFuncOp.compareString(nv1, nv2) == CMP_EQUAL;
+                return nv1.getString().equals(nv2.getString());
             case VSPACE_BOOLEAN :
                 return XSDFuncOp.compareBoolean(nv1, nv2) == CMP_EQUAL;
 
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 892c3d32f7..fb06d8a5ce 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
@@ -1151,6 +1151,32 @@ public class XSDFuncOp
     public static int compareString(NodeValue nv1, NodeValue nv2) {
         String s1 = nv1.getString();
         String s2 = nv2.getString();
+        int len1 = s1.length();
+        int len2 = s2.length();
+        int probeLimit = Math.min(Math.min(len1, len2), 4);
+        // Most unequal strings differ near the start. Decode only at that 
difference.
+        for ( int i = 0; i < probeLimit; i++ ) {
+            char c1 = s1.charAt(i);
+            char c2 = s2.charAt(i);
+            if ( c1 != c2 ) {
+                int j = i;
+                // A shared high surrogate may combine with only one of these 
chars.
+                if ( i > 0 && Character.isHighSurrogate(s1.charAt(i - 1))
+                     && (Character.isLowSurrogate(c1) || 
Character.isLowSurrogate(c2)) )
+                    j = i - 1;
+                return calcReturn(Integer.compare(s1.codePointAt(j), 
s2.codePointAt(j)));
+            }
+        }
+        if ( Math.min(len1, len2) <= probeLimit )
+            return calcReturn(Integer.compare(len1, len2));
+
+        int utf16Order = s1.compareTo(s2);
+        // Without surrogate pairs, UTF-16 order is code point order. String 
comparison
+        // can handle a long common prefix more efficiently than decoding each 
code point.
+        if ( utf16Order == 0 || (s1.codePointCount(0, len1) == len1
+                                && s2.codePointCount(0, len2) == len2) )
+            return calcReturn(utf16Order);
+
         int i1 = 0;
         int i2 = 0;
         // SPARQL uses Unicode code point order, not UTF-16 code unit order.
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java 
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
index 128533ca9a..644acabafb 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
@@ -34,10 +34,10 @@ import 
org.apache.jena.sparql.expr.nodevalue.TestNodeValueSortKey;
     , TestNodeValue.class
     , TestExpressions.class
     , TestExpressions2.class
-    , TestGH4300LangString.class
-    , TestCompareStrings.class
     , TestExpressions3.class
     , TestExpressions4.class
+    , TestCompareStrings.class
+    , TestCompareLangString.class
     , TestCastXSD.class
     , TestNodeFunctions.class
     , TestNodeFunctionsMisc.class
diff --git 
a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestGH4300LangString.java 
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareLangString.java
similarity index 97%
rename from 
jena-arq/src/test/java/org/apache/jena/sparql/expr/TestGH4300LangString.java
rename to 
jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareLangString.java
index 2209388b34..6c4cd603b2 100644
--- 
a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestGH4300LangString.java
+++ 
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareLangString.java
@@ -34,8 +34,8 @@ import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.ResultSet;
 
-public class TestGH4300LangString {
-    private static final String BMP = Character.toString(0xFFFD);
+public class TestCompareLangString {
+    private static final String BMP = Character.toString(0xFFE0);
     private static final String ASTRAL = Character.toString(0x1D11E);
 
     private static String literal(String value, String tag) {
diff --git 
a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareStrings.java 
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareStrings.java
index e7b2224b92..8668908f16 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareStrings.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCompareStrings.java
@@ -22,7 +22,9 @@
 package org.apache.jena.sparql.expr;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
@@ -32,7 +34,7 @@ import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp;
 
 /** Comparisons of RDF strings in Unicode code point order. */
 public class TestCompareStrings {
-    private static final String BMP = Character.toString(0xFFFD);
+    private static final String BMP = Character.toString(0xFFE0);
     private static final String SUPPLEMENTARY = Character.toString(0x1D11E);
     private static final String LATER_SUPPLEMENTARY = 
Character.toString(0x1F600);
 
@@ -50,7 +52,7 @@ public class TestCompareStrings {
 
     @Test public void equalStrings() {
         compare("", "", Expr.CMP_EQUAL);
-        compare(SUPPLEMENTARY + BMP, new String(SUPPLEMENTARY + BMP), 
Expr.CMP_EQUAL);
+        compare(SUPPLEMENTARY + BMP, SUPPLEMENTARY + BMP, Expr.CMP_EQUAL);
     }
 
     @Test public void prefixesAndEmptyStrings() {
@@ -59,6 +61,21 @@ public class TestCompareStrings {
         compare("a" + SUPPLEMENTARY, "a" + SUPPLEMENTARY + "b", Expr.CMP_LESS);
     }
 
+    @Test public void longCommonPrefix() {
+        String prefix = 
"http://example.org/resource/with/a/long/shared/prefix/";;
+        compare(prefix + "a", prefix + "b", Expr.CMP_LESS);
+        compare(prefix + BMP, prefix + SUPPLEMENTARY, Expr.CMP_LESS);
+    }
+
+    @Test public void stringValueEquality() {
+        String prefix = 
"http://example.org/resource/with/a/long/shared/prefix/";;
+        NodeValue bmp = NodeValue.makeString(prefix + BMP);
+        NodeValue supplementary = NodeValue.makeString(prefix + SUPPLEMENTARY);
+        assertFalse(NodeValue.sameValueAs(bmp, supplementary));
+        assertTrue(NodeValue.sameValueAs(bmp, NodeValue.makeNode(
+                NodeFactory.createLiteralDT(prefix + BMP, 
XSDDatatype.XSDstring))));
+    }
+
     @Test public void plainAndXsdStringValues() {
         NodeValue plain = NodeValue.makeString(BMP);
         NodeValue typed = 
NodeValue.makeNode(NodeFactory.createLiteralDT(SUPPLEMENTARY, 
XSDDatatype.XSDstring));
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 0ce7d2acfc..984bf48d12 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
@@ -260,7 +260,7 @@ public class TestExpressions2
     @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 bmp = Character.toString(0xFFE0);
         String astral = Character.toString(0x1D11E);
         eval("'"+bmp+"' < '"+astral+"'", true);
         eval("'"+bmp+"'^^xsd:string < '"+astral+"'^^xsd:string", true);
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 2586b565d8..497fb1362e 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
@@ -98,7 +98,7 @@ public class TestNodeValueSortKey {
 
     @Test
     public void testCompareToUnicodeCodePointOrder() {
-        NodeValueSortKey bmp = new 
NodeValueSortKey(Character.toString(0xFFFD), null);
+        NodeValueSortKey bmp = new 
NodeValueSortKey(Character.toString(0xFFE0), null);
         NodeValueSortKey astral = new 
NodeValueSortKey(Character.toString(0x1D11E), null);
         assertTrue(bmp.compareTo(astral) < 0);
         assertTrue(astral.compareTo(bmp) > 0);

Reply via email to