<!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">2012-02-23 00:27:32 +0900 (Thu, 23 Feb 2012)</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663">30afd4c7feae6a13dd74c446b6c9feac72fa6663</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">Support "-" as index table name separator
refs #1284</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#diff-0">ha_mroonga.cc</a></li>
<li><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#diff-1">mrn_sys.c</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 (+1 -10)</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6579">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6580">6580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6581">6581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6582">6582</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6583">6583</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6584">6584</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6585">6585</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6586">6586</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6587">6587</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6588">6588</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6589">6589</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6590">6590</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6591">6591</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6592">6592</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6593">6593</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6594">6594</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6595">6595</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6596">6596</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6597">6597</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0L6598">6598</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6579">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6580">6580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6581">6581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6582">6582</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6583">6583</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6584">6584</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6585">6585</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6586">6586</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6587">6587</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6588">6588</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L0R6589">6589</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">@@ -6580,19 +6580,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">FT_INFO *ha_mroonga::generic_ft_init_ext(uint flags, uint key_nr, String *key)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> info->primary_key_info = &(table->key_info[table_share->primary_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"> grn_obj *index_column = grn_index_columns[key_nr];</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- char index_column_name[GRN_TABLE_MAX_KEY_SIZE];</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- int index_column_name_length;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- index_column_name_length = grn_obj_name(info->ctx,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- index_column,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- index_column_name,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- GRN_TABLE_MAX_KEY_SIZE);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *match_columns, *match_columns_variable;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_EXPR_CREATE_FOR_QUERY(info->ctx, info->table, match_columns,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> match_columns_variable);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- grn_expr_parse(info->ctx, match_columns,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- index_column_name, index_column_name_length,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- NULL, GRN_OP_MATCH, GRN_OP_AND,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- GRN_EXPR_SYNTAX_SCRIPT);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_expr_append_obj(info->ctx, match_columns, index_column, GRN_OP_PUSH, 1);</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 *expression, *expression_variable;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_EXPR_CREATE_FOR_QUERY(info->ctx, info->table,</span>
</pre>
</td>
</tr>
</tbody>
</table>
<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: mrn_sys.c (+2 -2)</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L164">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L165">165</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L166">166</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L167">167</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L168">168</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L169">169</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L170">170</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L171">171</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L172">172</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L173">173</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L174">174</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L175">175</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1L176">176</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R164">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R165">165</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R166">166</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R167">167</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R168">168</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R169">169</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R170">170</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R171">171</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R172">172</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R173">173</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/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R174">174</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R175">175</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/30afd4c7feae6a13dd74c446b6c9feac72fa6663#L1R176">176</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">@@ -165,12 +165,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">char *mrn_table_name_gen_for_mysql(const char *arg, char *dest)</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"> </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">- * "${table}" ==> "${table}#${index_name}"</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ * "${table}" ==> "${table}-${index_name}"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> */</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char *mrn_index_table_name_gen(const char *table_name,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> const char *index_name,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char *dest)</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">- snprintf(dest, MRN_MAX_PATH_SIZE, "%s#%s", table_name, index_name);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ snprintf(dest, MRN_MAX_PATH_SIZE, "%s-%s", table_name, index_name);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return dest;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>