0005307: Adjusted DataService TableReloadRequest methods and ran spot…

…lessApply
JumpMind · May 24, 2022 · aee9138 · aee9138
1 parent 5b5ab69
commit aee9138
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 31 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2As400SymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2As400SymmetricDialect.java
@@ -83,9 +83,9 @@ public void createRequiredDatabaseObjects() {
     protected String getSystemSchemaName() {
         return "QSYS2";
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from sysibm.sysdummy1";
+        return "select current_timestamp from sysibm.sysdummy1";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java
@@ -195,9 +195,9 @@ protected String getDbSpecificDataHasChangedCondition(Trigger trigger) {
     public String getSourceNodeExpression() {
         return parameterService.getTablePrefix() + VAR_SOURCE_NODE_ID;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from sysibm.sysdummy1";
+        return "select current_timestamp from sysibm.sysdummy1";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java
@@ -226,9 +226,9 @@ public void truncateTable(String tableName) {
     public boolean needsToSelectLobData() {
         return true;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "values current_timestamp";
+        return "values current_timestamp";
     }
 }
diff --git a/...ric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java b/...ric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java
@@ -169,9 +169,9 @@ public String massageDataExtractionSql(String sql, boolean isContainsBigLob) {
     public long getCurrentSequenceValue(SequenceIdentifier identifier) {
         return platform.getSqlTemplate().queryForLong("select gen_id(GEN_" + getSequenceName(identifier) + ", 0) from rdb$database");
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from rdb$database";
+        return "select current_timestamp from rdb$database";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hana/HanaSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hana/HanaSymmetricDialect.java
@@ -118,9 +118,9 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc
             transaction.execute(sql);
         }
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from dummy";
+        return "select current_timestamp from dummy";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java
@@ -193,9 +193,9 @@ public void truncateTable(String tableName) {
     public boolean canGapsOccurInCapturedDataIds() {
         return false;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "SELECT current_timestamp FROM INFORMATION_SCHEMA.SYSTEM_USERS";
+        return "SELECT current_timestamp FROM INFORMATION_SCHEMA.SYSTEM_USERS";
     }
 }
diff --git a/...c-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java b/...c-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java
@@ -237,9 +237,9 @@ public Database readSymmetricSchemaFromXml() {
         description.setSize("1024");
         return db;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from rdb$database";
+        return "select current_timestamp from rdb$database";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbSymmetricDialect.java
@@ -187,9 +187,9 @@ public PermissionType[] getSymTablePermissions() {
         PermissionType[] permissions = { PermissionType.CREATE_TABLE, PermissionType.DROP_TABLE, PermissionType.CREATE_TRIGGER, PermissionType.DROP_TRIGGER };
         return permissions;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from dual";
+        return "select current_timestamp from dual";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java
@@ -439,9 +439,9 @@ public PermissionType[] getSymTablePermissions() {
                 PermissionType.EXECUTE };
         return permissions;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from dual";
+        return "select current_timestamp from dual";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/tibero/TiberoSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/tibero/TiberoSymmetricDialect.java
@@ -386,9 +386,9 @@ public PermissionType[] getSymTablePermissions() {
                 PermissionType.EXECUTE };
         return permissions;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp from dual";
+        return "select current_timestamp from dual";
     }
 }
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/voltdb/VoltDbSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/voltdb/VoltDbSymmetricDialect.java
@@ -75,9 +75,9 @@ public String getSyncTriggersExpression() {
     protected boolean doesTriggerExistOnPlatform(String catalogName, String schema, String tableName, String triggerName) {
         return false;
     }
-    
+
     @Override
     public String getDatabaseTimeSQL() {
-    	return "";
+        return "";
     }
 }
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java
@@ -728,9 +728,9 @@ public Date getEarliestTransactionStartTime() {
     }
 
     public String getDatabaseTimeSQL() {
-    	return "select current_timestamp";
+        return "select current_timestamp";
     }
-    
+
     public long getDatabaseTime() {
         try {
             Date dateTime = this.platform.getSqlTemplate().queryForObject(getDatabaseTimeSQL(), java.util.Date.class);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/ISymmetricDialect.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/ISymmetricDialect.java
@@ -194,7 +194,7 @@ public List<String> createPurgeSqlForMultipleTables(Node node, TriggerRouter tri
     public String preProcessTriggerSqlClause(String sqlClause);
 
     public void truncateTable(String tableName);
-    
+
     public String getDatabaseTimeSQL();
 
     public long getDatabaseTime();

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/IConfigurationChangedListener.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/IConfigurationChangedListener.java
@@ -26,6 +26,8 @@
 
 public interface IConfigurationChangedListener {
     public void handleChange(Context context, Table table, CsvData data);
+
     public void contextCommitted(Context context);
+
     public void contextComplete(Context context);
 }
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IDataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IDataService.java
@@ -58,6 +58,8 @@ public interface IDataService {
 
     public TableReloadRequest getTableReloadRequest(long loadId);
 
+    public List<TableReloadRequest> getTableReloadRequests(long loadId);
+
     public TableReloadRequest getTableReloadRequest(long loadId, String triggerId, String routerId);
 
     public List<TableReloadRequest> getTableReloadRequestToProcess(final String sourceNodeId);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -288,10 +288,16 @@ public TableReloadRequest mapRow(Row rs) {
 
     @Override
     public TableReloadRequest getTableReloadRequest(long loadId) {
+        List<TableReloadRequest> collapsedRequests = getTableReloadRequests(loadId);
+        return collapsedRequests == null || collapsedRequests.size() == 0 ? null : collapsedRequests.get(0);
+    }
+
+    @Override
+    public List<TableReloadRequest> getTableReloadRequests(long loadId) {
         List<TableReloadRequest> requests = sqlTemplate.query(getSql("selectTableReloadRequestsByLoadId"),
                 new TableReloadRequestMapper(), loadId);
         List<TableReloadRequest> collapsedRequests = collapseTableReloadRequestsByLoadId(requests);
-        return collapsedRequests == null || collapsedRequests.size() == 0 ? null : collapsedRequests.get(0);
+        return collapsedRequests;
     }
 
     @Override
@@ -424,10 +430,8 @@ public List<TableReloadRequest> collapseTableReloadRequestsByLoadId(List<TableRe
                 summary.setLoadId(request.getLoadId());
                 summary.setProcessed(request.isProcessed());
                 summary.setChannelId(request.getChannelId());
-                if (request.isFullLoadRequest()) {
-                    summary.setTriggerId(request.getTriggerId());
-                    summary.setRouterId(request.getRouterId());
-                }
+                summary.setTriggerId(request.getTriggerId());
+                summary.setRouterId(request.getRouterId());
             }
             previousLoadId = request.getLoadId();
         }

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDatabasePlatform.java
@@ -224,7 +224,7 @@ public List<Transaction> getTransactions() {
         String transactionString = "trx";
         String lockWaitsString = "information_schema.innodb_lock_waits";
         // TODO: Check if this is equivalent table, then add this to singlestore method or check if singlestore
-        //String lockWaitsString = "information_schema.mv_blocked_queries";
+        // String lockWaitsString = "information_schema.mv_blocked_queries";
         if (template.getDatabaseMajorVersion() >= 8) {
             transactionString = "engine_transaction";
             lockWaitsString = "performance_schema.data_lock_waits";