fix: update backup database functionality and improve logging (#2200)

Author: robfrank

e2e/src/test/java/com/arcadedb/e2e/JdbcQueriesTest.java

@@ -269,11 +269,20 @@ void testSelectSchemaTypes() throws SQLException, ClassNotFoundException {
   @Test
   void testBackupDatabase() throws SQLException {
     try (final Statement stmt = conn.createStatement()) {
-      assertThat(stmt.execute("{sql}BACKUP DATABASE;")).isTrue();
+      ResultSet backupDatabase = stmt.executeQuery("{sqlscript}BACKUP DATABASE");
+      while (backupDatabase.next()) {
+        assertThat(backupDatabase.getString("result")).isEqualTo("OK");
+        assertThat(backupDatabase.getString("backupFile")).startsWith("beer-backup-");
+      }
     }
 
     try (final Statement stmt = conn.createStatement()) {
-      assertThat(stmt.execute("{sqlscript}BACKUP DATABASE;")).isTrue();
+      ResultSet backupDatabase = stmt.executeQuery("{sql}BACKUP DATABASE");
+      while (backupDatabase.next()) {
+        assertThat(backupDatabase.getString("result")).isEqualTo("OK");
+        assertThat(backupDatabase.getString("backupFile")).startsWith("beer-backup-");
+      }
+
     }
 
   }

engine/src/main/java/com/arcadedb/query/sql/executor/CountFromTypeStep.java

@@ -40,7 +40,6 @@ public class CountFromTypeStep extends AbstractExecutionStep {
    * @param targetClass      An identifier containing the name of the class to count
    * @param alias            the name of the property returned in the result-set
    * @param context          the query context
-   * @param profilingEnabled true to enable the profiling of the execution (for SQL PROFILE)
    */
   public CountFromTypeStep(final String targetClass, final String alias, final CommandContext context) {
     super(context);

engine/src/main/java/com/arcadedb/query/sql/parser/BackupDatabaseStatement.java

@@ -60,6 +60,8 @@ public ResultSet executeSimple(final CommandContext context) {
 
       // ASSURE THE DIRECTORY CANNOT BE CHANGED
       String backupDirectory = context.getConfiguration().getValueAsString(GlobalConfiguration.SERVER_BACKUP_DIRECTORY);
+      LogManager.instance().log(this, Level.INFO,
+          String.format("Backing up database '%s' to directory '%s'", context.getDatabase().getName(), backupDirectory));
       if (!backupDirectory.endsWith(File.separator))
         backupDirectory += File.separator;
 

engine/src/main/java/com/arcadedb/query/sql/parser/SimpleExecStatement.java

@@ -48,6 +48,10 @@ public ResultSet execute(final Database db, final Object[] args, final CommandCo
     }
     context.setDatabase(db);
     context.setInputParameters(args);
+
+    if (parentContext != null)
+      context.setConfiguration(parentContext.getConfiguration());
+
     final SingleOpExecutionPlan executionPlan = (SingleOpExecutionPlan) createExecutionPlan(context);
     return executionPlan.executeInternal();
   }

engine/src/main/java/com/arcadedb/utility/VariableParser.java

@@ -20,7 +20,7 @@
 
 import com.arcadedb.log.LogManager;
 
-import java.util.logging.*;
+import java.util.logging.Level;
 
 /**
  * Resolve entity class and descriptors using the paths configured.

integration/src/main/java/com/arcadedb/integration/backup/format/FullBackupFormat.java

@@ -65,7 +65,7 @@ public void backupDatabase() throws Exception {
         throw new BackupException("The backup file '%s' cannot be created".formatted(backupFile));
     }
 
-    if (database.isTransactionActive())
+    if (database.isTransactionActive() && database.getTransaction().hasChanges())
       throw new BackupException("Transaction in progress found");
 
     logger.logLine(0, "Executing full backup of database to '%s'...", backupFile);

postgresw/src/main/java/com/arcadedb/postgres/PostgresNetworkExecutor.java

@@ -34,6 +34,7 @@
 import com.arcadedb.network.binary.ChannelBinaryServer;
 import com.arcadedb.query.sql.SQLQueryEngine;
 import com.arcadedb.query.sql.executor.BasicCommandContext;
+import com.arcadedb.query.sql.executor.CommandContext;
 import com.arcadedb.query.sql.executor.IteratorResultSet;
 import com.arcadedb.query.sql.executor.Result;
 import com.arcadedb.query.sql.executor.ResultInternal;
@@ -318,6 +319,7 @@ private void executeCommand() {
       else {
         if (!portal.executed) {
           final Object[] parameters = portal.parameterValues != null ? portal.parameterValues.toArray() : new Object[0];
+
           final ResultSet resultSet = portal.sqlStatement.execute(database, parameters, createCommandContext());
           portal.executed = true;
           if (portal.isExpectingResult) {
@@ -345,8 +347,8 @@ private void executeCommand() {
     }
   }
 
-  private BasicCommandContext createCommandContext() {
-    BasicCommandContext commandContext = new BasicCommandContext();
+  private CommandContext createCommandContext() {
+    CommandContext commandContext = new BasicCommandContext();
     commandContext.setConfiguration(server.getConfiguration());
     return commandContext;
   }
@@ -836,7 +838,6 @@ private void parseCommand() {
         case "sql":
           final SQLQueryEngine sqlEngine = (SQLQueryEngine) database.getQueryEngine("sql");
           portal.sqlStatement = sqlEngine.parse(query.query, (DatabaseInternal) database);
-
           if (portal.query.equalsIgnoreCase("BEGIN") || portal.query.equalsIgnoreCase("BEGIN TRANSACTION")) {
             explicitTransactionStarted = true;
             setEmptyResultSet(portal);

postgresw/src/test/java/com/arcadedb/postgres/PostgresWJdbcTest.java

@@ -68,7 +68,18 @@ public void endTest() {
   void testBackupDatabase() throws Exception {
     try (final Connection conn = getConnection()) {
       try (final Statement st = conn.createStatement()) {
-        st.execute("BACKUP DATABASE");
+        ResultSet backupDatabase = st.executeQuery("{sql}BACKUP DATABASE");
+        while (backupDatabase.next()) {
+          assertThat(backupDatabase.getString("result")).isEqualTo("OK");
+          assertThat(backupDatabase.getString("backupFile")).startsWith("postgresdb-backup-");
+        }
+      }
+      try (final Statement st = conn.createStatement()) {
+        ResultSet backupDatabase = st.executeQuery("{sqlscript}BACKUP DATABASE");
+        while (backupDatabase.next()) {
+          assertThat(backupDatabase.getString("result")).isEqualTo("OK");
+          assertThat(backupDatabase.getString("backupFile")).startsWith("postgresdb-backup-");
+        }
       }
     }
   }

server/src/main/java/com/arcadedb/server/ArcadeDBServer.java

@@ -224,7 +224,7 @@ public synchronized void start() {
 
   private void createDirectories() {
 
-    LogManager.instance().log(this, Level.INFO, "Server root path: %s", serverRootPath);
+    LogManager.instance().log(this, Level.INFO, "Server root path: %s", configuration.getValueAsString(GlobalConfiguration.SERVER_ROOT_PATH));
     LogManager.instance().log(this, Level.INFO, "Databases directory: %s", configuration.getValueAsString(GlobalConfiguration.SERVER_DATABASE_DIRECTORY));
     final File databaseDir = new File(configuration.getValueAsString(GlobalConfiguration.SERVER_DATABASE_DIRECTORY));
     if (!databaseDir.exists()) {