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
The following commit(s) were added to refs/heads/main by this push:
new ee2e031f83 GH-4297: Fix signed-zero numeric comparisons
ee2e031f83 is described below
commit ee2e031f83260079a49f092521738372b4dfe3c3
Author: mhatipog <[email protected]>
AuthorDate: Tue Nov 10 06:53:43 2026 +0100
GH-4297: Fix signed-zero numeric comparisons
---
.../apache/jena/sparql/expr/nodevalue/XSDFuncOp.java | 19 +++++++++++++++----
.../org/apache/jena/sparql/expr/TestExpressions2.java | 17 +++++++++++++++++
2 files changed, 32 insertions(+), 4 deletions(-)
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 11517e3009..5ba7d61e21 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
@@ -1119,10 +1119,21 @@ public class XSDFuncOp
return nv1.getInteger().compareTo(nv2.getInteger());
case OP_DECIMAL :
return nv1.getDecimal().compareTo(nv2.getDecimal());
- case OP_FLOAT :
- return Float.compare(nv1.getFloat(), nv2.getFloat());
- case OP_DOUBLE :
- return Double.compare(nv1.getDouble(), nv2.getDouble());
+ case OP_FLOAT : {
+ float x = nv1.getFloat();
+ float y = nv2.getFloat();
+ // Positive and negative zero have the same numeric value.
+ if ( x == y )
+ return Expr.CMP_EQUAL;
+ return Float.compare(x, y);
+ }
+ case OP_DOUBLE : {
+ double x = nv1.getDouble();
+ double y = nv2.getDouble();
+ if ( x == y )
+ return Expr.CMP_EQUAL;
+ return Double.compare(x, y);
+ }
default :
throw new ARQInternalErrorException("Unrecognized numeric
operation : (" + nv1 + " ," + nv2 + ")");
}
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 984bf48d12..d9c111e18c 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
@@ -81,6 +81,23 @@ public class TestExpressions2
@Test public void gregorian_cast_01() {
eval("xsd:gYear('2010-03-22'^^xsd:date) = '2010'^^xsd:gYear", true ); }
+ // GH-4297: Signed zero compares equal by value for float, double, and
promoted numbers.
+ @Test public void signed_zero_01() { eval("'0e0'^^xsd:double =
'-0e0'^^xsd:double", true); }
+ @Test public void signed_zero_02() { eval("'-0e0'^^xsd:double !=
'0e0'^^xsd:double", false); }
+ @Test public void signed_zero_03() { eval("'-0e0'^^xsd:double <
'0e0'^^xsd:double", false); }
+ @Test public void signed_zero_04() { eval("'0e0'^^xsd:double >
'-0e0'^^xsd:double", false); }
+ @Test public void signed_zero_05() { eval("'-0e0'^^xsd:double <=
'0e0'^^xsd:double", true); }
+ @Test public void signed_zero_06() { eval("'0e0'^^xsd:double >=
'-0e0'^^xsd:double", true); }
+ @Test public void signed_zero_07() { eval("'-0'^^xsd:float =
'0'^^xsd:float", true); }
+ @Test public void signed_zero_08() { eval("'-0'^^xsd:float <
'0'^^xsd:float", false); }
+ @Test public void signed_zero_09() { eval("'-0'^^xsd:float =
'0e0'^^xsd:double", true); }
+ @Test public void signed_zero_10() { eval("'-0'^^xsd:float = 0",
true); }
+ @Test public void signed_zero_11() { eval("'-0e0'^^xsd:double =
0.0", true); }
+ @Test public void signed_zero_12() { eval("'0e0'^^xsd:double IN
('-0e0'^^xsd:double)", true); }
+ @Test public void signed_zero_13() { eval("'-1e0'^^xsd:double <
'0e0'^^xsd:double", true); }
+ @Test public void signed_zero_14() { eval("'1e0'^^xsd:double >
'-0e0'^^xsd:double", true); }
+ @Test public void signed_zero_15() { eval("'INF'^^xsd:double >
'-0e0'^^xsd:double", true); }
+
@Test public void coalesce_01() {
assertThrows(ExprEvalException.class, ()-> eval("COALESCE()") ); }
@Test public void coalesce_02() { eval("COALESCE(1) = 1",
true); }
@Test public void coalesce_03() { eval("COALESCE(?x,1) = 1",
true); }