From 504c6f3c11681d3663d656324b64e7a1fa57af9f Mon Sep 17 00:00:00 2001 From: 0z5a Date: Thu, 19 Nov 2026 04:53:45 +0100 Subject: [PATCH] GH-4299: Compare xsd:date values by their starting instants getXMLGregorianCalendarXSD left xsd:date values without a time, so XMLGregorianCalendar.compare normalized the timezone on the date fields only and compared the UTC calendar day. Set the time to 00:00:00 for dates, as getXMLGregorianCalendarFO already does. --- .../jena/sparql/expr/nodevalue/XSDFuncOp.java | 8 +++++++ .../jena/sparql/expr/TestXSDFuncOp.java | 24 +++++++++++++++++++ 2 files changed, 32 insertions(+) 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 6d174af3baf..8baeeb90e13 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 @@ -1262,6 +1262,14 @@ public static int compareXSDDateTime(NodeValue nv1, NodeValue nv2) { /** Return a XMLGregorianCalendar appropriate for XSD comparision */ private static XMLGregorianCalendar getXMLGregorianCalendarXSD(NodeValue nv) { XMLGregorianCalendar dt = nv.getDateTime(); + if ( nv.isDate()) { + // Force time so that the starting instants are compared. + // Without a time, the timezone normalization compares the UTC calendar day. + dt.setHour(0); + dt.setMinute(0); + dt.setSecond(0); + return dt; + } if ( nv.isTime()) { if ( dt.getHour() == 24 ) // Normalize "24:00:00" diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java index 702e2738f3c..c995eb050d5 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java @@ -517,6 +517,21 @@ public void testCompare23() { assertThrows(ExprNotComparableException.class, ()->NodeValue.compare(nv1, nv2)); } + @Test public void testCompare24() { + // GH-4299 : Dates compare by their starting instants. + // Same calendar day after normalization to UTC, starting instants one hour apart. + NodeValue nv1 = NodeValue.makeDate("2026-01-01+01:00"); + NodeValue nv2 = NodeValue.makeDate("2026-01-01+02:00"); + assertEquals(NodeValue.CMP_GREATER, NodeValue.compare(nv1, nv2), "Does not compare " + nv1 + " & " + nv2); + } + + @Test public void testCompare25() { + // GH-4299 : Dates compare by their starting instants. + NodeValue nv1 = NodeValue.makeDate("2026-01-02+14:00"); + NodeValue nv2 = NodeValue.makeDate("2026-01-01-14:00"); + assertEquals(NodeValue.CMP_LESS, NodeValue.compare(nv1, nv2), "Does not compare " + nv1 + " & " + nv2); + } + @Test public void testSameUnknown_1() { NodeValue nv1 = NodeValue.makeNode(NodeFactory.createURI("test:abc")); NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")); @@ -624,6 +639,15 @@ public void testSameUnknown_3() { assertFalse(NodeValue.notSameValueAs(nv1, nv2)); } + @Test public void testSameDate_4() { + // GH-4299 : Same calendar day after normalization to UTC, different starting instants. + NodeValue nv1 = NodeValue.makeDate("2026-01-01+01:00"); + NodeValue nv2 = NodeValue.makeDate("2026-01-01+02:00"); + + assertFalse(NodeValue.sameValueAs(nv1, nv2)); + assertTrue(NodeValue.notSameValueAs(nv1, nv2)); + } + @Test public void testSameDate_3() { NodeValue nv1 = NodeValue.makeDate("2007-09-04Z"); NodeValue nv2 = NodeValue.makeDate("2007-09-04"); // No timezone