Kouhei Sutou
null+****@clear*****
Thu Jul 16 12:19:20 JST 2015
Kouhei Sutou 2015-07-16 12:19:20 +0900 (Thu, 16 Jul 2015) New Revision: 4e311b55b4abe8bf71bb0c2a7e1c151fdd89acaf https://github.com/groonga/groonga/commit/4e311b55b4abe8bf71bb0c2a7e1c151fdd89acaf Message: sharding: fix wrong min include detection for month range type Added files: test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_all_day_start.expected test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_all_day_start.test test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_partial_day_start.expected test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_partial_day_start.test Modified files: plugins/sharding/logical_enumerator.rb Modified: plugins/sharding/logical_enumerator.rb (+1 -4) =================================================================== --- plugins/sharding/logical_enumerator.rb 2015-07-15 23:35:23 +0900 (3593418) +++ plugins/sharding/logical_enumerator.rb 2015-07-16 12:19:20 +0900 (432bcea) @@ -270,10 +270,7 @@ module Groonga return true if @min_border == :exclude - not (@min.hour == 0 and - @min.min == 0 and - @min.sec == 0 and - @min.usec == 0) + shard_range.min_time != @min end def in_max?(shard_range) Added: test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_all_day_start.expected (+84 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_all_day_start.expected 2015-07-16 12:19:20 +0900 (e0892bd) @@ -0,0 +1,84 @@ +logical_range_filter Logs timestamp --min "2015-02-01 00:00:00" --min_border "include" --limit -1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + "memo", + "ShortText" + ], + [ + "message", + "Text" + ], + [ + "timestamp", + "Time" + ] + ], + [ + "2015-02-01 00:00:00", + "Start", + 1422716400.0 + ], + [ + "2015-02-01 00:00:01", + "Shutdown", + 1422716401.0 + ], + [ + "2015-02-02 00:00:00", + "Start", + 1422802800.0 + ], + [ + "2015-02-02 00:00:01", + "Shutdown", + 1422802801.0 + ], + [ + "2015-02-03 00:00:00", + "Start", + 1422889200.0 + ], + [ + "2015-02-03 00:00:01", + "Shutdown", + 1422889201.0 + ], + [ + "2015-02-03 23:59:58", + "Start", + 1422975598.0 + ], + [ + "2015-02-03 23:59:59", + "Shutdown", + 1422975599.0 + ], + [ + "2015-02-28 23:59:58", + "Start", + 1425135598.0 + ], + [ + "2015-02-28 23:59:59", + "Shutdown", + 1425135599.0 + ], + [ + "2015-03-01 00:00:00", + "Start", + 1425135600.0 + ], + [ + "2015-03-01 00:00:01", + "Shutdown", + 1425135601.0 + ] + ] +] Added: test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_all_day_start.test (+6 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_all_day_start.test 2015-07-16 12:19:20 +0900 (c43af29) @@ -0,0 +1,6 @@ +#@include fixture/sharding/logical_range_filter/shard_type/month_day.grn + +logical_range_filter Logs timestamp \ + --min "2015-02-01 00:00:00" \ + --min_border "include" \ + --limit -1 Added: test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_partial_day_start.expected (+74 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_partial_day_start.expected 2015-07-16 12:19:20 +0900 (91c138a) @@ -0,0 +1,74 @@ +logical_range_filter Logs timestamp --min "2015-02-02 00:00:00" --min_border "include" --limit -1 +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + "memo", + "ShortText" + ], + [ + "message", + "Text" + ], + [ + "timestamp", + "Time" + ] + ], + [ + "2015-02-02 00:00:00", + "Start", + 1422802800.0 + ], + [ + "2015-02-02 00:00:01", + "Shutdown", + 1422802801.0 + ], + [ + "2015-02-03 00:00:00", + "Start", + 1422889200.0 + ], + [ + "2015-02-03 00:00:01", + "Shutdown", + 1422889201.0 + ], + [ + "2015-02-03 23:59:58", + "Start", + 1422975598.0 + ], + [ + "2015-02-03 23:59:59", + "Shutdown", + 1422975599.0 + ], + [ + "2015-02-28 23:59:58", + "Start", + 1425135598.0 + ], + [ + "2015-02-28 23:59:59", + "Shutdown", + 1425135599.0 + ], + [ + "2015-03-01 00:00:00", + "Start", + 1425135600.0 + ], + [ + "2015-03-01 00:00:01", + "Shutdown", + 1425135601.0 + ] + ] +] Added: test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_partial_day_start.test (+6 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/sharding/logical_range_filter/shard_type/month_day/ascending/min_include_partial_day_start.test 2015-07-16 12:19:20 +0900 (05fafbf) @@ -0,0 +1,6 @@ +#@include fixture/sharding/logical_range_filter/shard_type/month_day.grn + +logical_range_filter Logs timestamp \ + --min "2015-02-02 00:00:00" \ + --min_border "include" \ + --limit -1 -------------- next part -------------- HTML����������������������������...ダウンロード
