<!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">2018-09-12 16:57:27 +0900 (Wed, 12 Sep 2018)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15">6a8b2b19865178affcfec1a9986b83d140542c15</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">grn_table_size: improve error message</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/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863">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 (+5 -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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2477">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2478">2478</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2479">2479</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2480">2480</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2481">2481</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/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2482">2482</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2483">2483</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2484">2484</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2485">2485</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/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2486">2486</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2487">2487</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863L2488">2488</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/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2477">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2478">2478</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2479">2479</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2480">2480</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2481">2481</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2482">2482</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2483">2483</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2484">2484</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2485">2485</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2486">2486</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2487">2487</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2488">2488</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2489">2489</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2490">2490</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/6a8b2b19865178affcfec1a9986b83d140542c15#diff-f96f0bc0782547730f4a2616bfb33863R2491">2491</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">@@ -2478,11 +2478,14 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_table_size(grn_ctx *ctx, grn_obj *table)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> n = grn_array_size(ctx, (grn_array *)table);</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"> default :</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- ERR(GRN_INVALID_ARGUMENT, "not supported");</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ ERR(GRN_INVALID_ARGUMENT,</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ "[table][size] must be table or DB: <%s>(%u)",</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ grn_obj_type_to_string(table->header.type),</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ table->header.type);</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-not-changed" style="display: block; white-space: pre"> } else {</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- ERR(GRN_INVALID_ARGUMENT, "<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">invalid </span>table<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000"> a</span>s<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">s</span>i<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">gn</span>e<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">d</span>");</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ ERR(GRN_INVALID_ARGUMENT, "<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">[</span>table<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">][size]</span> <span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">mu</span>s<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">t </span>n<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">ot NULL</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"> GRN_API_RETURN(n);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>