From 405c29228d308eed7e2869013f04887d8ab4082f Mon Sep 17 00:00:00 2001 From: erilong Date: Thu, 11 Oct 2007 13:19:43 +0000 Subject: [PATCH] add logging of table name --- .../symmetric/load/csv/CsvLoader.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java b/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java index 753c053a47..14c43b09db 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java @@ -172,12 +172,14 @@ protected int insert(String[] tokens) { } catch (DataIntegrityViolationException e) { // TODO: modify sql-error-codes.xml for unique constraint vs foreign key if (enableFallbackUpdate) { - logger.warn("Unable to insert, updating instead: " + ArrayUtils.toString(tokens)); + logger.warn("Unable to insert into " + context.getTableName() + ", updating instead: " + + ArrayUtils.toString(tokens)); String keyValues[] = parseKeys(tokens, 1); stats.incrementFallbackUpdateCount(); rows = context.getTableTemplate().update(columnValues, keyValues); if (rows == 0) { - throw new RuntimeException("Unable to update: " + ArrayUtils.toString(tokens)); + throw new RuntimeException("Unable to update " + context.getTableName() + ": " + + ArrayUtils.toString(tokens)); } } else { throw e; @@ -200,14 +202,17 @@ protected int update(String[] tokens) { int rows = context.getTableTemplate().update(columnValues, keyValues); if (rows == 0) { if (enableFallbackInsert) { - logger.warn("Unable to update, inserting instead: " + ArrayUtils.toString(tokens)); + logger.warn("Unable to update " + context.getTableName() + ", inserting instead: " + + ArrayUtils.toString(tokens)); stats.incrementFallbackInsertCount(); return context.getTableTemplate().insert(columnValues); } else { - throw new RuntimeException("Unable to update: " + ArrayUtils.toString(tokens)); + throw new RuntimeException("Unable to update " + context.getTableName() + ": " + + ArrayUtils.toString(tokens)); } } else if (rows > 1) { - logger.warn("Too many rows (" + rows + ") updated: " + ArrayUtils.toString(tokens)); + logger.warn("Too many rows (" + rows + ") updated for " + context.getTableName() + ": " + + ArrayUtils.toString(tokens)); } return rows; } @@ -225,11 +230,13 @@ protected int delete(String[] tokens) { int rows = context.getTableTemplate().delete(keyValues); if (rows == 0) { if (allowMissingDelete) { - logger.warn("Delete affected no rows: " + ArrayUtils.toString(tokens)); + logger.warn("Delete of " + context.getTableName() + " affected no rows: " + + ArrayUtils.toString(tokens)); stats.incrementMissingDeleteCount(); } else { - throw new RuntimeException("Delete affected no rows: " + ArrayUtils.toString(tokens)); + throw new RuntimeException("Delete of " + context.getTableName() + " affected no rows: " + + ArrayUtils.toString(tokens)); } } return rows;