sessionm-cassandra_object 2.5.0 → 2.5.1

data/lib/cassandra_object/associations.rb

@@ -39,7 +39,9 @@ module CassandraObject
       def remove(key)
         begin
           ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: relationships_column_family, key: key) do
-            connection.remove(relationships_column_family, key.to_s, consistency: thrift_write_consistency)
+            CassandraObject::Base.with_connection do
+              connection.remove(relationships_column_family, key.to_s, consistency: thrift_write_consistency)
+            end
           end
         rescue Cassandra::AccessError => e
           raise e unless e.message =~ /Invalid column family/

data/lib/cassandra_object/associations/one_to_many.rb

@@ -20,7 +20,9 @@ module CassandraObject
         key = owner.key
         attributes = {@association_name=>{new_key=>record.key.to_s}}
         ActiveSupport::Notifications.instrument("insert.cassandra_object", :column_family => column_family, :key => key, :attributes => attributes) do
-          connection.insert(column_family, key.to_s, attributes, :consistency => @owner_class.thrift_write_consistency)
+          CassandraObject::Base.with_connection do
+            connection.insert(column_family, key.to_s, attributes, :consistency => @owner_class.thrift_write_consistency)
+          end
         end
         if has_inverse? && set_inverse
           inverse.set_inverse(record, owner)

data/lib/cassandra_object/associations/one_to_one.rb

@@ -25,15 +25,19 @@ module CassandraObject
 
       def clear(owner)
         ActiveSupport::Notifications.instrument("remove.cassandra_object", :column_family => column_family, :key => owner.key, :columns => @association_name) do
-          connection.remove(column_family, owner.key.to_s, @association_name)
+          CassandraObject::Base.with_connection do
+            connection.remove(column_family, owner.key.to_s, @association_name)
+          end
         end
       end
 
       def find(owner)
-        if key = connection.get(column_family, owner.key.to_s, @association_name.to_s, :count=>1).values.first
-          target_class.get(key)
-        else
-          nil
+        CassandraObject::Base.with_connection do
+          if key = connection.get(column_family, owner.key.to_s, @association_name.to_s, :count=>1).values.first
+            target_class.get(key)
+          else
+            nil
+          end
         end
       end  
 
@@ -42,7 +46,9 @@ module CassandraObject
         key = owner.key
         attributes = {@association_name=>{new_key=>record.key.to_s}}
         ActiveSupport::Notifications.instrument("insert.cassandra_object", :column_family => column_family, :key => key, :attributes => attributes) do
-          connection.insert(column_family, key.to_s, attributes, :consistency => @owner_class.thrift_write_consistency)
+          CassandraObject::Base.with_connection do
+            connection.insert(column_family, key.to_s, attributes, :consistency => @owner_class.thrift_write_consistency)
+          end
         end
         if has_inverse? && set_inverse
           inverse.set_inverse(record, owner)

data/lib/cassandra_object/cursor.rb

@@ -23,11 +23,16 @@ module CassandraObject
       end
       
       while objects.size < number_to_find && !out_of_keys
-        index_results = connection.get(@column_family, @key, @super_column,
-          count: limit,
-          start: start_with,
-          reversed: @options[:reversed],
-          consistency: target_class.thrift_read_consistency)
+        index_results = 
+          begin
+            CassandraObject::Base.with_connection do
+              connection.get(@column_family, @key, @super_column,
+                             count: limit,
+                             start: start_with,
+                             reversed: @options[:reversed],
+                             consistency: target_class.thrift_read_consistency)
+            end
+          end
 
         out_of_keys  = index_results.size < limit
 
@@ -80,7 +85,9 @@ module CassandraObject
     end
     
     def remove(index_key)
-      connection.remove(@column_family, @key, @super_column, index_key, consistency: target_class.thrift_write_consistency)
+      CassandraObject::Base.with_connection do
+        connection.remove(@column_family, @key, @super_column, index_key, consistency: target_class.thrift_write_consistency)
+      end
     end
     
     def validator(&validator)

data/lib/cassandra_object/finder_methods.rb

@@ -9,8 +9,16 @@ module CassandraObject
         raise(ArgumentError, "unexpected conditions") if opts[:conditions].present?
         raise(CassandraObject::InvalidKey, "invalid key: #{key}") if key.blank? || ! parse_key(key)
 
-        if (attributes = ActiveSupport::Notifications.instrument("get.cassandra_object", column_family: column_family, key: key) { connection.get(column_family, key, opts.slice(:consistency)) }) &&
-           !attributes.empty?
+        attributes =
+          begin
+            ActiveSupport::Notifications.instrument("get.cassandra_object", column_family: column_family, key: key) do
+              CassandraObject::Base.with_connection do
+                connection.get column_family, key, opts.slice(:consistency)
+              end
+            end
+          end
+
+        if attributes && ! attributes.empty?
           instantiate(key, attributes)
         else
           raise CassandraObject::RecordNotFound
@@ -28,7 +36,9 @@ module CassandraObject
         opts[:consistency] ||= thrift_read_consistency
 
         result = ActiveSupport::Notifications.instrument("get_counter.cassandra_object", column_family: column_family, key: key, column: column) do
