fix: Update code

dhis2 · Dec 16, 2024 · bb3bf3e · bb3bf3e
1 parent 6923aa4
commit bb3bf3e
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/...e-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java b/...e-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
@@ -28,6 +28,7 @@
 package org.hisp.dhis.analytics.table;
 
 import static org.hisp.dhis.analytics.util.AnalyticsIndexHelper.getIndexes;
+import static org.hisp.dhis.commons.util.TextUtils.format;
 import static org.hisp.dhis.scheduling.JobProgress.FailurePolicy.SKIP_ITEM_OUTLIER;
 import static org.hisp.dhis.scheduling.JobProgress.FailurePolicy.SKIP_STAGE;
 import static org.hisp.dhis.util.DateUtils.toLongDate;
@@ -107,7 +108,7 @@ public void create(AnalyticsTableUpdateParams params, JobProgress progress) {
 
     if (tables.isEmpty()) {
       clock.logTime("Table update aborted, nothing to update: '{}'", tableType.getTableName());
-      progress.startingStage("Table updates " + tableType);
+      progress.startingStage("Table update of type: '{}'", tableType);
       progress.completedStage("Table updated aborted, no table or partitions to be updated");
       return;
     }
@@ -119,25 +120,25 @@ public void create(AnalyticsTableUpdateParams params, JobProgress progress) {
         params);
     progress.startingStage("Performing pre-create table work");
     progress.runStage(() -> tableManager.preCreateTables(params));
-    clock.logTime("Performed pre-create table work " + tableType);
+    clock.logTime("Performed pre-create table work: '{}'", tableType);
 
-    progress.startingStage("Dropping staging tables (if any) " + tableType, tables.size());
+    progress.startingStage(format("Dropping staging tables: '{}'", tableType), tables.size());
     dropTables(tables, progress);
     clock.logTime("Dropped staging tables");
 
-    progress.startingStage("Creating analytics tables " + tableType, tables.size());
+    progress.startingStage(format("Creating analytics tables: '{}'", tableType), tables.size());
     createTables(tables, progress);
     clock.logTime("Created analytics tables");
 
     List<AnalyticsTablePartition> partitions = getTablePartitions(tables);
     int partitionSize = partitions.size();
 
     progress.startingStage(
-        "Populating " + partitionSize + " analytics tables " + tableType, partitionSize);
+        format("Populating {} analytics tables: '{}'", partitionSize, tableType), partitionSize);
     populateTables(params, partitions, progress);
     clock.logTime("Populated analytics tables");
 
-    progress.startingStage("Invoking analytics table hooks " + tableType);
+    progress.startingStage("Invoking analytics table hooks: '{}'", tableType);
     tableUpdates += progress.runStage(0, tableManager::invokeAnalyticsTableSqlHooks);
     clock.logTime("Invoked analytics table hooks");
 
@@ -148,25 +149,27 @@ public void create(AnalyticsTableUpdateParams params, JobProgress progress) {
       List<Index> indexes = getIndexes(partitions);
       int indexSize = indexes.size();
       progress.startingStage(
-          "Creating " + indexSize + " indexes " + tableType, indexSize, SKIP_ITEM_OUTLIER);
+          format("Creating {} indexes: '{}'", indexSize, tableType), indexSize, SKIP_ITEM_OUTLIER);
       createIndexes(indexes, progress);
       clock.logTime("Created indexes");
     }
 
     if (tableUpdates > 0 && sqlBuilder.supportsVacuum()) {
-      progress.startingStage("Vacuuming tables " + tableType, partitions.size());
+      progress.startingStage(format("Vacuuming tables: '{}'", tableType), partitions.size());
       vacuumTables(partitions, progress);
       clock.logTime("Tables vacuumed");
     }
 
     if (sqlBuilder.supportsAnalyze()) {
-      progress.startingStage("Analyzing analytics tables " + tableType, partitions.size());
+      progress.startingStage(
+          format("Analyzing analytics tables: '{}'", tableType), partitions.size());
       analyzeTables(partitions, progress);
       clock.logTime("Analyzed tables");
     }
 
     if (params.isLatestUpdate()) {
-      progress.startingStage("Removing updated and deleted data " + tableType, SKIP_STAGE);
+      progress.startingStage(
+          format("Removing updated and deleted data: '{}'", tableType), SKIP_STAGE);
       progress.runStage(() -> tableManager.removeUpdatedData(tables));
       clock.logTime("Removed updated and deleted data");
     }
@@ -263,7 +266,7 @@ private int applyAggregationLevels(
 
       if (!dataElements.isEmpty()) {
         progress.startingStage(
-            "Applying aggregation level " + level + " " + tableType, tables.size());
+            format("Applying aggregation level {}: '{}'", level, tableType), tables.size());
         progress.runStageInParallel(
             getParallelJobs(),
             tables,
@@ -321,7 +324,8 @@ private void swapTables(
       AnalyticsTableUpdateParams params, List<AnalyticsTable> tables, JobProgress progress) {
     resourceTableService.dropAllSqlViews(progress);
 
-    progress.startingStage("Swapping analytics tables " + getAnalyticsTableType(), tables.size());
+    progress.startingStage(
+        format("Swapping analytics tables: '{}'", getAnalyticsTableType()), tables.size());
     progress.runStage(
         tables, AnalyticsTable::getName, table -> tableManager.swapTable(params, table));