<!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>[13597] twext/trunk/twext/enterprise</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/13597">13597</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-02 18:11:13 -0700 (Mon, 02 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unneeded deferreds.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisejobqueuepy">twext/trunk/twext/enterprise/jobqueue.py</a></li>
<li><a href="#twexttrunktwextenterprisetesttest_jobqueuepy">twext/trunk/twext/enterprise/test/test_jobqueue.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisejobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/jobqueue.py (13596 => 13597)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/jobqueue.py 2014-06-03 01:09:37 UTC (rev 13596)
+++ twext/trunk/twext/enterprise/jobqueue.py 2014-06-03 01:11:13 UTC (rev 13597)
</span><span class="lines">@@ -1486,13 +1486,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class TransactionFailed(Exception):
- """
- A transaction failed.
- """
-
-
-
</del><span class="cx"> def _cloneDeferred(d):
</span><span class="cx"> """
</span><span class="cx"> Make a new Deferred, adding callbacks to C{d}.
</span><span class="lines">@@ -1532,7 +1525,6 @@
</span><span class="cx"> self.txn = txn
</span><span class="cx"> self.workItemType = workItemType
</span><span class="cx"> self.kw = kw
</span><del>- self._whenCommitted = Deferred()
</del><span class="cx"> self.workItem = None
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1543,50 +1535,10 @@
</span><span class="cx"> waiting for the transaction where that addition was completed to
</span><span class="cx"> commit, and asking the local node controller process to do the work.
</span><span class="cx"> """
</span><del>- try:
- created = yield self.workItemType.makeJob(self.txn, **self.kw)
- except Exception:
- self._whenCommitted.errback(TransactionFailed)
- raise
- else:
- self.workItem = created
</del><ins>+ self.workItem = yield self.workItemType.makeJob(self.txn, **self.kw)
</ins><span class="cx">
</span><del>- @self.txn.postCommit
- def whenDone():
- self._whenCommitted.callback(self)
</del><span class="cx">
</span><del>- @self.txn.postAbort
- def whenFailed():
- self._whenCommitted.errback(TransactionFailed)
</del><span class="cx">
</span><del>-
- def whenProposed(self):
- """
- Let the caller know when the work has been proposed; i.e. when the work
- is first transmitted to the database.
-
- @return: a L{Deferred} that fires with this L{WorkProposal} when the
- relevant commands have been sent to the database to create the
- L{WorkItem}, and fails if those commands do not succeed for some
- reason.
- """
- return succeed(self)
-
-
- def whenCommitted(self):
- """
- Let the caller know when the work has been committed to; i.e. when the
- transaction where the work was proposed has been committed to the
- database.
-
- @return: a L{Deferred} that fires with this L{WorkProposal} when the
- relevant transaction has been committed, or fails if the
- transaction is not committed for any reason.
- """
- return _cloneDeferred(self._whenCommitted)
-
-
-
</del><span class="cx"> class _BaseQueuer(object):
</span><span class="cx"> implements(IQueuer)
</span><span class="cx">
</span><span class="lines">@@ -1922,10 +1874,6 @@
</span><span class="cx"> """
</span><span class="cx"> Register ourselves with the database and establish all outgoing
</span><span class="cx"> connections to other servers in the cluster.
</span><del>-
- @param waitForService: an optional L{Deferred} that will be called back when
- the service startup is done.
- @type waitForService: L{Deferred} or L{None}
</del><span class="cx"> """
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def startup(txn):
</span></span></pre></div>
<a id="twexttrunktwextenterprisetesttest_jobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py (13596 => 13597)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/test/test_jobqueue.py 2014-06-03 01:09:37 UTC (rev 13596)
+++ twext/trunk/twext/enterprise/test/test_jobqueue.py 2014-06-03 01:11:13 UTC (rev 13597)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> from twext.enterprise.jobqueue import (
</span><span class="cx"> inTransaction, PeerConnectionPool, astimestamp,
</span><span class="cx"> LocalPerformer, _IJobPerformer, WorkItem, WorkerConnectionPool,
</span><del>- ConnectionFromPeerNode, LocalQueuer,
</del><ins>+ ConnectionFromPeerNode,
</ins><span class="cx"> _BaseQueuer, NonPerformingQueuer, JobItem,
</span><span class="cx"> WORK_PRIORITY_LOW, WORK_PRIORITY_HIGH, WORK_PRIORITY_MEDIUM,
</span><span class="cx"> JobDescriptor, SingletonWorkItem
</span><span class="lines">@@ -360,8 +360,7 @@
</span><span class="cx"> notBefore=notBefore
</span><span class="cx"> )
</span><span class="cx">
</span><del>- proposal = yield check
- yield proposal.whenProposed()
</del><ins>+ yield check
</ins><span class="cx">
</span><span class="cx"> returnValue(qpool)
</span><span class="cx">
</span><span class="lines">@@ -571,41 +570,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class WorkProposalTests(TestCase):
- """
- Tests for L{WorkProposal}.
- """
-
- @inlineCallbacks
- def test_whenProposedSuccess(self):
- """
- The L{Deferred} returned by L{WorkProposal.whenProposed} fires when the
- SQL sent to the database has completed.
- """
- cph = SteppablePoolHelper(nodeSchema + jobSchema + schemaText)
- cph.setUp(test=self)
- lq = LocalQueuer(cph.createTransaction)
- enqTxn = cph.createTransaction()
- wp = yield lq.enqueueWork(enqTxn, DummyWorkItem, a=3, b=4)
- r = yield wp.whenProposed()
- self.assertEquals(r, wp)
-
-
- def test_whenProposedFailure(self):
- """
- The L{Deferred} returned by L{WorkProposal.whenProposed} fails with an
- errback when the SQL executed to create the WorkItem row fails.
- """
- cph = SteppablePoolHelper(nodeSchema + jobSchema + schemaText)
- cph.setUp(self)
- enqTxn = cph.createTransaction()
- lq = LocalQueuer(cph.createTransaction)
- self.failUnlessFailure(lq.enqueueWork(enqTxn, DummyWorkItem, a=3, b=4, bogus=3), TypeError)
- enqTxn.abort()
- self.flushLoggedErrors()
-
-
-
</del><span class="cx"> class PeerConnectionPoolUnitTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> L{PeerConnectionPool} has many internal components.
</span><span class="lines">@@ -825,8 +789,7 @@
</span><span class="cx"> notBefore=datetime.datetime(2012, 12, 12, 12, 12, 20)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- proposal = yield check
- yield proposal.whenProposed()
</del><ins>+ yield check
</ins><span class="cx">
</span><span class="cx"> # This is going to schedule the work to happen with some asynchronous
</span><span class="cx"> # I/O in the middle; this is a problem because how do we know when it's
</span><span class="lines">@@ -863,8 +826,7 @@
</span><span class="cx"> notBefore=datetime.datetime(2012, 12, 12, 12, 12, 0)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- proposal = yield check
- yield proposal.whenProposed()
</del><ins>+ yield check
</ins><span class="cx">
</span><span class="cx"> clock.advance(1000)
</span><span class="cx"> # Advance far beyond the given timestamp.
</span></span></pre>
</div>
</div>
</body>
</html>