<!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>[128276] trunk/base/src/cregistry/entry.c</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/128276">128276</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-11-17 15:31:21 -0800 (Mon, 17 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: cregistry/entry.c: Fix queries using wrong indices with SQLite NGQP</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrccregistryentryc">trunk/base/src/cregistry/entry.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrccregistryentryc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/cregistry/entry.c (128275 => 128276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/entry.c 2014-11-17 23:23:34 UTC (rev 128275)
+++ trunk/base/src/cregistry/entry.c 2014-11-17 23:31:21 UTC (rev 128276)
</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">@@ -1030,8 +1044,8 @@
</span><span class="cx"> char* update_query = "UPDATE registry.files "
</span><span class="cx"> #if SQLITE_VERSION_NUMBER >= 3006004
</span><span class="cx"> /* if the version of SQLite supports it force the usage of the index on
</span><del>- * 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
</del><ins>+ * 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
</ins><span class="cx"> * query planner introduced in 3.8.0 which would not use the correct
</span><span class="cx"> * index automatically. */
</span><span class="cx"> "INDEXED BY file_path "
</span><span class="lines">@@ -1137,8 +1151,8 @@
</span><span class="cx"> char* query = "UPDATE registry.files "
</span><span class="cx"> #if SQLITE_VERSION_NUMBER >= 3006004
</span><span class="cx"> /* if the version of SQLite supports it force the usage of the index on
</span><del>- * 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
</del><ins>+ * 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
</ins><span class="cx"> * query planner introduced in 3.8.0 which would not use the correct
</span><span class="cx"> * index automatically. */
</span><span class="cx"> "INDEXED BY file_actual "
</span></span></pre>
</div>
</div>
</body>
</html>