RubyGems - fluent-plugin-droonga - Versions diffs - 1.0.0 → 1.0.1 - Mend

fluent-plugin-droonga 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (90) hide show

data/.travis.yml +1 -1
data/Gemfile +1 -1
data/fluent-plugin-droonga.gemspec +1 -1
data/lib/droonga/catalog/collection_volume.rb +97 -0
data/lib/droonga/catalog/dataset.rb +28 -1
data/lib/droonga/catalog/errors.rb +28 -9
data/lib/droonga/catalog/schema.rb +23 -2
data/lib/droonga/catalog/single_volume.rb +28 -0
data/lib/droonga/catalog/slice.rb +43 -0
data/lib/droonga/catalog/version1.rb +3 -3
data/lib/droonga/catalog/version2.rb +17 -81
data/lib/droonga/catalog/version2_validator.rb +63 -0
data/lib/droonga/catalog/volume.rb +33 -0
data/lib/droonga/catalog/volume_collection.rb +56 -0
data/lib/droonga/catalog_observer.rb +7 -19
data/lib/droonga/collectors.rb +1 -1
data/lib/droonga/collectors/{add.rb → or.rb} +1 -1
data/lib/droonga/dispatcher.rb +24 -18
data/lib/droonga/distributed_command_planner.rb +7 -11
data/lib/droonga/distributor.rb +29 -17
data/lib/droonga/event_loop.rb +2 -11
data/lib/droonga/fluent_message_sender.rb +51 -5
data/lib/droonga/handler_runner.rb +1 -1
data/lib/droonga/job_protocol.rb +20 -0
data/lib/droonga/job_pusher.rb +178 -0
data/lib/droonga/{message_receiver.rb → job_receiver.rb} +13 -6
data/lib/droonga/message_matcher.rb +18 -15
data/lib/droonga/planner.rb +2 -3
data/lib/droonga/plugins/crud.rb +1 -1
data/lib/droonga/plugins/groonga/column_create.rb +4 -1
data/lib/droonga/plugins/groonga/table_create.rb +1 -1
data/lib/droonga/plugins/groonga/table_remove.rb +1 -1
data/lib/droonga/plugins/search/distributed_search_planner.rb +9 -0
data/lib/droonga/processor.rb +3 -3
data/lib/droonga/reducer.rb +15 -12
data/lib/droonga/searcher.rb +49 -4
data/lib/droonga/server.rb +2 -0
data/lib/droonga/single_step.rb +22 -7
data/lib/droonga/slice.rb +7 -7
data/lib/droonga/step_runner.rb +3 -2
data/lib/droonga/worker.rb +10 -8
data/test/command/suite/add/dimension/column.catalog.json +27 -0
data/test/command/suite/add/dimension/column.expected +57 -0
data/test/command/suite/add/dimension/column.test +51 -0
data/test/command/suite/search/adjusters/multiple.catalog.json +38 -0
data/test/command/suite/search/adjusters/multiple.expected +23 -0
data/test/command/suite/search/adjusters/multiple.test +75 -0
data/test/command/suite/search/adjusters/one.catalog.json +38 -0
data/test/command/suite/search/adjusters/one.expected +23 -0
data/test/command/suite/search/adjusters/one.test +66 -0
data/test/command/suite/search/attributes/array.test +0 -2
data/test/command/suite/search/attributes/hash.test +0 -2
data/test/command/suite/search/complex.test +0 -2
data/test/command/suite/search/condition/nested.test +0 -2
data/test/command/suite/search/condition/query.test +0 -2
data/test/command/suite/search/condition/script.test +0 -2
data/test/command/suite/search/group/string.test +0 -4
data/test/command/suite/search/group/subrecord/with-sort.catalog.json +33 -0
data/test/command/suite/search/group/subrecord/with-sort.expected +34 -0
data/test/command/suite/search/group/subrecord/with-sort.test +81 -0
data/test/command/suite/search/multiple/chained.test +0 -4
data/test/command/suite/search/multiple/parallel.test +0 -4
data/test/command/suite/search/range/only-output.test +0 -2
data/test/command/suite/search/range/only-sort.test +0 -2
data/test/command/suite/search/range/sort-and-output.test +0 -2
data/test/command/suite/search/range/too-large-output-offset.test +0 -2
data/test/command/suite/search/range/too-large-sort-offset.test +0 -2
data/test/command/suite/search/response/elapsed_time.catalog.json +13 -0
data/test/command/suite/search/response/elapsed_time.expected +15 -0
data/test/command/suite/search/response/elapsed_time.test +26 -0
data/test/command/suite/search/response/records/value/time.test +0 -2
data/test/command/suite/search/simple.test +0 -2
data/test/command/suite/search/sort/default-offset-limit.test +0 -2
data/test/command/suite/search/sort/invisible-column.test +0 -2
data/test/unit/catalog/test_collection_volume.rb +103 -0
data/test/unit/catalog/test_dataset.rb +69 -8
data/test/unit/catalog/test_schema.rb +63 -23
data/test/unit/catalog/test_single_volume.rb +31 -0
data/test/unit/catalog/test_slice.rb +92 -0
data/test/unit/catalog/test_version1.rb +1 -1
data/test/unit/catalog/test_version2.rb +1 -32
data/test/unit/catalog/test_version2_validator.rb +66 -0
data/test/unit/catalog/test_volume_collection.rb +50 -0
data/test/unit/plugins/groonga/test_column_create.rb +4 -1
data/test/unit/plugins/groonga/test_table_create.rb +1 -1
data/test/unit/test_message_matcher.rb +15 -15
data/test/unit/test_watch_schema.rb +1 -1
metadata +107 -94
checksums.yaml +0 -7
data/lib/droonga/message_pusher.rb +0 -64

