<!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-07-26 14:20:40 +0900 (Thu, 26 Jul 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/ebd352913f4a99905484aef967f7640e3a0bb05f">ebd352913f4a99905484aef967f7640e3a0bb05f</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: reduce storage size for ENUM
This is incompatible change!
ENUM requires 1 byte storage size for the number of elements < 256, 2
bytes storage size for the number of elements >= 256. Before this
change, ENUM always uses 2 byte storage size. By this change, ENUM
that has the number of elements < 256 uses 1 byte storage size.
Users who use ENUM that has the number of elements < 256 need to
recreate database. Users who doesn't use ENUM or use ENUM that has the
number of elements >= 256 don't need to recreate database.</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>ha_mroonga.cpp</li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<div class="diff" style="margin-left: 1em; margin-right: 1em">
<pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; white-space: normal"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cpp (+12 -5)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">--- ha_mroonga.cpp 2012-07-26 14:06:49 +0900 (e1cf691)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+++ ha_mroonga.cpp 2012-07-26 14:20:40 +0900 (5c085a2)</span>
<span class="diff-line" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1090,7 +1090,11 @@ static grn_builtin_type mrn_grn_type_from_field(grn_ctx *ctx, Field *field,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> type = GRN_DB_SHORT_TEXT; // 4Kbytes</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"> case MYSQL_TYPE_ENUM: // ENUM; <= 2bytes</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- type = GRN_DB_UINT16; // 2bytes</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (field->pack_length() == 1) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ type = GRN_DB_UINT8; // 1bytes</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ } else {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ type = GRN_DB_UINT16; // 2bytes</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"> break;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> case MYSQL_TYPE_SET: // SET; <= 8bytes</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> switch (field->pack_length()) {</span>
<span class="diff-line" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -9068,14 +9072,17 @@ int ha_mroonga::storage_encode_key_enum(Field *field, const uchar *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"> MRN_DBUG_ENTER_METHOD();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int error = 0;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- uint16 value;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (field->pack_length() == 1) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- value = static_cast<uint16>(key[0]);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ uchar value;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ value = key[0];</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ *size = 1;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ memcpy(buf, &value, *size);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } else {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ uint16 value;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> shortget(value, key);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ *size = 2;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ memcpy(buf, &value, *size);</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">- memcpy(buf, &value, 2);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- *size = 2;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(error);</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>
</pre>
</div>
</div>
</body>
</html>