groonga-client 0.5.8 → 0.6.3

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.5.8"
+    VERSION = "0.6.3"
   end
 end

data/test/response/helper.rb

@@ -30,4 +30,9 @@ module TestResponseHelper
     parse_raw_response_raw(command_name, {"output_type" => "xml"},
                            raw_response)
   end
+
+  def parse_raw_tsv_response(command_name, raw_response)
+    parse_raw_response_raw(command_name, {"output_type" => "tsv"},
+                           raw_response)
+  end
 end

data/test/response/test-base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2018  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -210,4 +210,17 @@ class TestResponseBase < Test::Unit::TestCase
       end
     end
   end
+
+  class TestParse < self
+    def test_jsonp
+      command = Groonga::Command::Base.new("status", {"callback" => "a"})
+      response = [
+        [0, 1396012478, 0.00050806999206543],
+        {"start_time" => 1396012478},
+      ]
+      raw_response = "a(#{response.to_json});"
+      response = Groonga::Client::Response::Base.parse(command, raw_response)
+      assert_equal(1396012478, response.body["start_time"])
+    end
+  end
 end

data/test/response/test-error.rb

@@ -55,7 +55,7 @@ class TestResponseError < Test::Unit::TestCase
 
     def test_no_header
       response = Groonga::Client::Response::Error.new(nil, nil, nil)
-      assert_equal("", response.message)
+      assert_nil(response.message)
     end
   end
 end

data/test/response/test-select-command-version1.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
@@ -320,12 +320,14 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
     class TestSlices < self
       def setup
         pair_arguments = {
-          "slices[groonga].filter" => 'tag @ "groonga"',
+          "slices[groonga].filter" => "tag @ 'groonga'",
+          "slices[groonga].limit" => "2",
+          "slices[groonga].drilldowns[author].keys" => "author",
         }
         @command = Groonga::Command::Select.new("select", pair_arguments)
         @body = [
           [
-            [3],
+            [4],
             [
               [
                 "_id",
@@ -339,10 +341,11 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
             [1, "groonga"],
             [2, "rroonga"],
             [3, "groonga"],
+            [4, "groonga"],
           ],
           {
             "groonga" => [
-              [2],
+              [3],
               [
                 [
                   "_id",
@@ -355,19 +358,55 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
               ],
               [1, "groonga"],
               [3, "groonga"],
-            ]
-          }
+              {
+                "author" => [
+                  [3],
+                  [
+                    [
+                      "_key",
+                      "ShortText",
+                    ],
+                    [
+                      "_nsubrecs",
+                      "Int32",
+                    ],
+                  ],
+                  [
+                    "Alice",
+                    1,
+                  ],
+                  [
+                    "Bob",
+                    1,
+                  ],
+                  [
+                    "Chris",
+                    1,
+                  ],
+                ],
+              },
+            ],
+          },
         ]
       end
 
       def test_slices
         assert_equal({
-                       "groonga" => [
-                         {"_id" => 1, "tag" => "groonga"},
-                         {"_id" => 3, "tag" => "groonga"},
-                       ]
+                       "groonga" => {
+                         records: [
+                           {"_id" => 1, "tag" => "groonga"},
+                           {"_id" => 3, "tag" => "groonga"},
+                         ],
+                         drilldowns: {
+                           "author" => [
+                             {"_key" => "Alice", "_nsubrecs" => 1},
+                             {"_key" => "Bob",   "_nsubrecs" => 1},
+                             {"_key" => "Chris", "_nsubrecs" => 1},
+                           ],
+                         },
+                       },
                      },
-                     collect_values(@body, &:records))
+                     collect_values(@body))
       end
 
       private
@@ -378,7 +417,14 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
       def collect_values(body)
         values = {}
         slices(body).each do |label, slice|
-          values[label] = yield(slice)
+          drilldowns = {}
+          slice.drilldowns.each do |drilldown_label, drilldown|
+            drilldowns[drilldown_label] = drilldown.records
+          end
+          values[label] = {
+            records: slice.records,
+            drilldowns: drilldowns,
+          }
         end
         values
       end

data/test/response/test-select-command-version3.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
@@ -284,6 +284,7 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
       def setup
         pair_arguments = {
           "slices[groonga].filter" => 'tag @ "groonga"',
+          "slices[groonga].drilldowns[author].keys" => "author",
         }
         @command = Groonga::Command::Select.new("select", pair_arguments)
         @body = {
@@ -319,7 +320,36 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
               "records" => [
                 [1, "groonga"],
                 [3, "groonga"],
-              ]
+              ],
+              "drilldowns" => {
+                "author" => {
+                  "n_hits" => 3,
+                  "columns" => [
+                    {
+                      "name" => "_key",
+                      "type" => "ShortText",
+                    },
+                    {
+                      "name" => "_nsubrecs",
+                      "type" => "Int32",
+                    },
+                  ],
+                  "records" => [
+                    [
+                      "Alice",
+                      1,
+                    ],
+                    [
+                      "Bob",
+                      1,
+                    ],
+                    [
+                      "Chris",
+                      1,
+                    ],
+                  ],
+                },
+              },
             }
           }
         }
@@ -327,12 +357,21 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
 
       def test_slices
         assert_equal({
-                       "groonga" => [
-                         {"_id" => 1, "tag" => "groonga"},
-                         {"_id" => 3, "tag" => "groonga"},
-                       ]
+                       "groonga" => {
+                         records: [
+                           {"_id" => 1, "tag" => "groonga"},
+                           {"_id" => 3, "tag" => "groonga"},
+                         ],
+                         drilldowns: {
+                           "author" => [
+                             {"_key" => "Alice", "_nsubrecs" => 1},
+                             {"_key" => "Bob",   "_nsubrecs" => 1},
+                             {"_key" => "Chris", "_nsubrecs" => 1},
+                           ],
+                         },
+                       },
                      },
-                     collect_values(@body, &:records))
+                     collect_values(@body))
       end
 
       private
