Navigation Menu

Skip to content

Commit

Permalink
mrb: implement index resolution for db_obj by mruby
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jun 8, 2014
1 parent 87a5fe3 commit bb97f4f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
11 changes: 2 additions & 9 deletions lib/mrb/mrb_expr.c
Expand Up @@ -358,16 +358,8 @@ scan_info_build(grn_ctx *ctx, grn_obj *expr, int *n,
for (k = 0; (arg = grn_scan_info_get_arg(ctx, si, k)) ; k++) {
if (GRN_DB_OBJP(*p)) {
mrb_value mrb_target;
mrb_value mrb_index_info;
mrb_target = grn_mrb_value_from_grn_obj(mrb, *p);
mrb_index_info = mrb_funcall(mrb, mrb_target, "find_index", 1,
mrb_fixnum_value(c->op));
if (!mrb_nil_p(mrb_index_info)) {
mrb_funcall(mrb, mrb_si, "put_index", 3,
mrb_funcall(mrb, mrb_index_info, "index", 0),
mrb_funcall(mrb, mrb_index_info, "section_id", 0),
mrb_fixnum_value(1));
}
mrb_funcall(mrb, mrb_si, "resolve_index_db_obj", 1, mrb_target);
} else if (GRN_ACCESSORP(*p)) {
mrb_value mrb_target;
mrb_value mrb_index_info;
Expand Down Expand Up @@ -560,6 +552,7 @@ grn_mrb_expr_init(grn_ctx *ctx)
mrb_define_method(mrb, klass, "weight",
mrb_grn_expr_code_get_weight, MRB_ARGS_NONE());
grn_mrb_load(ctx, "expression.rb");
grn_mrb_load(ctx, "scan_info.rb");
}

scan_info **
Expand Down
9 changes: 9 additions & 0 deletions lib/mrb/scripts/scan_info.rb
@@ -0,0 +1,9 @@
module Groonga
class ScanInfo
def 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
end
end
3 changes: 2 additions & 1 deletion lib/mrb/scripts/sources.am
@@ -1,3 +1,4 @@
RUBY_SCRIPT_FILES = \
eval_context.rb \
expression.rb
expression.rb \
scan_info.rb

0 comments on commit bb97f4f

Please sign in to comment.