<!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>[14228] twext/trunk/twext/who/opendirectory/_service.py</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/14228">14228</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 12:06:03 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor recordWithShortName for more code reuse, and temporarily turn off deferToThread while we investigate why the threadpool backs up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (14227 => 14228)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-12-12 21:25:23 UTC (rev 14227)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-12-17 20:06:03 UTC (rev 14228)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> MatchExpression, MatchFlags,
</span><span class="cx"> )
</span><span class="cx"> from ..ldap._util import LDAP_QUOTING_TABLE
</span><del>-from ..util import ConstantsContainer, firstResult
</del><ins>+from ..util import ConstantsContainer, firstResult, uniqueResult
</ins><span class="cx">
</span><span class="cx"> from Foundation import NSAutoreleasePool
</span><span class="cx"> from ._odframework import ODSession, ODNode, ODQuery
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> ODSearchPath, ODRecordType, ODAttribute, ODMatchType, ODAuthMethod,
</span><span class="cx"> )
</span><span class="cx">
</span><del>-DEFER_TO_THREAD = True
</del><ins>+DEFER_TO_THREAD = False
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -805,7 +805,9 @@
</span><span class="cx"> ):
</span><span class="cx"> self._maybeResetPool()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if isinstance(expression, MatchExpression):
</span><ins>+ self.log.debug("OD call: {}".format(expression))
</ins><span class="cx"> try:
</span><span class="cx"> query = self._queryFromMatchExpression(
</span><span class="cx"> expression,
</span><span class="lines">@@ -844,6 +846,7 @@
</span><span class="cx"> self._maybeResetPool()
</span><span class="cx">
</span><span class="cx"> try:
</span><ins>+ self.log.debug("OD call: {}".format(expression))
</ins><span class="cx"> query = self._queryFromCompoundExpression(
</span><span class="cx"> expression, recordTypes=recordTypes, limitResults=limitResults
</span><span class="cx"> )
</span><span class="lines">@@ -983,40 +986,27 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordWithShortName(self, recordType, shortName, timeoutSeconds=None):
</span><del>- self._maybeResetPool()
</del><span class="cx">
</span><ins>+ records = yield self.recordsFromNonCompoundExpression(
+ MatchExpression(self.fieldName.shortNames, shortName),
+ recordTypes=(recordType,),
+ limitResults=1
+ )
+
</ins><span class="cx"> try:
</span><del>- query = self._queryFromMatchExpression(
- MatchExpression(self.fieldName.shortNames, shortName),
- recordTypes=(recordType,),
- limitResults=1
</del><ins>+ record = uniqueResult(records)
+ except DirectoryServiceError:
+ self.log.error(
+ "Duplicate records for name: {name} ({recordType})"
+ .format(name=shortName, recordType=recordType.name)
</ins><span class="cx"> )
</span><del>- results = yield self._recordsFromQuery(
- query,
- timeoutSeconds=timeoutSeconds
- )
</del><ins>+ raise
</ins><span class="cx">
</span><del>- try:
- record = firstResult(results)
- except DirectoryServiceError:
- self.log.error(
- "Duplicate records for name: {name} ({recordType})"
- .format(name=shortName, recordType=recordType.name)
- )
- raise
</del><ins>+ returnValue(record)
</ins><span class="cx">
</span><del>- returnValue(record)
</del><span class="cx">
</span><del>- except QueryNotSupportedError:
- # Let the superclass try
- returnValue((yield BaseDirectoryService.recordWithShortName(
- self, recordType, shortName, timeoutSeconds=timeoutSeconds)))
</del><span class="cx">
</span><del>- except UnsupportedRecordTypeError:
- returnValue(None)
</del><span class="cx">
</span><del>-
-
</del><span class="cx"> @implementer(IPlaintextPasswordVerifier, IHTTPDigestVerifier)
</span><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>