Kouhei Sutou
null+****@clear*****
Thu Apr 4 17:03:46 JST 2013
Kouhei Sutou 2013-04-04 17:03:46 +0900 (Thu, 04 Apr 2013) New Revision: 66fdfba0dc7bafb76b8c1b688105b4478b1879ee https://github.com/groonga/fluent-plugin-droonga/commit/66fdfba0dc7bafb76b8c1b688105b4478b1879ee Message: Use "request" as column name Because "value" conflicts with value space in table. Modified files: lib/droonga/job_queue_schema.rb lib/droonga/worker.rb test/test_job_queue_schema.rb Modified: lib/droonga/job_queue_schema.rb (+1 -1) =================================================================== --- lib/droonga/job_queue_schema.rb 2013-04-04 16:59:07 +0900 (f9bcbb3) +++ lib/droonga/job_queue_schema.rb 2013-04-04 17:03:46 +0900 (df42ac8) @@ -46,7 +46,7 @@ module Droonga context.open_database(@database_path) do Groonga::Schema.define(:context => context) do |schema| schema.create_table(@queue_name, :type => :array) do |table| - table.text("value") + table.text("request") end end end Modified: lib/droonga/worker.rb (+11 -11) =================================================================== --- lib/droonga/worker.rb 2013-04-04 16:59:07 +0900 (558bd28) +++ lib/droonga/worker.rb 2013-04-04 17:03:46 +0900 (c620ab4) @@ -57,28 +57,28 @@ module Droonga end queue = @context[@queue_name] while !@finish - value = nil + request = nil queue.pull do |record| @status = :BUSY - value = record["value"] if record + request = record.request if record end - if value -# value.force_encoding("UTF-8") -# envelope = MessagePack.unpack(value) - envelope = JSON.parse(value) - process_message(envelope) if value + if request +# request.force_encoding("UTF-8") +# envelope = MessagePack.unpack(request) + envelope = JSON.parse(request) + process_message(envelope) if request end @status = :IDLE end end def post_message(envelope) -# value = envelope.to_msgpack -# value.force_encoding("UTF-8") - value = envelope.to_json +# request = envelope.to_msgpack +# request.force_encoding("UTF-8") + request = envelope.to_json queue = @context[@queue_name] queue.push do |record| - record["value"] = value + record.request = request end end Modified: test/test_job_queue_schema.rb (+1 -1) =================================================================== --- test/test_job_queue_schema.rb 2013-04-04 16:59:07 +0900 (e86da48) +++ test/test_job_queue_schema.rb 2013-04-04 17:03:46 +0900 (94bd2c3) @@ -39,7 +39,7 @@ class JobQueueSchemaTest < Test::Unit::TestCase context.close assert_equal(<<-SCHEMA, dumped_commands) table_create #{@queue_name} TABLE_NO_KEY -column_create #{@queue_name} value COLUMN_SCALAR Text +column_create #{@queue_name} request COLUMN_SCALAR Text SCHEMA end end -------------- next part -------------- HTML����������������������������...Download