<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Tetsuro IKEDA <te.ik****@jpta*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2009-08-19 17:49:05 +0900 (Wed, 19 Aug 2009)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984">8d6b3e995c52f724d9e1073200d5582591d9b984</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Log</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em">add status variable "Mroonga_cond_push_used".</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#diff-0">ha_groonga.cc</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_groonga.cc (+5 -1)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L80">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L81">81</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L82">82</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L83">83</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L85">85</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L86">86</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L87">87</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L88">88</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L89">89</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L90">90</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L91">91</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L341">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L342">342</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L343">343</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L344">344</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L345">345</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L346">346</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L347">347</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L359">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L360">360</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L361">361</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L362">362</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L363">363</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L364">364</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L365">365</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L366">366</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0L367">367</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R80">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R81">81</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R82">82</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R83">83</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R85">85</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R86">86</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R87">87</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R88">88</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R89">89</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R90">90</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R91">91</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R92">92</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R93">93</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R343">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R344">344</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R345">345</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R346">346</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R347">347</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R348">348</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R349">349</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R350">350</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R362">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R363">363</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R364">364</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R365">365</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R366">366</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R367">367</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R368">368</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R369">369</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R370">370</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8d6b3e995c52f724d9e1073200d5582591d9b984#L0R371">371</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -81,11 +81,13 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">struct st_mysql_storage_engine storage_engine_structure =</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> longlong mrn_status_column_target = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> longlong mrn_status_column_used = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+longlong mrn_status_cond_push_used = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> struct st_mysql_show_var mrn_status_variables[] =</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {"Mroonga_column_target", (char*) &mrn_status_column_target, SHOW_LONGLONG},</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {"Mroonga_column_used", (char*) &mrn_status_column_used, SHOW_LONGLONG},</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ {"Mroonga_cond_push_used", (char*) &mrn_status_cond_push_used, SHOW_LONGLONG},</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> NULL</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> };</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -342,6 +344,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_groonga::rnd_init(bool scan)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_HTRACE;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int i, used=0, n_columns, alloc_size;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char use_column_pruning = THDVAR(table->in_use, use_column_pruning);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ char use_cond_push = THDVAR(table->in_use, use_cond_push);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> n_columns = minfo->n_columns;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> alloc_size = n_columns / 8 + 1;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uchar* column_map = (uchar*) malloc(alloc_size);</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -360,8 +363,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_groonga::rnd_init(bool scan)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_status_column_used += used;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this->cur = mrn_init_record(ctx, minfo, column_map, used);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (mcond)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (use_cond_push && mcond)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_status_cond_push_used++;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> const COND *cond = mcond->cond;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mcond->expr = (mrn_expr*) malloc(sizeof(mrn_expr));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_expr *expr = mcond->expr;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>