<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15492] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15492">15492</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-03-31 10:48:33 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix old work item upgrade priority/weight default values during schema upgrade. Pull in latest twext.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementscstxt">CalendarServer/trunk/requirements-cs.txt</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_36_to_37sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_36_to_37sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementscstxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-cs.txt (15491 => 15492)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-cs.txt 2016-03-31 17:43:21 UTC (rev 15491)
+++ CalendarServer/trunk/requirements-cs.txt 2016-03-31 17:48:33 UTC (rev 15492)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> zope.interface==4.1.3
</span><span class="cx"> setuptools==18.5
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15423#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15491#egg=twextpy
</ins><span class="cx"> cffi==1.3.0
</span><span class="cx"> pycparser==2.14
</span><span class="cx"> #twisted
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_36_to_37sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql (15491 => 15492)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql 2016-03-31 17:43:21 UTC (rev 15491)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql 2016-03-31 17:48:33 UTC (rev 15492)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> update IMIP_INVITATION_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'IMIP_INVITATION_WORK', NOT_BEFORE from IMIP_INVITATION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'IMIP_INVITATION_WORK', 0, 5, NOT_BEFORE from IMIP_INVITATION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table IMIP_INVITATION_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> update IMIP_POLLING_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'IMIP_POLLING_WORK', NOT_BEFORE from IMIP_POLLING_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'IMIP_POLLING_WORK', 0, 5, NOT_BEFORE from IMIP_POLLING_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table IMIP_POLLING_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx"> update IMIP_REPLY_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'IMIP_REPLY_WORK', NOT_BEFORE from IMIP_REPLY_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'IMIP_REPLY_WORK', 0, 5, NOT_BEFORE from IMIP_REPLY_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table IMIP_REPLY_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> rename column "PRIORITY" to "PUSH_PRIORITY";
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'PUSH_NOTIFICATION_WORK', NOT_BEFORE from PUSH_NOTIFICATION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'PUSH_NOTIFICATION_WORK', 2, 1, NOT_BEFORE from PUSH_NOTIFICATION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table PUSH_NOTIFICATION_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -118,8 +118,8 @@
</span><span class="cx"> update GROUP_CACHER_POLLING_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', 0, 5, NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table GROUP_CACHER_POLLING_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -137,8 +137,8 @@
</span><span class="cx"> update GROUP_REFRESH_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'GROUP_REFRESH_WORK', NOT_BEFORE from GROUP_REFRESH_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'GROUP_REFRESH_WORK', 0, 5, NOT_BEFORE from GROUP_REFRESH_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table GROUP_REFRESH_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> update GROUP_ATTENDEE_RECONCILIATION_ set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_', NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_', 0, 5, NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_);
</ins><span class="cx">
</span><span class="cx"> alter table GROUP_ATTENDEE_RECONCILIATION_
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -175,8 +175,8 @@
</span><span class="cx"> update CALENDAR_OBJECT_SPLITTER_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', 0, 5, NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table CALENDAR_OBJECT_SPLITTER_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -194,8 +194,8 @@
</span><span class="cx"> update FIND_MIN_VALID_REVISION_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', 0, 5, NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table FIND_MIN_VALID_REVISION_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> update REVISION_CLEANUP_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'REVISION_CLEANUP_WORK', NOT_BEFORE from REVISION_CLEANUP_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'REVISION_CLEANUP_WORK', 0, 5, NOT_BEFORE from REVISION_CLEANUP_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table REVISION_CLEANUP_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> update INBOX_CLEANUP_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'INBOX_CLEANUP_WORK', NOT_BEFORE from INBOX_CLEANUP_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'INBOX_CLEANUP_WORK', 0, 5, NOT_BEFORE from INBOX_CLEANUP_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table INBOX_CLEANUP_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -251,8 +251,8 @@
</span><span class="cx"> update CLEANUP_ONE_INBOX_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', 0, 5, NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table CLEANUP_ONE_INBOX_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -270,8 +270,8 @@
</span><span class="cx"> update SCHEDULE_REFRESH_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_REFRESH_WORK', NOT_BEFORE from SCHEDULE_REFRESH_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_REFRESH_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REFRESH_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_REFRESH_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -289,8 +289,8 @@
</span><span class="cx"> update SCHEDULE_AUTO_REPLY_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_AUTO_REPLY_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -308,8 +308,8 @@
</span><span class="cx"> update SCHEDULE_ORGANIZER_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', 1, 5, NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_ORGANIZER_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -327,8 +327,8 @@
</span><span class="cx"> update SCHEDULE_REPLY_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_REPLY_WORK', NOT_BEFORE from SCHEDULE_REPLY_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_REPLY_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span><span class="lines">@@ -346,8 +346,8 @@
</span><span class="cx"> update SCHEDULE_REPLY_CANCEL_WORK set JOB_ID = JOB_SEQ.nextval;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_REPLY_CANCEL_WORK
</span><span class="cx"> drop column NOT_BEFORE;
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_36_to_37sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql (15491 => 15492)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql 2016-03-31 17:43:21 UTC (rev 15491)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql 2016-03-31 17:48:33 UTC (rev 15492)
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'IMIP_INVITATION_WORK', NOT_BEFORE from IMIP_INVITATION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'IMIP_INVITATION_WORK', 0, 5, NOT_BEFORE from IMIP_INVITATION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table IMIP_INVITATION_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'IMIP_POLLING_WORK', NOT_BEFORE from IMIP_POLLING_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'IMIP_POLLING_WORK', 0, 5, NOT_BEFORE from IMIP_POLLING_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table IMIP_POLLING_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'IMIP_REPLY_WORK', NOT_BEFORE from IMIP_REPLY_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'IMIP_REPLY_WORK', 0, 5, NOT_BEFORE from IMIP_REPLY_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table IMIP_REPLY_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> rename PRIORITY to PUSH_PRIORITY;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'PUSH_NOTIFICATION_WORK', NOT_BEFORE from PUSH_NOTIFICATION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'PUSH_NOTIFICATION_WORK', 2, 1, NOT_BEFORE from PUSH_NOTIFICATION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table PUSH_NOTIFICATION_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', 0, 5, NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table GROUP_CACHER_POLLING_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -130,8 +130,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'GROUP_REFRESH_WORK', NOT_BEFORE from GROUP_REFRESH_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'GROUP_REFRESH_WORK', 0, 5, NOT_BEFORE from GROUP_REFRESH_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table GROUP_REFRESH_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -146,8 +146,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_WORK', NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_WORK', 0, 5, NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table GROUP_ATTENDEE_RECONCILIATION_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -162,8 +162,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', 0, 5, NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table CALENDAR_OBJECT_SPLITTER_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -178,8 +178,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', 0, 5, NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table FIND_MIN_VALID_REVISION_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -194,8 +194,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'REVISION_CLEANUP_WORK', NOT_BEFORE from REVISION_CLEANUP_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'REVISION_CLEANUP_WORK', 0, 5, NOT_BEFORE from REVISION_CLEANUP_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table REVISION_CLEANUP_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'INBOX_CLEANUP_WORK', NOT_BEFORE from INBOX_CLEANUP_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'INBOX_CLEANUP_WORK', 0, 5, NOT_BEFORE from INBOX_CLEANUP_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table INBOX_CLEANUP_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -226,8 +226,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', 0, 5, NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table CLEANUP_ONE_INBOX_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -242,8 +242,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_REFRESH_WORK', NOT_BEFORE from SCHEDULE_REFRESH_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_REFRESH_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REFRESH_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_REFRESH_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -258,8 +258,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_AUTO_REPLY_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -274,8 +274,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', 1, 5, NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_ORGANIZER_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -290,8 +290,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_REPLY_WORK', NOT_BEFORE from SCHEDULE_REPLY_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_REPLY_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span><span class="lines">@@ -306,8 +306,8 @@
</span><span class="cx"> add JOB_ID integer default nextval('JOB_SEQ') not null;
</span><span class="cx">
</span><span class="cx"> insert into JOB
</span><del>- (JOB_ID, WORK_TYPE, NOT_BEFORE)
- (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
</del><ins>+ (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+ (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
</ins><span class="cx">
</span><span class="cx"> alter table SCHEDULE_REPLY_CANCEL_WORK
</span><span class="cx"> drop column NOT_BEFORE,
</span></span></pre>
</div>
</div>
</body>
</html>