droonga-engine 1.0.7 → 1.0.8

data/test/unit/helper/distributed_search_planner_helper.rb

@@ -17,7 +17,15 @@ require "droonga/plugins/search/distributed_search_planner"
 
 module DistributedSearchPlannerHelper
   def plan(search_request)
-    planner = Droonga::Plugins::Search::DistributedSearchPlanner.new(search_request)
+    # TODO: Use real dataset
+    stub_dataset = Object.new
+    stub(stub_dataset).name do
+      Droonga::Catalog::Dataset::DEFAULT_NAME
+    end
+    stub(stub_dataset).single_slice? do
+      false
+    end
+    planner = Droonga::Plugins::Search::DistributedSearchPlanner.new(stub_dataset, search_request)
     planner.plan
   end
 

data/test/unit/plugins/groonga/select/test_adapter_input.rb

@@ -57,11 +57,24 @@ class GroongaSelectAdapterInputTest < Test::Unit::TestCase
 
     class FunctionTest < self
       def test_single_argument
-        assert_attributes(["snippet_html(content)"], "snippet_html(content)")
+        assert_attributes(["snippet_html(content)"],
+                           "snippet_html(content)")
       end
 
       def test_with_columns
-        assert_attributes(["_id","_key","snippet_html(content)"], "_id,_key,snippet_html(content)")
+        assert_attributes(["_id","_key","snippet_html(content)"],
+                           "_id,_key,snippet_html(content)")
+      end
+    end
+
+    class WhiteSpaceSeparatedTest < self
+      def test_command_version_1
+        assert_attributes(["_id","_key"], "_id _key")
+      end
+
+      def test_whitespace_in_function_args
+        assert_attributes(["_id","_key","snippet_html( content )"],
+                           "_id,_key,snippet_html( content )")
       end
     end
   end

data/test/unit/plugins/groonga/test_column_list.rb

@@ -32,6 +32,19 @@ class ColumnListTest < GroongaHandlerTest
                                                        @loop)
   end
 
+  def virtual_key_column(id, table_name)
+    [
+      id,
+      "_key",
+      "",
+      "",
+      "COLUMN_SCALAR",
+      table_name,
+      "ShortText",
+      [],
+    ]
+  end
+
   class HeaderTest < self
     def test_success
       Groonga::Schema.define do |schema|
@@ -68,7 +81,7 @@ class ColumnListTest < GroongaHandlerTest
   class BodyTest < self
     def test_fix
       Groonga::Schema.define do |schema|
-        schema.create_table("Books", :type => :hash)
+        schema.create_table("Books", :type => :array)
         schema.change_table("Books") do |table|
           table.column("age", "UInt32", :type => :scalar)
         end
@@ -91,7 +104,7 @@ class ColumnListTest < GroongaHandlerTest
 
     def test_var
       Groonga::Schema.define do |schema|
-        schema.create_table("Books", :type => :hash)
+        schema.create_table("Books", :type => :array)
         schema.change_table("Books") do |table|
           table.column("title", "ShortText", :type => :scalar)
         end
@@ -114,7 +127,7 @@ class ColumnListTest < GroongaHandlerTest
 
     def test_vector
       Groonga::Schema.define do |schema|
-        schema.create_table("Books", :type => :hash)
+        schema.create_table("Books", :type => :array)
         schema.change_table("Books") do |table|
           table.column("authors", "ShortText", :type => :vector)
         end
@@ -137,7 +150,7 @@ class ColumnListTest < GroongaHandlerTest
 
     def test_index
       Groonga::Schema.define do |schema|
-        schema.create_table("Books", :type => :hash)
+        schema.create_table("Books", :type => :array)
         schema.change_table("Books") do |table|
           table.column("title", "ShortText", :type => :scalar)
           table.index("Books", "title", :name => "entry_title")
@@ -166,5 +179,107 @@ class ColumnListTest < GroongaHandlerTest
       ]
       assert_equal(expected, response.last)
     end
