expr scan_info: use "start" value as the default "end" value

groonga · Feb 15, 2018 · e368cf6 · e368cf6
1 parent 142d09e
commit e368cf6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/lib/expr.c b/lib/expr.c
@@ -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);\

diff --git a/lib/mrb/scripts/scan_info_builder.rb b/lib/mrb/scripts/scan_info_builder.rb
@@ -78,7 +78,6 @@ def build
           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 @@ def build
           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 @@ def upper_condition?(operator)
 
     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

diff --git a/lib/mrb/scripts/scan_info_data.rb b/lib/mrb/scripts/scan_info_data.rb
@@ -17,7 +17,7 @@ class ScanInfoData
     attr_accessor :weight
     def initialize(start)
       @start = start
-      @end = 0
+      @end = start
       @op = Operator::NOP
       @logical_op = Operator::OR
       @query = nil