Kouhei Sutou
null+****@clear*****
Tue Aug 22 14:49:17 JST 2017
Kouhei Sutou 2017-08-22 14:49:17 +0900 (Tue, 22 Aug 2017) New Revision: 923b716d01b203a4aafc51e3e5edba9b85e70e6a https://github.com/groonga/groonga/commit/923b716d01b203a4aafc51e3e5edba9b85e70e6a Merged 2b87c39: Merge pull request #754 from groonga/support-adjust Message: Don't set needless weight Modified files: lib/expr.c Modified: lib/expr.c (+15 -3) =================================================================== --- lib/expr.c 2017-08-22 12:30:04 +0900 (b7880cb9b) +++ lib/expr.c 2017-08-22 14:49:17 +0900 (0671d9f63) @@ -7162,7 +7162,11 @@ parse_query_accept_string(grn_ctx *ctx, efs_info *efsi, max_interval = grn_int32_value_at(&efsi->max_interval_stack, -1); grn_expr_append_const_int(efsi->ctx, efsi->e, max_interval, GRN_OP_PUSH, 1); - grn_expr_append_const_int(efsi->ctx, efsi->e, weight, mode, 3); + if (weight == 0) { + grn_expr_append_op(efsi->ctx, efsi->e, mode, 3); + } else { + grn_expr_append_const_int(efsi->ctx, efsi->e, weight, mode, 3); + } } break; case GRN_OP_SIMILAR : @@ -7172,11 +7176,19 @@ parse_query_accept_string(grn_ctx *ctx, efs_info *efsi, grn_int32_value_at(&efsi->similarity_threshold_stack, -1); grn_expr_append_const_int(efsi->ctx, efsi->e, similarity_threshold, GRN_OP_PUSH, 1); - grn_expr_append_const_int(efsi->ctx, efsi->e, weight, mode, 3); + if (weight == 0) { + grn_expr_append_op(efsi->ctx, efsi->e, mode, 3); + } else { + grn_expr_append_const_int(efsi->ctx, efsi->e, weight, mode, 3); + } } break; default : - grn_expr_append_const_int(efsi->ctx, efsi->e, weight, mode, 2); + if (weight == 0) { + grn_expr_append_op(efsi->ctx, efsi->e, mode, 2); + } else { + grn_expr_append_const_int(efsi->ctx, efsi->e, weight, mode, 2); + } break; } } -------------- next part -------------- HTML����������������������������...Download