sessionm-cassandra_object 2.5.8 → 2.5.9

data/lib/cassandra_object/associations/one_to_many.rb

@@ -19,7 +19,7 @@ module CassandraObject
       def add(owner, record, set_inverse = true)
         key = owner.key
         attributes = {@association_name=>{new_key=>record.key.to_s}}
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :write) do
           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)
           end

data/lib/cassandra_object/associations/one_to_one.rb

@@ -24,7 +24,7 @@ module CassandraObject
       end
 
       def clear(owner)
-        CassandraObject::Base.with_connection(owner.key) do
+        CassandraObject::Base.with_connection(owner.key, :write) do
           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)
           end
@@ -32,7 +32,7 @@ module CassandraObject
       end
 
       def find(owner)
-        CassandraObject::Base.with_connection(owner.key.to_s) do
+        CassandraObject::Base.with_connection(owner.key.to_s, :read) do
           if key = connection.get(column_family, owner.key.to_s, @association_name.to_s, :count=>1).values.first
             target_class.get(key)
           else
@@ -45,7 +45,7 @@ module CassandraObject
         clear(owner)
         key = owner.key
         attributes = {@association_name=>{new_key=>record.key.to_s}}
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :write) do
           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)
           end

data/lib/cassandra_object/associations.rb

@@ -38,7 +38,7 @@ module CassandraObject
       
       def remove(key)
         begin
-          CassandraObject::Base.with_connection(key) do
+          CassandraObject::Base.with_connection(key, :write) do
             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)
             end

data/lib/cassandra_object/connection.rb

@@ -8,36 +8,17 @@ module CassandraObject
       class_attribute :connection_spec
 
       class_eval do
-        def self.new_event_machine_connection(servers=nil)
+
+        @@schema = nil
+        def self.new_connection(async, servers)
           spec = connection_spec.dup
-              
-          require 'thrift_client/event_machine'
-          spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
-                               :transport_wrapper => nil)
-              
-          Cassandra.new(spec[:keyspace], servers || spec[:servers], spec[:thrift]).tap do |conn|
-            conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
-            if spec[:cache_schema]
-              if @@schema
-                conn.instance_variable_set '@schema', @@schema
-              else
-                begin
-                  @@schema = conn.schema
-                rescue CassandraThrift::InvalidRequestException => e
-                  # initially the schema doesn't exists
-                end
-              end
-            end
-          end
-        end
 
-        def new_event_machine_connection(servers=nil)
-          self.class.new_event_machine_connection(servers)
-        end
+          if async
+            require 'thrift_client/event_machine'
+            spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
+                                 :transport_wrapper => nil)
+          end
 
-        def self.new_connection(servers=nil)
-          spec = connection_spec.dup
-              
           Cassandra.new(spec[:keyspace], servers || spec[:servers], spec[:thrift]).tap do |conn|
             conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
             if spec[:cache_schema]
@@ -54,43 +35,33 @@ module CassandraObject
           end
         end
 
-        def new_connection(servers=nil)
-          self.class.new_connection(servers)
+        def self.new_async_connection(servers=nil)
+          new_connection true, servers
         end
 
-        @@schema = nil
-        @@async_connection_pool = nil
-        @@sync_connection_pool = nil
-        def self.async_connection_pool
-          @@async_connection_pool ||=
-            begin
-              adapter_method = Proc.new do
-                self.new_event_machine_connection
-              end
-              spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-              WithConnection::ConnectionPool.new "async cassandra", spec
-            end
-        end
-        def async_connection_pool
-          self.class.async_connection_pool
+        def self.new_sync_connection(servers=nil)
+          new_connection false, servers
         end
 
-        def self.sync_connection_pool
-          @@sync_connection_pool ||=
-            begin
-              adapter_method = Proc.new do
-                self.new_connection
-              end
-              spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-              WithConnection::ConnectionPool.new "sync cassandra", spec
-            end
+        def self.new_async_connection_pool(servers=nil)
+          adapter_method = Proc.new do
+            self.new_async_connection servers
+          end
+          spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
+          WithConnection::ConnectionPool.new "async cassandra", spec
         end
-        def sync_connection_pool
-          self.class.sync_connection_pool
+
+        def self.new_sync_connection_pool(servers=nil)
+          adapter_method = Proc.new do
+            self.new_sync_connection servers
+          end
+          spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
+          WithConnection::ConnectionPool.new "sync cassandra", spec
         end
 
+        @@ring = nil
         def self.ring