+
+    def test_index_source_key
+      Groonga::Schema.define do |schema|
+        schema.create_table("Memos", :type => :patricia_trie)
+        schema.create_table("Terms", :type => :patricia_trie)
+        schema.change_table("Terms") do |table|
+          table.index("Memos", "_key", :name => "index")
+        end
+      end
+      response = process(:column_list,
+                         {"table" => "Terms"})
+      expected = [
+        COLUMNS_HEADER,
+        virtual_key_column(257, "Terms"),
+        [258,
+         "index",
+         @database_path.to_s + ".0000102",
+         "index",
+         "COLUMN_INDEX",
+         "Terms",
+         "Memos",
+         ["Memos"]],
+      ]
+      assert_equal(expected, response.last)
+    end
+  end
+
+  class VirtualColumnsTest < self
+    def test_array
+      Groonga::Schema.define do |schema|
+        schema.create_table("Books", :type => :array)
+      end
+      response = process(:column_list,
+                         {"table" => "Books"})
+      expected = [
+        COLUMNS_HEADER,
+      ]
+      assert_equal(expected, response.last)
+    end
+
+    def test_hash
+      Groonga::Schema.define do |schema|
+        schema.create_table("Books", :type => :hash)
+      end
+      response = process(:column_list,
+                         {"table" => "Books"})
+      expected = [
+        COLUMNS_HEADER,
+        virtual_key_column(256, "Books"),
+      ]
+      assert_equal(expected, response.last)
+    end
+
+    def test_patricia_trie
+      Groonga::Schema.define do |schema|
+        schema.create_table("Books", :type => :patricia_trie)
+      end
+      response = process(:column_list,
+                         {"table" => "Books"})
+      expected = [
+        COLUMNS_HEADER,
+        virtual_key_column(256, "Books"),
+      ]
+      assert_equal(expected, response.last)
+    end
+
+    def test_double_array_trie
+      Groonga::Schema.define do |schema|
+        schema.create_table("Books", :type => :double_array_trie)
+      end
+      response = process(:column_list,
+                         {"table" => "Books"})
+      expected = [
+        COLUMNS_HEADER,
+        virtual_key_column(256, "Books"),
+      ]
+      assert_equal(expected, response.last)
+    end
+
+    def test_both_virtual_and_real
+      Groonga::Schema.define do |schema|
+        schema.create_table("Books", :type => :hash)
+        schema.change_table("Books") do |table|
+          table.column("age", "UInt32", :type => :scalar)
+        end
+      end
+      response = process(:column_list,
+                         {"table" => "Books"})
+      expected = [
+        COLUMNS_HEADER,
+        virtual_key_column(256, "Books"),
+        [257,
+         "age",
+         @database_path.to_s + ".0000101",
+         "fix",
+         "COLUMN_SCALAR",
+         "Books",
+         "UInt32",
+         []],
+      ]
+      assert_equal(expected, response.last)
+    end
   end
 end

data/test/unit/plugins/groonga/test_table_create.rb

@@ -54,30 +54,35 @@ table_create Books TABLE_NO_KEY
            },
            "TABLE_HASH_KEY" => {
              :flags => "TABLE_HASH_KEY",
+             :key_type => "ShortText",
              :schema => <<-SCHEMA,
 table_create Books TABLE_HASH_KEY ShortText
              SCHEMA
            },
            "TABLE_PAT_KEY" => {
              :flags => "TABLE_PAT_KEY",
+             :key_type => "ShortText",
              :schema => <<-SCHEMA,
 table_create Books TABLE_PAT_KEY ShortText
              SCHEMA
            },
            "TABLE_DAT_KEY" => {
              :flags => "TABLE_DAT_KEY",
+             :key_type => "ShortText",
              :schema => <<-SCHEMA,
 table_create Books TABLE_DAT_KEY ShortText
              SCHEMA
            },
            "KEY_WITH_SIS with TABLE_PAT_KEY" => {
              :flags => "KEY_WITH_SIS|TABLE_PAT_KEY",
+             :key_type => "ShortText",
              :schema => <<-SCHEMA,
 table_create Books TABLE_PAT_KEY|KEY_WITH_SIS ShortText
              SCHEMA
            },
            "KEY_WITH_SIS without TABLE_PAT_KEY" => {
              :flags => "TABLE_NO_KEY|KEY_WITH_SIS",
+             :key_type => "ShortText",
              :schema => <<-SCHEMA,
 table_create Books TABLE_NO_KEY
              SCHEMA
@@ -88,9 +93,33 @@ table_create Books TABLE_NO_KEY
         "name" => "Books",
         "flags" => data[:flags],
       }
+      request["key_type"] = data[:key_type] if data[:key_type]
       process(:table_create, request)
       assert_equal(data[:schema], dump)
     end