data/test/unit/test_watch_schema.rb CHANGED

@@ -35,7 +35,7 @@ class WatchSchemaTest < Test::Unit::TestCase
                                                      :database => database)
     end
     assert_equal(<<-SCHEMA, dumped_commands)
-table_create Keyword TABLE_PAT_KEY|KEY_NORMALIZE --key_type ShortText
+table_create Keyword TABLE_PAT_KEY --key_type ShortText --normalizer NormalizerAuto
 table_create Query TABLE_HASH_KEY --key_type ShortText

metadata CHANGED

@@ -1,183 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-droonga
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
+  prerelease:
 platform: ruby
 authors:
 - Droonga Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81240960 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81240960
 - !ruby/object:Gem::Dependency
   name: rroonga
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81240700 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *81240700
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81186790 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81186790
 - !ruby/object:Gem::Dependency
   name: serverengine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81185020 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81185020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81183730 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81183730
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81182530 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81182530
 - !ruby/object:Gem::Dependency
   name: droonga-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81182000 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81182000
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81181430 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81181430
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81180520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81180520
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81180110 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81180110
 - !ruby/object:Gem::Dependency
   name: packnga
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81999480 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81999480
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81999270 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *81999270
 description: Droonga (distributed Groonga) plugin for Fluent event collector
 email:
 - droonga@groonga.org
@@ -204,19 +169,25 @@ files:
 - lib/droonga/adapter.rb
 - lib/droonga/adapter_runner.rb
 - lib/droonga/catalog/base.rb
+- lib/droonga/catalog/collection_volume.rb
 - lib/droonga/catalog/dataset.rb
 - lib/droonga/catalog/errors.rb
 - lib/droonga/catalog/schema.rb
+- lib/droonga/catalog/single_volume.rb
+- lib/droonga/catalog/slice.rb
 - lib/droonga/catalog/version1.rb
 - lib/droonga/catalog/version2.rb
+- lib/droonga/catalog/version2_validator.rb
+- lib/droonga/catalog/volume.rb
+- lib/droonga/catalog/volume_collection.rb
 - lib/droonga/catalog_loader.rb
 - lib/droonga/catalog_observer.rb
 - lib/droonga/collector.rb
 - lib/droonga/collector_message.rb
 - lib/droonga/collector_runner.rb
 - lib/droonga/collectors.rb
-- lib/droonga/collectors/add.rb
 - lib/droonga/collectors/and.rb
+- lib/droonga/collectors/or.rb
 - lib/droonga/collectors/sum.rb
 - lib/droonga/dispatcher.rb
 - lib/droonga/distributed_command_planner.rb
@@ -233,12 +204,13 @@ files:
 - lib/droonga/handler_messenger.rb
 - lib/droonga/handler_runner.rb
 - lib/droonga/input_message.rb
+- lib/droonga/job_protocol.rb
+- lib/droonga/job_pusher.rb
+- lib/droonga/job_receiver.rb
 - lib/droonga/loggable.rb
 - lib/droonga/logger.rb
 - lib/droonga/message_matcher.rb
 - lib/droonga/message_pack_packer.rb