-          self.new_connection.ring
+          @@ring ||= self.new_sync_connection.ring
         end
 
         def self.servers_and_ranges(datacenter)
@@ -104,55 +75,35 @@ module CassandraObject
           end
         end
 
-        @@ranged_connection_pool_key_algo = nil
         def self.ranged_connection_pool_key_algo
-          @@ranged_connection_pool_key_algo ||= Proc.new { |key| Digest::MD5.hexdigest key.to_s }
+          Proc.new { |key| Digest::MD5.hexdigest key.to_s }
         end
 
-        def self.create_ranged_connection_pool(async)
-          require 'with_connection/ranged_connection_pool'
+        def self.new_ranged_connection_pool(async)
+          if self.connection_spec[:datacenter]
+            require 'with_connection/ranged_connection_pool'
 
-          adapter_method = Proc.new do
-            async ? self.new_event_machine_connection : self.new_connection
-          end
+            default_pool = async ? new_async_connection_pool : new_sync_connection_pool
 
-          spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-          default_pool = WithConnection::ConnectionPool.new "sync cassandra", spec
-
-          ranges_and_pools = self.servers_and_ranges(self.connection_spec[:datacenter]).map do |info|
-            conn_method = Proc.new do
-              async ? self.new_event_machine_connection(info[:servers]) : self.new_connection(info[:servers])
+            ranges_and_pools = self.servers_and_ranges(self.connection_spec[:datacenter]).map do |info|
+              pool = async ? new_async_connection_pool(info[:servers]) : new_sync_connection_pool(info[:servers])
+              [WithConnection::RangedConnectionPool::BasicRange.new(info[:start_token], info[:end_token]), pool]
             end
-            spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, conn_method
-            pool = WithConnection::ConnectionPool.new "sync cassandra", spec
-            [WithConnection::RangedConnectionPool::BasicRange.new(info[:start_token], info[:end_token]), pool]
-          end
 
-          ranges_and_pools.size <= 1 ? default_pool : WithConnection::RangedConnectionPool.new(ranges_and_pools, default_pool, self.ranged_connection_pool_key_algo)
-        end
-
-        @@sync_ranged_connection_pool = nil
-        @@async_ranged_connection_pool = nil
-        def self.sync_ranged_connection_pool
-          @@sync_ranged_connection_pool ||= create_ranged_connection_pool(false)
-        end
-
-        def self.async_ranged_connection_pool
-          @@async_ranged_connection_pool ||= create_ranged_connection_pool(true)
+            ranges_and_pools.size <= 1 ? default_pool : WithConnection::RangedConnectionPool.new(ranges_and_pools, default_pool, self.ranged_connection_pool_key_algo)
+          else
+            async ? new_async_connection_pool : new_sync_connection_pool
+          end
         end
 
-        if defined?(EM)
-          def self.ranged_connection_pool
-            EM.reactor_running? ? self.async_ranged_connection_pool : self.sync_ranged_connection_pool
-          end
-        else
-          def self.ranged_connection_pool
-            self.sync_ranged_connection_pool
-          end
+        @@sync_connection_pool = nil
+        def self.sync_connection_pool
+          @@sync_connection_pool ||= new_ranged_connection_pool(false)
         end
 
-        def ranged_connection_pool
-          self.class.ranged_connection_pool
+        @@async_connection_pool = nil
+        def self.async_connection_pool
+          @@async_connection_pool ||= new_ranged_connection_pool(true)
         end
 
         if defined?(EM)
@@ -169,17 +120,17 @@ module CassandraObject
           self.class.connection_pool
         end
 
-        def self.connection()
-          self.connection_spec[:datacenter] ? self.ranged_connection_pool.connection : self.connection_pool.connection
+        def self.connection
+          self.connection_pool.connection
         end
-        def self.connection?() !!connection end
+        def self.connection?; !!connection; end
 
-        def self.with_connection(key=nil, &block)
-          self.connection_spec[:datacenter] ? self.ranged_connection_pool.with_connection(key, &block) : self.connection_pool.with_connection(&block)
+        def self.with_connection(key=nil, read_write=nil, &block)
+          self.connection_pool.with_connection(key, read_write, &block)
         end
 
-        def with_connection(key=nil, &block)
-          self.class.with_connection(key, &block)
+        def with_connection(key=nil, read_write=nil, &block)
+          self.class.with_connection(key, read_write, &block)
         end
 
         def self.disconnect!

data/lib/cassandra_object/cursor.rb

