null+****@clear*****
null+****@clear*****
2012年 3月 9日 (金) 14:48:15 JST
Kouhei Sutou 2012-03-09 14:48:15 +0900 (Fri, 09 Mar 2012)
New Revision: 02ca7a3bb144ed1ee84edc599b2ce5d2eff9fbad
Log:
suggest: improve vairable name: add _id
Modified files:
plugins/suggest/suggest.c
Modified: plugins/suggest/suggest.c (+4 -4)
===================================================================
--- plugins/suggest/suggest.c 2012-03-09 14:47:18 +0900 (565e9fe)
+++ plugins/suggest/suggest.c 2012-03-09 14:48:15 +0900 (03bcd2e)
@@ -539,10 +539,10 @@ learn(grn_ctx *ctx, grn_obj **args)
grn_id post_event_id = GRN_RECORD_VALUE(args[0]);
grn_id post_type_id = GRN_RECORD_VALUE(args[1]);
grn_id post_item_id = GRN_RECORD_VALUE(args[2]);
- grn_id seq = GRN_RECORD_VALUE(args[3]);
+ grn_id seq_id = GRN_RECORD_VALUE(args[3]);
int64_t post_time = GRN_TIME_VALUE(args[4]);
grn_obj *pairs = args[5];
- if (post_event_id && post_item_id && seq) {
+ if (post_event_id && post_item_id && seq_id) {
grn_obj *items = grn_ctx_at(ctx, GRN_OBJ_GET_DOMAIN(args[2]));
grn_obj *items_freq = grn_obj_column(ctx, items, CONST_STR_LEN("freq"));
grn_obj *items_freq2 = grn_obj_column(ctx, items, CONST_STR_LEN("freq2"));
@@ -569,7 +569,7 @@ learn(grn_ctx *ctx, grn_obj **args)
grn_obj pre_type, pre_time, pre_item;
uint64_t key, key_ = ((uint64_t)post_item_id) << 32;
grn_obj_set_value(ctx, items_freq2, post_item_id, &v1, GRN_OBJ_INCR);
- grn_obj_get_value(ctx, seqs_events, seq, &pre_events);
+ grn_obj_get_value(ctx, seqs_events, seq_id, &pre_events);
ep = (grn_id *)GRN_BULK_CURR(&pre_events);
es = (grn_id *)GRN_BULK_HEAD(&pre_events);
GRN_RECORD_INIT(&pre_type, 0, grn_obj_get_range(ctx, events_type));
@@ -624,7 +624,7 @@ learn(grn_ctx *ctx, grn_obj **args)
GRN_BULK_REWIND(&pre_events);
}
GRN_RECORD_SET(ctx, &pre_events, post_event_id);
- grn_obj_set_value(ctx, seqs_events, seq, &pre_events, GRN_OBJ_APPEND);
+ grn_obj_set_value(ctx, seqs_events, seq_id, &pre_events, GRN_OBJ_APPEND);
GRN_OBJ_FIN(ctx, &pre_events);
GRN_OBJ_FIN(ctx, &v1);
}