groonga-command 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a4658a7058ae319eef6558e4b0890cf63f1374cbc18ca6620f89c1713d1079
-  data.tar.gz: 585f68bee46bc0455b5b0be0056636b9b61518bf53354513081191ceb7156996
+  metadata.gz: c0516f0f80a6af2fefb12d10390e6f314ecf88e08f1cafc3abc942c92e13a23b
+  data.tar.gz: 67eb82831789e515f65f153d9dd6b2833b0b364b4d80befdb04013ca7343caf2
 SHA512:
-  metadata.gz: 6141e8378ce9f64024c481af745a519e598c40b15b313447537d78030f24ce8d7a84ca1f2df52ad06176a1153792f2edbde20cf32d4dce40ff1b043a53780ba3
-  data.tar.gz: eee5697534989943e5d0b038b14af59eea0a811c9aab09e2bf25d4251c7783efac899846c6a631e3de291b16d95fc33f9f88fe5e318be87eba61c7331870deba
+  metadata.gz: e6771fb6bd7beab7ac173819a9164d810240372a2caad156c3b34d86a45d3a79549fda55e2a86aaba17040640fdede581ef3b878f79870ba3bf588f4d0388d88
+  data.tar.gz: 96d88ac9df80ab87c3df8537a0f6280d851cd24af476fc04ccd6439e46f91a80a01ee59c6e0511c8d340cdaabebd1ecfcf651bc16e3d7b3a769997d8e8187048

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.4.7: 2020-01-10
+
+### Improvements
+
+  * {Groonga::Command::Load#build_arrow_table}: Added support for raw
+    values case.
+
 ## 1.4.6: 2020-01-10
 
 ### Improvements

data/lib/groonga/command/load.rb

@@ -84,7 +84,19 @@ module Groonga
         unless defined?(::Arrow)
           raise NotImplementedError, "red-arrow is required"
         end
-        builder = ArrowTableBuilder.new(columns, values)
+        source_lines = (original_source || "").lines
+        if source_lines.size >= 2
+          if /\s--columns\s/ =~ source_lines.first
+            target_columns = columns
+          else
+            target_columns = nil
+          end
+          target_values = JSON.parse(source_lines[1..-1].join(""))
+        else
+          target_columns = columns
+          target_values = values
+        end
+        builder = ArrowTableBuilder.new(target_columns, target_values)
         builder.build
       end
 

data/lib/groonga/command/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  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
   module Command
-    VERSION = "1.4.6"
+    VERSION = "1.4.7"
   end
 end

data/test/command/test-load.rb

@@ -123,7 +123,7 @@ class LoadCommandTest < Test::Unit::TestCase
     end
 
     sub_test_case("Array") do
-      def test_no_columns_argument
+      def test_without_columns_argument
         command = load_command({"values" => [
                                   ["column1", "column2"],
                                   ["value1", "value2"],
@@ -135,7 +135,7 @@ class LoadCommandTest < Test::Unit::TestCase
                      command.build_arrow_table)
       end
 
-      def test_columns_argument
+      def test_with_columns_argument
         command = load_command({"columns" => ["column1", "column2"].join(", "),
                                 "values" => [
                                   ["value1", "value2"],
@@ -168,5 +168,38 @@ class LoadCommandTest < Test::Unit::TestCase
                      command.build_arrow_table)
       end
     end
+
+    sub_test_case("raw values") do
+      def test_without_columns_argument
+        columns = ["column1", "column2"]
+        command = load_command("columns" => columns.join(","))
+        command.original_source = "load\n" + [
+          columns,
+          ["value1", "value2"],
+          ["value10", "value20"],
+        ].to_json
+        columns = {
+          "column1" => ["value1", "value10"],
+          "column2" => ["value2", "value20"],
+        }
+        assert_equal(Arrow::Table.new(columns),
+                     command.build_arrow_table)
+      end
+
+      def test_with_columns_argument
+        columns = ["column1", "column2"]
+        command = load_command("columns" => columns.join(","))
+        command.original_source = "load --columns #{columns.join(",")}\n" + [
+          ["value1", "value2"],
+          ["value10", "value20"],
+        ].to_json
+        columns = {
+          "column1" => ["value1", "value10"],
+          "column2" => ["value2", "value20"],
+        }
+        assert_equal(Arrow::Table.new(columns),
+                     command.build_arrow_table)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Kouhei Sutou