Kouhei Sutou
null+****@clear*****
Thu Feb 15 18:13:14 JST 2018
Kouhei Sutou 2018-02-15 18:13:14 +0900 (Thu, 15 Feb 2018) New Revision: e368cf667fb4c0ee859a10a4b505d8ad78602559 https://github.com/groonga/groonga/commit/e368cf667fb4c0ee859a10a4b505d8ad78602559 Message: expr scan_info: use "start" value as the default "end" value Modified files: lib/expr.c lib/mrb/scripts/scan_info_builder.rb lib/mrb/scripts/scan_info_data.rb Modified: lib/expr.c (+1 -0) =================================================================== --- lib/expr.c 2018-02-15 18:12:20 +0900 (011b51880) +++ lib/expr.c 2018-02-15 18:13:14 +0900 (4db25b4a2) @@ -3981,6 +3981,7 @@ struct _grn_scan_info { (si)->similarity_threshold = DEFAULT_SIMILARITY_THRESHOLD;\ (si)->quorum_threshold = DEFAULT_QUORUM_THRESHOLD;\ (si)->start = (st);\ + (si)->end = (st);\ (si)->query = NULL;\ GRN_PTR_INIT(&(si)->scorers, GRN_OBJ_VECTOR, GRN_ID_NIL);\ GRN_PTR_INIT(&(si)->scorer_args_exprs, GRN_OBJ_VECTOR, GRN_ID_NIL);\ Modified: lib/mrb/scripts/scan_info_builder.rb (+0 -3) =================================================================== --- lib/mrb/scripts/scan_info_builder.rb 2018-02-15 18:12:20 +0900 (8f938e315) +++ lib/mrb/scripts/scan_info_builder.rb 2018-02-15 18:13:14 +0900 (ea2aa1fdb) @@ -78,7 +78,6 @@ module Groonga if context.status == :const data = context.data data.op = Operator::PUSH - data.end = data.start @data_list << data context.data = nil end @@ -100,7 +99,6 @@ module Groonga if code.modify > 0 and LOGICAL_OPERATORS.include?(codes[i + code.modify].op) data.op = Operator::PUSH - data.end = data.start @data_list << data context.data = nil context.status = :start @@ -482,7 +480,6 @@ module Groonga def create_all_match_data data = ScanInfoData.new(0) - data.end = 0 data.flags = ScanInfo::Flags::PUSH data.op = Operator::CALL data.logical_op = Operator::OR Modified: lib/mrb/scripts/scan_info_data.rb (+1 -1) =================================================================== --- lib/mrb/scripts/scan_info_data.rb 2018-02-15 18:12:20 +0900 (771a19621) +++ lib/mrb/scripts/scan_info_data.rb 2018-02-15 18:13:14 +0900 (904fe748b) @@ -17,7 +17,7 @@ module Groonga attr_accessor :weight def initialize(start) @start = start - @end = 0 + @end = start @op = Operator::NOP @logical_op = Operator::OR @query = nil -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180215/e8bc471d/attachment-0001.htm