@@ -343,7 +382,14 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
       def collect_values(body)
         values = {}
         slices(body).each do |label, slice|
-          values[label] = yield(slice)
+          drilldowns = {}
+          slice.drilldowns.each do |drilldown_label, drilldown|
+            drilldowns[drilldown_label] = drilldown.records
+          end
+          values[label] = {
+            records: slice.records,
+            drilldowns: drilldowns,
+          }
         end
         values
       end

data/test/response/test-select-tsv.rb

@@ -0,0 +1,149 @@
+# Copyright (C) 2018-2019  Sutou Kouhei <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "response/helper"
+
+class TestResponseSelectTSV < Test::Unit::TestCase
+  include TestResponseHelper
+
+  def drilldown(label,
+                keys,
+                n_hits,
+                records,
+                raw_columns,
+                raw_records)
+    Groonga::Client::Response::Select::Drilldown.new(label,
+                                                     keys,
+                                                     n_hits,
+                                                     records,
+                                                     raw_columns,
+                                                     raw_records)
+  end
+
+  def test_error
+    raw_response = <<-TSV
+-22	0	0.0	"message"	"function"	"file"	29
+
+END
+    TSV
+
+    response = parse_raw_tsv_response("select", raw_response)
+    assert_equal({
+                   :return_code => -22,
+                   :start_time => Time.at(0),
+                   :elapsed_time => 0.0,
+                   :error => {
+                     :message => "message",
+                     :function => "function",
+                     :file => "file",
+                     :line => 29,
+                   },
+                 },
+                 {
+                   :return_code => response.return_code,
+                   :start_time => response.start_time,
+                   :elapsed_time => response.elapsed_time,
+                   :error => {
+                     :message => response.message,
+                     :function => response.function,
+                     :file => response.file,
+                     :line => response.line,
+                   },
+                 })
+  end
+
+  def test_basic
+    raw_response = <<-TSV
+ 0	0	0.0
+100
+[	"_id"	"UInt32"	]
+1
+2
+END
+    TSV
+
+    response = parse_raw_tsv_response("select", raw_response)
+    assert_equal({
+                   :return_code => 0,
+                   :start_time => Time.at(0),
+                   :elapsed_time => 0.0,
+                   :records => [
+                     {"_id" => "1"},
+                     {"_id" => "2"},
+                   ],
+                 },
+                 {
+                   :return_code => response.return_code,
+                   :start_time => response.start_time,
+                   :elapsed_time => response.elapsed_time,
+                   :records => response.records,
+                 })
+  end
+
+  def test_drilldown
+    raw_response = <<-TSV
+ 0	0	0.0
+100
+[	"_id"	"UInt32"	]
+7
+[	"_key"	"ShortText"	]	[	"_nsubrecs"	"UInt32"	]
+"2.2.0"	"18044"
+"2.3.0"	"18115"
+"2.4.0"	"14594"
+END
+    TSV
+
+    response = parse_raw_response_raw("select",
+                                      {
+                                        "drilldown" => "version",
+                                        "output_type" => "tsv",
+                                      },
+                                      raw_response)
+    drilldown_records = [
+      {"_key" => "2.2.0", "_nsubrecs" => "18044"},
+      {"_key" => "2.3.0", "_nsubrecs" => "18115"},
+      {"_key" => "2.4.0", "_nsubrecs" => "14594"},
+    ]
+    assert_equal({
+                   :return_code => 0,
+                   :start_time => Time.at(0),
+                   :elapsed_time => 0.0,
+                   :records => [],
+                   :drilldowns => [
+                     drilldown("version",
+                               ["version"],
+                               7,
+                               drilldown_records,
+                               [
+                                 ["_key", "ShortText"],
+                                 ["_nsubrecs", "UInt32"],
+                               ],
+                               [
+                                 ["2.2.0", "18044"],
+                                 ["2.3.0", "18115"],
+                                 ["2.4.0", "14594"],
+                               ]),
+                   ],
+                 },
+                 {
+                   :return_code => response.return_code,
+                   :start_time => response.start_time,
+                   :elapsed_time => response.elapsed_time,
+                   :records => response.records,
+                   :drilldowns => response.drilldowns,
+                 })
+  end
+end

data/test/response/test-select-xml.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017-2019  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,18 @@ require "response/helper"
 class TestResponseSelectXML < Test::Unit::TestCase
   include TestResponseHelper
 
-  def drilldown(key, n_hits, records)
-    Groonga::Client::Response::Select::Drilldown.new(key, n_hits, records)
+  def drilldown(label,
+                keys,
+                n_hits,
+                records,
+                raw_columns,
+                raw_records)
+    Groonga::Client::Response::Select::Drilldown.new(label,
+                                                     keys,
+                                                     n_hits,
+                                                     records,
+                                                     raw_columns,
+                                                     raw_records)
   end
 
   def test_basic
@@ -91,7 +101,19 @@ class TestResponseSelectXML < Test::Unit::TestCase
                    :elapsed_time => 0.0,
                    :records => [],
                    :drilldowns => [
-                     drilldown("version", 7, drilldown_records),
+                     drilldown("version",
+                               ["version"],
+                               7,
+                               drilldown_records,
+                               [
+                                 ["_key", "ShortText"],
+                                 ["_nsubrecs", "ShortText"],
+                               ],
+                               [
+                                 ["2.2.0", "18044"],
+                                 ["2.3.0", "18115"],
+                                 ["2.4.0", "14594"],
+                               ]),
                    ],
                  },
                  {