Kouhei Sutou
null+****@clear*****
Sun Nov 2 14:21:52 JST 2014
Kouhei Sutou 2014-11-02 14:21:52 +0900 (Sun, 02 Nov 2014) New Revision: d6734f7d1ad38e30ff94854020bbe556c0955766 https://github.com/groonga/groonga/commit/d6734f7d1ad38e30ff94854020bbe556c0955766 Message: mrb: add missing "break"s Added files: test/command/suite/select/filter/complex/and_not_or_and.expected test/command/suite/select/filter/complex/and_not_or_and.test Modified files: lib/mrb/scripts/scan_info_builder.rb Modified: lib/mrb/scripts/scan_info_builder.rb (+3 -0) =================================================================== --- lib/mrb/scripts/scan_info_builder.rb 2014-11-02 14:26:42 +0900 (5e258e9) +++ lib/mrb/scripts/scan_info_builder.rb 2014-11-02 14:21:52 +0900 (650be65) @@ -206,10 +206,12 @@ module Groonga new_data.flags = ScanInfo::Flags::POP new_data.logical_op = operator @data_list << new_data + break end else data.flags &= ~ScanInfo::Flags::PUSH data.logical_op = operator + break end else if n_dif_ops > 0 @@ -225,6 +227,7 @@ module Groonga @data_list[r..-1] + @data_list[j...r] end + break end end else Added: test/command/suite/select/filter/complex/and_not_or_and.expected (+15 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/complex/and_not_or_and.expected 2014-11-02 14:21:52 +0900 (a1bfaf3) @@ -0,0 +1,15 @@ +table_create IDs TABLE_PAT_KEY Int32 +[[0,0.0,0.0],true] +table_create Logs TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Logs id COLUMN_SCALAR IDs +[[0,0.0,0.0],true] +column_create IDs logs_id COLUMN_INDEX Logs id +[[0,0.0,0.0],true] +load --table Logs +[ +{"id": 1} +] +[[0,0.0,0.0],1] +select Logs --filter 'id @ 1 &! id @ 2 && ((id @ 1) || (id @ 3)) && id @ 1' --output_columns id +[[0,0.0,0.0],[[[1],[["id","IDs"]],[1]]]] Added: test/command/suite/select/filter/complex/and_not_or_and.test (+15 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/complex/and_not_or_and.test 2014-11-02 14:21:52 +0900 (e84d778) @@ -0,0 +1,15 @@ +table_create IDs TABLE_PAT_KEY Int32 + +table_create Logs TABLE_NO_KEY +column_create Logs id COLUMN_SCALAR IDs + +column_create IDs logs_id COLUMN_INDEX Logs id + +load --table Logs +[ +{"id": 1} +] + +select Logs \ + --filter 'id @ 1 &! id @ 2 && ((id @ 1) || (id @ 3)) && id @ 1' \ + --output_columns id -------------- next part -------------- HTML����������������������������...ダウンロード
