Kouhei Sutou
null+****@clear*****
Mon Jan 16 12:34:29 JST 2017
Kouhei Sutou 2017-01-16 12:34:29 +0900 (Mon, 16 Jan 2017) New Revision: 50485e73a32777f7c8ce19c465b8ee1b7729bc83 https://github.com/groonga/groonga/commit/50485e73a32777f7c8ce19c465b8ee1b7729bc83 Message: Remove needless NULL check It's always not NULL. Modified files: lib/expr.c Modified: lib/expr.c (+9 -17) =================================================================== --- lib/expr.c 2017-01-16 12:12:03 +0900 (bfbf30b) +++ lib/expr.c 2017-01-16 12:34:29 +0900 (c15a20f) @@ -6185,17 +6185,13 @@ grn_table_select_index_match(grn_ctx *ctx, optarg.vector_size = 1; optarg.proc = NULL; optarg.max_size = 0; - if (min_id) { - previous_min_id = *min_id; - optarg.match_info.flags |= GRN_MATCH_INFO_GET_MIN_RECORD_ID; - } + previous_min_id = *min_id; + optarg.match_info.flags |= GRN_MATCH_INFO_GET_MIN_RECORD_ID; ctx->flags |= GRN_CTX_TEMPORARY_DISABLE_II_RESOLVE_SEL_AND; for (j = 0; j < n_indexes; j++, ip++, wp += 2) { uint32_t sid = (uint32_t) wp[0]; int32_t weight = wp[1]; - if (min_id) { - optarg.match_info.min = previous_min_id; - } + optarg.match_info.min = previous_min_id; if (sid) { int weight_index = sid - 1; int current_vector_size; @@ -6229,18 +6225,14 @@ grn_table_select_index_match(grn_ctx *ctx, } } GRN_BULK_REWIND(&wv); - if (min_id) { - if (previous_min_id < optarg.match_info.min && - (*min_id == previous_min_id || optarg.match_info.min < *min_id)) { - *min_id = optarg.match_info.min; - } + if (previous_min_id < optarg.match_info.min && + (*min_id == previous_min_id || optarg.match_info.min < *min_id)) { + *min_id = optarg.match_info.min; } } - if (min_id) { - if (!((si->logical_op == GRN_OP_AND) || - (si->logical_op == GRN_OP_OR && previous_n_hits == 0))) { - *min_id = GRN_ID_NIL; - } + if (!((si->logical_op == GRN_OP_AND) || + (si->logical_op == GRN_OP_OR && previous_n_hits == 0))) { + *min_id = GRN_ID_NIL; } GRN_OBJ_FIN(ctx, &wv); -------------- next part -------------- HTML����������������������������...Download