+
+    data({
+           "TABLE_HASH_KEY missing key_type" => {
+             :flags => "TABLE_HASH_KEY",
+           },
+           "TABLE_PAT_KEY missing key_type" => {
+             :flags => "TABLE_PAT_KEY",
+           },
+           "TABLE_DAT_KEY missing key_type" => {
+             :flags => "TABLE_DAT_KEY",
+           },
+         })
+    def test_missing_required_parameter(data)
+      request = {
+        "name" => "Books",
+        "flags" => data[:flags],
+      }
+      response = process(:table_create, request)
+      assert_equal(
+        [NORMALIZED_HEADER_INVALID_ARGUMENT, false],
+        [normalize_header(response.first), response.last]
+      )
+    end
   end
 
   class KeyTypeTest < self

data/test/unit/plugins/search/planner/test_basic.rb

@@ -21,7 +21,7 @@ class DistributedSearchPlannerBasicTest < Test::Unit::TestCase
       def setup
         @request = {
           "type"    => "search",
-          "dataset" => "Droonga",
+          "dataset" => "Default",
           "body"    => {
             "queries" => {
               "query1" => {
@@ -63,7 +63,7 @@ class DistributedSearchPlannerBasicTest < Test::Unit::TestCase
     def setup
       @request = {
         "type"    => "search",
-        "dataset" => "Droonga",
+        "dataset" => "Default",
         "body"    => {
           "queries" => {
             "no_output" => {

data/test/unit/plugins/search/test_planner.rb

@@ -19,7 +19,15 @@ class SearchPlannerTest < Test::Unit::TestCase
   def setup
     setup_database
     @planner = Droonga::Test::StubPlanner.new
-    @plugin = Droonga::Plugins::Search::Planner.new
+    # TODO: Use real dataset
+    stub_dataset = Object.new
+    stub(stub_dataset).name do
+      Droonga::Catalog::Dataset::DEFAULT_NAME
+    end
+    stub(stub_dataset).single_slice? do
+      false
+    end
+    @plugin = Droonga::Plugins::Search::Planner.new(stub_dataset)
   end
 
   def teardown
@@ -135,7 +143,7 @@ class SearchPlannerTest < Test::Unit::TestCase
     searcher = {
       "type" => "broadcast",
       "command" => "search",
-      "dataset" => "Droonga",
+      "dataset" => "Default",
       "body" => {
         "queries" => {
           "query1" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droonga-engine
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: droonga-message-pack-packer
   requirement: !ruby/object:Gem::Requirement
@@ -475,6 +475,7 @@ files:
 - test/command/fixture/event.jsons
 - test/command/fixture/user-table-array.jsons
 - test/command/fixture/user-table.jsons
+- test/command/fixture/users.jsons
 - test/command/run-test.rb
 - test/command/suite/add/dimension/column.catalog.json
 - test/command/suite/add/dimension/column.expected
@@ -535,10 +536,12 @@ files:
 - test/command/suite/groonga/column_create/unknown-table.test
 - test/command/suite/groonga/column_create/vector.expected
 - test/command/suite/groonga/column_create/vector.test
-- test/command/suite/groonga/column_list/success.expected
-- test/command/suite/groonga/column_list/success.test
+- test/command/suite/groonga/column_list/no-key.expected
+- test/command/suite/groonga/column_list/no-key.test
 - test/command/suite/groonga/column_list/unknown-table.expected
 - test/command/suite/groonga/column_list/unknown-table.test
+- test/command/suite/groonga/column_list/with-key.expected
+- test/command/suite/groonga/column_list/with-key.test
 - test/command/suite/groonga/column_remove/success.expected
 - test/command/suite/groonga/column_remove/success.test
 - test/command/suite/groonga/column_remove/unknown-column.expected
@@ -565,13 +568,27 @@ files:
 - test/command/suite/groonga/delete/unknown-table.test
 - test/command/suite/groonga/select/minimum.expected
 - test/command/suite/groonga/select/minimum.test
+- test/command/suite/groonga/select/output_columns/default/array.expected
+- test/command/suite/groonga/select/output_columns/default/array.test
+- test/command/suite/groonga/select/output_columns/nonexistent.expected
+- test/command/suite/groonga/select/output_columns/nonexistent.test
 - test/command/suite/groonga/select/type/time.catalog.json
 - test/command/suite/groonga/select/type/time.expected
 - test/command/suite/groonga/select/type/time.test
 - test/command/suite/groonga/table_create/array.expected
 - test/command/suite/groonga/table_create/array.test
+- test/command/suite/groonga/table_create/dat-without-key-type.expected
+- test/command/suite/groonga/table_create/dat-without-key-type.test
+- test/command/suite/groonga/table_create/dat.expected
+- test/command/suite/groonga/table_create/dat.test
+- test/command/suite/groonga/table_create/hash-without-key-type.expected
+- test/command/suite/groonga/table_create/hash-without-key-type.test
 - test/command/suite/groonga/table_create/hash.expected
 - test/command/suite/groonga/table_create/hash.test
+- test/command/suite/groonga/table_create/pat-without-key-type.expected
+- test/command/suite/groonga/table_create/pat-without-key-type.test
+- test/command/suite/groonga/table_create/pat.expected
+- test/command/suite/groonga/table_create/pat.test
 - test/command/suite/groonga/table_list/success.expected
 - test/command/suite/groonga/table_list/success.test
 - test/command/suite/groonga/table_remove/success.expected
@@ -764,6 +781,7 @@ test_files:
 - test/command/fixture/event.jsons
 - test/command/fixture/user-table-array.jsons
 - test/command/fixture/user-table.jsons
+- test/command/fixture/users.jsons
 - test/command/run-test.rb
 - test/command/suite/add/dimension/column.catalog.json
 - test/command/suite/add/dimension/column.expected
@@ -824,10 +842,12 @@ test_files:
 - test/command/suite/groonga/column_create/unknown-table.test
 - test/command/suite/groonga/column_create/vector.expected
 - test/command/suite/groonga/column_create/vector.test
-- test/command/suite/groonga/column_list/success.expected
-- test/command/suite/groonga/column_list/success.test
+- test/command/suite/groonga/column_list/no-key.expected
+- test/command/suite/groonga/column_list/no-key.test
 - test/command/suite/groonga/column_list/unknown-table.expected
 - test/command/suite/groonga/column_list/unknown-table.test
+- test/command/suite/groonga/column_list/with-key.expected
+- test/command/suite/groonga/column_list/with-key.test
 - test/command/suite/groonga/column_remove/success.expected
 - test/command/suite/groonga/column_remove/success.test
 - test/command/suite/groonga/column_remove/unknown-column.expected
@@ -854,13 +874,27 @@ test_files:
 - test/command/suite/groonga/delete/unknown-table.test
 - test/command/suite/groonga/select/minimum.expected
 - test/command/suite/groonga/select/minimum.test
+- test/command/suite/groonga/select/output_columns/default/array.expected
+- test/command/suite/groonga/select/output_columns/default/array.test
+- test/command/suite/groonga/select/output_columns/nonexistent.expected
+- test/command/suite/groonga/select/output_columns/nonexistent.test
 - test/command/suite/groonga/select/type/time.catalog.json
 - test/command/suite/groonga/select/type/time.expected
 - test/command/suite/groonga/select/type/time.test
 - test/command/suite/groonga/table_create/array.expected
 - test/command/suite/groonga/table_create/array.test
+- test/command/suite/groonga/table_create/dat-without-key-type.expected
+- test/command/suite/groonga/table_create/dat-without-key-type.test
+- test/command/suite/groonga/table_create/dat.expected
+- test/command/suite/groonga/table_create/dat.test
+- test/command/suite/groonga/table_create/hash-without-key-type.expected
+- test/command/suite/groonga/table_create/hash-without-key-type.test
 - test/command/suite/groonga/table_create/hash.expected
 - test/command/suite/groonga/table_create/hash.test
+- test/command/suite/groonga/table_create/pat-without-key-type.expected
+- test/command/suite/groonga/table_create/pat-without-key-type.test
+- test/command/suite/groonga/table_create/pat.expected
+- test/command/suite/groonga/table_create/pat.test
 - test/command/suite/groonga/table_list/success.expected
 - test/command/suite/groonga/table_list/success.test
 - test/command/suite/groonga/table_remove/success.expected
@@ -1022,3 +1056,4 @@ test_files:
 - test/unit/test_sweeper.rb
 - test/unit/test_watch_schema.rb
 - test/unit/test_watcher.rb
+has_rdoc: