cassie 1.0.0.beta.4 → 1.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b68910ecc81a9d339e0a59ee8b46adc36841089
-  data.tar.gz: 42a0a317184f67ad97c9d7281378fedf787eb605
+  metadata.gz: ad2343accacdf35f48e99a510cf6905bb86f91b5
+  data.tar.gz: 8e79fb85280c7f756c2f43c4be640f932dcd7eaf
 SHA512:
-  metadata.gz: 096994330cb1cd057c68d1fc90276d682426f91b9be08939f372d9e8c980c2f0857b1fdd5db7750826fbae94caab1073576a849fff2eb8a33163cb8c697a1cd4
-  data.tar.gz: 28a4de6c7522a2c360af1472cc6e76d52a0b1957fe7c94a1e1460072b7b2fabcbcecaaa32b91884e91622f5c733d65c79d14ae3cf6924cb036621ff41e251c8e
+  metadata.gz: 9d1823d0746fb58f0c7bc6026cda513f5957fd42d7fe63e162635cc70ac39b14dd6531a8fe85aa7a157e56a03d8669683f015a061329e86fba1cc24256f8ec41
+  data.tar.gz: ea60edb6e9944e0009a2864a0d349990aa349b820751940beb41b73047a13fdc7b3307ef4c9b84aefdc216116c21167ca8d29f7ee1e9394a62a468a09e9df65d

data/lib/cassie/queries/statement/batches.rb

@@ -7,8 +7,8 @@ module Cassie::Queries::Statement
     extend ::ActiveSupport::Concern
 
     included do
-      attr_reader :paging_state
-      attr_reader :stateless_page_size
+      attr_accessor :paging_state
+      attr_accessor :stateless_page_size
     end
 
     def fetch_each(opts={})
@@ -29,24 +29,34 @@ module Cassie::Queries::Statement
     #
     #  "max score in group: 26"
     def fetch_in_batches(opts={})
-      return to_enum(:fetch_in_batches, opts) unless block_given?
+      # we want to clone the query as soon as the enumerable is
+      # created, not wait until the firt iteration is called
+      # as the client could mutate the object between these states
+      # but we don't want to clone twice if enumerator returned
+      return to_enum(:fetch_in_batches, opts.merge(_paged_query: self.clone)) unless block_given?
+
       opts[:batch_size] ||= 1000
 
+      # use Cassandra internal paging
+      # but clone the query to isolate it
+      # but allow all paging queries
+      # to execute within a Cassie::Query
+      # for use of other features, like logging
+      paged_query = opts.delete(:_paged_query) || self.clone
+
       # set cassandra internal
       # stateless page size (independent from limit)
-      @stateless_page_size = opts[:batch_size]
-      @paging_state = nil
+      paged_query.stateless_page_size = opts[:batch_size]
+      paged_query.paging_state = nil
       done = false
 
-      # use Cassandra internal paging
-      # but keep result within this query object
       loop do
-        raise page_size_changed_error(opts[:batch_size]) if opts[:batch_size] != self.stateless_page_size
-        batch = fetch
+        raise page_size_changed_error(opts[:batch_size]) if opts[:batch_size] != paged_query.stateless_page_size
+        batch = paged_query.fetch
 
-        @paging_state = result.paging_state
+        paged_query.paging_state = paged_query.result.paging_state
         break if done
-        done = true if result.last_page?
+        done = true if paged_query.result.last_page?
 
         yield batch
       end

data/lib/cassie/testing/fake/result.rb

@@ -4,9 +4,10 @@ module Cassie::Testing::Fake
   class Result
     attr_accessor :rows, :statement
 
-    def initialize(statement, opts={})
+    def initialize(statement, execution_opts={})
       @statement = statement
-      @rows = opts[:rows]
+      @opts = execution_opts
+      @rows = @opts[:rows]
     end
 
     def execution_info
@@ -22,11 +23,21 @@ module Cassie::Testing::Fake
     end
 
     def last_page?
+      return nil unless @opts[:page_size]
+      return @last_page if defined?(@last_page)
       true
     end
 
+    def assert_last_page(val=true)
+      @last_page = val
+    end
+
     def paging_state
-      'that state tho!'
+      return nil unless @opts[:page_size]
+      return "paging #{SecureRandom.hex(6)}:0" unless @opts[:paging_state]
+      bytes = @opts[:paging_state].bytes
+      bytes[-1] = bytes[-1] + 1
+      return bytes.pack('c*')
     end
   end
 end

data/lib/cassie/testing/fake/session.rb

@@ -6,9 +6,9 @@ module Cassie::Testing::Fake
     attr_reader :last_statement
     attr_accessor :rows
 
-    def execute(statement, *args)
+    def execute(statement, args={})
       @last_statement = statement
-      Result.new(statement, rows: rows)
+      Result.new(statement, args.merge(rows: rows))
     end
 
     def prepare(statement)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.4
+  version: 1.0.0.beta.5
 platform: ruby
 authors:
 - Evan Prothro