Kouhei Sutou
null+****@clear*****
Fri Apr 19 23:58:15 JST 2013
Kouhei Sutou 2013-04-19 23:58:15 +0900 (Fri, 19 Apr 2013) New Revision: be64585f69fe4c27cf89809efbcdc13ae6ab4b37 https://github.com/groonga/groonga/commit/be64585f69fe4c27cf89809efbcdc13ae6ab4b37 Message: Extract logging source code Modified files: lib/db.c Modified: lib/db.c (+22 -18) =================================================================== --- lib/db.c 2013-04-19 23:57:00 +0900 (bb7c0a6) +++ lib/db.c 2013-04-19 23:58:15 +0900 (ff15ecf) @@ -5989,27 +5989,31 @@ grn_obj_spec_save(grn_ctx *ctx, grn_db_obj *obj) grn_obj_close(ctx, &v); } -inline static grn_rc -grn_obj_set_info_source(grn_ctx *ctx, grn_obj *obj, grn_obj *source_ids) +inline static void +grn_obj_set_info_source_log(grn_ctx *ctx, grn_obj *obj, grn_obj *source_ids) { - { - grn_obj buf; - grn_id *vp = (grn_id *)GRN_BULK_HEAD(source_ids); - uint32_t vs = GRN_BULK_VSIZE(source_ids), s = 0; - const char *n = _grn_table_key(ctx, ctx->impl->db, DB_OBJ(obj)->id, &s); - GRN_TEXT_INIT(&buf, 0); + grn_obj buf; + grn_id *vp = (grn_id *)GRN_BULK_HEAD(source_ids); + uint32_t vs = GRN_BULK_VSIZE(source_ids), s = 0; + const char *n = _grn_table_key(ctx, ctx->impl->db, DB_OBJ(obj)->id, &s); + GRN_TEXT_INIT(&buf, 0); + GRN_TEXT_PUT(ctx, &buf, n, s); + GRN_TEXT_PUTC(ctx, &buf, ' '); + while (vs) { + n = _grn_table_key(ctx, ctx->impl->db, *vp++, &s); GRN_TEXT_PUT(ctx, &buf, n, s); - GRN_TEXT_PUTC(ctx, &buf, ' '); - while (vs) { - n = _grn_table_key(ctx, ctx->impl->db, *vp++, &s); - GRN_TEXT_PUT(ctx, &buf, n, s); - vs -= sizeof(grn_id); - if (vs) { GRN_TEXT_PUTC(ctx, &buf, ','); } - } - GRN_LOG(ctx, GRN_LOG_NOTICE, "DDL:set_source %.*s", - (int)GRN_BULK_VSIZE(&buf), GRN_BULK_HEAD(&buf)); - GRN_OBJ_FIN(ctx, &buf); + vs -= sizeof(grn_id); + if (vs) { GRN_TEXT_PUTC(ctx, &buf, ','); } } + GRN_LOG(ctx, GRN_LOG_NOTICE, "DDL:set_source %.*s", + (int)GRN_BULK_VSIZE(&buf), GRN_BULK_HEAD(&buf)); + GRN_OBJ_FIN(ctx, &buf); +} + +inline static grn_rc +grn_obj_set_info_source(grn_ctx *ctx, grn_obj *obj, grn_obj *source_ids) +{ + grn_obj_set_info_source_log(ctx, obj, source_ids); { void *v = GRN_BULK_HEAD(source_ids); -------------- next part -------------- HTML����������������������������...Download