<!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">susumu.yata <susum****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2014-06-23 14:58:10 +0900 (Mon, 23 Jun 2014)</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc">d836f505b4571ba7e436e1fb2d2be70f58340bfc</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 arguments to Merger::create().</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#diff-0">new-interface/merger.hpp</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: new-interface/merger.hpp (+3 -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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L63">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L64">64</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L65">65</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L66">66</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L67">67</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L68">68</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L69">69</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L70">70</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L71">71</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L72">72</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L73">73</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L79">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L80">80</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L81">81</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L82">82</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L83">83</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0L85">85</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R63">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R64">64</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R65">65</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R66">66</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/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R67">67</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R68">68</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R69">69</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R70">70</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R71">71</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R72">72</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R78">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R79">79</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R80">80</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R81">81</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R82">82</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/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R83">83</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R85">85</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/d836f505b4571ba7e436e1fb2d2be70f58340bfc#L0R86">86</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">@@ -64,10 +64,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Merger {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Merger();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> virtual ~Merger();</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">- // TODO: 入力の順序によって実装の切り替えが必要である.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ // TODO: 入力の順序によって実装を切り替える.</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> //</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> // TODO: 一気に合成するときは,入力の数によって実装を切り替えたい.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- // ただし, Merger の作成時点で出力の順序が確定しなくなる.</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-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -80,6 +79,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Merger {</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"> static std::unique_ptr<Merger> create(Error *error,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ std::unique_ptr<Order> &&lhs_order,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ std::unique_ptr<Order> &&rhs_order,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> const MergerOptions &options);</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>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>