Merge branch 'master' into DHIS2-18417

dhis2 · Dec 16, 2024 · 2c64306 · 2c64306
2 parents d376053 + aaf0205
commit 2c64306
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/...rvice-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java b/...rvice-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java
@@ -231,17 +231,19 @@ public void swapTable(AnalyticsTableUpdateParams params, AnalyticsTable table) {
         params.isPartialUpdate() && tableExists && table.getTableType().isLatestPartition();
 
     log.info("Swapping table: '{}'", table.getMainName());
-    log.info("Master table exists: {}, skip master table: {}", tableExists, skipMasterTable);
-    log.info("Supports multi-statements: {}", sqlBuilder.supportsMultiStatements());
+    log.info("Master table exists: '{}', skip master table: '{}'", tableExists, skipMasterTable);
 
-    List<Table> swapPartitions = new UniqueArrayList<>();
-    table.getTablePartitions().stream()
-        .forEach(partition -> swapPartitions.add(swapTable(partition, partition.getMainName())));
+    List<Table> swappedPartitions = new UniqueArrayList<>();
+
+    table.getTablePartitions().forEach(part -> swapTable(part, part.getMainName()));
+    table.getTablePartitions().forEach(part -> swappedPartitions.add(part.fromStaging()));
 
     if (!skipMasterTable) {
+      // Full replace update and main table exist, swap main table
       swapTable(table, table.getMainName());
     } else {
-      swapPartitions.forEach(
+      // Incremental append update, update parent of partitions to existing main table
+      swappedPartitions.forEach(
           partition -> swapParentTable(partition, table.getName(), table.getMainName()));
       dropTable(table);
     }
@@ -289,14 +291,8 @@ public int invokeAnalyticsTableSqlHooks() {
    * @param stagingTable the staging table.
    * @param mainTableName the main table name.
    */
-  private Table swapTable(Table stagingTable, String mainTableName) {
-    if (sqlBuilder.supportsMultiStatements()) {
-      executeSilently(sqlBuilder.swapTable(stagingTable, mainTableName));
-    } else {
-      executeSilently(sqlBuilder.dropTableIfExistsCascade(mainTableName));
-      executeSilently(sqlBuilder.renameTable(stagingTable, mainTableName));
-    }
-    return stagingTable.fromStaging();
+  private void swapTable(Table stagingTable, String mainTableName) {
+    executeSilently(sqlBuilder.swapTable(stagingTable, mainTableName));
   }
 
   /**
@@ -307,12 +303,7 @@ private Table swapTable(Table stagingTable, String mainTableName) {
    * @param mainMasterName the main master table name.
    */
   private void swapParentTable(Table partition, String stagingMasterName, String mainMasterName) {
-    if (sqlBuilder.supportsMultiStatements()) {
-      executeSilently(sqlBuilder.swapParentTable(partition, stagingMasterName, mainMasterName));
-    } else {
-      sqlBuilder.removeParentTable(partition, stagingMasterName);
-      sqlBuilder.setParentTable(partition, mainMasterName);
-    }
+    executeSilently(sqlBuilder.swapParentTable(partition, stagingMasterName, mainMasterName));
   }
 
   /**

diff --git a/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/model/Table.java b/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/model/Table.java
@@ -254,6 +254,11 @@ public boolean hasPartitions() {
     return isNotEmpty(partitions);
   }
 
+  /**
+   * Returns this {@link Table} with the staging table name converted to the main table name.
+   *
+   * @return a {@link Table}.
+   */
   public Table fromStaging() {
     return new Table(
         fromStaging(this.getName()),