Kouhei Sutou
null+****@clear*****
Thu Jun 22 10:35:50 JST 2017
Kouhei Sutou 2017-06-22 10:35:50 +0900 (Thu, 22 Jun 2017) New Revision: e341012a059337f1b4b2393577bec4bf0c837770 https://github.com/groonga/groonga/commit/e341012a059337f1b4b2393577bec4bf0c837770 Message: Use more meaningful result code Modified files: lib/geo.c Modified: lib/geo.c (+21 -3) =================================================================== --- lib/geo.c 2017-06-22 10:33:35 +0900 (a13e274) +++ lib/geo.c 2017-06-22 10:35:50 +0900 (5456b32) @@ -1086,11 +1086,29 @@ in_rectangle_data_fill(grn_ctx *ctx, grn_obj *index, const char *domain_name; data->pat = grn_ctx_at(ctx, index->header.domain); - if(!data->pat) { - ERR(GRN_INVALID_ARGUMENT, "grn_ctx_at(): unknown grn_id" - "index->header.domain:%d", index->header.domain); + if (!data->pat) { + char index_name[GRN_TABLE_MAX_KEY_SIZE]; + int index_name_size; + char lexicon_name[GRN_TABLE_MAX_KEY_SIZE]; + int lexicon_name_size; + index_name_size = grn_obj_name(ctx, + index, + index_name, + GRN_TABLE_MAX_KEY_SIZE); + lexicon_name_size = grn_table_get_key(ctx, + grn_ctx_db(ctx), + index->header.domain, + lexicon_name, + GRN_TABLE_MAX_KEY_SIZE); + ERR(GRN_OBJECT_CORRUPT, + "%s: lexicon lexicon is broken: <%.*s>: <%.*s>(%d)", + process_name, + index_name_size, index_name, + lexicon_name_size, lexicon_name, + index->header.domain); return; } + domain = data->pat->header.domain; if (domain != GRN_DB_TOKYO_GEO_POINT && domain != GRN_DB_WGS84_GEO_POINT) { char name[GRN_TABLE_MAX_KEY_SIZE]; -------------- next part -------------- HTML����������������������������...下载