@@ -25,7 +25,7 @@ module CassandraObject
       while objects.size < number_to_find && !out_of_keys
         index_results = 
           begin
-            CassandraObject::Base.with_connection(@key) do
+            CassandraObject::Base.with_connection(@key, :read) do
               connection.get(@column_family, @key, @super_column,
                              count: limit,
                              start: start_with,

data/lib/cassandra_object/finder_methods.rb

@@ -11,7 +11,7 @@ module CassandraObject
 
         attributes =
           begin
-            CassandraObject::Base.with_connection(key) do
+            CassandraObject::Base.with_connection(key, :read) do
               ActiveSupport::Notifications.instrument("get.cassandra_object", column_family: column_family, key: key) do
                 connection.get column_family, key, opts.slice(:consistency)
               end
@@ -35,7 +35,7 @@ module CassandraObject
         opts.assert_valid_keys(:consistency)
         opts[:consistency] ||= thrift_read_consistency
 
-        result = CassandraObject::Base.with_connection(key) do
+        result = CassandraObject::Base.with_connection(key, :read) do
           ActiveSupport::Notifications.instrument("get_counter.cassandra_object", column_family: column_family, key: key, column: column) do
             connection.get(column_family, key, column, opts)
           end
@@ -50,7 +50,7 @@ module CassandraObject
 
       def all(options = {})
         limit = options[:limit] || 100
-        results = CassandraObject::Base.with_connection do
+        results = CassandraObject::Base.with_connection(nil, :read) do
           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)
           end
@@ -88,7 +88,7 @@ module CassandraObject
 
       # Selecting a slice of a super column
       def get_slice(key, start, finish, opts={})
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :read) do
           connection.get_slice(column_family,
                                key, 
                                start,
@@ -118,7 +118,7 @@ module CassandraObject
         end
 
         def multi_get(keys, options={})
-          attribute_results = CassandraObject::Base.with_connection do
+          attribute_results = CassandraObject::Base.with_connection(nil, :read) do
             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)
             end
@@ -130,7 +130,7 @@ module CassandraObject
         def multi_get_by_expression(expression, options={})
           options = options.reverse_merge(:consistency => thrift_read_consistency)
 
-          attribute_results = CassandraObject::Base.with_connection do
+          attribute_results = CassandraObject::Base.with_connection(nil, :read) do
             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)

data/lib/cassandra_object/persistence.rb

@@ -4,11 +4,11 @@ module CassandraObject
 
     module ClassMethods
       def add(key, value, *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, {}) }
+        column_family, column, sub_column, options = CassandraObject::Base.with_connection(key, :write) { connection.extract_and_validate_params(self.column_family, key, columns_and_options, {}) }
         # the options are removed, leaving just columns
         columns = columns_and_options
 
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :write) do
           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)
           end
@@ -28,7 +28,7 @@ module CassandraObject
         values.uniq!
         value_spec = values.length == 1 ? values[0] : '<various>'
 
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :write) do
           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)
           end
@@ -36,7 +36,7 @@ module CassandraObject
       end
 
       def remove(key)
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :write) do
           ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do
             connection.remove(column_family, key.to_s, consistency: thrift_write_consistency)
           end
@@ -46,7 +46,7 @@ module CassandraObject
       # remove_counter is not exposed by Cassandra gem.
       # TODO: move this to Cassandra gem.
       def remove_counter(key)
-        CassandraObject::Base.with_connection(key) do
+        CassandraObject::Base.with_connection(key, :write) do
           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)
@@ -55,7 +55,7 @@ module CassandraObject
       end
 
       def delete_all
-        CassandraObject::Base.with_connection do
+        CassandraObject::Base.with_connection(nil, :write) do
           ActiveSupport::Notifications.instrument("truncate.cassandra_object", column_family: column_family) do
             connection.truncate!(column_family)
           end
@@ -72,7 +72,7 @@ module CassandraObject
         key.tap do |key|
           unless attributes.blank?
             attributes = encode_columns_hash(attributes, schema_version)
-            CassandraObject::Base.with_connection(key) do
+            CassandraObject::Base.with_connection(key, :write) do
               ActiveSupport::Notifications.instrument("insert.cassandra_object", column_family: column_family, key: key, attributes: attributes) do
               
                 options = {}.tap do |options|

data/sessionm-cassandra_object.gemspec

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 5
-  - 8
-  version: 2.5.8
+  - 9
+  version: 2.5.9
 platform: ruby
 authors: 
 - Michael Koziarski
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-22 00:00:00 -04:00
+date: 2013-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency