Merge branch 'main' of github.com:BaseXdb/basex

ChristianGruen · ChristianGruen · commit 7b2fd713f05e · 2026-04-21T15:34:02.000+02:00
diff --git a/basex-core/src/main/java/org/basex/io/serial/json/JsonSerializer.java b/basex-core/src/main/java/org/basex/io/serial/json/JsonSerializer.java
@@ -178,7 +178,8 @@ protected void atomic(final Item item) throws IOException {
       if(type.oneOf(BasicType.DOUBLE, BasicType.FLOAT) || canonical && type.isNumber()) {
         final double d = item.dbl(null);
         if(Double.isFinite(d)) {
-          out.print(Dbl.string(d));
+          final byte[] s = Dbl.string(d);
+          out.print(canonical && s == NEGATIVE_ZERO ? token(0) : s);
         } else {
           if(canonical) throw SERNUMBER_X.getIO(d);
           out.print(d == Double.POSITIVE_INFINITY ? JsonConstants.INF :
diff --git a/basex-core/src/main/java/org/basex/query/QueryContext.java b/basex-core/src/main/java/org/basex/query/QueryContext.java
@@ -153,9 +153,10 @@ public final class QueryContext extends Job implements Closeable {
   /**
    * Constructor.
    * @param parent parent context
+   * @param nsContext inherited namespace context (can be {@code null})
    */
-  public QueryContext(final QueryContext parent) {
-    this(parent.context, parent, parent.info);
+  public QueryContext(final QueryContext parent, final NSDynContext nsContext) {
+    this(parent.context, parent, nsContext, parent.info);
     parent.pushJob(this);
     updates = parent.updates;
   }
@@ -165,20 +166,22 @@ public QueryContext(final QueryContext parent) {
    * @param context database context
    */
   public QueryContext(final Context context) {
-    this(context, null, null);
+    this(context, null, null, null);
   }
 
   /**
    * Constructor.
    * @param context database context
    * @param parent parent context (can be {@code null})
+   * @param nsContext inherited namespace context (can be {@code null})
    * @param info query info (can be {@code null})
    */
-  public QueryContext(final Context context, final QueryContext parent, final QueryInfo info) {
+  public QueryContext(final Context context, final QueryContext parent,
+      final NSDynContext nsContext, final QueryInfo info) {
     this.context = context;
     this.parent = parent;
     this.info = info != null ? info : new QueryInfo(context);
-    ns = parent != null ? new NSDynContext(parent.ns) : new NSDynContext(null);
+    ns = new NSDynContext(nsContext);
     resources = parent != null ? parent.resources : new QueryResources(this);
     ftPosData = parent != null ? parent.ftPosData : null;
     shared = parent != null ? parent.shared : new SharedData();
diff --git a/basex-core/src/main/java/org/basex/query/QueryProcessor.java b/basex-core/src/main/java/org/basex/query/QueryProcessor.java
@@ -50,7 +50,7 @@ public QueryProcessor(final String query, final Context ctx) {
   public QueryProcessor(final String query, final String uri, final Context ctx,
       final QueryInfo info) {
     this.query = query;
-    qc = pushJob(new QueryContext(ctx, null, info));
+    qc = pushJob(new QueryContext(ctx, null, null, info));
     sc = new StaticContext(qc);
     sc.baseURI(uri != null && uri.isEmpty() ? "./" : uri);
   }
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnLoadXQueryModule.java b/basex-core/src/main/java/org/basex/query/func/fn/FnLoadXQueryModule.java
@@ -91,7 +91,7 @@ public XQMap item(final QueryContext qc, final InputInfo ii) throws QueryExcepti
       if(!isSupported(version)) throw MODULE_XQUERY_VERSION_X.get(info, version);
     }
 
-    final QueryContext mqc = new QueryContext(qc);
+    final QueryContext mqc = new QueryContext(qc, null);
     for(final byte[] uri : qc.modDeclared) mqc.modDeclared.put(uri, qc.modDeclared.get(uri));
     int nParsed = 0;
     final Value ctx = opt.get(CONTEXT_ITEM);
diff --git a/basex-core/src/main/java/org/basex/query/func/xquery/XQueryEval.java b/basex-core/src/main/java/org/basex/query/func/xquery/XQueryEval.java
@@ -75,7 +75,7 @@ final Value eval(final IOContent query, final boolean updating, final QueryConte
     if(!user.has(perm)) throw XQUERY_PERMREQUIRED_X.get(info, perm);
 
     Timer to = null;
-    try(QueryContext qctx = new QueryContext(qc)) {
+    try(QueryContext qctx = new QueryContext(qc, null)) {
       qctx.user = new User(user).permission(perm);
 
       // limit memory consumption: enforce garbage collection and calculate usage
diff --git a/basex-core/src/main/java/org/basex/query/func/xquery/XQueryTask.java b/basex-core/src/main/java/org/basex/query/func/xquery/XQueryTask.java
@@ -45,7 +45,7 @@ protected Value compute() {
     final int size = end - start;
     if(size == 1) {
       // perform the work
-      try(QueryContext qc = new QueryContext(tc.qc)) {
+      try(QueryContext qc = new QueryContext(tc.qc, tc.qc.ns)) {
         return tc.funcs.get(start).invoke(qc, tc.info);
       } catch(final QueryException ex) {
         if(tc.errors) {
diff --git a/basex-core/src/main/java/org/basex/query/value/item/Dbl.java b/basex-core/src/main/java/org/basex/query/value/item/Dbl.java
@@ -168,7 +168,7 @@ public static double parse(final byte[] value, final InputInfo info) throws Quer
    */
   public static byte[] string(final double value) {
     // handle known edge cases
-    if(value == 0) return Token.token(0);
+    if(value == 0) return 1 / value > 0 ? Token.token(0) : Token.NEGATIVE_ZERO;
     if(value == Double.MIN_VALUE) return Token.token("5e-324");
     if(value == -Double.MIN_VALUE) return Token.token("-5e-324");
     if(value == 1e23) return Token.token("1e+23");
diff --git a/basex-core/src/test/java/org/basex/io/serial/json/BaseXSerializerTest.java b/basex-core/src/test/java/org/basex/io/serial/json/BaseXSerializerTest.java
@@ -22,6 +22,7 @@ public final class BaseXSerializerTest extends SandboxTest {
     serialize("()", "");
     serialize("1", "1");
     serialize("1, 2", "1\n2");
+    serialize("xs:double('-0'), xs:float('-0')", "-0\n-0");
 
     // nodes
     serialize("<x/>", "<x/>");
diff --git a/basex-core/src/test/java/org/basex/io/serial/json/JsonSerializerTest.java b/basex-core/src/test/java/org/basex/io/serial/json/JsonSerializerTest.java
@@ -27,6 +27,8 @@ public final class JsonSerializerTest extends SandboxTest {
     final JsonFormat format = JsonFormat.DIRECT;
     serialize("'x'", "'x'", format);
     serialize("1", "1", format);
+    serialize("xs:double('-0')", "-0", format);
+    serialize("xs:float('-0')", "-0", format);
     serialize("true()", "true", format);
     serialize("<_/>", "'<_\\/>'", format);
 
@@ -64,6 +66,8 @@ public final class JsonSerializerTest extends SandboxTest {
     final JsonFormat format = JsonFormat.ATTRIBUTES;
     serialize("'x'", "'x'", format);
     serialize("1", "1", format);
+    serialize("xs:double('-0')", "-0", format);
+    serialize("xs:float('-0')", "-0", format);
     serialize("true()", "true", format);
     serialize("<_/>", "'<_\\/>'", format);
 
@@ -116,6 +120,8 @@ public final class JsonSerializerTest extends SandboxTest {
     serialize("{ 'A': false() }", "{'A':false}", format);
     serialize("{ true(): false() }", "{'true':false}", format);
     serialize("{ 1: 'E' }", "{'1':'E'}", format);
+    serialize("{ 0: xs:double('-0') }", "{'0':-0}", format);
+    serialize("{ 0: xs:float('-0') }", "{'0':-0}", format);
 
     serialize("{ 'A': 1 div 0.0e0 }", "{'A':1e9999}", format);
     serialize("{ 'A': -1 div 0.0e0 }", "{'A':-1e9999}", format);
@@ -129,6 +135,8 @@ public final class JsonSerializerTest extends SandboxTest {
     serialize("[ 2 ]", "[2]", format);
     serialize("[ 2, 3 ]", "[2,3]", format);
     serialize("[ 2, (), 4 ]", "[2,null,4]", format);
+    serialize("[ xs:double('-0') ]", "[-0]", format);
+    serialize("[ xs:float('-0') ]", "[-0]", format);
 
     error("[ (1, 2) ]", format, SERJSONSEQ);
 
@@ -146,7 +154,8 @@ public final class JsonSerializerTest extends SandboxTest {
     serialize("1", "1", format);
 
     serialize("0.0e0", "0", format);
-    serialize("-0.0e0", "0", format);
+    serialize("-0.0e0", "-0", format);
+    serialize("xs:float('-0')", "-0", format);
     serialize("1e-6", "0.000001", format);
     serialize("1e-7", "1e-7", format);
     serialize("1e20", "100000000000000000000", format);
diff --git a/basex-core/src/test/java/org/basex/query/SerializerTest.java b/basex-core/src/test/java/org/basex/query/SerializerTest.java
@@ -262,6 +262,7 @@ public final class SerializerTest extends SandboxTest {
     query(option + "1234567890e0", "1.23456789e9");
     query(option + "xs:double('NaN')", "NaN");
     query(option + "xs:double('INF')", "INF");
+    query(option + "xs:double('-0')", "-0.0e0");
     query(option + "xs:byte(1)", 1);
     query(option + "false()", "false()");
     query(option + "'A'", "\"A\"");
@@ -273,6 +274,7 @@ public final class SerializerTest extends SandboxTest {
     query(option + "true#0", "fn:true#0");
     query(option + "fn() {}", "fn() as empty-sequence() { () }");
     query(option + "xs:float(1)", "xs:float(\"1\")");
+    query(option + "xs:float('-0')", "xs:float(\"-0\")");
 
     query(option + "[]", "[]");
     query(option + "[ 1 ]", "[1]");
@@ -281,6 +283,7 @@ public final class SerializerTest extends SandboxTest {
     query(option + "[ 1234567890e0 ]", "[1.23456789e9]");
     query(option + "[ xs:double('NaN') ]", "[NaN]");
     query(option + "[ xs:double('INF') ]", "[INF]");
+    query(option + "[ xs:double('-0') ]", "[-0.0e0]");
     query(option + "[ xs:byte(1) ]", "[1]");
     query(option + "[ false() ]", "[false()]");
     query(option + "[ 'A' ]", "[\"A\"]");
@@ -292,6 +295,7 @@ public final class SerializerTest extends SandboxTest {
     query(option + "[ true#0 ]", "[fn:true#0]");
     query(option + "[ fn() {} ]", "[fn() as empty-sequence() { () }]");
     query(option + "[ xs:float(1) ]", "[xs:float(\"1\")]");
+    query(option + "[ xs:float('-0')]", "[xs:float(\"-0\")]");
 
     query(option + "{ 1: (), 2: 3, 4: (5, 6) }", "{1:(),2:3,4:(5,6)}");
   }
@@ -305,6 +309,7 @@ public final class SerializerTest extends SandboxTest {
     query("1234567890e0", 1234567890);
     query("xs:double('NaN')", "NaN");
     query("xs:double('INF')", "INF");
+    query("xs:double('-0')", "-0");
     query("xs:byte(1)", 1);
     query("false()", "false");
     query("'A'", "A");
@@ -316,6 +321,7 @@ public final class SerializerTest extends SandboxTest {
     query("true#0", "fn:true#0");
     query("fn() {}", "fn() as empty-sequence() { () }");
     query("xs:float(1)", 1);
+    query("xs:float('-0')", "-0");
 
     query("[]", "[]");
     query("[ 1 ]", "[1]");
diff --git a/basex-core/src/test/java/org/basex/query/func/BinModuleTest.java b/basex-core/src/test/java/org/basex/query/func/BinModuleTest.java
@@ -410,7 +410,7 @@ public final class BinModuleTest extends SandboxTest {
     query(func.args(hex("0000000000000000"), 0),                           0);
     query(func.args(hex("3FF0000000000000"), 0),                           1);
     query(func.args(hex("BFF0000000000000"), 0),                           -1);
-    query(func.args(hex("8000000000000000"), 0),                           0);
+    query(func.args(hex("8000000000000000"), 0),                           "-0");
     query(func.args(hex("0000000000000000"), 0),                           0);
     query(func.args(hex("7FF0000000000000"), 0),                           "INF");
     query(func.args(hex("FFF0000000000000"), 0),                           "-INF");
diff --git a/basex-core/src/test/java/org/basex/query/func/FnModuleTest.java b/basex-core/src/test/java/org/basex/query/func/FnModuleTest.java
@@ -2003,6 +2003,13 @@ public final class FnModuleTest extends SandboxTest {
     query(func.args("x", " { 'content': 'module namespace x=\"x\";\ndeclare variable $x:x := 1;', "
         + "'xquery-version': 4.0 }") + "?variables?#Q{x}x", 1);
 
+    // GH-2640
+    error("<e xmlns:p='p'>{\n"
+        + "  load-xquery-module(\"m\", {\n"
+        + "    'content': ``[module namespace m='m'; declare function m:f() {<p:x/>};]``\n"
+        + "  })?functions?#Q{m}f?0()\n"
+        + "}</e>", MODULE_STATIC_ERROR_X_X);
+
     error(func.args(""), MODULE_URI_EMPTY);
     error(func.args("x"), MODULE_NOT_FOUND_X);
     error(func.args("x", " { 'content': '%@?$' }"), MODULE_STATIC_ERROR_X_X);
@@ -3189,6 +3196,8 @@ public final class FnModuleTest extends SandboxTest {
 
     final String canonicalJson = " {'method': 'json', 'canonical': true()}";
     query(func.args(" [0x7fff_ffff_ffff_ffff]", canonicalJson), "[9223372036854776000]");
+    query(func.args(" [xs:double('-0')]", " {'method': 'json'}"), "[-0]");
+    query(func.args(" [xs:double('-0')]", canonicalJson), "[0]");
 
     // The tests below were adapted from Apache 2.0–licensed code from project
     // erdtman/java-json-canonicalization at https://github.com/erdtman/java-json-canonicalization
@@ -3436,6 +3445,8 @@ public final class FnModuleTest extends SandboxTest {
     query(func.args("A"), "A");
     query(func.args(wrap("A")), "A");
     query("(" + wrap("A") + ", 1, 'X') ! " + func.args(), "A\n1\nX");
+    query(func.args(" xs:float('-0')"), "-0");
+    query(func.args(" xs:double('-0')"), "-0");
 
     check("for $s in ('a', 'b') return " + func.args(" $s"), "a\nb", empty(func));
     check("for $s in (<a/>, <b/>) return " + func.args(" $s"), "\n", exists(func));
diff --git a/basex-core/src/test/java/org/basex/query/func/JsonModuleTest.java b/basex-core/src/test/java/org/basex/query/func/JsonModuleTest.java
@@ -120,7 +120,7 @@ public final class JsonModuleTest extends SandboxTest {
     query(func.args("0E1", options), 0);
     query(func.args("0E-1", options), 0);
     query(func.args("0E+1", options), 0);
-    query(func.args("-0E+1", options), "0");
+    query(func.args("-0E+1", options), "-0");
     query(func.args("0E00", options), 0);
     query(func.args("123e-123", options), "1.23e-121");
     query(func.args("123.4e-123", options), "1.234e-121");
diff --git a/basex-core/src/test/java/org/basex/query/func/XQueryModuleTest.java b/basex-core/src/test/java/org/basex/query/func/XQueryModuleTest.java
@@ -36,6 +36,17 @@ public final class XQueryModuleTest extends SandboxTest {
     // GH-2332
     query("try {" + func.args("declare function local:f() { local:f() }; local:f()") +
         "} catch xquery:error { 'STOP' }", "STOP");
+
+    // GH-2640
+    query("element e { attribute { QName('', 'a') } {}, " + func.args("true()") + " }",
+        "<e a=\"\">true</e>");
+    query("<e xmlns:p='p'\n"
+        + "   p:a='{\n"
+        + "     map:keys(in-scope-namespaces(<x/>))\n"
+        + "   }'\n"
+        + "   p:b='{xquery:eval('\n"
+        + "     map:keys(in-scope-namespaces(<x/>))\n"
+        + "   ')}'/>", "<e xmlns:p=\"p\" p:a=\"p xml\" p:b=\"xml\"/>");
   }
 
   /** Test method. */
@@ -183,6 +194,15 @@ public final class XQueryModuleTest extends SandboxTest {
         + " }")
         + "=> distinct-values()", "a b c d e");
 
+    // GH-2640: fork-join inherits parent dynamic namespace context
+    query("<e xmlns:p='p'\n"
+        + "   p:a='{\n"
+        + "     " + func.args(" \n"
+        + "       (1 to 100) ! fn() {map:keys(in-scope-namespaces(<x/>))}\n"
+        + "     ") + "[. = 'p'] => count()\n"
+        + "   }'\n"
+        + "/>", "<e xmlns:p=\"p\" p:a=\"100\"/>");
+
     // optimizations
     check(func.args(" ()"), "", empty());
     check(func.args(" false#0"), false, root(DynFuncCall.class));

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public QueryProcessor(final String query, final Context ctx) {`
`50`	`50`	`public QueryProcessor(final String query, final String uri, final Context ctx,`
`51`	`51`	`final QueryInfo info) {`
`52`	`52`	`this.query = query;`
`53`		`- qc = pushJob(new QueryContext(ctx, null, info));`
	`53`	`+ qc = pushJob(new QueryContext(ctx, null, null, info));`
`54`	`54`	`sc = new StaticContext(qc);`
`55`	`55`	`sc.baseURI(uri != null && uri.isEmpty() ? "./" : uri);`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public XQMap item(final QueryContext qc, final InputInfo ii) throws QueryExcepti`
`91`	`91`	`if(!isSupported(version)) throw MODULE_XQUERY_VERSION_X.get(info, version);`
`92`	`92`	`}`
`93`	`93`
`94`		`- final QueryContext mqc = new QueryContext(qc);`
	`94`	`+ final QueryContext mqc = new QueryContext(qc, null);`
`95`	`95`	`for(final byte[] uri : qc.modDeclared) mqc.modDeclared.put(uri, qc.modDeclared.get(uri));`
`96`	`96`	`int nParsed = 0;`
`97`	`97`	`final Value ctx = opt.get(CONTEXT_ITEM);`