From 839929b9b2768aa79636b61ded1386b6546b3a7a Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 3 Oct 2012 14:58:07 -0700 Subject: [PATCH] Fixed lineendings and trailing whitespaces in a bunch of files Conflicts: core/src/com/cloud/async/SyncQueueItemVO.java core/src/com/cloud/async/SyncQueueVO.java server/src/com/cloud/async/dao/SyncQueueDaoImpl.java server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java --- core/src/com/cloud/async/SyncQueueItemVO.java | 132 ++++++++-------- core/src/com/cloud/async/SyncQueueVO.java | 145 +++++++++--------- .../com/cloud/async/dao/SyncQueueDaoImpl.java | 57 +++---- .../cloud/async/dao/SyncQueueItemDaoImpl.java | 99 ++++++------ 4 files changed, 220 insertions(+), 213 deletions(-) diff --git a/core/src/com/cloud/async/SyncQueueItemVO.java b/core/src/com/cloud/async/SyncQueueItemVO.java index f70ff852b5b..aceb3181d70 100644 --- a/core/src/com/cloud/async/SyncQueueItemVO.java +++ b/core/src/com/cloud/async/SyncQueueItemVO.java @@ -29,19 +29,19 @@ import javax.persistence.Table; @Table(name="sync_queue_item") public class SyncQueueItemVO implements SyncQueueItem{ - @Id + @Id @GeneratedValue(strategy=GenerationType.IDENTITY) @Column(name="id") private Long id = null; - + @Column(name="queue_id") - private Long queueId; - + private Long queueId; + @Column(name="content_type") - private String contentType; - + private String contentType; + @Column(name="content_id") - private Long contentId; + private Long contentId; @Column(name="queue_proc_msid") private Long lastProcessMsid; @@ -49,76 +49,76 @@ public class SyncQueueItemVO implements SyncQueueItem{ @Column(name="queue_proc_number") private Long lastProcessNumber; - @Column(name="created") - private Date created; + @Column(name="created") + private Date created; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public Long getQueueId() { - return queueId; - } + public Long getQueueId() { + return queueId; + } - public void setQueueId(Long queueId) { - this.queueId = queueId; - } + public void setQueueId(Long queueId) { + this.queueId = queueId; + } - @Override - public String getContentType() { - return contentType; - } + @Override + public String getContentType() { + return contentType; + } - public void setContentType(String contentType) { - this.contentType = contentType; - } - - @Override - public Long getContentId() { - return contentId; - } + public void setContentType(String contentType) { + this.contentType = contentType; + } + + @Override + public Long getContentId() { + return contentId; + } - public void setContentId(Long contentId) { - this.contentId = contentId; - } + public void setContentId(Long contentId) { + this.contentId = contentId; + } - public Long getLastProcessMsid() { - return lastProcessMsid; - } + public Long getLastProcessMsid() { + return lastProcessMsid; + } - public void setLastProcessMsid(Long lastProcessMsid) { - this.lastProcessMsid = lastProcessMsid; - } - + public void setLastProcessMsid(Long lastProcessMsid) { + this.lastProcessMsid = lastProcessMsid; + } + public Long getLastProcessNumber() { - return lastProcessNumber; - } + return lastProcessNumber; + } - public void setLastProcessNumber(Long lastProcessNumber) { - this.lastProcessNumber = lastProcessNumber; - } + public void setLastProcessNumber(Long lastProcessNumber) { + this.lastProcessNumber = lastProcessNumber; + } - public Date getCreated() { - return created; - } + public Date getCreated() { + return created; + } - public void setCreated(Date created) { - this.created = created; - } - - public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append("SyncQueueItemVO {id:").append(getId()).append(", queueId: ").append(getQueueId()); - sb.append(", contentType: ").append(getContentType()); - sb.append(", contentId: ").append(getContentId()); - sb.append(", lastProcessMsid: ").append(getLastProcessMsid()); - sb.append(", lastprocessNumber: ").append(getLastProcessNumber()); - sb.append(", created: ").append(getCreated()); - sb.append("}"); - return sb.toString(); - } + public void setCreated(Date created) { + this.created = created; + } + + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("SyncQueueItemVO {id:").append(getId()).append(", queueId: ").append(getQueueId()); + sb.append(", contentType: ").append(getContentType()); + sb.append(", contentId: ").append(getContentId()); + sb.append(", lastProcessMsid: ").append(getLastProcessMsid()); + sb.append(", lastprocessNumber: ").append(getLastProcessNumber()); + sb.append(", created: ").append(getCreated()); + sb.append("}"); + return sb.toString(); + } } diff --git a/core/src/com/cloud/async/SyncQueueVO.java b/core/src/com/cloud/async/SyncQueueVO.java index 741312f74dd..419fecba6a4 100644 --- a/core/src/com/cloud/async/SyncQueueVO.java +++ b/core/src/com/cloud/async/SyncQueueVO.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package com.cloud.async; import java.util.Date; @@ -30,110 +31,112 @@ import javax.persistence.TemporalType; @Entity @Table(name="sync_queue") public class SyncQueueVO { - @Id + + @Id @GeneratedValue(strategy=GenerationType.IDENTITY) @Column(name="id") private Long id; @Column(name="sync_objtype") - private String syncObjType; + + private String syncObjType; @Column(name="sync_objid") - private Long syncObjId; + private Long syncObjId; @Column(name="queue_proc_number") private Long lastProcessNumber; @Column(name="queue_proc_time") @Temporal(TemporalType.TIMESTAMP) - private Date lastProcessTime; + private Date lastProcessTime; @Column(name="queue_proc_msid") - private Long lastProcessMsid; + private Long lastProcessMsid; @Column(name="created") @Temporal(TemporalType.TIMESTAMP) - private Date created; + private Date created; @Column(name="last_updated") @Temporal(TemporalType.TIMESTAMP) - private Date lastUpdated; + private Date lastUpdated; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getSyncObjType() { - return syncObjType; - } + public String getSyncObjType() { + return syncObjType; + } - public void setSyncObjType(String syncObjType) { - this.syncObjType = syncObjType; - } + public void setSyncObjType(String syncObjType) { + this.syncObjType = syncObjType; + } - public Long getSyncObjId() { - return syncObjId; - } + public Long getSyncObjId() { + return syncObjId; + } - public void setSyncObjId(Long syncObjId) { - this.syncObjId = syncObjId; - } - - public Long getLastProcessNumber() { - return lastProcessNumber; - } - - public void setLastProcessNumber(Long number) { - lastProcessNumber = number; - } + public void setSyncObjId(Long syncObjId) { + this.syncObjId = syncObjId; + } + + public Long getLastProcessNumber() { + return lastProcessNumber; + } + + public void setLastProcessNumber(Long number) { + lastProcessNumber = number; + } - public Date getLastProcessTime() { - return lastProcessTime; - } + public Date getLastProcessTime() { + return lastProcessTime; + } - public void setLastProcessTime(Date lastProcessTime) { - this.lastProcessTime = lastProcessTime; - } + public void setLastProcessTime(Date lastProcessTime) { + this.lastProcessTime = lastProcessTime; + } - public Long getLastProcessMsid() { - return lastProcessMsid; - } + public Long getLastProcessMsid() { + return lastProcessMsid; + } - public void setLastProcessMsid(Long lastProcessMsid) { - this.lastProcessMsid = lastProcessMsid; - } + public void setLastProcessMsid(Long lastProcessMsid) { + this.lastProcessMsid = lastProcessMsid; + } - public Date getCreated() { - return created; - } + public Date getCreated() { + return created; + } - public void setCreated(Date created) { - this.created = created; - } + public void setCreated(Date created) { + this.created = created; + } - public Date getLastUpdated() { - return lastUpdated; - } + public Date getLastUpdated() { + return lastUpdated; + } - public void setLastUpdated(Date lastUpdated) { - this.lastUpdated = lastUpdated; - } - - public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append("SyncQueueVO {id:").append(getId()); - sb.append(", syncObjType: ").append(getSyncObjType()); - sb.append(", syncObjId: ").append(getSyncObjId()); - sb.append(", lastProcessMsid: ").append(getLastProcessMsid()); - sb.append(", lastProcessNumber: ").append(getLastProcessNumber()); - sb.append(", lastProcessTime: ").append(getLastProcessTime()); - sb.append(", lastUpdated: ").append(getLastUpdated()); - sb.append(", created: ").append(getCreated()); - sb.append("}"); - return sb.toString(); - } + public void setLastUpdated(Date lastUpdated) { + this.lastUpdated = lastUpdated; + } + + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("SyncQueueVO {id:").append(getId()); + sb.append(", syncObjType: ").append(getSyncObjType()); + sb.append(", syncObjId: ").append(getSyncObjId()); + sb.append(", lastProcessMsid: ").append(getLastProcessMsid()); + sb.append(", lastProcessNumber: ").append(getLastProcessNumber()); + sb.append(", lastProcessTime: ").append(getLastProcessTime()); + sb.append(", lastUpdated: ").append(getLastUpdated()); + sb.append(", created: ").append(getCreated()); + sb.append("}"); + return sb.toString(); + } } diff --git a/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java b/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java index 49c6c4e49f8..a40edb26df7 100644 --- a/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java +++ b/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package com.cloud.async.dao; import java.sql.PreparedStatement; @@ -38,12 +39,12 @@ public class SyncQueueDaoImpl extends GenericDaoBase implemen private static final Logger s_logger = Logger.getLogger(SyncQueueDaoImpl.class.getName()); SearchBuilder TypeIdSearch = createSearchBuilder(); - - @Override - public void ensureQueue(String syncObjType, long syncObjId) { - Date dt = DateUtil.currentGMTTime(); - String sql = "INSERT IGNORE INTO sync_queue(sync_objtype, sync_objid, created, last_updated) values(?, ?, ?, ?)"; - + + @Override + public void ensureQueue(String syncObjType, long syncObjId) { + Date dt = DateUtil.currentGMTTime(); + String sql = "INSERT IGNORE INTO sync_queue(sync_objtype, sync_objid, created, last_updated) values(?, ?, ?, ?)"; + Transaction txn = Transaction.currentTxn(); PreparedStatement pstmt = null; try { @@ -54,24 +55,24 @@ public class SyncQueueDaoImpl extends GenericDaoBase implemen pstmt.setString(4, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), dt)); pstmt.execute(); } catch (SQLException e) { - s_logger.warn("Unable to create sync queue " + syncObjType + "-" + syncObjId + ":" + e.getMessage(), e); + s_logger.warn("Unable to create sync queue " + syncObjType + "-" + syncObjId + ":" + e.getMessage(), e); } catch (Throwable e) { - s_logger.warn("Unable to create sync queue " + syncObjType + "-" + syncObjId + ":" + e.getMessage(), e); + s_logger.warn("Unable to create sync queue " + syncObjType + "-" + syncObjId + ":" + e.getMessage(), e); } - } - - @Override - public SyncQueueVO find(String syncObjType, long syncObjId) { - SearchCriteria sc = TypeIdSearch.create(); - sc.setParameters("syncObjType", syncObjType); - sc.setParameters("syncObjId", syncObjId); + } + + @Override + public SyncQueueVO find(String syncObjType, long syncObjId) { + SearchCriteria sc = TypeIdSearch.create(); + sc.setParameters("syncObjType", syncObjType); + sc.setParameters("syncObjId", syncObjId); return findOneBy(sc); - } + } - @Override @DB - public void resetQueueProcessing(long msid) { - String sql = "UPDATE sync_queue set queue_proc_msid=NULL, queue_proc_time=NULL where queue_proc_msid=?"; - + @Override @DB + public void resetQueueProcessing(long msid) { + String sql = "UPDATE sync_queue set queue_proc_msid=NULL, queue_proc_time=NULL where queue_proc_msid=?"; + Transaction txn = Transaction.currentTxn(); PreparedStatement pstmt = null; try { @@ -79,17 +80,17 @@ public class SyncQueueDaoImpl extends GenericDaoBase implemen pstmt.setLong(1, msid); pstmt.execute(); } catch (SQLException e) { - s_logger.warn("Unable to reset sync queue for management server " + msid, e); + s_logger.warn("Unable to reset sync queue for management server " + msid, e); } catch (Throwable e) { - s_logger.warn("Unable to reset sync queue for management server " + msid, e); + s_logger.warn("Unable to reset sync queue for management server " + msid, e); } - } - - protected SyncQueueDaoImpl() { - super(); - TypeIdSearch = createSearchBuilder(); + } + + protected SyncQueueDaoImpl() { + super(); + TypeIdSearch = createSearchBuilder(); TypeIdSearch.and("syncObjType", TypeIdSearch.entity().getSyncObjType(), SearchCriteria.Op.EQ); TypeIdSearch.and("syncObjId", TypeIdSearch.entity().getSyncObjId(), SearchCriteria.Op.EQ); TypeIdSearch.done(); - } + } } diff --git a/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java b/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java index 814777da797..e6a4e53875c 100644 --- a/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java +++ b/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package com.cloud.async.dao; import java.sql.PreparedStatement; @@ -44,35 +45,36 @@ public class SyncQueueItemDaoImpl extends GenericDaoBase private final SyncQueueDao _syncQueueDao = new SyncQueueDaoImpl(); - @Override - public SyncQueueItemVO getNextQueueItem(long queueId) { - - SearchBuilder sb = createSearchBuilder(); + + @Override + public SyncQueueItemVO getNextQueueItem(long queueId) { + + SearchBuilder sb = createSearchBuilder(); sb.and("queueId", sb.entity().getQueueId(), SearchCriteria.Op.EQ); - sb.and("lastProcessNumber", sb.entity().getLastProcessNumber(), SearchCriteria.Op.NULL); + sb.and("lastProcessNumber", sb.entity().getLastProcessNumber(), SearchCriteria.Op.NULL); sb.done(); - SearchCriteria sc = sb.create(); - sc.setParameters("queueId", queueId); - - Filter filter = new Filter(SyncQueueItemVO.class, "created", true, 0L, 1L); + SearchCriteria sc = sb.create(); + sc.setParameters("queueId", queueId); + + Filter filter = new Filter(SyncQueueItemVO.class, "created", true, 0L, 1L); List l = listBy(sc, filter); if(l != null && l.size() > 0) - return l.get(0); - - return null; - } + return l.get(0); + + return null; + } - @Override - public List getNextQueueItems(int maxItems) { - List l = new ArrayList(); - - String sql = "SELECT i.id, i.queue_id, i.content_type, i.content_id, i.created " + - " FROM sync_queue AS q JOIN sync_queue_item AS i ON q.id = i.queue_id " + - " WHERE q.queue_proc_time IS NULL AND i.queue_proc_number IS NULL " + - " GROUP BY q.id " + - " ORDER BY i.id " + - " LIMIT 0, ?"; + @Override + public List getNextQueueItems(int maxItems) { + List l = new ArrayList(); + + String sql = "SELECT i.id, i.queue_id, i.content_type, i.content_id, i.created " + + " FROM sync_queue AS q JOIN sync_queue_item AS i ON q.id = i.queue_id " + + " WHERE q.queue_proc_time IS NULL AND i.queue_proc_number IS NULL " + + " GROUP BY q.id " + + " ORDER BY i.id " + + " LIMIT 0, ?"; Transaction txn = Transaction.currentTxn(); PreparedStatement pstmt = null; @@ -81,39 +83,40 @@ public class SyncQueueItemDaoImpl extends GenericDaoBase pstmt.setInt(1, maxItems); ResultSet rs = pstmt.executeQuery(); while(rs.next()) { - SyncQueueItemVO item = new SyncQueueItemVO(); - item.setId(rs.getLong(1)); - item.setQueueId(rs.getLong(2)); - item.setContentType(rs.getString(3)); - item.setContentId(rs.getLong(4)); - item.setCreated(DateUtil.parseDateString(TimeZone.getTimeZone("GMT"), rs.getString(5))); - l.add(item); + SyncQueueItemVO item = new SyncQueueItemVO(); + item.setId(rs.getLong(1)); + item.setQueueId(rs.getLong(2)); + item.setContentType(rs.getString(3)); + item.setContentId(rs.getLong(4)); + item.setCreated(DateUtil.parseDateString(TimeZone.getTimeZone("GMT"), rs.getString(5))); + l.add(item); } } catch (SQLException e) { - s_logger.error("Unexpected sql excetpion, ", e); + s_logger.error("Unexpected sql excetpion, ", e); } catch (Throwable e) { - s_logger.error("Unexpected excetpion, ", e); + s_logger.error("Unexpected excetpion, ", e); } - return l; - } - - @Override - public List getActiveQueueItems(Long msid, boolean exclusive) { - SearchBuilder sb = createSearchBuilder(); + return l; + } + + @Override + public List getActiveQueueItems(Long msid, boolean exclusive) { + SearchBuilder sb = createSearchBuilder(); sb.and("lastProcessMsid", sb.entity().getLastProcessMsid(), - SearchCriteria.Op.EQ); + SearchCriteria.Op.EQ); sb.done(); - SearchCriteria sc = sb.create(); - sc.setParameters("lastProcessMsid", msid); - - Filter filter = new Filter(SyncQueueItemVO.class, "created", true, null, null); - - if(exclusive) - return lockRows(sc, filter, true); + SearchCriteria sc = sb.create(); + sc.setParameters("lastProcessMsid", msid); + + Filter filter = new Filter(SyncQueueItemVO.class, "created", true, null, null); + + if(exclusive) + return lockRows(sc, filter, true); return listBy(sc, filter); - } - + } + + @Override public List getBlockedQueueItems(long thresholdMs, boolean exclusive) { Date cutTime = DateUtil.currentGMTTime();