<!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 &lt;susum****@gmail*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2014-06-12 16:26:58 +0900 (Thu, 12 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1">ef6cad99c4fee31f6f15447edb4931db41da8fe1</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, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Rename RowSet to RecordSet.</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-0">new-interface/cursor.hpp</a></li>
          <li><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-1">new-interface/expression.hpp</a></li>
          <li><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-2">new-interface/group-set.hpp</a></li>
          <li><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-3">new-interface/merger.hpp</a></li>
          <li><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-5">new-interface/sorter.hpp</a></li>
          <li><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-6">new-interface/table.hpp</a></li>
          <li><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-7">new-interface/types.hpp</a></li>
        </ul>
      </dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Renamed files</dt>
      <dd style="margin-left: 8.5em">
        <ul>
          <li>
            <a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#diff-4">new-interface/record-set.hpp</a><br>
            (from new-interface/row-set.hpp)
          </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, &quot;Liberation Mono&quot;, 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/cursor.hpp (+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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L20">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L21">21</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L22">22</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L23">23</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L24">24</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L26">26</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L27">27</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0L30">30</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R20">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R21">21</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R22">22</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R23">23</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R24">24</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R26">26</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R27">27</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L0R30">30</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -21,10 +21,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Cursor {</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">   // 失敗したときは *error にその内容を格納し, -1 を返す.</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">-  // カーソルの移動中に取得した行は *row_set の末尾に追加する.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // カーソルの移動中に取得した行は *record_set の末尾に追加する.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   //</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 途中で終端に到達したときは count より小さい値を返す.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  virtual int64_t read(Error *error, int64_t count, RowSet *row_set) = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  virtual int64_t read(Error *error, int64_t count, RecordSet *record_set) = 0;</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"> }  // namespace grnxx</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, &quot;Liberation Mono&quot;, 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/expression.hpp (+4 -4)</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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L36">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L39">39</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L40">40</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L41">41</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L44">44</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L46">46</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L47">47</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L48">48</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L50">50</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L59">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L60">60</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L61">61</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L62">62</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L63">63</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L64">64</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L65">65</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L66">66</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L74">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L75">75</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L76">76</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L77">77</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L78">78</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L79">79</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L80">80</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1L81">81</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R36">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R39">39</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R40">40</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R41">41</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R44">44</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R46">46</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R47">47</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R48">48</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R50">50</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R59">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R60">60</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R61">61</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R62">62</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R63">63</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R64">64</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R65">65</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R66">66</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R74">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R75">75</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R76">76</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R77">77</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R78">78</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R79">79</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R80">80</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L1R81">81</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -37,14 +37,14 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Expression {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">   //  - NaN が発生する.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   //   - TODO: これらの取り扱いについては検討の余地がある.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual int64_t filter(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                         RowSet *row_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                         RecordSet *record_set,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                          int64_t offset) = 0;</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">   // 成功すれば true を返す.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 失敗したときは *error にその内容を格納し, false を返す.</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">-  // 評価結果を *row_set に格納する.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // 評価結果を *record_set に格納する.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 式の構築において _score を指定することにより,</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">@@ -60,7 +60,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Expression {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">   //  - NaN が発生する.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   //   - TODO: これらの取り扱いについては検討の余地がある.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual bool adjust(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                      RowSet *row_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                      RecordSet *record_set,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                       int64_t offset) = 0;</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">@@ -75,7 +75,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Expression {</span></span>
<span class="diff-not-changed" style="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">   virtual bool evaluate(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                        const RowSet &amp;row_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                        const RecordSet &amp;record_set,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                         int64_t offset,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                         int64_t limit,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                         Data *values) = 0;</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, &quot;Liberation Mono&quot;, 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/group-set.hpp (+1 -1)</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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L17">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L18">18</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L20">20</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L21">21</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L22">22</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L23">23</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2L24">24</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R17">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R18">18</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R20">20</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R21">21</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R22">22</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R23">23</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L2R24">24</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -18,7 +18,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class GroupSet {</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">   int64_t get_num_rows(int64_t i) const;</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">-  RowSet *get_row_set(int64_t i) const;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  RecordSet *get_record_set(int64_t i) const;</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">   // 成功すれば true を返す.</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, &quot;Liberation Mono&quot;, 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 (+6 -6)</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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L24">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L26">26</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L27">27</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L28">28</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L29">29</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L30">30</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L33">33</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L36">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L39">39</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L40">40</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L41">41</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L42">42</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L44">44</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3L45">45</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R24">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R26">26</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R27">27</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R28">28</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R29">29</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R30">30</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R33">33</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R36">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R39">39</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R40">40</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R41">41</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R44">44</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L3R45">45</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -25,9 +25,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">   // 入力がまだ残っているときは MERGE_CONTINUE,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 入力がもう残っていないときは MERGE_FINISH を指定する.</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">-  // lhs_row_set, rhs_row_set を入力として,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  // 合成した結果を result_row_set に出力する.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  // 合成に使用された行は lhs_row_set, rhs_row_set から取り除かれる.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // lhs_record_set, rhs_record_set を入力として,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // 合成した結果を result_record_set に出力する.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // 合成に使用された行は lhs_record_set, rhs_record_set から取り除かれる.</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">   // 入力は行 ID 昇順もしくは降順になっているものとする.</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -37,9 +37,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">   // - スコアが合成によって不正な値になる.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - リソースが確保できない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual int64_t merge(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                        RowSet *lhs_row_set,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                        RowSet *rhs_row_set,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                        RowSet *result_row_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                        RecordSet *lhs_record_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                        RecordSet *rhs_record_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                        RecordSet *result_record_set,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                         MergeStatus status) const = 0;</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>
      <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, &quot;Liberation Mono&quot;, 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">  Renamed: new-interface/record-set.hpp (+15 -13) 74%</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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L0">...</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L1">1</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L2">2</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L3">3</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L4">4</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L7">7</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L8">8</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L9">9</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L10">10</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L11">11</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L12">12</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L13">13</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L14">14</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L15">15</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L16">16</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L17">17</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L18">18</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L19">19</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L20">20</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L21">21</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L22">22</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L23">23</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L24">24</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L29">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L30">30</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L32">32</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L33">33</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L34">34</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L35">35</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L36">36</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L39">39</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L45">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L46">46</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L47">47</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L48">48</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L49">49</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L51">51</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L52">52</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L62">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L63">63</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L64">64</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L65">65</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4L66">66</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R0">...</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R1">1</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R2">2</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R3">3</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R4">4</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R7">7</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R8">8</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R9">9</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R10">10</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R11">11</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R12">12</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R13">13</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R14">14</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R15">15</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R16">16</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R17">17</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R18">18</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R20">20</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R21">21</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R22">22</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R23">23</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R24">24</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R26">26</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R31">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R34">34</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R35">35</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R36">36</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R37">37</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R40">40</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R41">41</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R47">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R48">48</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R50">50</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R51">51</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R52">52</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R53">53</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R54">54</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R64">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R65">65</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R66">66</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R67">67</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L4R68">68</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -1,24 +1,26 @@</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-#ifndef GRNXX_ROW_SET_HPP</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-#define GRNXX_ROW_SET_HPP</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifndef GRNXX_RECORD_SET_HPP</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#define GRNXX_RECORD_SET_HPP</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #include &quot;grnxx/types.hpp&quot;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> namespace grnxx {</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">-class RowSet {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+class RecordSet {</span>
<span class="diff-not-changed" style="display: block; white-space: pre">  public:</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  RowSet();</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  ~RowSet();</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  RecordSet();</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  ~RecordSet();</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">   Table *table() const;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  // 行数を取得する.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  int64_t num_rows() const;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // レコード ID の最小値を取得する.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  RecordID min_record_id() const;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // レコード ID の最大値を取得する.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  RecordID max_record_id() const;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 行 ID を取得する.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  RowID get_row_id(int64_t i) const;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  RowID get_row_id(RecordID record_id) const;</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">-  double get_score(int64_t i) const;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  double get_score(RecordID record_id) const;</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">   // 成功すれば true を返す.</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -30,10 +32,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class RowSet {</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">-  // - 最大値が 0.0, negative, infinity である.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // - 最大値が 0.0, negative, infinity のいずれかである.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   bool normalize(Error *error, const NormalizeOptions &amp;options);</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: Sorter を使うより RowSet::sort() の方が良い?</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // TODO: Sorter を使うより RecordSet::sort() の方が良い?</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">   // 成功すれば true を返す.</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -46,7 +48,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class RowSet {</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">   bool sort(Error *error, const SortConditions &amp;conditions);</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: Grouper を使うより RowSet::group() の方が良い?</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  // TODO: Grouper を使うより RecordSet::group() の方が良い?</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">   // 成功すれば true を返す.</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -63,4 +65,4 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class RowSet {</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"> }  // namespace grnxx</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">-#endif  // GRNXX_ROW_SET_HPP</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#endif  // GRNXX_RECORD_SET_HPP</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, &quot;Liberation Mono&quot;, 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/sorter.hpp (+1 -1)</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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L23">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L24">24</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L26">26</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L27">27</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5L30">30</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R23">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R24">24</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R25">25</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R26">26</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R27">27</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L5R30">30</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -24,7 +24,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Sorter {</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">   virtual bool sort(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                    RowSet *row_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                    RecordSet *record_set,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                     int64_t offset,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                     int64_t limit);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> };</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, &quot;Liberation Mono&quot;, 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/table.hpp (+3 -3)</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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L342">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L343">343</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L344">344</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L345">345</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L346">346</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L347">347</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L348">348</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L349">349</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L350">350</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6L351">351</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R342">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R343">343</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R344">344</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R345">345</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R346">346</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R347">347</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R348">348</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R349">349</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R350">350</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L6R351">351</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -343,9 +343,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class Table {</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">   virtual bool merge(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                     RowSet *lhs,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                     RowSet *rhs,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                     RowSet *output,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                     RecordSet *lhs_record_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                     RecordSet *rhs_record_set,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                     RecordSet *result_record_set,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                      const MergerOptions &amp;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">  protected:</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, &quot;Liberation Mono&quot;, 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/types.hpp (+1 -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, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L30">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L33">33</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L34">34</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L35">35</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7L36">36</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R30">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R33">33</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/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R34">34</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R35">35</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R36">36</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/ef6cad99c4fee31f6f15447edb4931db41da8fe1#L7R37">37</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -31,6 +31,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">using TableID  = int64_t;</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> using ColumnID = int64_t;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> using IndexID  = int64_t;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> using RowID    = int64_t;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+using RecordID = int64_t;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> constexpr RowID NULL_ROW_ID = RowID(0);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> constexpr RowID MIN_ROW_ID  = RowID(1);</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>