<!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-09-23 22:03:22 +0900 (Fri, 23 Sep 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/ed316e3e1261e42109724e46360d48652f692e11">ed316e3e1261e42109724e46360d48652f692e11</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">[storage] idx_tbl_flags -> index_table_flags.</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/ed316e3e1261e42109724e46360d48652f692e11#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 (+6 -6)</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1639">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1640">1640</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1641">1641</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1642">1642</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1643">1643</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1644">1644</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1645">1645</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1646">1646</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1654">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1655">1655</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1656">1656</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1657">1657</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1658">1658</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1659">1659</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1660">1660</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1661">1661</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1666">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1667">1667</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1668">1668</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1669">1669</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1670">1670</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1671">1671</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1672">1672</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1673">1673</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1674">1674</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1675">1675</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1676">1676</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1677">1677</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1678">1678</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/ed316e3e1261e42109724e46360d48652f692e11#L0L1679">1679</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1680">1680</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0L1681">1681</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1639">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1640">1640</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1641">1641</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1642">1642</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1643">1643</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1644">1644</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1645">1645</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1646">1646</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1654">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1655">1655</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1656">1656</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1657">1657</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1658">1658</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1659">1659</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1660">1660</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1661">1661</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1666">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1667">1667</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1668">1668</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1669">1669</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1670">1670</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1671">1671</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1672">1672</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1673">1673</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1674">1674</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1675">1675</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1676">1676</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1677">1677</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/ed316e3e1261e42109724e46360d48652f692e11#L0R1678">1678</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1679">1679</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1680">1680</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ed316e3e1261e42109724e46360d48652f692e11#L0R1681">1681</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">@@ -1640,7 +1640,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_create(const char *name, TABLE *table,</span></span>
<span class="diff-not-changed" style="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"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int key_parts = key_info.key_parts;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- grn_obj_flags idx_tbl_flags = GRN_OBJ_PERSISTENT;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_obj_flags index_table_flags = GRN_OBJ_PERSISTENT;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (key_parts == 1) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Field *field = key_info.key_part[0].field;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> const char *column_name = field->field_name;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1655,7 +1655,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_create(const char *name, TABLE *table,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int mysql_field_type = field->type();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_builtin_type groonga_type = mrn_get_type(ctx, mysql_field_type);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> index_type = grn_ctx_at(ctx, groonga_type);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- idx_tbl_flags |= GRN_OBJ_KEY_NORMALIZE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ index_table_flags |= GRN_OBJ_KEY_NORMALIZE;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } else {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> index_type = grn_ctx_at(ctx, GRN_DB_SHORT_TEXT);</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">@@ -1667,15 +1667,15 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_create(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"> int key_alg = key_info.algorithm;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (key_alg == HA_KEY_ALG_FULLTEXT) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- idx_tbl_flags |= GRN_OBJ_TABLE_PAT_KEY;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ index_table_flags |= GRN_OBJ_TABLE_PAT_KEY;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } else if (key_alg == HA_KEY_ALG_HASH) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- idx_tbl_flags |= GRN_OBJ_TABLE_HASH_KEY;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ index_table_flags |= GRN_OBJ_TABLE_HASH_KEY;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } else {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- idx_tbl_flags |= GRN_OBJ_TABLE_PAT_KEY;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ index_table_flags |= GRN_OBJ_TABLE_PAT_KEY;</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-not-changed" style="display: block; white-space: pre"> idx_tbl_obj = grn_table_create(ctx, idx_name, strlen(idx_name), NULL,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- idx_tbl_flags, index_type, 0);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ index_table_flags, index_type, 0);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (ctx->rc) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj_remove(ctx, tbl_obj);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = ER_CANT_CREATE_TABLE;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>