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 b882cd697b416022c00c4b932cd68cc6639b7913 Author: Shin <[email protected]> AuthorDate: Tue Oct 13 09:24:06 2026 +0900 GH-4300: Compare rdf:langString by Unicode code point --- .../org/apache/jena/sparql/expr/NVCompare.java | 2 +- .../java/org/apache/jena/sparql/expr/TS_Expr.java | 1 + .../jena/sparql/expr/TestGH4300LangString.java | 95 ++++++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) 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 b9f17cb6b6..5a351b345a 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 @@ -309,7 +309,7 @@ class NVCompare { } // same lang tag (case insensitive) - x = strcompare(node1.getLiteralLexicalForm(), node2.getLiteralLexicalForm()); + x = XSDFuncOp.compareString(nv1, nv2); if ( x != CMP_EQUAL ) return x; // Same lexical forms, same lang tag by value 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 2092860076..ecde6cecb3 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,6 +34,7 @@ import org.apache.jena.sparql.expr.nodevalue.TestNodeValueSortKey; , TestNodeValue.class , TestExpressions.class , TestExpressions2.class + , TestGH4300LangString.class , TestExpressions3.class , TestExpressions4.class , TestCastXSD.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/TestGH4300LangString.java new file mode 100644 index 0000000000..2209388b34 --- /dev/null +++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestGH4300LangString.java @@ -0,0 +1,95 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.apache.jena.sparql.expr; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import org.apache.jena.query.DatasetFactory; +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); + private static final String ASTRAL = Character.toString(0x1D11E); + + private static String literal(String value, String tag) { + return "'" + value + "'@" + tag; + } + + private static boolean expression(String expression) { + String query = "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> SELECT (" + expression + " AS ?result) WHERE {}"; + try (QueryExecution exec = QueryExecutionFactory.create(query, DatasetFactory.empty())) { + return exec.execSelect().next().getLiteral("result").getBoolean(); + } + } + + @Test public void sameLanguageLessThan() { + assertTrue(expression(literal(BMP, "en") + " < " + literal(ASTRAL, "en"))); + } + + @Test public void sameLanguageGreaterThan() { + assertTrue(expression(literal(ASTRAL, "en") + " > " + literal(BMP, "en"))); + } + + @Test public void sameLanguageOrderBy() { + String query = "SELECT ?v WHERE { VALUES ?v { " + literal(ASTRAL, "en") + " " + literal(BMP, "en") + " } } ORDER BY ?v"; + List<String> actual = new ArrayList<>(); + try (QueryExecution exec = QueryExecutionFactory.create(query, DatasetFactory.empty())) { + ResultSet results = exec.execSelect(); + while (results.hasNext()) + actual.add(results.next().getLiteral("v").getLexicalForm()); + } + assertEquals(List.of(BMP, ASTRAL), actual); + } + + @Test public void equalityAndMembership() { + assertTrue(expression(literal(BMP, "en") + " = " + literal(BMP, "EN"))); + assertTrue(expression(literal(BMP, "en") + " != " + literal(ASTRAL, "en"))); + assertTrue(expression(literal(BMP, "en") + " IN (" + literal(ASTRAL, "en") + ", " + literal(BMP, "en") + ")")); + assertTrue(expression("'" + BMP + "'^^xsd:string = '" + BMP + "'")); + assertTrue(expression("'" + BMP + "' != '" + ASTRAL + "'")); + assertTrue(expression("'" + BMP + "' IN ('" + ASTRAL + "', '" + BMP + "'^^xsd:string)")); + } + + @Test public void differentLanguagesKeepComparisonContract() { + assertThrows(ExprEvalException.class, () -> TestExpressions2.eval(literal(BMP, "en") + " < " + literal(ASTRAL, "fr"))); + assertTrue(expression(literal(BMP, "en") + " != " + literal(BMP, "fr"))); + } + + @Test public void orderByDifferentLanguagesStillUsesLanguageFirst() { + String query = "SELECT ?v WHERE { VALUES ?v { " + literal(BMP, "fr") + " " + literal(ASTRAL, "en") + " } } ORDER BY ?v"; + List<String> tags = new ArrayList<>(); + try (QueryExecution exec = QueryExecutionFactory.create(query, DatasetFactory.empty())) { + ResultSet results = exec.execSelect(); + while (results.hasNext()) + tags.add(results.next().getLiteral("v").getLanguage()); + } + assertEquals(List.of("en", "fr"), tags); + } +}
