fluent-plugin-droonga 0.0.2 → 0.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +6 -0
- data/.yardopts +7 -0
- data/Gemfile +14 -2
- data/LICENSE.txt +1 -1
- data/README.md +1 -1
- data/Rakefile +27 -5
- data/benchmark/benchmark.rb +1 -1
- data/benchmark/utils.rb +9 -6
- data/benchmark/watch/benchmark-notify.rb +2 -2
- data/benchmark/watch/benchmark-publish.rb +1 -1
- data/benchmark/watch/benchmark-scan.rb +1 -1
- data/benchmark/watch/catalog.json +1 -1
- data/bin/grn2jsons +1 -1
- data/fluent-plugin-droonga.gemspec +5 -3
- data/lib/droonga/adapter.rb +13 -130
- data/lib/droonga/adapter_plugin.rb +51 -0
- data/lib/droonga/catalog.rb +2 -2
- data/lib/droonga/collector.rb +107 -0
- data/lib/droonga/collector_plugin.rb +82 -0
- data/lib/droonga/command_mapper.rb +1 -1
- data/lib/droonga/{proxy.rb → dispatcher.rb} +116 -151
- data/lib/droonga/distributor.rb +51 -0
- data/lib/droonga/distributor_plugin.rb +59 -0
- data/lib/droonga/engine.rb +9 -50
- data/lib/droonga/farm.rb +47 -0
- data/lib/droonga/forwarder.rb +125 -0
- data/lib/droonga/handler.rb +69 -60
- data/lib/droonga/handler_plugin.rb +22 -11
- data/lib/droonga/input_message.rb +51 -0
- data/lib/droonga/job_queue.rb +5 -1
- data/lib/droonga/job_queue_schema.rb +1 -1
- data/lib/droonga/logger.rb +1 -1
- data/lib/droonga/partition.rb +76 -0
- data/lib/droonga/pluggable.rb +62 -0
- data/lib/droonga/plugin.rb +18 -16
- data/lib/droonga/plugin/{adapter_groonga.rb → adapter/groonga.rb} +10 -10
- data/lib/droonga/plugin/adapter/groonga/select.rb +13 -4
- data/lib/droonga/plugin/collector/basic.rb +142 -0
- data/lib/droonga/plugin/distributor/crud.rb +43 -0
- data/lib/droonga/plugin/distributor/groonga.rb +37 -0
- data/lib/droonga/plugin/distributor/search.rb +273 -0
- data/lib/droonga/plugin/distributor/watch.rb +39 -0
- data/lib/droonga/plugin/{handler_add.rb → handler/add.rb} +6 -6
- data/lib/droonga/plugin/{handler_forward.rb → handler/forward.rb} +9 -4
- data/lib/droonga/plugin/{handler_groonga.rb → handler/groonga.rb} +36 -4
- data/lib/droonga/plugin/handler/groonga/column_create.rb +5 -9
- data/lib/droonga/plugin/handler/groonga/table_create.rb +9 -18
- data/lib/droonga/plugin/{handler_search.rb → handler/search.rb} +4 -4
- data/lib/droonga/plugin/{handler_watch.rb → handler/watch.rb} +4 -4
- data/lib/droonga/plugin_loader.rb +45 -0
- data/lib/droonga/plugin_registerable.rb +51 -0
- data/lib/droonga/plugin_repository.rb +56 -0
- data/lib/droonga/processor.rb +64 -0
- data/lib/droonga/searcher.rb +16 -7
- data/lib/droonga/server.rb +5 -9
- data/lib/droonga/sweeper.rb +1 -1
- data/lib/droonga/watch_schema.rb +1 -1
- data/lib/droonga/watcher.rb +1 -1
- data/lib/droonga/worker.rb +21 -9
- data/lib/fluent/plugin/out_droonga.rb +33 -15
- data/lib/groonga_command_converter.rb +1 -1
- data/sample/cluster/fluentd.conf +0 -1
- data/test/command/config/default/catalog.json +43 -0
- data/test/command/config/default/fluentd.conf +11 -0
- data/test/command/fixture/documents.jsons +208 -0
- data/test/command/fixture/user-table-array.jsons +38 -0
- data/test/command/fixture/user-table.jsons +38 -0
- data/test/command/run-test.rb +35 -0
- data/test/command/suite/add/minimum.expected +12 -0
- data/test/command/suite/add/minimum.test +11 -0
- data/test/command/suite/add/with-values.expected +12 -0
- data/test/command/suite/add/with-values.test +17 -0
- data/test/command/suite/add/without-key.expected +12 -0
- data/test/command/suite/add/without-key.test +16 -0
- data/test/command/suite/groonga/column_create/scalar.expected +34 -0
- data/test/command/suite/groonga/column_create/scalar.test +17 -0
- data/test/command/suite/groonga/column_create/vector.expected +34 -0
- data/test/command/suite/groonga/column_create/vector.test +18 -0
- data/test/command/suite/groonga/select/minimum.expected +26 -0
- data/test/command/suite/groonga/select/minimum.test +8 -0
- data/test/command/suite/groonga/table_create/array.expected +17 -0
- data/test/command/suite/groonga/table_create/array.test +8 -0
- data/test/command/suite/groonga/table_create/hash.expected +17 -0
- data/test/command/suite/groonga/table_create/hash.test +8 -0
- data/test/command/suite/search/array-attribute-label.expected +25 -0
- data/test/command/suite/search/array-attribute-label.test +30 -0
- data/test/command/suite/search/chained-queries.expected +45 -0
- data/test/command/suite/search/chained-queries.test +43 -0
- data/test/command/suite/search/complex.expected +52 -0
- data/test/command/suite/search/complex.test +25 -0
- data/test/command/suite/search/condition-nested.expected +19 -0
- data/test/command/suite/search/condition-nested.test +29 -0
- data/test/command/suite/search/condition-query.expected +28 -0
- data/test/command/suite/search/condition-query.test +25 -0
- data/test/command/suite/search/condition-script.expected +28 -0
- data/test/command/suite/search/condition-script.test +28 -0
- data/test/command/suite/search/hash-attribute-label.expected +34 -0
- data/test/command/suite/search/hash-attribute-label.test +38 -0
- data/test/command/suite/search/minimum.expected +13 -0
- data/test/command/suite/search/minimum.test +16 -0
- data/test/command/suite/search/multiple-queries.expected +39 -0
- data/test/command/suite/search/multiple-queries.test +39 -0
- data/test/command/suite/search/output-range.expected +28 -0
- data/test/command/suite/search/output-range.test +25 -0
- data/test/command/suite/search/simple.expected +52 -0
- data/test/command/suite/search/simple.test +24 -0
- data/test/command/suite/search/sort-and-output-range.expected +25 -0
- data/test/command/suite/search/sort-and-output-range.test +29 -0
- data/test/command/suite/search/sort-range.expected +28 -0
- data/test/command/suite/search/sort-range.test +28 -0
- data/test/command/suite/search/sort-with-invisible-column.expected +28 -0
- data/test/command/suite/search/sort-with-invisible-column.test +28 -0
- data/test/unit/fixtures/array.grn +18 -0
- data/test/{fixtures → unit/fixtures}/catalog.json +0 -0
- data/test/{fixtures → unit/fixtures}/document.grn +20 -9
- data/test/unit/fixtures/reference/array.grn +11 -0
- data/test/unit/fixtures/reference/hash.grn +7 -0
- data/test/{helper.rb → unit/helper.rb} +2 -1
- data/test/{helper → unit/helper}/fixture.rb +1 -1
- data/test/unit/helper/plugin_helper.rb +38 -0
- data/test/{helper → unit/helper}/sandbox.rb +19 -6
- data/test/{helper → unit/helper}/stub_worker.rb +1 -1
- data/test/{helper → unit/helper}/watch_helper.rb +1 -13
- data/test/{plugin → unit/plugin}/adapter/groonga/test_select.rb +108 -4
- data/test/unit/plugin/collector/test_basic.rb +558 -0
- data/test/unit/plugin/distributor/test_search.rb +914 -0
- data/test/{plugin → unit/plugin}/handler/groonga/test_column_create.rb +18 -14
- data/test/{plugin → unit/plugin}/handler/groonga/test_table_create.rb +13 -11
- data/test/{plugin/handler/test_handler_add.rb → unit/plugin/handler/test_add.rb} +2 -14
- data/test/{plugin/handler/test_handler_groonga.rb → unit/plugin/handler/test_groonga.rb} +6 -26
- data/test/unit/plugin/handler/test_search.rb +601 -0
- data/test/{plugin/handler/test_handler_watch.rb → unit/plugin/handler/test_watch.rb} +2 -2
- data/test/{run-test.rb → unit/run-test.rb} +3 -3
- data/test/{test_adapter.rb → unit/test_adapter.rb} +17 -14
- data/test/{test_catalog.rb → unit/test_catalog.rb} +4 -4
- data/test/{test_command_mapper.rb → unit/test_command_mapper.rb} +1 -1
- data/test/{test_groonga_command_converter.rb → unit/test_groonga_command_converter.rb} +3 -3
- data/test/{test_job_queue_schema.rb → unit/test_job_queue_schema.rb} +1 -1
- data/test/{test_output.rb → unit/test_output.rb} +9 -9
- data/test/{test_handler.rb → unit/test_plugin.rb} +19 -22
- data/test/unit/test_plugin_repository.rb +89 -0
- data/test/{test_sweeper.rb → unit/test_sweeper.rb} +1 -1
- data/test/{test_watch_schema.rb → unit/test_watch_schema.rb} +1 -1
- data/test/{test_watcher.rb → unit/test_watcher.rb} +1 -1
- metadata +226 -66
- data/lib/droonga/executor.rb +0 -289
- data/lib/droonga/plugin/handler_proxy.rb +0 -82
- data/test/plugin/handler/test_handler_search.rb +0 -512
- data/test/test_worker.rb +0 -144
data/test/test_worker.rb
DELETED
@@ -1,144 +0,0 @@
|
|
1
|
-
# Copyright (C) 2013 droonga project
|
2
|
-
#
|
3
|
-
# This library is free software; you can redistribute it and/or
|
4
|
-
# modify it under the terms of the GNU Lesser General Public
|
5
|
-
# License version 2.1 as published by the Free Software Foundation.
|
6
|
-
#
|
7
|
-
# This library is distributed in the hope that it will be useful,
|
8
|
-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
9
|
-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
10
|
-
# Lesser General Public License for more details.
|
11
|
-
#
|
12
|
-
# You should have received a copy of the GNU Lesser General Public
|
13
|
-
# License along with this library; if not, write to the Free Software
|
14
|
-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
15
|
-
|
16
|
-
require "helper"
|
17
|
-
|
18
|
-
require "droonga/worker"
|
19
|
-
|
20
|
-
class WorkerTest < Test::Unit::TestCase
|
21
|
-
def setup
|
22
|
-
setup_database
|
23
|
-
setup_handlers
|
24
|
-
setup_worker
|
25
|
-
setup_output_receiver
|
26
|
-
end
|
27
|
-
|
28
|
-
def teardown
|
29
|
-
teardown_worker
|
30
|
-
teardown_output_receiver
|
31
|
-
end
|
32
|
-
|
33
|
-
private
|
34
|
-
def setup_database
|
35
|
-
restore(fixture_data("document.grn"))
|
36
|
-
end
|
37
|
-
|
38
|
-
def setup_handlers
|
39
|
-
["search"].each do |handler_name|
|
40
|
-
plugin = Droonga::Plugin.new("handler", handler_name)
|
41
|
-
plugin.load
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
def setup_worker
|
46
|
-
@worker = Droonga::Worker.new(:database => @database_path.to_s,
|
47
|
-
:queue_name => "DroongaQueue",
|
48
|
-
:pool_size => 0)
|
49
|
-
@worker.add_handler("search")
|
50
|
-
end
|
51
|
-
|
52
|
-
def teardown_worker
|
53
|
-
@worker.shutdown
|
54
|
-
@worker = nil
|
55
|
-
end
|
56
|
-
|
57
|
-
def setup_output_receiver
|
58
|
-
@output_receiver_host = "127.0.0.1"
|
59
|
-
@output_receiver_port = 2929
|
60
|
-
@output_receiver = TCPServer.new(@output_receiver_host,
|
61
|
-
@output_receiver_port)
|
62
|
-
end
|
63
|
-
|
64
|
-
def teardown_output_receiver
|
65
|
-
@output_receiver.close
|
66
|
-
@output_receiver = nil
|
67
|
-
end
|
68
|
-
|
69
|
-
class SearchTest < self
|
70
|
-
def test_minimum
|
71
|
-
request = {
|
72
|
-
"type" => "search",
|
73
|
-
"id" => request_id,
|
74
|
-
"replyTo" => reply_to,
|
75
|
-
"body" => {
|
76
|
-
"queries" => {
|
77
|
-
"sections" => {
|
78
|
-
"source" => "Sections",
|
79
|
-
"output" => {
|
80
|
-
"elements" => [
|
81
|
-
"count",
|
82
|
-
],
|
83
|
-
},
|
84
|
-
},
|
85
|
-
},
|
86
|
-
},
|
87
|
-
}
|
88
|
-
expected = {
|
89
|
-
"inReplyTo" => request_id,
|
90
|
-
"type" => "search.result",
|
91
|
-
"statusCode" => 200,
|
92
|
-
"body" => {
|
93
|
-
"sections" => {
|
94
|
-
"count" => 9,
|
95
|
-
},
|
96
|
-
},
|
97
|
-
}
|
98
|
-
@worker.dispatch("", 0, request)
|
99
|
-
actual = receive_response
|
100
|
-
assert_equal(expected, normalize_result_set(actual))
|
101
|
-
end
|
102
|
-
|
103
|
-
private
|
104
|
-
def start_time
|
105
|
-
"2013-01-31T14:34:47+09:00"
|
106
|
-
end
|
107
|
-
|
108
|
-
def elapsed_time
|
109
|
-
0.01
|
110
|
-
end
|
111
|
-
|
112
|
-
def reply_to
|
113
|
-
"#{@output_receiver_host}:#{@output_receiver_port}/droonga.message"
|
114
|
-
end
|
115
|
-
|
116
|
-
def request_id
|
117
|
-
"request-id"
|
118
|
-
end
|
119
|
-
|
120
|
-
def normalize_result_set(result_set)
|
121
|
-
normalized_result_set = copy_deeply(result_set)
|
122
|
-
normalized_result_set["body"].each do |name, result|
|
123
|
-
result["startTime"] = start_time if result["startTime"]
|
124
|
-
result["elapsedTime"] = elapsed_time if result["elapsedTime"]
|
125
|
-
end
|
126
|
-
normalized_result_set
|
127
|
-
end
|
128
|
-
|
129
|
-
ENOUGH_RESPONSE_DATA_SIZE = 4096 * 4
|
130
|
-
def receive_response
|
131
|
-
readables, = IO.select([@output_receiver], [], [], 0)
|
132
|
-
assert_not_empty(readables, "not replied")
|
133
|
-
|
134
|
-
response_socket = @output_receiver.accept
|
135
|
-
response_data = response_socket.read_nonblock(ENOUGH_RESPONSE_DATA_SIZE)
|
136
|
-
tag, time, response = MessagePack.unpack(response_data)
|
137
|
-
response
|
138
|
-
end
|
139
|
-
|
140
|
-
def copy_deeply(object)
|
141
|
-
Marshal.load(Marshal.dump(object))
|
142
|
-
end
|
143
|
-
end
|
144
|
-
end
|