<!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>[15733] CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.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/15733">15733</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-01 09:33:47 -0700 (Fri, 01 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure we serialize fractional seconds in Oracle queries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavbasedatastoredbapiclientpy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavbasedatastoredbapiclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py (15732 => 15733)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py 2016-07-01 13:55:11 UTC (rev 15732)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py 2016-07-01 16:33:47 UTC (rev 15733)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx">
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError
</span><span class="cx">
</span><ins>+import datetime
+
</ins><span class="cx"> import pg8000 as postgres
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -124,7 +126,7 @@
</span><span class="cx"> return self.realCursor.var(*args)
</span><span class="cx">
</span><span class="cx">
</span><del>- def execute(self, sql, args=()):
</del><ins>+ def mapArgs(self, args):
</ins><span class="cx"> realArgs = []
</span><span class="cx"> for arg in args:
</span><span class="cx"> if isinstance(arg, str):
</span><span class="lines">@@ -133,6 +135,7 @@
</span><span class="cx"> # application layer as they consume less memory, so do the
</span><span class="cx"> # conversion here.
</span><span class="cx"> arg = arg.decode('utf-8')
</span><ins>+
</ins><span class="cx"> if isinstance(arg, unicode) and len(arg) > 1024:
</span><span class="cx"> # This *may* cause a type mismatch, but none of the non-CLOB
</span><span class="cx"> # strings that we're passing would allow a value this large
</span><span class="lines">@@ -143,18 +146,37 @@
</span><span class="cx"> # it is:
</span><span class="cx"> v = self.var(cx_Oracle.NCLOB, len(arg) + 1)
</span><span class="cx"> v.setvalue(0, arg)
</span><ins>+
+ elif isinstance(arg, datetime.datetime):
+ # By default when cx_Oracle is passed a datetime object it maps it to a
+ # cx_Oracle.DATETIME variable which does not serialize fraction seconds
+ # into the query, or call, arguments. However, for high volume systems,
+ # we really want sub-second resolution for things like the job queue,
+ # so we want to serialize datetime as cx_Oracle.TIMESTAMP.
+ v = self.var(cx_Oracle.TIMESTAMP)
+ v.setvalue(0, arg)
+
</ins><span class="cx"> else:
</span><span class="cx"> v = arg
</span><ins>+
</ins><span class="cx"> realArgs.append(v)
</span><ins>+
+ return realArgs
+
+
+ def execute(self, sql, args=()):
+ realArgs = self.mapArgs(args)
</ins><span class="cx"> return super(OracleCursorWrapper, self).execute(sql, realArgs)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def callproc(self, name, args=()):
</span><del>- return self.realCursor.callproc(name, args)
</del><ins>+ realArgs = self.mapArgs(args)
+ return self.realCursor.callproc(name, realArgs)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def callfunc(self, name, returnType, args=()):
</span><del>- return self.realCursor.callfunc(name, returnType, args)
</del><ins>+ realArgs = self.mapArgs(args)
+ return self.realCursor.callfunc(name, returnType, realArgs)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>