<!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">2013-06-05 18:39:05 +0900 (Wed, 05 Jun 2013)</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/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6">1f1a77402e22a75ca74d488694cd584ac8566dc6</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</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; width: auto">Add missing lock for table creation
It may fix a crash bug of mroonga:
https://gist.github.com/y-ken/9a5d564d37a58e810abe
Reported by Y.Kentaro. Thanks!!!</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/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#diff-0">lib/db.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; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: lib/db.c (+7 -0)</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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L869">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L870">870</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L871">871</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L872">872</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L873">873</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L874">874</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L875">875</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L884">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L885">885</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L886">886</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L887">887</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L888">888</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L889">889</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0L890">890</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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R869">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R870">870</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R871">871</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R872">872</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R873">873</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R874">874</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R875">875</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R876">876</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R877">877</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R878">878</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R879">879</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R888">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R889">889</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R890">890</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R891">891</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R892">892</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R893">893</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R894">894</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R895">895</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R896">896</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/1f1a77402e22a75ca74d488694cd584ac8566dc6#L0R897">897</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; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -870,6 +870,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,</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"> calc_rec_size(flags, &max_n_subrecs, &subrec_size,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &subrec_offset, &key_size, &value_size);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_io *db_io;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ db_io = grn_obj_io(db);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!grn_io_lock(ctx, db_io, 10000000)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> switch (flags & GRN_OBJ_TABLE_TYPE_MASK) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> case GRN_OBJ_TABLE_HASH_KEY :</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> res = (grn_obj *)grn_hash_create(ctx, path, key_size, value_size, flags);</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -885,6 +889,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> res = (grn_obj *)grn_array_create(ctx, path, value_size, flags);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> break;</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">+ grn_io_unlock(db_io);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (res) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DB_OBJ(res)->header.impl_flags = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DB_OBJ(res)->header.domain = domain;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>