Kouhei Sutou
null+****@clear*****
Sun Jun 8 17:58:11 JST 2014
Kouhei Sutou 2014-06-08 17:58:11 +0900 (Sun, 08 Jun 2014) New Revision: 031d848ed623e8a5372adb83554bf93e5cc95492 https://github.com/groonga/groonga/commit/031d848ed623e8a5372adb83554bf93e5cc95492 Message: mrb: add prefix Modified files: lib/mrb/mrb_expr.c lib/mrb/scripts/scan_info.rb Modified: lib/mrb/mrb_expr.c (+1 -1) =================================================================== --- lib/mrb/mrb_expr.c 2014-06-08 17:55:32 +0900 (eb86e54) +++ lib/mrb/mrb_expr.c 2014-06-08 17:58:11 +0900 (f69c85e) @@ -353,7 +353,7 @@ scan_info_build(grn_ctx *ctx, grn_obj *expr, int *n, mrb_funcall(mrb, mrb_si, "op=", 1, mrb_fixnum_value(c->op)); mrb_funcall(mrb, mrb_si, "end=", 1, mrb_fixnum_value(c - e->codes)); sis[i++] = si; - mrb_funcall(mrb, mrb_si, "resolve_indexes", 0); + mrb_funcall(mrb, mrb_si, "call_relational_resolve_indexes", 0); si = NULL; } else { stat = SCAN_COL2; Modified: lib/mrb/scripts/scan_info.rb (+7 -7) =================================================================== --- lib/mrb/scripts/scan_info.rb 2014-06-08 17:55:32 +0900 (906b56c) +++ lib/mrb/scripts/scan_info.rb 2014-06-08 17:58:11 +0900 (ce58955) @@ -18,32 +18,32 @@ module Groonga nil end - def resolve_indexes + def call_relational_resolve_indexes # better index resolving framework for functions should be implemented each_arg do |arg| - resolve_index(arg) + call_relational_resolve_index(arg) end end private - def resolve_index(object) + def call_relational_resolve_index(object) case object when Accessor - resolve_index_accessor(object) + call_relational_resolve_index_accessor(object) when Bulk self.query = object else - resolve_index_db_obj(object) + call_relational_resolve_index_db_obj(object) end end - def resolve_index_db_obj(db_obj) + def call_relational_resolve_index_db_obj(db_obj) index_info = db_obj.find_index(op) return if index_info.nil? put_index(index_info.index, index_info.section_id, 1) end - def resolve_index_accessor(accessor) + def call_relational_resolve_index_accessor(accessor) self.flags |= Flags::ACCESSOR index_info = accessor.find_index(op) return if index_info.nil? -------------- next part -------------- HTML����������������������������...Download