<!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>[128421] branches/release_2_3</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="https://trac.macports.org/changeset/128421">128421</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-11-20 16:32:48 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge <a href="https://trac.macports.org/changeset/128113">r128113</a>, <a href="https://trac.macports.org/changeset/128274">r128274</a>, <a href="https://trac.macports.org/changeset/128276">r128276</a> from trunk:
force use of a specific high-quality index to fix slowness with SQLite's new query planner first shipped with Yosemite, closes #45645</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3basesrccregistryentryc">branches/release_2_3/base/src/cregistry/entry.c</a></li>
<li><a href="#branchesrelease_2_3basesrccregistryfilec">branches/release_2_3/base/src/cregistry/file.c</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_3">branches/release_2_3/</a></li>
<li><a href="#branchesrelease_2_3base">branches/release_2_3/base/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesrelease_2_3"></a>
<div class="propset"><h4>Property changes: branches/release_2_3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276
</span><a id="branchesrelease_2_3base"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx"> + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesrelease_2_3basesrccregistryentryc"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/cregistry/entry.c (128420 => 128421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/cregistry/entry.c 2014-11-20 22:57:21 UTC (rev 128420)
+++ branches/release_2_3/base/src/cregistry/entry.c 2014-11-21 00:32:48 UTC (rev 128421)
</span><span class="lines">@@ -185,11 +185,17 @@
</span><span class="cx"> int lower_bound = 0;
</span><span class="cx"> char* query;
</span><span class="cx"> if (strlen(epoch) > 0) {
</span><del>- query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
- "AND revision=? AND variants=? AND epoch=?";
</del><ins>+ query = "SELECT id FROM registry.ports "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ "INDEXED BY port_name "
+#endif
+ "WHERE name=? AND version=? AND revision=? AND variants=? AND epoch=?";
</ins><span class="cx"> } else {
</span><del>- query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
- "AND revision=? AND variants=? AND epoch!=?";
</del><ins>+ query = "SELECT id FROM registry.ports "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ "INDEXED BY port_name "
+#endif
+ "WHERE name=? AND version=? AND revision=? AND variants=? AND epoch!=?";
</ins><span class="cx"> }
</span><span class="cx"> if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
</span><span class="cx"> && (sqlite3_bind_text(stmt, 1, name, -1, SQLITE_STATIC)
</span><span class="lines">@@ -494,7 +500,11 @@
</span><span class="cx"> if (name == NULL) {
</span><span class="cx"> format = "%s WHERE state='installed'";
</span><span class="cx"> } else {
</span><del>- format = "%s WHERE state='installed' AND name='%q'";
</del><ins>+ format = "%s "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ "INDEXED BY port_name "
+#endif
+ "WHERE state='installed' AND name='%q'";
</ins><span class="cx"> }
</span><span class="cx"> query = sqlite3_mprintf(format, select, name);
</span><span class="cx"> result = reg_all_entries(reg, query, -1, entries, errPtr);
</span><span class="lines">@@ -826,7 +836,11 @@
</span><span class="cx"> reg_registry* reg = entry->reg;
</span><span class="cx"> int result = 1;
</span><span class="cx"> sqlite3_stmt* stmt = NULL;
</span><del>- char* query = "DELETE FROM registry.files WHERE path=? AND id=?";
</del><ins>+ char* query = "DELETE FROM registry.files "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ "INDEXED BY file_path "
+#endif
+ "WHERE path=? AND id=?";
</ins><span class="cx"> if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
</span><span class="cx"> && (sqlite3_bind_int64(stmt, 2, entry->id) == SQLITE_OK)) {
</span><span class="cx"> int i;
</span><span class="lines">@@ -1027,8 +1041,16 @@
</span><span class="cx"> sqlite3_stmt* update = NULL;
</span><span class="cx"> char* select_query = "SELECT id FROM registry.files WHERE actual_path=? "
</span><span class="cx"> "AND active";
</span><del>- char* update_query = "UPDATE registry.files SET actual_path=?, active=1 "
- "WHERE path=? AND id=?";
</del><ins>+ char* update_query = "UPDATE registry.files "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ /* if the version of SQLite supports it force the usage of the index on
+ * path, rather than the one on id which has a lot less discriminative
+ * power and leads to very slow queries. This is needed for the new
+ * query planner introduced in 3.8.0 which would not use the correct
+ * index automatically. */
+ "INDEXED BY file_path "
+#endif
+ "SET actual_path=?, active=1 WHERE path=? AND id=?";
</ins><span class="cx">
</span><span class="cx"> /* if as_files wasn't specified, activate as the original files */
</span><span class="cx"> if (as_files == NULL) {
</span><span class="lines">@@ -1126,7 +1148,16 @@
</span><span class="cx"> int result = 1;
</span><span class="cx"> int i;
</span><span class="cx"> sqlite3_stmt* stmt = NULL;
</span><del>- char* query = "UPDATE registry.files SET active=0 WHERE actual_path=? AND id=?";
</del><ins>+ char* query = "UPDATE registry.files "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ /* if the version of SQLite supports it force the usage of the index on
+ * path, rather than the one on id which has a lot less discriminative
+ * power and leads to very slow queries. This is needed for the new
+ * query planner introduced in 3.8.0 which would not use the correct
+ * index automatically. */
+ "INDEXED BY file_actual "
+#endif
+ "SET active=0 WHERE actual_path=? AND id=?";
</ins><span class="cx"> if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
</span><span class="cx"> && (sqlite3_bind_int64(stmt, 2, entry->id) == SQLITE_OK)) {
</span><span class="cx"> for (i=0; i<file_count && result; i++) {
</span></span></pre></div>
<a id="branchesrelease_2_3basesrccregistryfilec"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/cregistry/file.c (128420 => 128421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/cregistry/file.c 2014-11-20 22:57:21 UTC (rev 128420)
+++ branches/release_2_3/base/src/cregistry/file.c 2014-11-21 00:32:48 UTC (rev 128421)
</span><span class="lines">@@ -105,7 +105,16 @@
</span><span class="cx"> reg_error* errPtr) {
</span><span class="cx"> sqlite3_stmt* stmt = NULL;
</span><span class="cx"> reg_file* file = NULL;
</span><del>- char* query = "SELECT id, path FROM registry.files WHERE id=? AND path=?";
</del><ins>+ char* query = "SELECT id, path FROM registry.files "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ /* if the version of SQLite supports it force the usage of the index on
+ * path, rather than the one on id which has a lot less discriminative
+ * power and leads to very slow queries. This is needed for the new
+ * query planner introduced in 3.8.0 which would not use the correct
+ * index automatically. */
+ "INDEXED BY file_path "
+#endif
+ "WHERE id=? AND path=?";
</ins><span class="cx"> int lower_bound = 0;
</span><span class="cx">
</span><span class="cx"> if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
</span><span class="lines">@@ -235,8 +244,17 @@
</span><span class="cx"> sqlite3_stmt* stmt = NULL;
</span><span class="cx"> char* query;
</span><span class="cx"> const char *text;
</span><del>- query = sqlite3_mprintf("SELECT %q FROM registry.files WHERE id=%lld "
- "AND path='%q'", key, file->key.id, file->key.path);
</del><ins>+ query = sqlite3_mprintf(
+ "SELECT %q FROM registry.files "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ /* if the version of SQLite supports it force the usage of the index
+ * on path, rather than the one on id which has a lot less
+ * discriminative power and leads to very slow queries. This is
+ * needed for the new query planner introduced in 3.8.0 which would
+ * not use the correct index automatically. */
+ "INDEXED BY file_path "
+#endif
+ "WHERE id=%lld AND path='%q'", key, file->key.id, file->key.path);
</ins><span class="cx"> if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
</span><span class="cx"> int r;
</span><span class="cx"> do {
</span><span class="lines">@@ -290,8 +308,17 @@
</span><span class="cx"> int result = 0;
</span><span class="cx"> sqlite3_stmt* stmt = NULL;
</span><span class="cx"> char* query;
</span><del>- query = sqlite3_mprintf("UPDATE registry.files SET %q = '%q' WHERE id=%lld "
- "AND path='%q'", key, value, file->key.id, file->key.path);
</del><ins>+ query = sqlite3_mprintf(
+ "UPDATE registry.files "
+#if SQLITE_VERSION_NUMBER >= 3006004
+ /* if the version of SQLite supports it force the usage of the index
+ * on path, rather than the one on id which has a lot less
+ * discriminative power and leads to very slow queries. This is
+ * needed for the new query planner introduced in 3.8.0 which would
+ * not use the correct index automatically. */
+ "INDEXED BY file_path "
+#endif
+ "SET %q = '%q' WHERE id=%lld AND path='%q'", key, value, file->key.id, file->key.path);
</ins><span class="cx"> if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
</span><span class="cx"> int r;
</span><span class="cx"> do {
</span></span></pre>
</div>
</div>
</body>
</html>