<!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>[15677] CalendarServer/trunk/txdav</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/15677">15677</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-16 12:36:40 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds a combined index on (ORIGINAL_COLLECTION, TRASHED) and breaks the single trashForCollection query into 3 that can take advantage of the new index</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_62_to_63sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_62_to_63sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (15676 => 15677)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-06-15 22:32:47 UTC (rev 15676)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-06-16 19:36:40 UTC (rev 15677)
</span><span class="lines">@@ -5560,7 +5560,12 @@
</span><span class="cx"> returnValue(name)
</span><span class="cx">
</span><span class="cx">
</span><ins>+class UnsupportedQuery(Exception):
+ """
+ Indicates the particular set of query parameters passed are not supported.
+ """
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class TrashCollection(Calendar):
</span><span class="cx">
</span><span class="cx"> _childType = _CHILD_TYPE_TRASH
</span><span class="lines">@@ -5574,9 +5579,32 @@
</span><span class="cx"> obj = cls._objectSchema
</span><span class="cx"> return Select(
</span><span class="cx"> [obj.RESOURCE_ID], From=obj,
</span><ins>+ Where=(obj.ORIGINAL_COLLECTION == Parameter("resourceID")),
+ OrderBy=obj.TRASHED,
+ Ascending=False
+ )
+
+
+ @classproperty
+ def _trashForCollectionStartingQuery(cls):
+ obj = cls._objectSchema
+ return Select(
+ [obj.RESOURCE_ID], From=obj,
</ins><span class="cx"> Where=(
</span><span class="cx"> obj.ORIGINAL_COLLECTION == Parameter("resourceID")).And(
</span><del>- obj.TRASHED >= Parameter("start")).And(
</del><ins>+ obj.TRASHED >= Parameter("start")),
+ OrderBy=obj.TRASHED,
+ Ascending=False
+ )
+
+
+ @classproperty
+ def _trashForCollectionEndingQuery(cls):
+ obj = cls._objectSchema
+ return Select(
+ [obj.RESOURCE_ID], From=obj,
+ Where=(
+ obj.ORIGINAL_COLLECTION == Parameter("resourceID")).And(
</ins><span class="cx"> obj.TRASHED <= Parameter("end")),
</span><span class="cx"> OrderBy=obj.TRASHED,
</span><span class="cx"> Ascending=False
</span><span class="lines">@@ -5586,15 +5614,21 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def trashForCollection(self, resourceID, start=None, end=None):
</span><span class="cx">
</span><del>- if start is None:
- start = datetime.datetime(datetime.MINYEAR, 1, 1)
</del><ins>+ if start is None and end is None:
+ results = yield self._trashForCollectionQuery.on(
+ self._txn, resourceID=resourceID
+ )
+ elif start is None and end is not None:
+ results = yield self._trashForCollectionEndingQuery.on(
+ self._txn, resourceID=resourceID, end=end
+ )
+ elif start is not None and end is None:
+ results = yield self._trashForCollectionStartingQuery.on(
+ self._txn, resourceID=resourceID, start=start
+ )
+ else:
+ raise UnsupportedQuery()
</ins><span class="cx">
</span><del>- if end is None:
- end = datetime.datetime.utcnow()
-
- results = yield self._trashForCollectionQuery.on(
- self._txn, resourceID=resourceID, start=start, end=end
- )
</del><span class="cx"> resources = []
</span><span class="cx"> for (objectResourceID,) in results:
</span><span class="cx"> resource = yield self.objectResourceWithID(objectResourceID)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql (15676 => 15677)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2016-06-15 22:32:47 UTC (rev 15676)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2016-06-16 19:36:40 UTC (rev 15677)
</span><span class="lines">@@ -750,8 +750,9 @@
</span><span class="cx"> "DROPBOX_ID"
</span><span class="cx"> );
</span><span class="cx">
</span><del>-create index CALENDAR_OBJECT_ORIGI_a3d15cf2 on CALENDAR_OBJECT (
- "ORIGINAL_COLLECTION"
</del><ins>+create index CALENDAR_OBJECT_ORIGI_53447b73 on CALENDAR_OBJECT (
+ "ORIGINAL_COLLECTION",
+ "TRASHED"
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index TIME_RANGE_CALENDAR_R_beb6e7eb on TIME_RANGE (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (15676 => 15677)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2016-06-15 22:32:47 UTC (rev 15676)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2016-06-16 19:36:40 UTC (rev 15677)
</span><span class="lines">@@ -316,8 +316,8 @@
</span><span class="cx"> create index CALENDAR_OBJECT_DROPBOX_ID on
</span><span class="cx"> CALENDAR_OBJECT(DROPBOX_ID);
</span><span class="cx">
</span><del>-create index CALENDAR_OBJECT_ORIGINAL_COLLECTION on
- CALENDAR_OBJECT(ORIGINAL_COLLECTION);
</del><ins>+create index CALENDAR_OBJECT_ORIGINAL_COLLECTION_AND_TRASHED on
+ CALENDAR_OBJECT(ORIGINAL_COLLECTION, TRASHED);
</ins><span class="cx">
</span><span class="cx"> -- Enumeration of attachment modes
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_62_to_63sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql (15676 => 15677)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql 2016-06-15 22:32:47 UTC (rev 15676)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql 2016-06-16 19:36:40 UTC (rev 15677)
</span><span class="lines">@@ -18,8 +18,9 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 62 to 63 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx">
</span><del>-create index CALENDAR_OBJECT_ORIGI_a3d15cf2 on CALENDAR_OBJECT (
- "ORIGINAL_COLLECTION"
</del><ins>+create index CALENDAR_OBJECT_ORIGI_53447b73 on CALENDAR_OBJECT (
+ "ORIGINAL_COLLECTION",
+ "TRASHED"
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> -- update the version
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_62_to_63sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql (15676 => 15677)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql 2016-06-15 22:32:47 UTC (rev 15676)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql 2016-06-16 19:36:40 UTC (rev 15677)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 62 to 63 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx">
</span><del>-create index CALENDAR_OBJECT_ORIGINAL_COLLECTION on
- CALENDAR_OBJECT(ORIGINAL_COLLECTION);
</del><ins>+create index CALENDAR_OBJECT_ORIGINAL_COLLECTION_AND_TRASHED on
+ CALENDAR_OBJECT(ORIGINAL_COLLECTION, TRASHED);
</ins><span class="cx">
</span><span class="cx"> -- update the version
</span><span class="cx"> update CALENDARSERVER set VALUE = '63' where NAME = 'VERSION';
</span></span></pre>
</div>
</div>
</body>
</html>