sessionm-cassandra_object 4.0.26 → 4.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c95d37c29798d4b4b4a205482e29246e5704fe10
-  data.tar.gz: 99e1416d2948790d7afa64b111321349f3c1c440
+  metadata.gz: 1c93aa37334ac497b7c97b5c0a1c04350502e230
+  data.tar.gz: 894c0e7ffac48271d0efa1b75defe0c67f7c3b47
 SHA512:
-  metadata.gz: 66d3159473f341ec86f13c8e51b9c9951feb0a23ee24c2e3fda3504a1740320322798252528fae9ec76a16fabf864648a4ecb92ec18bbf9c446167e384e4cb60
-  data.tar.gz: 61a629a5df9908850bdcaba861044a745d9873e250a28c7e40e9fce33e253f48e9e0822e88699cef0c64cdea809b60d52f27fabdd502a9ad08a4071bc6cbcb4d
+  metadata.gz: 4162a2b08feefbe4ed8cffa60826421344b6982f4e82b31627495dcf2e6dcfbe2f3af4cc666051918a868d2e410a9d97077f34c14e2d651c164206870a24684d
+  data.tar.gz: 936877179c08b6e3b3ffdf4d74d7384bc3da5e32dbafb29f4d361daa10b2a417be76e20fee99139858a7db7399aa495400112aee04a4882258eef77d9e899c70

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -99,13 +99,18 @@ module CassandraObject
 
           insert_into_options = ttl ? " USING TTL #{ttl}" : ''
 
-          query = "BEGIN BATCH\n"
-          query << values.map do |name, value|
-            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{escape(key, key_type(column_family))}, #{escape(name, name_type(column_family))}, #{escape(value, value_type(column_family))})#{insert_into_options}"
+          insert_query = values.map do |name, value|
+              "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{escape(key, key_type(column_family))}, #{escape(name, name_type(column_family))}, #{escape(value, value_type(column_family))})#{insert_into_options}"
           end.join("\n")
-          query << "\nAPPLY BATCH;"
 
-          async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+          if batch_mode?
+            @batched_queries << insert_query
+          else
+            query = "BEGIN BATCH\n"
+            query << insert_query
+            query << "\nAPPLY BATCH;"
+            async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+          end
         end
 
         def get(column_family, key, *columns_options)
@@ -261,8 +266,28 @@ module CassandraObject
           @column_families ||= self.cluster.keyspace(session.keyspace).tables.inject({}) { |hsh, table| hsh[table.name] = table; hsh }
         end
 
-        def batch
-          yield
+        def batch_mode?
+          !! @batched_queries
+        end
+
+        def batch(opts=false)
+          if @batched_queries
+            yield
+          else
+            begin
+              async = opts.try(:[], :async)
+              @batched_queries ||= []
+              yield
+              query = "BEGIN BATCH\n"
+              query << @batched_queries.join("\n")
+              query << "\nAPPLY BATCH;"
+              async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+            rescue Exception => e
+              raise e
+            ensure
+              @batched_queries = nil
+            end
+          end
         end
 
         def schema(reload=false)

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.26'
+  s.version = '4.0.27'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.26
+  version: 4.0.27
 platform: ruby
 authors:
 - Doug Youch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com