Kouhei Sutou
null+****@clear*****
Tue Oct 18 17:08:51 JST 2016
Kouhei Sutou 2016-10-18 17:08:51 +0900 (Tue, 18 Oct 2016) New Revision: 190eec23195520a5c05dcd2bbd786e74ffa683df https://github.com/groonga/groonga/commit/190eec23195520a5c05dcd2bbd786e74ffa683df Message: logical_table_remove: add missing clearing error Modified files: plugins/sharding/logical_table_remove.rb test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected Modified: plugins/sharding/logical_table_remove.rb (+9 -4) =================================================================== --- plugins/sharding/logical_table_remove.rb 2016-10-17 23:51:41 +0900 (5f146f8) +++ plugins/sharding/logical_table_remove.rb 2016-10-18 17:08:51 +0900 (7a1c1c1) @@ -32,10 +32,15 @@ module Groonga return if cover_type == :none shard_key = shard.key - if shard_key.nil? and !@force - message = "[logical_table_remove] shard_key doesn't exist: " + - "<#{shard.key_name}>" - raise InvalidArgument, message + if shard_key.nil? + if @force + Context.instance.clear_error + else + message = + "[logical_table_remove] shard_key doesn't exist: " + + "<#{shard.key_name}>" + raise InvalidArgument, message + end end table = shard.table Modified: test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected (+1 -0) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected 2016-10-17 23:51:41 +0900 (39d82f7) +++ test/command/suite/sharding/logical_table_remove/broken/shard_key_column/dependent_force.expected 2016-10-18 17:08:51 +0900 (e78b7a6) @@ -54,6 +54,7 @@ logical_table_remove Logs timestamp --min "2015-02-04 00:00:00" --min_border #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) +#|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) #|e| [object][remove] column is broken: <Logs_20150204.timestamp>: [object][remove] column is broken: <Logs_20150204.timestamp>: [io][open] file size is too small: <8>(required: >= 64): <db/db.0 #|e| [io][open] file size is too small: <8>(required: >= 64): <db/db.0000111> #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) Modified: test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected (+1 -0) =================================================================== --- test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected 2016-10-17 23:51:41 +0900 (145988e) +++ test/command/suite/sharding/logical_table_remove/broken/shard_key_column/force.expected 2016-10-18 17:08:51 +0900 (5ddd8c4) @@ -52,6 +52,7 @@ logical_table_remove Logs timestamp --min "2015-02-04 00:00:00" --min_border #|e| [io][open] file size is too small: <8>(required: >= 64): <db/db.0000111> #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) +#|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) #|e| [object][remove] column is broken: <Logs_20150204.timestamp>: [object][remove] column is broken: <Logs_20150204.timestamp>: [io][open] file size is too small: <8>(required: >= 64): <db/db.0 #|e| [io][open] file size is too small: <8>(required: >= 64): <db/db.0000111> #|e| grn_ctx_at: failed to open object: <273>(<Logs_20150204.timestamp>):<64>(<column:fix_size>) -------------- next part -------------- HTML����������������������������...Download