0005945: support compare and repair http, use of dyna SQL

JumpMind · Sep 7, 2023 · 4f93158 · 4f93158
1 parent de86102
commit 4f93158
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 3 deletions.
diff --git a/...ore/src/main/java/org/jumpmind/symmetric/service/impl/AbstractOfflineDetectorService.java b/...ore/src/main/java/org/jumpmind/symmetric/service/impl/AbstractOfflineDetectorService.java
@@ -47,6 +47,7 @@
 import org.jumpmind.symmetric.transport.ConnectionDuplicateException;
 import org.jumpmind.symmetric.transport.ConnectionRejectedException;
 import org.jumpmind.symmetric.transport.NoReservationException;
+import org.jumpmind.symmetric.transport.ServiceNotReadyException;
 import org.jumpmind.symmetric.transport.ServiceUnavailableException;
 import org.jumpmind.symmetric.transport.SyncDisabledException;
 import org.jumpmind.util.ExceptionUtils;
@@ -84,7 +85,11 @@ protected void fireOffline(Exception exception, Node remoteNode, RemoteNodeStatu
             status.setStatus(Status.OFFLINE);
         } else if (isServiceUnavailable(exception)) {
             ServiceUnavailableException e = (ServiceUnavailableException) exception;
-            logTransportMessage(remoteNode, "Remote node {} at {} was unavailable{}", remoteNode, syncUrl, e.getMessage() == null ? "" : ": " + e.getMessage());
+            logTransportMessage(remoteNode, "Remote node {} at {} was unavailable {}", remoteNode, syncUrl, e.getMessage() == null ? ""
+                    : ": " + e.getMessage());
+            status.setStatus(Status.OFFLINE);
+        } else if (isServiceNotReady(exception)) {
+            logTransportMessage(remoteNode, "Remote node {} at {} service not ready", remoteNode, syncUrl);
             status.setStatus(Status.OFFLINE);
         } else if (isBusy(exception)) {
             logTransportMessage(remoteNode, "Remote node {} at {} was busy", remoteNode, syncUrl);
@@ -190,6 +195,10 @@ protected boolean isServiceUnavailable(Exception ex) {
         return is(ex, ServiceUnavailableException.class);
     }
 
+    protected boolean isServiceNotReady(Exception ex) {
+        return is(ex, ServiceNotReadyException.class);
+    }
+
     protected boolean isSyncDisabled(Exception ex) {
         return is(ex, SyncDisabledException.class);
     }

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -559,7 +559,10 @@ protected Trigger buildTriggerForSymmetricTable(String tableName, Set<String> co
         } else if (TableConstants.getTableName(tablePrefix, TableConstants.SYM_MONITOR_EVENT).equals(tableName) ||
                 TableConstants.getTableName(tablePrefix, TableConstants.SYM_TABLE_RELOAD_REQUEST).equals(tableName) ||
                 TableConstants.getTableName(tablePrefix, TableConstants.SYM_TABLE_RELOAD_STATUS).equals(tableName) ||
-                TableConstants.getTableName(tablePrefix, TableConstants.SYM_EXTRACT_REQUEST).equals(tableName)) {
+                TableConstants.getTableName(tablePrefix, TableConstants.SYM_EXTRACT_REQUEST).equals(tableName) ||
+                TableConstants.getTableName(tablePrefix, TableConstants.SYM_COMPARE_REQUEST).equals(tableName) ||
+                TableConstants.getTableName(tablePrefix, TableConstants.SYM_COMPARE_STATUS).equals(tableName) ||
+                TableConstants.getTableName(tablePrefix, TableConstants.SYM_COMPARE_TABLE_STATUS).equals(tableName)) {
             trigger.setChannelId(Constants.CHANNEL_MONITOR);
             trigger.setUseCaptureOldData(true);
         } else if (TableConstants.getTableName(tablePrefix, TableConstants.SYM_FILE_SNAPSHOT)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/ServiceNotReadyException.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/ServiceNotReadyException.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to JumpMind Inc under one or more contributor
+ * license agreements.  See the NOTICE file distributed
+ * with this work for additional information regarding
+ * copyright ownership.  JumpMind Inc licenses this file
+ * to you under the GNU General Public License, version 3.0 (GPLv3)
+ * (the "License"); you may not use this file except in compliance
+ * with the License.
+ *
+ * You should have received a copy of the GNU General Public License,
+ * version 3.0 (GPLv3) along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jumpmind.symmetric.transport;
+
+public class ServiceNotReadyException extends OfflineException {
+    private static final long serialVersionUID = 1L;
+}
diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpIncomingTransport.java b/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpIncomingTransport.java
@@ -40,6 +40,7 @@
 import org.jumpmind.symmetric.transport.ConnectionRejectedException;
 import org.jumpmind.symmetric.transport.IIncomingTransport;
 import org.jumpmind.symmetric.transport.NoContentException;
+import org.jumpmind.symmetric.transport.ServiceNotReadyException;
 import org.jumpmind.symmetric.transport.ServiceUnavailableException;
 import org.jumpmind.symmetric.transport.SyncDisabledException;
 import org.jumpmind.symmetric.transport.TransportUtils;
@@ -139,6 +140,8 @@ public InputStream openStream() throws IOException {
                 throw new ConnectionDuplicateException();
             case WebConstants.SC_SERVICE_UNAVAILABLE:
                 throw new ServiceUnavailableException();
+            case WebConstants.SC_SERVICE_NOT_READY:
+                throw new ServiceNotReadyException();
             case WebConstants.SC_FORBIDDEN:
                 httpTransportManager.clearSession(connection);
                 throw new AuthenticationException();

diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpOutgoingTransport.java b/...etric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpOutgoingTransport.java
@@ -48,6 +48,7 @@
 import org.jumpmind.symmetric.transport.ConnectionRejectedException;
 import org.jumpmind.symmetric.transport.IOutgoingWithResponseTransport;
 import org.jumpmind.symmetric.transport.NoReservationException;
+import org.jumpmind.symmetric.transport.ServiceNotReadyException;
 import org.jumpmind.symmetric.transport.ServiceUnavailableException;
 import org.jumpmind.symmetric.transport.SyncDisabledException;
 import org.jumpmind.symmetric.web.WebConstants;
@@ -259,6 +260,8 @@ private void analyzeResponseCode(int code) {
             throw new ConnectionRejectedException();
         } else if (WebConstants.SC_SERVICE_UNAVAILABLE == code) {
             throw new ServiceUnavailableException();
+        } else if (WebConstants.SC_SERVICE_NOT_READY == code) {
+            throw new ServiceNotReadyException();
         } else if (WebConstants.SC_NO_RESERVATION == code) {
             throw new NoReservationException();
         } else if (WebConstants.SC_ALREADY_CONNECTED == code) {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/web/WebConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/web/WebConstants.java
@@ -46,6 +46,7 @@ public class WebConstants {
     public static final int SC_AUTH_EXPIRED = 669;
     public static final int SC_SERVICE_UNAVAILABLE = 660;
     public static final int SC_SERVICE_BUSY = 670;
+    public static final int SC_SERVICE_NOT_READY = 671;
     public static final int SC_SERVICE_ERROR = 601;
     public static final int SC_NO_RESERVATION = 604;
     public static final int SC_ALREADY_CONNECTED = 605;

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java
@@ -106,6 +106,8 @@ public H2DdlBuilder() {
         databaseInfo.setEmptyStringNulled(false);
         databaseInfo.setNullAsDefaultValueRequired(true);
         databaseInfo.setGeneratedColumnsSupported(true);
+        databaseInfo.setBinaryQuoteStart("X'");
+        databaseInfo.setBinaryQuoteEnd("'");
     }
 
     @Override

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatement.java
@@ -439,7 +439,7 @@ public Object[] getValueArray(Map<String, Object> params) {
 
     public String buildDynamicSql(BinaryEncoding encoding, Row row,
             boolean useVariableDates, boolean useJdbcTimestampFormat, Column[] columns) {
-        String newSql = sql;
+        String newSql = getSql(false);
         String quote = databaseInfo.getValueQuoteToken();
         String binaryQuoteStart = databaseInfo.getBinaryQuoteStart();
         String binaryQuoteEnd = databaseInfo.getBinaryQuoteEnd();
@@ -473,6 +473,10 @@ public String buildDynamicSql(BinaryEncoding encoding, Row row,
                         newSql = newSql.replaceFirst(regex, (useJdbcTimestampFormat ? "{t " : "")
                                 + quote + FormatUtils.TIME_FORMATTER.format(date) + quote
                                 + (useJdbcTimestampFormat ? "}" : ""));
+                    } else if (type == Types.DATE) {
+                        newSql = newSql.replaceFirst(regex, (useJdbcTimestampFormat ? "{d " : "")
+                                + quote + FormatUtils.DATE_FORMATTER.format(date) + quote
+                                + (useJdbcTimestampFormat ? "}" : ""));
                     } else {
                         newSql = newSql.replaceFirst(regex, (useJdbcTimestampFormat ? "{ts " : "")
                                 + quote + FormatUtils.TIMESTAMP_FORMATTER.format(date) + quote

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatementOptions.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/DmlStatementOptions.java
@@ -97,6 +97,11 @@ public DmlStatementOptions textColumnExpression(String textColumnExpression) {
         return this;
     }
 
+    public DmlStatementOptions dmlType(DmlType dmlType) {
+        this.dmlType = dmlType;
+        return this;
+    }
+
     public DmlType getDmlType() {
         return dmlType;
     }

diff --git a/symmetric-util/src/main/java/org/jumpmind/util/FormatUtils.java b/symmetric-util/src/main/java/org/jumpmind/util/FormatUtils.java
@@ -54,6 +54,7 @@ public final class FormatUtils {
     };
     public static final FastDateFormat TIMESTAMP_FORMATTER = FastDateFormat
             .getInstance("yyyy-MM-dd HH:mm:ss.SSS");
+    public static final FastDateFormat DATE_FORMATTER = FastDateFormat.getInstance("yyyy-MM-dd");
     public static final DateTimeFormatter TIMESTAMP9_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.nnnnnnnnn").withZone(ZoneId.systemDefault());
     public static final FastDateFormat TIME_FORMATTER = FastDateFormat.getInstance("HH:mm:ss.SSS");
     public static final DateTimeFormatter TIME9_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.nnnnnnnnn").withZone(ZoneId.systemDefault());