Susumu Yata
null+****@clear*****
Tue Dec 15 17:38:06 JST 2015
Susumu Yata 2015-12-15 17:38:06 +0900 (Tue, 15 Dec 2015) New Revision: c4e8a6e43db6b6f21f07e9c085a8e105261680d0 https://github.com/groonga/groonga/commit/c4e8a6e43db6b6f21f07e9c085a8e105261680d0 Merged e1d688f: Merge pull request #449 from groonga/detect-truncate Message: Remove needless compatibility checks GitHub: #447 Modified files: lib/hash.c lib/pat.c Modified: lib/hash.c (+1 -7) =================================================================== --- lib/hash.c 2015-12-15 17:12:34 +0900 (f6ae06f) +++ lib/hash.c 2015-12-15 17:38:06 +0900 (e25f0e6) @@ -1960,13 +1960,7 @@ grn_hash_reopen(grn_ctx *ctx, grn_hash *hash) hash->header.common = new_header; hash->lock = &new_header->lock; hash->tokenizer = grn_ctx_at(ctx, new_header->tokenizer); - if (new_header->flags & GRN_OBJ_KEY_NORMALIZE) { - new_header->flags &= ~GRN_OBJ_KEY_NORMALIZE; - hash->normalizer = grn_ctx_get(ctx, GRN_NORMALIZER_AUTO_NAME, -1); - new_header->normalizer = grn_obj_id(ctx, hash->normalizer); - } else { - hash->normalizer = grn_ctx_at(ctx, new_header->normalizer); - } + hash->normalizer = grn_ctx_at(ctx, new_header->normalizer); GRN_PTR_INIT(&(hash->token_filters), GRN_OBJ_VECTOR, GRN_ID_NIL); hash->obj.header.flags = new_header->flags; return GRN_SUCCESS; Modified: lib/pat.c (+1 -8) =================================================================== --- lib/pat.c 2015-12-15 17:12:34 +0900 (4633413) +++ lib/pat.c 2015-12-15 17:38:06 +0900 (9a5d02c) @@ -664,14 +664,7 @@ grn_pat_reopen(grn_ctx *ctx, grn_pat *pat) pat->value_size = new_header->value_size; pat->encoding = new_header->encoding; pat->tokenizer = grn_ctx_at(ctx, new_header->tokenizer); - /* FIXME: This check may not be required. */ - if (new_header->flags & GRN_OBJ_KEY_NORMALIZE) { - new_header->flags &= ~GRN_OBJ_KEY_NORMALIZE; - pat->normalizer = grn_ctx_get(ctx, GRN_NORMALIZER_AUTO_NAME, -1); - new_header->normalizer = grn_obj_id(ctx, pat->normalizer); - } else { - pat->normalizer = grn_ctx_at(ctx, new_header->normalizer); - } + pat->normalizer = grn_ctx_at(ctx, new_header->normalizer); GRN_OBJ_FIN(ctx, &(pat->token_filters)); GRN_PTR_INIT(&(pat->token_filters), GRN_OBJ_VECTOR, GRN_ID_NIL); pat->obj.header.flags = new_header->flags; -------------- next part -------------- HTML����������������������������...Download
