groonga-client 0.5.2 → 0.5.3

data/lib/groonga/client/response/column-list.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2017  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
@@ -66,6 +64,37 @@ module Groonga
                                   :domain,
                                   :range,
                                   :source)
+          # @return [::Array<String>]
+          #   The flag names of the column.
+          #
+          # @since 0.5.3
+          def flags
+            (super || "").split("|")
+          end
+
+          # @return [Boolean]
+          #   `true` if the column is a scalar column, `false` otherwise.
+          #
+          # @since 0.5.3
+          def scalar?
+            flags.include?("COLUMN_SCALAR")
+          end
+
+          # @return [Boolean]
+          #   `true` if the column is a vector column, `false` otherwise.
+          #
+          # @since 0.5.3
+          def vector?
+            flags.include?("COLUMN_VECTOR")
+          end
+
+          # @return [Boolean]
+          #   `true` if the column is an index column, `false` otherwise.
+          #
+          # @since 0.5.3
+          def index?
+            flags.include?("COLUMN_INDEX")
+          end
         end
       end
     end

data/lib/groonga/client/response/schema.rb

@@ -96,8 +96,25 @@ module Groonga
           @tables
         end
 
-        private
-        def coerce_tables
+        # @param name [String] The object name to be retrieved.
+        #
+        # @return [Plugin, Type, Tokenizer, Normalizer, TokenFilter, Table, Column]
+        #   The object named `name`.
+        #
+        # @since 0.5.3
+        def [](name)
+          name = name.to_s if name.is_a?(Symbol)
+          if name.include?(".")
+            table_name, column_name = name.split(".", 2)
+            tables[table_name].columns[column_name]
+          else
+            tables[name] ||
+              types[name] ||
+              tokenizers[name] ||
+              normalizers[name] ||
+              token_filters[name] ||
+              plugins[name]
+          end
         end
 
         module HashValueConverter
@@ -147,6 +164,11 @@ module Groonga
           include Hashie::Extensions::MethodAccess
         end
 
+        class Command < ::Hash
+          include Hashie::Extensions::MergeInitializer
+          include Hashie::Extensions::MethodAccess
+        end
+
         class Index < ::Hash
           include Hashie::Extensions::MethodAccess
 
@@ -204,6 +226,8 @@ module Groonga
             when :value_type
               value = ValueType.new(value) unless value.nil?
               super(key, value)
+            when :command
+              super(key, Command.new(value))
             else
               super
             end
@@ -243,6 +267,8 @@ module Groonga
               super(key, coerce_columns(value))
             when :indexes
               super(key, coerce_indexes(value))
+            when :command
+              super(key, Command.new(value))
             else
               super
             end

data/lib/groonga/client/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/test/command-line/test-index-recreate.rb

