YUKI Hiroshi
null+****@clear*****
Wed Nov 27 21:30:43 JST 2013
YUKI Hiroshi 2013-11-27 21:30:43 +0900 (Wed, 27 Nov 2013) New Revision: 70821621e8547ae9d361dd1830da39acf113beaa https://github.com/droonga/fluent-plugin-droonga/commit/70821621e8547ae9d361dd1830da39acf113beaa Message: Don't apply limit and offset for non-array results Modified files: lib/droonga/plugin/collector/basic.rb Modified: lib/droonga/plugin/collector/basic.rb (+7 -5) =================================================================== --- lib/droonga/plugin/collector/basic.rb 2013-11-27 20:55:52 +0900 (94ebab2) +++ lib/droonga/plugin/collector/basic.rb 2013-11-27 21:30:43 +0900 (12a4647) @@ -50,11 +50,13 @@ module Droonga reduced_values = merge(values[0][key], values[1][key], deal["order"]) end - if deal["offset"] - reduced_values = reduced_values[deal["offset"]..-1] - end - if deal["limit"] && deal["limit"] != UNLIMITED - reduced_values = reduced_values[0..deal["limit"]-1] + if reduced_values.is_a?(Array) + if deal["offset"] + reduced_values = reduced_values[deal["offset"]..-1] + end + if deal["limit"] && deal["limit"] != UNLIMITED + reduced_values = reduced_values[0..deal["limit"]-1] + end end result[key] = reduced_values -------------- next part -------------- HTML����������������������������...Download