Kouhei Sutou
null+****@clear*****
Thu Dec 7 16:50:02 JST 2017
Kouhei Sutou 2017-12-07 16:50:02 +0900 (Thu, 07 Dec 2017) New Revision: b82105373938b577bebbf96ad3d776c93372f098 https://github.com/groonga/groonga/commit/b82105373938b577bebbf96ad3d776c93372f098 Message: sharding: use "[...]" for target information Because labeled drilldown uses it. Modified files: plugins/sharding/logical_select.rb test/command/suite/sharding/logical_select/columns/stage/filtered/filter.expected test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected test/command/suite/sharding/logical_select/limit/negative.expected test/command/suite/sharding/logical_select/limit/positive.expected test/command/suite/sharding/logical_select/offset/negative.expected test/command/suite/sharding/logical_select/offset/positive.expected test/command/suite/sharding/logical_select/offset/with_limit.expected Modified: plugins/sharding/logical_select.rb (+1 -1) =================================================================== --- plugins/sharding/logical_select.rb 2017-12-07 16:45:38 +0900 (63ee677db) +++ plugins/sharding/logical_select.rb 2017-12-07 16:50:02 +0900 (642b2aa48) @@ -771,7 +771,7 @@ module Groonga def add_result_set(result_set, condition) query_logger.log(:size, ":", - "select(#{result_set.size}): #{@shard.table_name}") + "select(#{result_set.size})[#{@shard.table_name}]") if result_set.empty? result_set.close Modified: test/command/suite/sharding/logical_select/columns/stage/filtered/filter.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/columns/stage/filtered/filter.expected 2017-12-07 16:45:38 +0900 (cd5739748) +++ test/command/suite/sharding/logical_select/columns/stage/filtered/filter.expected 2017-12-07 16:50:02 +0900 (f16f0627a) @@ -92,10 +92,10 @@ logical_select Logs --shard_key timestamp --columns[filtered_id].stage filte ] #>logical_select --columns[filtered_id].flags "COLUMN_SCALAR" --columns[filtered_id].stage "filtered" --columns[filtered_id].type "UInt32" --columns[filtered_id].value "_id" --filter "price < 910" --logical_table "Logs" --output_columns "_id,filtered_id,price" --shard_key "timestamp" #:000000000000000 filter(1) -#:000000000000000 select(1): Logs_20170315 +#:000000000000000 select(1)[Logs_20170315] #:000000000000000 filter(2) -#:000000000000000 select(2): Logs_20170316 +#:000000000000000 select(2)[Logs_20170316] #:000000000000000 filter(2) -#:000000000000000 select(2): Logs_20170317 +#:000000000000000 select(2)[Logs_20170317] #:000000000000000 output(5) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2017-12-07 16:45:38 +0900 (0c12dcbea) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2017-12-07 16:50:02 +0900 (692cae743) @@ -138,9 +138,9 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_lim ] ] #>logical_select --drilldown "action" --drilldown_limit "-2" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldown(2) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected 2017-12-07 16:45:38 +0900 (bad5c5c53) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected 2017-12-07 16:50:02 +0900 (bc32017cd) @@ -134,9 +134,9 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_lim ] ] #>logical_select --drilldown "action" --drilldown_limit "1" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldown(1) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected 2017-12-07 16:45:38 +0900 (a7f6f3709) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected 2017-12-07 16:50:02 +0900 (7912f744c) @@ -134,9 +134,9 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_off ] ] #>logical_select --drilldown "action" --drilldown_offset "-1" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldown(1) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected 2017-12-07 16:45:38 +0900 (5d8b7bf66) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected 2017-12-07 16:50:02 +0900 (4e7dc88d0) @@ -138,9 +138,9 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_off ] ] #>logical_select --drilldown "action" --drilldown_offset "1" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldown(2) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected 2017-12-07 16:45:38 +0900 (11b96ee50) +++ test/command/suite/sharding/logical_select/drilldowns/limit/negative.expected 2017-12-07 16:50:02 +0900 (c98a5fe65) @@ -175,9 +175,9 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio ] ] #>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].limit "-2" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldowns(4) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected 2017-12-07 16:45:38 +0900 (4c9e09412) +++ test/command/suite/sharding/logical_select/drilldowns/limit/positive.expected 2017-12-07 16:50:02 +0900 (beebb9235) @@ -160,9 +160,9 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio ] ] #>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].limit "1" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldowns(1) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected 2017-12-07 16:45:38 +0900 (96da7377f) +++ test/command/suite/sharding/logical_select/drilldowns/offset/negative.expected 2017-12-07 16:50:02 +0900 (c6177cd9b) @@ -160,9 +160,9 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio ] ] #>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].offset "-1" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldowns(1) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected 2017-12-07 16:45:38 +0900 (5082c99f5) +++ test/command/suite/sharding/logical_select/drilldowns/offset/positive.expected 2017-12-07 16:50:02 +0900 (33e24a326) @@ -175,9 +175,9 @@ logical_select Logs timestamp --limit 0 --drilldowns[action_date].keys actio ] ] #>logical_select --drilldowns[action_date].keys "action,date" --drilldowns[action_date].offset "1" --drilldowns[action_date].output_columns "_value.action,_value.date,_nsubrecs" --limit "0" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(0) #:000000000000000 output.drilldowns(4) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/limit/negative.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/limit/negative.expected 2017-12-07 16:45:38 +0900 (3bfca31af) +++ test/command/suite/sharding/logical_select/limit/negative.expected 2017-12-07 16:50:02 +0900 (2ff84f8b3) @@ -128,8 +128,8 @@ logical_select Logs timestamp --limit -6 ] ] #>logical_select --limit "-6" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(4) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/limit/positive.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/limit/positive.expected 2017-12-07 16:45:38 +0900 (5bb9d16b2) +++ test/command/suite/sharding/logical_select/limit/positive.expected 2017-12-07 16:50:02 +0900 (0694ab8da) @@ -123,8 +123,8 @@ logical_select Logs timestamp --limit 3 ] ] #>logical_select --limit "3" --logical_table "Logs" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(3) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/offset/negative.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/offset/negative.expected 2017-12-07 16:45:38 +0900 (0f325a0d8) +++ test/command/suite/sharding/logical_select/offset/negative.expected 2017-12-07 16:50:02 +0900 (915cdaa80) @@ -133,8 +133,8 @@ logical_select Logs timestamp --offset -5 ] ] #>logical_select --logical_table "Logs" --offset "-5" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(5) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/offset/positive.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/offset/positive.expected 2017-12-07 16:45:38 +0900 (7e673bf9e) +++ test/command/suite/sharding/logical_select/offset/positive.expected 2017-12-07 16:50:02 +0900 (a0607f19f) @@ -138,8 +138,8 @@ logical_select Logs timestamp --offset 3 ] ] #>logical_select --logical_table "Logs" --offset "3" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(6) #<000000000000000 rc=0 Modified: test/command/suite/sharding/logical_select/offset/with_limit.expected (+3 -3) =================================================================== --- test/command/suite/sharding/logical_select/offset/with_limit.expected 2017-12-07 16:45:38 +0900 (04901f5ab) +++ test/command/suite/sharding/logical_select/offset/with_limit.expected 2017-12-07 16:50:02 +0900 (b15a66cac) @@ -118,8 +118,8 @@ logical_select Logs timestamp --offset 3 --limit 2 ] ] #>logical_select --limit "2" --logical_table "Logs" --offset "3" --shard_key "timestamp" -#:000000000000000 select(2): Logs_20150203 -#:000000000000000 select(3): Logs_20150204 -#:000000000000000 select(4): Logs_20150205 +#:000000000000000 select(2)[Logs_20150203] +#:000000000000000 select(3)[Logs_20150204] +#:000000000000000 select(4)[Logs_20150205] #:000000000000000 output(2) #<000000000000000 rc=0 -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171207/f953f366/attachment-0001.htm
