<!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>[15142] 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/15142">15142</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-21 07:34:01 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Latest CDT and twext. Support Oracle stored procedures for next_job.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoredbapiclientpy">CalendarServer/trunk/txdav/base/datastore/dbapiclient.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectextrassql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_58_to_59sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_58_to_59.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretesttest_sql_schema_filespy">CalendarServer/trunk/txdav/common/datastore/test/test_sql_schema_files.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/requirements-dev.txt 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15066#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15138#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/requirements-stable.txt 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15118#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15141#egg=twextpy
</ins><span class="cx"> cffi==1.1.0
</span><span class="cx"> pycparser==2.13
</span><span class="cx"> #twisted
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> #six
</span><span class="cx"> six==1.9.0
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@15134#egg=kerberos
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@15140#egg=kerberos
</ins><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@15020#egg=pycalendar
</span><span class="cx"> python-dateutil==1.5 # Note: v2.0+ is for Python 3
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoredbapiclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/dbapiclient.py (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/dbapiclient.py 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/txdav/base/datastore/dbapiclient.py 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -149,7 +149,15 @@
</span><span class="cx"> return super(OracleCursorWrapper, self).execute(sql, realArgs)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def callproc(self, name, args=()):
+ return self.realCursor.callproc(name, args)
</ins><span class="cx">
</span><ins>+
+ def callfunc(self, name, returnType, args=()):
+ return self.realCursor.callfunc(name, returnType, args)
+
+
+
</ins><span class="cx"> class DiagnosticConnectionWrapper(object):
</span><span class="cx"> """
</span><span class="cx"> Diagnostic wrapper around a DB-API 2.0 connection for debugging connection
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectextrassql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -15,3 +15,66 @@
</span><span class="cx"> ----
</span><span class="cx">
</span><span class="cx"> -- Extra schema to add to current-oracle-dialect.sql
</span><ins>+
+create or replace function next_job_all(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function next_job_medium_high(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where PRIORITY != 0 and ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function next_job_high(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where PRIORITY = 2 and ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function overdue_job(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where ASSIGNED is not NULL and OVERDUE <= now
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -1052,3 +1052,66 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> -- Extra schema to add to current-oracle-dialect.sql
</span><ins>+
+create or replace function next_job_all(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function next_job_medium_high(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where PRIORITY != 0 and ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function next_job_high(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where PRIORITY = 2 and ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function overdue_job(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where ASSIGNED is not NULL and OVERDUE <= now
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_58_to_59sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_58_to_59.sql (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_58_to_59.sql 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_58_to_59.sql 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -37,6 +37,68 @@
</span><span class="cx"> "OVERDUE"
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+create or replace function next_job_all(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
</ins><span class="cx">
</span><ins>+create or replace function next_job_medium_high(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where PRIORITY != 0 and ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function next_job_high(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where PRIORITY = 2 and ASSIGNED is NULL and PAUSE = 0 and NOT_BEFORE <= now
+ order by PRIORITY desc
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
+create or replace function overdue_job(now timestamp)
+ return integer is
+ cursor c1 is
+ select JOB_ID from JOB
+ where ASSIGNED is not NULL and OVERDUE <= now
+ for update skip locked;
+ result integer;
+begin
+ open c1;
+ fetch c1 into result;
+ close c1;
+ return result;
+end;
+/
+
</ins><span class="cx"> -- update the version
</span><span class="cx"> update CALENDARSERVER set VALUE = '59' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretesttest_sql_schema_filespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql_schema_files.py (15141 => 15142)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_sql_schema_files.py 2015-09-21 14:29:03 UTC (rev 15141)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql_schema_files.py 2015-09-21 14:34:01 UTC (rev 15142)
</span><span class="lines">@@ -114,6 +114,10 @@
</span><span class="cx"> if constraint.affectsColumns[0].type.name in ("text", "char", "varchar"):
</span><span class="cx"> table.constraints.remove(constraint)
</span><span class="cx">
</span><ins>+ # Remove stored procedures which we only use on Oracle
+ schema_oracle.functions = []
+
+
</ins><span class="cx"> mismatched = schema_current.compare(schema_oracle)
</span><span class="cx"> self.assertEqual(len(mismatched), 0, msg=", ".join(mismatched))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>