Merge branch 'upstream-main'

Author: tae898

bolt/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.5.1-SNAPSHOT</version>
+        <version>26.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

console/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.5.1-SNAPSHOT</version>
+        <version>26.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

console/src/main/java/com/arcadedb/console/Console.java

@@ -860,9 +860,10 @@ else if (subject.startsWith("type ")) {
       final TableFormatter table = new TableFormatter((text, args) -> output(0, text, args));
       table.setMaxWidthSize(maxWidth);
 
-      final ResultSet typeResult = databaseProxy.command("sql", "select from schema:types where name = \"" + typeName + "\"");
-      if (!typeResult.hasNext())
-        return;
+      try (final ResultSet typeResult = databaseProxy.command("sql",
+          "select from schema:types where name = \"" + typeName + "\"")) {
+        if (!typeResult.hasNext())
+          return;
 
       final Result result = typeResult.next();
 
@@ -908,6 +909,7 @@ else if (subject.startsWith("type ")) {
         }
         table.writeRows(rows, -1);
       }
+      }
 
     } else
       throw new ConsoleException("Information about '" + subject + "' is not available");

coverage/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.5.1-SNAPSHOT</version>
+        <version>26.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

e2e-ha/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.5.1-SNAPSHOT</version>
+        <version>26.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

e2e/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.5.1-SNAPSHOT</version>
+        <version>26.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

engine/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.5.1-SNAPSHOT</version>
+        <version>26.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

engine/src/main/java/com/arcadedb/GlobalConfiguration.java

@@ -750,13 +750,6 @@ source via leadership transfer, and the others either bootstrap locally (matchin
       knows which peer was unreachable.""",
       Long.class, 120_000L),
 
-  HA_BOOTSTRAP_DELTA_THRESHOLD("arcadedb.ha.bootstrapDeltaThreshold", SCOPE.SERVER,
-      """
-      Maximum lastTxId gap (number of transactions) for which a follower can be brought up to date by replaying \
-      a WAL delta from the source peer instead of downloading a full snapshot. Above this gap the leader-shipped \
-      full-snapshot path is used. Set to 0 to disable delta resync entirely.""",
-      Long.class, 100_000L),
-
   HA_SNAPSHOT_MAX_CONCURRENT("arcadedb.ha.snapshotMaxConcurrent", SCOPE.SERVER,
       "Maximum number of concurrent snapshot downloads served by the leader. Requests over this limit receive HTTP 503.",
       Integer.class, 2),

engine/src/main/java/com/arcadedb/database/async/AsyncResultsetCallback.java

@@ -31,8 +31,25 @@
 public interface AsyncResultsetCallback {
   /**
    * Invoked as soon as the command has been executed.
+   * <p>
+   * <b>Ownership contract:</b> the supplied {@link ResultSet} is owned by the async executor
+   * and is closed by the framework <i>immediately after this method returns</i>. Implementations
+   * MUST consume (iterate / drain / materialize via {@code stream().toList()}, etc.) the result
+   * set synchronously inside this callback. The reference must not be stored on a field or
+   * handed off to another thread for deferred iteration.
+   * <p>
+   * <b>Failure mode if violated:</b> any post-close access to the underlying execution-plan
+   * iterators (hasNext / next) will observe drained/closed state and may either return false
+   * silently, throw {@code IllegalStateException}, or surface as a downstream
+   * {@code NullPointerException} depending on the engine path. There is no defensive open-state
+   * check on the {@code ResultSet} interface, so misuse is not explicit - treat this Javadoc as
+   * the contract.
+   * <p>
+   * The framework-level close was added in the #4197 audit to avoid leaking the execution plan
+   * (and the parallel-scan worker threads it pins) when the callback is fire-and-forget, such as
+   * a logging-only completion handler.
    *
-   * @param resultset result set to fetch
+   * @param resultset result set to fetch, valid only for the duration of this call
    */
   void onComplete(final ResultSet resultset);
 

engine/src/main/java/com/arcadedb/database/async/DatabaseAsyncCommand.java

@@ -59,14 +59,13 @@ public DatabaseAsyncCommand(final ContextConfiguration configuration, final bool
 
   @Override
   public void execute(final DatabaseAsyncExecutorImpl.AsyncThread async, final DatabaseInternal database) {
-    try {
-      final ResultSet resultset = idempotent ?
-          parametersMap != null ?
-              database.query(language, command, configuration, parametersMap) :
-              database.query(language, command, configuration, parameters) :
-          parametersMap != null ?
-              database.command(language, command, configuration, parametersMap) :
-              database.command(language, command, configuration, parameters);
+    try (final ResultSet resultset = idempotent ?
+        parametersMap != null ?
+            database.query(language, command, configuration, parametersMap) :
+            database.query(language, command, configuration, parameters) :
+        parametersMap != null ?
+            database.command(language, command, configuration, parametersMap) :
+            database.command(language, command, configuration, parameters)) {
 
       if (userCallback != null)
         userCallback.onComplete(resultset);