<!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">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2011-10-03 17:53:57 +0900 (Mon, 03 Oct 2011)</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892">7d2277fbd8942304cb2703b5fde5dcb487bdb892</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">[wrapper] cleanup.</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#diff-0">ha_mroonga.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_mroonga.cc (+3 -11)</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1556">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1557">1557</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1558">1558</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1559">1559</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1560">1560</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1561">1561</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1562">1562</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1563">1563</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1564">1564</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1565">1565</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1566">1566</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1567">1567</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1568">1568</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1569">1569</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1579">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1580">1580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1581">1581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1582">1582</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1583">1583</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1584">1584</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1585">1585</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1586">1586</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1587">1587</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1588">1588</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1589">1589</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1590">1590</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1591">1591</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1592">1592</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1593">1593</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0L1594">1594</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1556">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1557">1557</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1558">1558</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1559">1559</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1560">1560</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1561">1561</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1562">1562</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1563">1563</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1564">1564</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1565">1565</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1566">1566</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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1567">1567</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1568">1568</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1569">1569</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1579">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1580">1580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1581">1581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1582">1582</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </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/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1583">1583</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1584">1584</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1585">1585</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/7d2277fbd8942304cb2703b5fde5dcb487bdb892#L0R1586">1586</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">@@ -1557,13 +1557,13 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::wrapper_create_index(const char *name, TABLE *table,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uint n_keys = table->s->keys;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *index_tables[n_keys];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> for (i = 0; i < n_keys; i++) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- KEY key_info = table->s->key_info[i];</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ index_tables[i] = NULL;</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">+ KEY key_info = table->s->key_info[i];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (key_info.algorithm != HA_KEY_ALG_FULLTEXT) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;</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-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- index_tables[i] = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = wrapper_validate_key_info(&key_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (error)</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">@@ -1580,15 +1580,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::wrapper_create_index(const char *name, TABLE *table,</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"> if (error)</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">- int j;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- for (j = 0; j < i; j++) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- KEY key_info = table->s->key_info[j];</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (key_info.algorithm != HA_KEY_ALG_FULLTEXT)</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- continue;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- }</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ for (int j = 0; j < i; j++) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (index_tables[j])</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj_remove(ctx, index_tables[j]);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>