diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/LoadSummary.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/LoadSummary.java
deleted file mode 100644
index ddbbdff991..0000000000
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/LoadSummary.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.jumpmind.symmetric.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class LoadSummary implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private long loadId;
- private String nodeId;
- private boolean inError;
- private int finishedBatchCount;
- private int pendingBatchCount;
- private long currentBatchId;
- private long currentDataEventCount;
- private String createBy;
- private Date createTime;
- private Date lastUpdateTime;
- private String channelQueue;
- private int tableCount;
- private boolean isFullLoad;
- private boolean isCreateFirst;
- private boolean isDeleteFirst;
- private boolean isRequestProcessed;
- private boolean isConditional;
- private boolean isCustomSql;
- private long batchCount;
- private String currentTableName;
- private long dataCount;
- private String processStatus;
- private String processName;
- private int targetNodeCount;
- private int ignoreCount;
-
- public boolean isActive() {
- return pendingBatchCount > 0;
- }
-
- public void setInError(boolean inError) {
- this.inError = inError;
- }
-
- public boolean isInError() {
- return inError;
- }
-
- public long getLoadId() {
- return loadId;
- }
-
- public void setIgnoreCount(int count){
- this.ignoreCount = count;
- }
-
- public int getIgnoreCount(){
- return ignoreCount;
- }
-
- public void setLoadId(long loadId) {
- this.loadId = loadId;
- }
-
- public String getNodeId() {
- return nodeId;
- }
-
- public void setNodeId(String nodeId) {
- this.nodeId = nodeId;
- }
-
- public int getFinishedBatchCount() {
- return finishedBatchCount;
- }
-
- public void setFinishedBatchCount(int finishedBatchCount) {
- this.finishedBatchCount = finishedBatchCount;
- }
-
- public int getPendingBatchCount() {
- return pendingBatchCount;
- }
-
- public void setPendingBatchCount(int pendingBatchCount) {
- this.pendingBatchCount = pendingBatchCount;
- }
-
- public long getCurrentBatchId() {
- return currentBatchId;
- }
-
- public void setCurrentBatchId(long currentBatchId) {
- this.currentBatchId = currentBatchId;
- }
-
- public long getCurrentDataEventCount() {
- return currentDataEventCount;
- }
-
- public void setCurrentDataEventCount(long currentDataEventCount) {
- this.currentDataEventCount = currentDataEventCount;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getLastUpdateTime() {
- return lastUpdateTime;
- }
-
- public void setLastUpdateTime(Date lastUpdateTime) {
- this.lastUpdateTime = lastUpdateTime;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public String getLoadNodeId() {
- return String.format("%010d-%s", loadId, nodeId);
- }
-
- public String getChannelQueue() {
- return channelQueue;
- }
-
- public void setChannelQueue(String channelQueue) {
- this.channelQueue = channelQueue;
- }
-
- public int getTableCount() {
- return tableCount;
- }
-
- public void setTableCount(int tableCount) {
- this.tableCount = tableCount;
- }
-
- public boolean isFullLoad() {
- return isFullLoad;
- }
-
- public void setFullLoad(boolean isFullLoad) {
- this.isFullLoad = isFullLoad;
- }
-
- public boolean isCreateFirst() {
- return isCreateFirst;
- }
-
- public void setCreateFirst(boolean isCreateFirst) {
- this.isCreateFirst = isCreateFirst;
- }
-
- public boolean isDeleteFirst() {
- return isDeleteFirst;
- }
-
- public void setDeleteFirst(boolean isDeleteFirst) {
- this.isDeleteFirst = isDeleteFirst;
- }
-
- public boolean isRequestProcessed() {
- return isRequestProcessed;
- }
-
- public void setRequestProcessed(boolean isRequestProcessed) {
- this.isRequestProcessed = isRequestProcessed;
- }
-
- public boolean isConditional() {
- return isConditional;
- }
-
- public void setConditional(boolean isConditional) {
- this.isConditional = isConditional;
- }
-
- public boolean isCustomSql() {
- return isCustomSql;
- }
-
- public void setCustomSql(boolean isCustomSql) {
- this.isCustomSql = isCustomSql;
- }
-
- public long getBatchCount() {
- return batchCount;
- }
-
- public void setBatchCount(long batchCount) {
- this.batchCount = batchCount;
- }
-
- public String getCurrentTableName() {
- return currentTableName;
- }
-
- public void setCurrentTableName(String currentTableName) {
- this.currentTableName = currentTableName;
- }
-
- public long getDataCount() {
- return dataCount;
- }
-
- public void setDataCount(long dataCount) {
- this.dataCount = dataCount;
- }
-
- public String getProcessStatus() {
- return processStatus;
- }
-
- public void setProcessStatus(String processStatus) {
- this.processStatus = processStatus;
- }
-
- public String getProcessName() {
- return processName;
- }
-
- public void setProcessName(String processName) {
- this.processName = processName;
- }
-
- public int getTargetNodeCount() {
- return targetNodeCount;
- }
-
- public void setTargetNodeCount(int targetNodeCount) {
- this.targetNodeCount = targetNodeCount;
- }
-
-
-
-
-}
-
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/OutgoingLoadSummary.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/OutgoingLoadSummary.java
deleted file mode 100644
index 6c5a62fec7..0000000000
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/OutgoingLoadSummary.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * 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
- * .
- *
- * 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.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class OutgoingLoadSummary implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private long loadId;
- private String nodeId;
- private boolean inError;
- private int finishedBatchCount;
- private int pendingBatchCount;
- private long currentBatchId;
- private long currentDataEventCount;
- private String createBy;
- private Date createTime;
- private Date lastUpdateTime;
- private int reloadBatchCount;
- private String channelId;
-
- public boolean isActive() {
- return pendingBatchCount > 0;
- }
-
- public void setInError(boolean inError) {
- this.inError = inError;
- }
-
- public boolean isInError() {
- return inError;
- }
-
- public long getLoadId() {
- return loadId;
- }
-
- public void setLoadId(long loadId) {
- this.loadId = loadId;
- }
-
- public String getNodeId() {
- return nodeId;
- }
-
- public void setNodeId(String nodeId) {
- this.nodeId = nodeId;
- }
-
- public int getFinishedBatchCount() {
- return finishedBatchCount;
- }
-
- public void setFinishedBatchCount(int finishedBatchCount) {
- this.finishedBatchCount = finishedBatchCount;
- }
-
- public int getPendingBatchCount() {
- return pendingBatchCount;
- }
-
- public void setPendingBatchCount(int pendingBatchCount) {
- this.pendingBatchCount = pendingBatchCount;
- }
-
- public int getTotalBatchCount() {
- return getPendingBatchCount() + getFinishedBatchCount();
- }
-
- public long getCurrentBatchId() {
- return currentBatchId;
- }
-
- public void setCurrentBatchId(long currentBatchId) {
- this.currentBatchId = currentBatchId;
- }
-
- public long getCurrentDataEventCount() {
- return currentDataEventCount;
- }
-
- public void setCurrentDataEventCount(long currentDataEventCount) {
- this.currentDataEventCount = currentDataEventCount;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getLastUpdateTime() {
- return lastUpdateTime;
- }
-
- public void setLastUpdateTime(Date lastUpdateTime) {
- this.lastUpdateTime = lastUpdateTime;
- }
-
- public int getReloadBatchCount() {
- return reloadBatchCount;
- }
-
- public void setReloadBatchCount(int reloadBatchCount) {
- this.reloadBatchCount = reloadBatchCount;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public String getLoadNodeId() {
- return String.format("%010d-%s", loadId, nodeId);
- }
-
- public String getChannelId() {
- return channelId;
- }
-
- public void setChannelId(String channelId) {
- this.channelId = channelId;
- }
-
-
-
-}
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IOutgoingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IOutgoingBatchService.java
index e18d9cab3e..94615297d8 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IOutgoingBatchService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IOutgoingBatchService.java
@@ -21,21 +21,16 @@
package org.jumpmind.symmetric.service;
-import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.symmetric.model.AbstractBatch.Status;
-import org.jumpmind.symmetric.model.LoadSummary;
import org.jumpmind.symmetric.model.NodeGroupLinkAction;
import org.jumpmind.symmetric.model.OutgoingBatch;
import org.jumpmind.symmetric.model.OutgoingBatchSummary;
import org.jumpmind.symmetric.model.OutgoingBatches;
-import org.jumpmind.symmetric.model.OutgoingLoadSummary;
-import org.jumpmind.symmetric.service.impl.OutgoingBatchService.LoadCounts;
-import org.jumpmind.symmetric.service.impl.OutgoingBatchService.LoadStatusSummary;
/**
* This service provides an API to access to the outgoing batch table.
@@ -115,29 +110,12 @@ public OutgoingBatches getOutgoingBatchByLoadRangeAndTable(long loadId, long sta
public List findOutgoingBatchSummaryByNode(String nodeId,
Date sinceCreateTime, Status... statuses);
- public List findOutgoingBatchSummaryByNodeAndChannel(String nodeId, String channelId,
- Date sinceCreateTime, Status... statuses);
-
public int countOutgoingBatches(List nodeIds, List channels,
List statuses, List loads);
public List listOutgoingBatches(List nodeIds, List channels,
List statuses, List loads, long startAtBatchId, int rowsExpected, boolean ascending);
- public List getLoadSummaries(boolean activeOnly);
-
- public Map getActiveLoadCounts();
-
- public List getQueuedLoads(String sourceNodeId);
-
- public LoadSummary getLoadSummary(long loadId);
-
- public Map getLoadOverview(long loadId);
-
- public Collection getLoadHistory(String sourceNodeId, final String symTablePrefix, int rowsReturned);
-
- public Map> getLoadStatusSummaries(int loadId);
-
public void copyOutgoingBatches(String channelId, long startBatchId, String fromNodeId, String toNodeId);
public List getAllBatches();
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
index 22accdced7..a44cfca5b8 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
@@ -20,19 +20,15 @@
*/
package org.jumpmind.symmetric.service.impl;
-import java.io.Serializable;
import java.sql.Types;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import org.apache.commons.lang.StringUtils;
import org.jumpmind.db.sql.ISqlRowMapper;
@@ -46,7 +42,6 @@
import org.jumpmind.symmetric.ext.IOutgoingBatchFilter;
import org.jumpmind.symmetric.model.AbstractBatch.Status;
import org.jumpmind.symmetric.model.Channel;
-import org.jumpmind.symmetric.model.LoadSummary;
import org.jumpmind.symmetric.model.NodeChannel;
import org.jumpmind.symmetric.model.NodeGroupChannelWindow;
import org.jumpmind.symmetric.model.NodeGroupLinkAction;
@@ -55,7 +50,6 @@
import org.jumpmind.symmetric.model.OutgoingBatch;
import org.jumpmind.symmetric.model.OutgoingBatchSummary;
import org.jumpmind.symmetric.model.OutgoingBatches;
-import org.jumpmind.symmetric.model.OutgoingLoadSummary;
import org.jumpmind.symmetric.service.IClusterService;
import org.jumpmind.symmetric.service.IConfigurationService;
import org.jumpmind.symmetric.service.IExtensionService;
@@ -636,20 +630,6 @@ public List findOutgoingBatchSummaryByNode(String nodeId,
"whereStatusAndNodeGroupByStatusSql").replace(":STATUS_LIST", inList.substring(0, inList.length() - 1));
return sqlTemplateDirty.query(sql, new OutgoingBatchSummaryMapper(false, false), args);
}
-
- public List findOutgoingBatchSummaryByNodeAndChannel(String nodeId,
- String channelId, Date sinceCreateTime, Status... statuses) {
-
- Object[] args = new Object[statuses.length + 2];
- args[args.length - 1] = nodeId;
- args[args.length - 2] = channelId;
- StringBuilder inList = buildStatusList(args, statuses);
-
- String sql = getSql("selectOutgoingBatchSummaryPrefixSql",
- "selectOutgoingBatchSummaryStatsPrefixSql",
- "whereStatusAndNodeAndChannelGroupByStatusSql").replace(":STATUS_LIST", inList.substring(0, inList.length() - 1));
- return sqlTemplateDirty.query(sql, new OutgoingBatchSummaryMapper(false, false), args);
- }
public List findOutgoingBatchSummary(Status... statuses) {
Object[] args = new Object[statuses.length];
@@ -675,350 +655,6 @@ public List findOutgoingBatchSummaryByChannel(Status... st
return sqlTemplateDirty.query(sql, new OutgoingBatchSummaryMapper(true, true), args);
}
- public Map getActiveLoadCounts() {
- return sqlTemplateDirty.queryForMap(getSql("getActiveLoadCountsSql"), new ISqlRowMapper() {
-
- @Override
- public LoadCounts mapRow(Row rs) {
- LoadCounts lc = new LoadCounts();
- lc.setLoadedBatchCount(rs.getInt("loaded_batch_count"));
- lc.setLoadedByteCount(rs.getLong("loaded_byte_count"));
- lc.setLoadedRowCount(rs.getLong("loaded_row_count"));
-
- return lc;
- }
-
- }, "load_id");
- }
-
- public List getQueuedLoads(String sourceNodeId) {
- return sqlTemplateDirty.query(getSql("getLoadSummaryUnprocessedSql"), new LoadSummaryMapper(), sourceNodeId);
- }
-
- public LoadSummary getLoadSummary(long loadId) {
- return sqlTemplateDirty.queryForObject(getSql("getLoadSummarySql"), new LoadSummaryMapper(), loadId);
- }
-
- private static class LoadSummaryMapper implements ISqlRowMapper {
- public LoadSummary mapRow(Row rs) {
- LoadSummary summary = new LoadSummary();
- // summary.setLoadId(rs.getLong("load_id"));
- summary.setNodeId(rs.getString("node_id"));
- summary.setCreateBy(rs.getString("last_update_by"));
- summary.setTableCount(rs.getInt("table_count"));
- String triggerId = rs.getString("trigger_id");
- if (triggerId == null || triggerId.equals(ParameterConstants.ALL)) {
- summary.setFullLoad(true);
- } else {
- summary.setFullLoad(false);
- }
- summary.setCreateFirst(rs.getBoolean("create_table"));
- summary.setDeleteFirst(rs.getBoolean("delete_first"));
- summary.setRequestProcessed(rs.getBoolean("processed"));
- summary.setIgnoreCount(rs.getInt("ignore_count"));
- // summary.setConditional(rs.getBoolean("reload_select"));
- // summary.setCustomSql(rs.getBoolean("before_custom_sql"));
- return summary;
- }
- }
-
- public Map> getLoadStatusSummaries(int loadId) {
- LoadStatusByQueueMapper mapper = new LoadStatusByQueueMapper(this.symmetricDialect.getTablePrefix());
- sqlTemplateDirty.query(getSql("getLoadStatusSummarySql"), mapper, loadId);
- return mapper.getResults();
- }
-
- private static class LoadStatusByQueueMapper implements ISqlRowMapper