Return empty collection for empty TS query.

jonasschmidt · Jan 13, 2016 · 53dc97f · 53dc97f
1 parent 5767ee8
commit 53dc97f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/riak/client/beefcake/time_series_query_operator.rb b/lib/riak/client/beefcake/time_series_query_operator.rb
@@ -18,12 +18,10 @@ def query(base, interpolations = {  })
         p.expect :TsQueryResp, TsQueryResp, empty_body_acceptable: true
       end
 
-      return nil if :empty == result
+      return [] if :empty == result
 
       codec = TsCellCodec.new
 
-      return [] if :empty == result
-
       collection = Riak::TimeSeries::Collection.
                    new(result.rows.map do |row|
                          Riak::TimeSeries::Row.new codec.scalars_for row.cells

diff --git a/spec/integration/riak/time_series_spec.rb b/spec/integration/riak/time_series_spec.rb
@@ -38,7 +38,8 @@
   #{now_range_str}
 SQL
   end
-    let(:no_data_query) do
+
+  let(:no_data_query) do
     <<-SQL
 SELECT * FROM #{table_name}
 WHERE