@@ -0,0 +1,369 @@
+# Copyright (C) 2017  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
+# 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 "time"
+
+require "groonga/command/parser"
+
+require "groonga/client"
+require "groonga/client/test-helper"
+require "groonga/client/command-line/groonga-client-index-recreate"
+
+class TestCommandLineIndexRecreate < Test::Unit::TestCase
+  include Groonga::Client::TestHelper
+
+  def setup
+    @now = Time.parse("2017-10-25T17:22:00+0900")
+    stub(Time).now {@now}
+  end
+
+  def groonga_url
+    @groonga_server_runner.url.to_s
+  end
+
+  def open_client
+    Groonga::Client.open(:url => groonga_url) do |client|
+      yield(client)
+    end
+  end
+
+  def restore(commands)
+    open_client do |client|
+      values = nil
+      Groonga::Command::Parser.parse(commands) do |event, *args|
+        case event
+        when :on_command
+          command, = args
+          response = client.execute(command)
+          unless response.success?
+            raise Groonga::Client::Request::ErrorResponse.new(response)
+          end
+        when :on_load_start
+          command, = args
+          values = []
+        when :on_load_columns
+          command, columns = args
+          command[:columns] ||= columns.join(",")
+        when :on_load_value
+          command, value = args
+          values << value
+        when :on_load_complete
+          command, = args
+          command[:values] ||= JSON.generate(values)
+          response = client.execute(command)
+          unless response.success?
+            raise Groonga::Client::Request::ErrorResponse.new(response)
+          end
+        else
+          p [:unhandled_event, event, *args]
+        end
+      end
+    end
+  end
+
+  def dump
+    open_client do |client|
+      client.dump.body
+    end
+  end
+
+  def index_recreate(*arguments)
+    command_line = Groonga::Client::CommandLine::GroongaClientIndexRecreate.new
+    begin
+      stdout, $stdout = $stdout, StringIO.new
+      stderr, $stderr = $stderr, StringIO.new
+      [
+        command_line.run(["--url", groonga_url, *arguments]),
+        $stdout.string,
+        $stderr.string,
+      ]
+    ensure
+      $stdout, $stderr = stdout, stderr
+    end
+  end
+
+  def test_no_alias_column
+    index_recreate
+    assert_equal(<<-DUMP.chomp, dump)
+config_set alias.column Aliases.real_name
+
+table_create Aliases TABLE_HASH_KEY ShortText
+column_create Aliases real_name COLUMN_SCALAR ShortText
+    DUMP
+  end
+
+  def test_real_index
+    restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+    COMMANDS
+
+    assert_equal([true, "", ""],
+                 index_recreate("Terms.memos_content"))
+
+    assert_equal(<<-DUMP.chomp, dump)
+config_set alias.column Aliases.real_name
+
+table_create Aliases TABLE_HASH_KEY ShortText
+column_create Aliases real_name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+load --table Aliases
+[
+["_key","real_name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+
+column_create Terms memos_content_20171025 COLUMN_INDEX|WITH_POSITION Memos content
+    DUMP
+  end
+
+  def test_old_index
+    restore(<<-COMMANDS)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content_20171024 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171024"]
+]
+    COMMANDS
+
+    assert_equal([true, "", ""],
+                 index_recreate("Terms.memos_content"))
+
+    assert_equal(<<-DUMP.chomp, dump)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+
+column_create Terms memos_content_20171024 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171025 COLUMN_INDEX|WITH_POSITION Memos content
+    DUMP
+  end
+
+  def test_old_indexes
+    restore(<<-COMMANDS)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content_20171022 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171023 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171024 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171024"]
+]
+    COMMANDS
+
+    assert_equal([true, "", ""],
+                 index_recreate("Terms.memos_content"))
+
+    assert_equal(<<-DUMP.chomp, dump)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+
+column_create Terms memos_content_20171024 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171025 COLUMN_INDEX|WITH_POSITION Memos content
+    DUMP
+  end
+
+  def test_already_latest
+    restore(<<-COMMANDS)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content_20171022 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171023 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171024 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171025 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+    COMMANDS
+
+    assert_equal([true, "", ""],
+                 index_recreate("Terms.memos_content"))
+
+    assert_equal(<<-DUMP.chomp, dump)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+
+column_create Terms memos_content_20171022 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171023 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171024 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171025 COLUMN_INDEX|WITH_POSITION Memos content
+    DUMP
+  end
+
+  def test_latest_alias_but_not_exist
+    restore(<<-COMMANDS)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content_20171022 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171023 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content_20171024 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+    COMMANDS
+
+    assert_equal([
+                   false,
+                   "",
+                   "Alias doesn't specify real index column: " +
+                   "<Terms.memos_content_20171025>\n",
+                 ],
+                 index_recreate("Terms.memos_content"))
+
+    assert_equal(<<-DUMP.chomp, dump)
+config_set alias.column CustomAliases.name
+
+table_create CustomAliases TABLE_HASH_KEY ShortText
+column_create CustomAliases name COLUMN_SCALAR ShortText
+
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+
+load --table CustomAliases
+[
+["_key","name"],
+["Terms.memos_content","Terms.memos_content_20171025"]
+]
+
+column_create Terms memos_content_20171022 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171023 COLUMN_INDEX|WITH_POSITION Memos content
+column_create Terms memos_content_20171024 COLUMN_INDEX|WITH_POSITION Memos content
+    DUMP
+  end
+end