-          connection.get(column_family, key, column, opts)
+          CassandraObject::Base.with_connection do
+            connection.get(column_family, key, column, opts)
+          end
         end
 
         if result
@@ -41,7 +51,9 @@ module CassandraObject
       def all(options = {})
         limit = options[:limit] || 100
         results = ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, key_count: limit) do
-          connection.get_range(column_family, key_count: limit, consistency: thrift_read_consistency)
+          CassandraObject::Base.with_connection do
+            connection.get_range(column_family, key_count: limit, consistency: thrift_read_consistency)
+          end
         end
 
         results.map do |k, v|
@@ -76,13 +88,15 @@ module CassandraObject
 
       # Selecting a slice of a super column
       def get_slice(key, start, finish, opts={})
-        connection.get_slice(column_family,
-                             key, 
-                             start,
-                             finish,
-                             opts[:count] || 100,
-                             opts[:reversed] || false,
-                             opts[:consistency] || thrift_read_consistency)
+        CassandraObject::Base.with_connection do
+          connection.get_slice(column_family,
+                               key, 
+                               start,
+                               finish,
+                               opts[:count] || 100,
+                               opts[:reversed] || false,
+                               opts[:consistency] || thrift_read_consistency)
+        end
       end
 
       private
@@ -105,7 +119,9 @@ module CassandraObject
 
         def multi_get(keys, options={})
           attribute_results = ActiveSupport::Notifications.instrument("multi_get.cassandra_object", column_family: column_family, keys: keys) do
-            connection.multi_get(column_family, keys.map(&:to_s), consistency: thrift_read_consistency)
+            CassandraObject::Base.with_connection do
+              connection.multi_get(column_family, keys.map(&:to_s), consistency: thrift_read_consistency)
+            end
           end
 
           instantiate_many(attribute_results)
@@ -115,8 +131,10 @@ module CassandraObject
           options = options.reverse_merge(:consistency => thrift_read_consistency)
 
           attribute_results = ActiveSupport::Notifications.instrument("multi_get_by_expression.cassandra_object", column_family: column_family, expression: expression) do
-            intermediate_results = connection.get_indexed_slices(column_family, expression, options)
-            connection.send(:multi_columns_to_hash!, column_family, intermediate_results)
+            CassandraObject::Base.with_connection do
+              intermediate_results = connection.get_indexed_slices(column_family, expression, options)
+              connection.send(:multi_columns_to_hash!, column_family, intermediate_results)
+            end
           end
 
           instantiate_many(attribute_results)

data/lib/cassandra_object/persistence.rb

@@ -4,12 +4,14 @@ module CassandraObject
 
     module ClassMethods
       def add(key, value, *columns_and_options)
-        column_family, column, sub_column, options = connection.extract_and_validate_params(self.column_family, key, columns_and_options, {})
+        column_family, column, sub_column, options = CassandraObject::Base.with_connection { connection.extract_and_validate_params(self.column_family, key, columns_and_options, {}) }
         # the options are removed, leaving just columns
         columns = columns_and_options
 
         ActiveSupport::Notifications.instrument("add.cassandra_object", column_family: column_family, key: key, column: column, sub_column: sub_column, value: value) do
-          connection.add(column_family, key, value, *columns, :consistency => thrift_write_consistency)
+          CassandraObject::Base.with_connection do
+            connection.add(column_family, key, value, *columns, :consistency => thrift_write_consistency)
+          end
         end
       end
 
@@ -27,13 +29,17 @@ module CassandraObject
         value_spec = values.length == 1 ? values[0] : '<various>'
 
         ActiveSupport::Notifications.instrument("add.cassandra_object", column_family: column_family, key: key, column: column_spec, value: value_spec) do
-          connection.add_multiple_columns(column_family, key, hash, :consistency => thrift_write_consistency)
+          CassandraObject::Base.with_connection do
+            connection.add_multiple_columns(column_family, key, hash, :consistency => thrift_write_consistency)
+          end
         end
       end
 
       def remove(key)
-        ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do 
-          connection.remove(column_family, key.to_s, consistency: thrift_write_consistency)
+        ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do
+          CassandraObject::Base.with_connection do
+            connection.remove(column_family, key.to_s, consistency: thrift_write_consistency)
+          end
         end
       end
 
@@ -42,13 +48,17 @@ module CassandraObject
       def remove_counter(key)
         ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do
           parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
-          connection.send(:client).remove_counter(key, parent, thrift_write_consistency)
+          CassandraObject::Base.with_connection do
+            connection.send(:client).remove_counter(key, parent, thrift_write_consistency)
+          end
         end
       end
 
       def delete_all
         ActiveSupport::Notifications.instrument("truncate.cassandra_object", column_family: column_family) do
-          connection.truncate!(column_family)
+          CassandraObject::Base.with_connection do
+            connection.truncate!(column_family)
+          end
         end
       end
 
@@ -68,7 +78,9 @@ module CassandraObject
                 options[:consistency] = thrift_write_consistency
                 options[:ttl] = row_ttl unless row_ttl.nil?
               end
-              connection.insert(column_family, key.to_s, attributes, options)
+              CassandraObject::Base.with_connection do
+                connection.insert(column_family, key.to_s, attributes, options)
+              end
             end
           end
         end

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '2.5.0'
+  s.version = '2.5.1'
   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: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors: