0006661: Logging of exceptions on data load can show values used in the

wrong order when conflict resolution is in play

Author: Philip Marzullo

symmetric-client/src/main/java/org/jumpmind/symmetric/io/HbaseDatabaseWriter.java

@@ -140,4 +140,8 @@ protected boolean sql(CsvData data) {
     @Override
     protected void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDetails) {
     }
+    
+    @Override
+    protected void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDetails, Object[] values) {
+    }
 }

symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/AbstractDatabaseWriter.java

@@ -411,6 +411,8 @@ protected void filterAfter(CsvData data) {
     protected abstract boolean sql(CsvData data);
 
     protected abstract void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDetails);
+    
+    protected abstract void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDetails, Object[] values);
 
     protected String[] getRowData(CsvData data, String dataType) {
         String[] targetValues = new String[targetTable.getColumnCount()];

symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriter.java

@@ -260,6 +260,7 @@ protected boolean isDml(String sql) {
 
     @Override
     protected LoadStatus insert(CsvData data) {
+        String[] values = null;
         try {
             if (isRequiresSavePointsInTransaction && conflictResolver != null && conflictResolver.isIgnoreRow(this, data)) {
                 statistics.get(batch).increment(DataWriterStatisticConstants.IGNOREROWCOUNT);
@@ -279,7 +280,7 @@ protected LoadStatus insert(CsvData data) {
             boolean isFindAndThrowException = false;
             try {
                 Conflict conflict = writerSettings.pickConflict(targetTable, batch);
-                String[] values = (String[]) ArrayUtils.addAll(getRowData(data, CsvData.ROW_DATA),
+                values = (String[]) ArrayUtils.addAll(getRowData(data, CsvData.ROW_DATA),
                         currentDmlStatement.getLookupKeyData(getLookupDataMap(data, conflict)));
                 long count = execute(data, values);
                 statistics.get(batch).increment(DataWriterStatisticConstants.INSERTCOUNT, count);
@@ -305,7 +306,7 @@ protected LoadStatus insert(CsvData data) {
                 }
             }
         } catch (RuntimeException ex) {
-            logFailureDetails(ex, data, true);
+            logFailureDetails(ex, data, true, values);
             throw ex;
         } finally {
             statistics.get(batch).stopTimer(DataWriterStatisticConstants.LOADMILLIS);
@@ -967,6 +968,11 @@ private void removeExcludedColumns(Conflict conflict,
 
     @Override
     protected void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDetails) {
+        logFailureDetails(e, data, logLastDmlDetails, currentDmlValues);
+    }
+
+    @Override
+    protected void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDetails, Object[] values) {
         StringBuilder failureMessage = new StringBuilder();
         failureMessage.append("Failed to process ");
         failureMessage.append(data.getDataEventType().toString().toLowerCase());
@@ -979,7 +985,7 @@ protected void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDe
             boolean shouldLogRawSql = true;
             if (writerSettings.isLogSqlParamsOnError()) {
                 failureMessage.append("Failed sql was: ");
-                String dynamicSQL = logSqlBuilder.buildDynamicSqlForLog(currentDmlStatement.getSql(), currentDmlValues, currentDmlStatement.getTypes());
+                String dynamicSQL = logSqlBuilder.buildDynamicSqlForLog(currentDmlStatement.getSql(), values, currentDmlStatement.getTypes());
                 failureMessage.append(dynamicSQL);
                 failureMessage.append("\n");
                 shouldLogRawSql = !dynamicSQL.equals(currentDmlStatement.getSql());
@@ -990,10 +996,10 @@ protected void logFailureDetails(Throwable e, CsvData data, boolean logLastDmlDe
             }
             failureMessage.append("\n");
         }
-        if (logLastDmlDetails && currentDmlValues != null && currentDmlStatement != null) {
+        if (logLastDmlDetails && values != null && currentDmlStatement != null) {
             if (writerSettings.isLogSqlParamsOnError()) {
                 failureMessage.append("Failed sql parameters: ");
-                failureMessage.append(StringUtils.abbreviate("[" + dmlValuesToString(currentDmlValues, currentDmlStatement.getTypes()) + "]",
+                failureMessage.append(StringUtils.abbreviate("[" + dmlValuesToString(values, currentDmlStatement.getTypes()) + "]",
                         CsvData.MAX_DATA_SIZE_TO_PRINT_TO_LOG));
                 failureMessage.append("\n");
             }