[ 1913542 ] Collect more info about errors in batches

try to clean up some of the ack code
removed outgoing batch history service
altered sym_outgoing_batch_hist to match incoming
got rid of SE status in outgoing batch

symmetric/src/main/java/org/jumpmind/symmetric/model/BatchInfo.java

@@ -21,16 +21,29 @@
 package org.jumpmind.symmetric.model;
 
 public class BatchInfo {
-    public static final String OK = "OK";
 
-    public static final int UNDEFINED_ERROR_LINE_NUMBER = 0;
-
     private String batchId;
 
+    private String nodeId;
+
     private boolean isOk;
 
     private long errorLine;
 
+    private long networkMillis;
+
+    private long filterMillis;
+
+    private long databaseMillis;
+
+    private long byteCount;
+
+    private String sqlState;
+
+    private int sqlCode;
+
+    private String sqlMessage;
+
     public BatchInfo(String batchId) {
         this.batchId = batchId;
         isOk = true;
@@ -54,4 +67,80 @@ public boolean isOk() {
         return isOk;
     }
 
+    public void setBatchId(String batchId) {
+        this.batchId = batchId;
+    }
+
+    public void setErrorLine(long errorLine) {
+        this.errorLine = errorLine;
+    }
+
+    public void setOk(boolean isOk) {
+        this.isOk = isOk;
+    }
+
+    public long getByteCount() {
+        return byteCount;
+    }
+
+    public void setByteCount(long byteCount) {
+        this.byteCount = byteCount;
+    }
+
+    public long getDatabaseMillis() {
+        return databaseMillis;
+    }
+
+    public void setDatabaseMillis(long databaseMillis) {
+        this.databaseMillis = databaseMillis;
+    }
+
+    public long getFilterMillis() {
+        return filterMillis;
+    }
+
+    public void setFilterMillis(long filterMillis) {
+        this.filterMillis = filterMillis;
+    }
+
+    public long getNetworkMillis() {
+        return networkMillis;
+    }
+
+    public void setNetworkMillis(long networkMillis) {
+        this.networkMillis = networkMillis;
+    }
+
+    public int getSqlCode() {
+        return sqlCode;
+    }
+
+    public void setSqlCode(int sqlCode) {
+        this.sqlCode = sqlCode;
+    }
+
+    public String getSqlMessage() {
+        return sqlMessage;
+    }
+
+    public void setSqlMessage(String sqlMessage) {
+        this.sqlMessage = sqlMessage;
+    }
+
+    public String getSqlState() {
+        return sqlState;
+    }
+
+    public void setSqlState(String sqlState) {
+        this.sqlState = sqlState;
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
 }

symmetric/src/main/java/org/jumpmind/symmetric/model/OutgoingBatchHistory.java

@@ -1,7 +1,8 @@
 /*
  * SymmetricDS is an open source database synchronization solution.
  *   
- * Copyright (C) Chris Henson <chenson42@users.sourceforge.net>
+ * Copyright (C) Chris Henson <chenson42@users.sourceforge.net>,
+ *               Eric Long <erilong@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,85 +19,201 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-
 package org.jumpmind.symmetric.model;
 
 import java.io.Serializable;
 import java.util.Date;
 
-public class OutgoingBatchHistory implements Serializable
-{
+import org.jumpmind.symmetric.util.AppUtils;
+
+public class OutgoingBatchHistory implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
-    public enum Status
-    {
-        OK, ER, SK;
+    private static String thisHostName;
+
+    public enum Status {
+        OK, ER, SK, SE, NE;
     }
 
-    private int batchId;
+    private long batchId;
+
+    private String nodeId;
 
     private Status status;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private long networkMillis;
 
-    private long dataEventCount;
+    private long filterMillis;
+
+    private long databaseMillis;
+
+    private String hostName;
+
+    private long byteCount;
 
+    private long dataEventCount;
+
     private long failedDataId;
+
+    private String sqlState;
+
+    private int sqlCode;
+
+    private String sqlMessage;
 
-    private Date eventTime;
+    static {
+        thisHostName = AppUtils.getServerId();
+    }
 
-    public OutgoingBatchHistory()
-    {
+    public OutgoingBatchHistory() {
+        this.hostName = thisHostName;
+        this.status = Status.NE;
+        this.startTime = new Date();
     }
 
-    public int getBatchId()
-    {
-        return batchId;
+    public OutgoingBatchHistory(OutgoingBatch batch) {
+        this();
+        this.batchId = new Long(batch.getBatchId());
+        this.nodeId = batch.getNodeId();
     }
 
-    public void setBatchId(int batchId)
-    {
-        this.batchId = batchId;
+    public OutgoingBatchHistory(BatchInfo batch) {
+        this();
+        this.batchId = new Long(batch.getBatchId());
+        this.nodeId = batch.getNodeId();
+        this.status = batch.isOk() ? Status.OK : Status.ER;
+        this.networkMillis = batch.getNetworkMillis();
+        this.filterMillis = batch.getFilterMillis();
+        this.databaseMillis = batch.getDatabaseMillis();
+        this.byteCount = batch.getByteCount();
+        this.sqlState = batch.getSqlState();
+        this.sqlCode = batch.getSqlCode();
+        this.sqlMessage = batch.getSqlMessage();
     }
 
-    public Date getEventTime()
-    {
-        return eventTime;
+    public long getBatchId() {
+        return batchId;
     }
 
-    public void setEventTime(Date complete)
-    {
-        this.eventTime = complete;
+    public void setBatchId(long batchId) {
+        this.batchId = batchId;
     }
 
-    public long getDataEventCount()
-    {
+    public long getDataEventCount() {
         return dataEventCount;
     }
 
-    public void setDataEventCount(long dataEventCount)
-    {
+    public void setDataEventCount(long dataEventCount) {
         this.dataEventCount = dataEventCount;
     }
 
-    public long getFailedDataId()
-    {
+    public long getFailedDataId() {
         return failedDataId;
     }
 
-    public void setFailedDataId(long failedDataId)
-    {
+    public void setFailedDataId(long failedDataId) {
         this.failedDataId = failedDataId;
     }
 
-    public Status getStatus()
-    {
+    public Status getStatus() {
         return status;
     }
 
-    public void setStatus(Status status)
-    {
+    public void setStatus(Status status) {
         this.status = status;
     }
+
+    public long getByteCount() {
+        return byteCount;
+    }
+
+    public void setByteCount(long byteCount) {
+        this.byteCount = byteCount;
+    }
+
+    public long getDatabaseMillis() {
+        return databaseMillis;
+    }
+
+    public void setDatabaseMillis(long databaseMillis) {
+        this.databaseMillis = databaseMillis;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public long getFilterMillis() {
+        return filterMillis;
+    }
+
+    public void setFilterMillis(long filterMillis) {
+        this.filterMillis = filterMillis;
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public int getSqlCode() {
+        return sqlCode;
+    }
+
+    public void setSqlCode(int sqlCode) {
+        this.sqlCode = sqlCode;
+    }
+
+    public String getSqlMessage() {
+        return sqlMessage;
+    }
+
+    public void setSqlMessage(String sqlMessage) {
+        this.sqlMessage = sqlMessage;
+    }
+
+    public String getSqlState() {
+        return sqlState;
+    }
+
+    public void setSqlState(String sqlState) {
+        this.sqlState = sqlState;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
 
-
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    public long getNetworkMillis() {
+        return networkMillis;
+    }
+
+    public void setNetworkMillis(long networkMillis) {
+        this.networkMillis = networkMillis;
+    }
 
 }