Kouhei Sutou 2019-03-18 09:48:57 +0900 (Mon, 18 Mar 2019) Revision: 54f43f9065bf2bf79a72e1f3455fdf431fb51237 https://github.com/groonga/groonga/commit/54f43f9065bf2bf79a72e1f3455fdf431fb51237 Message: logical_select: log load status as query log Modified files: plugins/sharding/logical_select.rb test/command/suite/sharding/logical_select/load_table/key.expected test/command/suite/sharding/logical_select/load_table/key.test Modified: plugins/sharding/logical_select.rb (+53 -30) =================================================================== --- plugins/sharding/logical_select.rb 2019-03-18 09:31:47 +0900 (d47e6f1f6) +++ plugins/sharding/logical_select.rb 2019-03-18 09:48:57 +0900 (8b9c845f7) @@ -39,6 +39,8 @@ module Groonga executor = Executor.new(context) executor.execute + load_records(context) + n_results = 1 n_plain_drilldowns = context.plain_drilldown.n_result_sets n_labeled_drilldowns = context.labeled_drilldowns.n_result_sets @@ -112,6 +114,57 @@ module Groonga key end + def resolve_target_table_name(result_set) + target_table = result_set + while target_table.domain_id + domain = Context.instance[target_table.domain_id] + break unless domain.is_a?(Table) + target_table = domain + end + target_table.name + end + + def load_records(context) + load_table = context.load_table + load_columns = context.load_columns + load_values = context.load_values + return if load_table.nil? + return if load_columns.nil? + return if load_values.nil? + + n_loaded_records = 0 + to = Context.instance[load_table] + to_columns = [] + begin + load_columns.split(/\s*,\s*/).each do |name| + to_columns << to.find_column(name) + end + context.result_sets.each do |result_set| + output_columns = result_set.parse_output_columns(load_values) + begin + output_columns.apply(to_columns) + ensure + output_columns.close + end + n_sub_loaded_records = result_set.size + query_logger.log(:size, + ":", + "load(#{n_sub_loaded_records})" + + "[#{resolve_target_table_name(result_set)}]: " + + "[#{load_table}][#{to.size}]") + n_loaded_records += n_sub_loaded_records + end + ensure + to_columns.each do |column| + column.close if column.is_a?(Accessor) + end + end + query_logger.log(:size, + ":", + "load(#{n_loaded_records}): " + + "[#{load_table}][#{to.size}]") + end + def write_records(writer, context) result_sets = context.result_sets @@ -542,7 +595,6 @@ module Groonga def execute execute_search - execute_load_table if****@conte*****_drilldown.have_keys? execute_plain_drilldown elsif****@conte*****_drilldowns.have_keys? @@ -580,35 +632,6 @@ module Groonga end end - def execute_load_table - load_table =****@conte*****_table - load_columns =****@conte*****_columns - load_values =****@conte*****_values - return if load_table.nil? - return if load_columns.nil? - return if load_values.nil? - - to = Context.instance[load_table] - to_columns = [] - begin - load_columns.split(/\s*,\s*/).each do |name| - to_columns << to.find_column(name) - end - @context.result_sets.each do |result_set| - output_columns = result_set.parse_output_columns(load_values) - begin - output_columns.apply(to_columns) - ensure - output_columns.close - end - end - ensure - to_columns.each do |column| - column.close if column.is_a?(Accessor) - end - end - end - def execute_plain_drilldown drilldown =****@conte*****_drilldown group_result = TableGroupResult.new Modified: test/command/suite/sharding/logical_select/load_table/key.expected (+11 -1) =================================================================== --- test/command/suite/sharding/logical_select/load_table/key.expected 2019-03-18 09:31:47 +0900 (3f6739942) +++ test/command/suite/sharding/logical_select/load_table/key.expected 2019-03-18 09:48:57 +0900 (ecc692edf) @@ -34,7 +34,7 @@ load --table Logs_20150204 } ] [[0,0.0,0.0],1] -logical_select --logical_table Logs --shard_key timestamp --load_table Logs --load_columns "_key, original_id, timestamp_text" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --limit 0 +logical_select --logical_table Logs --shard_key timestamp --filter true --load_table Logs --load_columns "_key, original_id, timestamp_text" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --limit 0 [ [ 0, @@ -63,6 +63,16 @@ logical_select --logical_table Logs --shard_key timestamp --load_table Log ] ] ] +#>logical_select --filter "true" --limit "0" --load_columns "_key, original_id, timestamp_text" --load_table "Logs" --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" --logical_table "Logs" --shard_key "timestamp" +#:000000000000000 filter(2): true +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 filter(1): true +#:000000000000000 select(1)[Logs_20150204] +#:000000000000000 load(2)[Logs_20150203]: [Logs][2] +#:000000000000000 load(1)[Logs_20150204]: [Logs][3] +#:000000000000000 load(3): [Logs][3] +#:000000000000000 output(0) +#<000000000000000 rc=0 select --table Logs [ [ Modified: test/command/suite/sharding/logical_select/load_table/key.test (+3 -0) =================================================================== --- test/command/suite/sharding/logical_select/load_table/key.test 2019-03-18 09:31:47 +0900 (26e77047c) +++ test/command/suite/sharding/logical_select/load_table/key.test 2019-03-18 09:48:57 +0900 (3940490b2) @@ -32,12 +32,15 @@ load --table Logs_20150204 } ] +#@collect-query-log true logical_select \ --logical_table Logs \ --shard_key timestamp \ + --filter true \ --load_table Logs \ --load_columns "_key, original_id, timestamp_text" \ --load_values "cast_loose(ShortText, timestamp, '') + ':' + _id, _id, timestamp" \ --limit 0 +#@collect-query-log false select --table Logs -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190318/5f539966/attachment-0001.html>