-- lib/droonga/message_pusher.rb
-- lib/droonga/message_receiver.rb
 - lib/droonga/output_message.rb
 - lib/droonga/planner.rb
 - lib/droonga/pluggable.rb
@@ -301,6 +273,9 @@ files:
 - test/command/fixture/user-table-array.jsons
 - test/command/fixture/user-table.jsons
 - test/command/run-test.rb
+- test/command/suite/add/dimension/column.catalog.json
+- test/command/suite/add/dimension/column.expected
+- test/command/suite/add/dimension/column.test
 - test/command/suite/add/error/invalid-integer.expected
 - test/command/suite/add/error/invalid-integer.test
 - test/command/suite/add/error/invalid-time.expected
@@ -341,6 +316,12 @@ files:
 - test/command/suite/message/error/unknown-dataset.test
 - test/command/suite/message/error/unknown-type.expected
 - test/command/suite/message/error/unknown-type.test
+- test/command/suite/search/adjusters/multiple.catalog.json
+- test/command/suite/search/adjusters/multiple.expected
+- test/command/suite/search/adjusters/multiple.test
+- test/command/suite/search/adjusters/one.catalog.json
+- test/command/suite/search/adjusters/one.expected
+- test/command/suite/search/adjusters/one.test
 - test/command/suite/search/attributes/array.expected
 - test/command/suite/search/attributes/array.test
 - test/command/suite/search/attributes/hash.expected
@@ -369,6 +350,9 @@ files:
 - test/command/suite/search/group/limit.test
 - test/command/suite/search/group/string.expected
 - test/command/suite/search/group/string.test
+- test/command/suite/search/group/subrecord/with-sort.catalog.json
+- test/command/suite/search/group/subrecord/with-sort.expected
+- test/command/suite/search/group/subrecord/with-sort.test
 - test/command/suite/search/multiple/chained.expected
 - test/command/suite/search/multiple/chained.test
 - test/command/suite/search/multiple/parallel.expected
@@ -383,6 +367,9 @@ files:
 - test/command/suite/search/range/too-large-output-offset.test
 - test/command/suite/search/range/too-large-sort-offset.expected
 - test/command/suite/search/range/too-large-sort-offset.test
+- test/command/suite/search/response/elapsed_time.catalog.json
+- test/command/suite/search/response/elapsed_time.expected
+- test/command/suite/search/response/elapsed_time.test
 - test/command/suite/search/response/records/value/time.expected
 - test/command/suite/search/response/records/value/time.test
 - test/command/suite/search/simple.expected
@@ -400,10 +387,15 @@ files:
 - test/performance/watch/feed.json
 - test/performance/watch/fluentd.conf
 - test/performance/watch/subscribe.json
+- test/unit/catalog/test_collection_volume.rb
 - test/unit/catalog/test_dataset.rb
 - test/unit/catalog/test_schema.rb
+- test/unit/catalog/test_single_volume.rb
+- test/unit/catalog/test_slice.rb
 - test/unit/catalog/test_version1.rb
 - test/unit/catalog/test_version2.rb
+- test/unit/catalog/test_version2_validator.rb
+- test/unit/catalog/test_volume_collection.rb
 - test/unit/fixtures/array.grn
 - test/unit/fixtures/catalog/version1.json
 - test/unit/fixtures/catalog/version2.json
@@ -443,26 +435,27 @@ files:
 - test/unit/test_watcher.rb
 homepage: https://github.com/droonga/fluent-plugin-droonga
 licenses: []
-metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.14
+rubygems_version: 1.8.11
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: Droonga (distributed Groonga) plugin for Fluent event collector
 test_files:
 - test/command/config/default/catalog.json
@@ -474,6 +467,9 @@ test_files:
 - test/command/fixture/user-table-array.jsons
 - test/command/fixture/user-table.jsons
 - test/command/run-test.rb
+- test/command/suite/add/dimension/column.catalog.json
+- test/command/suite/add/dimension/column.expected
+- test/command/suite/add/dimension/column.test
 - test/command/suite/add/error/invalid-integer.expected
 - test/command/suite/add/error/invalid-integer.test
 - test/command/suite/add/error/invalid-time.expected
@@ -514,6 +510,12 @@ test_files:
 - test/command/suite/message/error/unknown-dataset.test
 - test/command/suite/message/error/unknown-type.expected
 - test/command/suite/message/error/unknown-type.test
