Kouhei Sutou
null+****@clear*****
Thu Jan 11 09:15:16 JST 2018
Kouhei Sutou 2018-01-11 09:15:16 +0900 (Thu, 11 Jan 2018) New Revision: 4811d58527d232715742d09f5ed794c119deccc8 https://github.com/groonga/groonga/commit/4811d58527d232715742d09f5ed794c119deccc8 Message: mrb: use "clear_lock" because Groonga uses it Modified files: lib/mrb/mrb_column.c lib/mrb/mrb_database.c lib/mrb/mrb_table.c lib/mrb/scripts/command_line/grndb.rb Modified: lib/mrb/mrb_column.c (+3 -3) =================================================================== --- lib/mrb/mrb_column.c 2018-01-11 09:12:22 +0900 (0b5e63d0d) +++ lib/mrb/mrb_column.c 2018-01-11 09:15:16 +0900 (3b2acab7a) @@ -111,7 +111,7 @@ mrb_grn_column_is_locked(mrb_state *mrb, mrb_value self) } static mrb_value -mrb_grn_column_unlock(mrb_state *mrb, mrb_value self) +mrb_grn_column_clear_lock(mrb_state *mrb, mrb_value self) { grn_ctx *ctx = (grn_ctx *)mrb->ud; @@ -173,8 +173,8 @@ grn_mrb_column_init(grn_ctx *ctx) mrb_define_method(mrb, klass, "locked?", mrb_grn_column_is_locked, MRB_ARGS_NONE()); - mrb_define_method(mrb, klass, "unlock", - mrb_grn_column_unlock, MRB_ARGS_NONE()); + mrb_define_method(mrb, klass, "clear_lock", + mrb_grn_column_clear_lock, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "table", mrb_grn_column_get_table, MRB_ARGS_NONE()); Modified: lib/mrb/mrb_database.c (+3 -3) =================================================================== --- lib/mrb/mrb_database.c 2018-01-11 09:12:22 +0900 (3671f6168) +++ lib/mrb/mrb_database.c 2018-01-11 09:15:16 +0900 (e6e035138) @@ -97,7 +97,7 @@ mrb_grn_database_is_locked(mrb_state *mrb, mrb_value self) } static mrb_value -mrb_grn_database_unlock(mrb_state *mrb, mrb_value self) +mrb_grn_database_clear_lock(mrb_state *mrb, mrb_value self) { grn_ctx *ctx = (grn_ctx *)mrb->ud; @@ -207,8 +207,8 @@ grn_mrb_database_init(grn_ctx *ctx) mrb_grn_database_recover, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "locked?", mrb_grn_database_is_locked, MRB_ARGS_NONE()); - mrb_define_method(mrb, klass, "unlock", - mrb_grn_database_unlock, MRB_ARGS_NONE()); + mrb_define_method(mrb, klass, "clear_lock", + mrb_grn_database_clear_lock, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "last_modified", mrb_grn_database_get_last_modified, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "dirty?", Modified: lib/mrb/mrb_table.c (+3 -3) =================================================================== --- lib/mrb/mrb_table.c 2018-01-11 09:12:22 +0900 (01ce605cc) +++ lib/mrb/mrb_table.c 2018-01-11 09:15:16 +0900 (f77a6f3b3) @@ -177,7 +177,7 @@ mrb_grn_table_is_locked(mrb_state *mrb, mrb_value self) } static mrb_value -mrb_grn_table_unlock(mrb_state *mrb, mrb_value self) +mrb_grn_table_clear_lock(mrb_state *mrb, mrb_value self) { grn_ctx *ctx = (grn_ctx *)mrb->ud; grn_obj_clear_lock(ctx, DATA_PTR(self)); @@ -476,8 +476,8 @@ grn_mrb_table_init(grn_ctx *ctx) mrb_define_method(mrb, klass, "locked?", mrb_grn_table_is_locked, MRB_ARGS_NONE()); - mrb_define_method(mrb, klass, "unlock", - mrb_grn_table_unlock, MRB_ARGS_NONE()); + mrb_define_method(mrb, klass, "clear_lock", + mrb_grn_table_clear_lock, MRB_ARGS_NONE()); mrb_define_method(mrb, klass, "size", mrb_grn_table_get_size, MRB_ARGS_NONE()); Modified: lib/mrb/scripts/command_line/grndb.rb (+2 -2) =================================================================== --- lib/mrb/scripts/command_line/grndb.rb 2018-01-11 09:12:22 +0900 (79d5afe94) +++ lib/mrb/scripts/command_line/grndb.rb 2018-01-11 09:15:16 +0900 (cd70175e3) @@ -490,13 +490,13 @@ module Groonga def lock_clear_objects if****@datab*****? - @database.unlock + @database.clear_lock end @database.each do |object| case object when Column, Table next unless object.locked? - object.unlock + object.clear_lock end end end -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180111/0233ff97/attachment-0001.htm