+- test/command/suite/search/adjusters/multiple.catalog.json
+- test/command/suite/search/adjusters/multiple.expected
+- test/command/suite/search/adjusters/multiple.test
+- test/command/suite/search/adjusters/one.catalog.json
+- test/command/suite/search/adjusters/one.expected
+- test/command/suite/search/adjusters/one.test
 - test/command/suite/search/attributes/array.expected
 - test/command/suite/search/attributes/array.test
 - test/command/suite/search/attributes/hash.expected
@@ -542,6 +544,9 @@ test_files:
 - test/command/suite/search/group/limit.test
 - test/command/suite/search/group/string.expected
 - test/command/suite/search/group/string.test
+- test/command/suite/search/group/subrecord/with-sort.catalog.json
+- test/command/suite/search/group/subrecord/with-sort.expected
+- test/command/suite/search/group/subrecord/with-sort.test
 - test/command/suite/search/multiple/chained.expected
 - test/command/suite/search/multiple/chained.test
 - test/command/suite/search/multiple/parallel.expected
@@ -556,6 +561,9 @@ test_files:
 - test/command/suite/search/range/too-large-output-offset.test
 - test/command/suite/search/range/too-large-sort-offset.expected
 - test/command/suite/search/range/too-large-sort-offset.test
+- test/command/suite/search/response/elapsed_time.catalog.json
+- test/command/suite/search/response/elapsed_time.expected
+- test/command/suite/search/response/elapsed_time.test
 - test/command/suite/search/response/records/value/time.expected
 - test/command/suite/search/response/records/value/time.test
 - test/command/suite/search/simple.expected
@@ -573,10 +581,15 @@ test_files:
 - test/performance/watch/feed.json
 - test/performance/watch/fluentd.conf
 - test/performance/watch/subscribe.json
+- test/unit/catalog/test_collection_volume.rb
 - test/unit/catalog/test_dataset.rb
 - test/unit/catalog/test_schema.rb
+- test/unit/catalog/test_single_volume.rb
+- test/unit/catalog/test_slice.rb
 - test/unit/catalog/test_version1.rb
 - test/unit/catalog/test_version2.rb
+- test/unit/catalog/test_version2_validator.rb
+- test/unit/catalog/test_volume_collection.rb
 - test/unit/fixtures/array.grn
 - test/unit/fixtures/catalog/version1.json
 - test/unit/fixtures/catalog/version2.json

checksums.yaml DELETED

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 611f2ebd66b47ba06e51dcba81545e17dc8759fb
-  data.tar.gz: 60378c2f9a04272698fbb64bbeb104ab7dd49b76
-SHA512:
-  metadata.gz: 80eb92e66a2114940e77b7668941a2fd25d032d8caf1b3ca9752368b01027ed979049a4a90cfdcbb89a25e8ab85c3e91b7b9441da47fb2571a45b9e5fe271a71
-  data.tar.gz: a5dc67e0af98b68713b90ff8d15e8cf3923d86597d19777816a1a74391b5666295cfa74b3a569829b261e5eb629861cca79ecfcff3cbbb7259797f13e678a0e3

data/lib/droonga/message_pusher.rb DELETED

@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 Droonga Project
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License version 2.1 as published by the Free Software Foundation.
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-require "msgpack"
-require "droonga/logger"
-module Droonga
-  class MessagePusher
-    include Loggable
-    attr_reader :raw_receiver
-    def initialize(loop)
-      @loop = loop
-    end
-    def start(base_path)
-      socket_path = "#{base_path}.sock"
-      FileUtils.rm_f(socket_path)
-      @raw_receiver = UNIXServer.new(socket_path)
-      FileUtils.chmod(0600, socket_path)
-    end
-    def shutdown
-      logger.trace("shutdown: start")
-      socket_path = @raw_receiver.path
-      @raw_receiver.close
-      FileUtils.rm_f(socket_path)
-      logger.trace("shutdown: done")
-    end
-    def push(message)
-      logger.trace("push: start")
-      packed_message = message.to_msgpack
-      path = @raw_receiver.path
-      sender = Coolio::UNIXSocket.connect(path)
-      sender.write(message.to_msgpack)
-      sender.on_write_complete do
-        close
-      end
-      @loop.attach(sender)
-      logger.trace("push: done")
-    end
-    private
-    def log_tag
-      "message_pusher"
-    end
-  end
-end