cassandra-driver 1.0.0.beta.1 → 1.0.0.beta.2

data/lib/cassandra/cluster/options.rb

@@ -21,16 +21,18 @@ module Cassandra
     # @private
     class Options
       attr_reader :credentials, :auth_provider, :compressor, :port,
-                  :connection_timeout, :connections_per_local_node, :connections_per_remote_node
+                  :connect_timeout, :ssl, :connections_per_local_node,
+                  :connections_per_remote_node
       attr_accessor :protocol_version
 
-      def initialize(protocol_version, credentials, auth_provider, compressor, port, connection_timeout, connections_per_local_node, connections_per_remote_node)
+      def initialize(protocol_version, credentials, auth_provider, compressor, port, connect_timeout, ssl, connections_per_local_node, connections_per_remote_node)
         @protocol_version   = protocol_version
         @credentials        = credentials
         @auth_provider      = auth_provider
         @compressor         = compressor
         @port               = port
-        @connection_timeout = connection_timeout
+        @connect_timeout    = connect_timeout
+        @ssl                = ssl
 
         @connections_per_local_node  = connections_per_local_node
         @connections_per_remote_node = connections_per_remote_node

data/lib/cassandra/cluster/registry.rb

@@ -45,7 +45,12 @@ module Cassandra
       end
 
       def each_host(&block)
-        @hosts.values.each(&block)
+        if block_given?
+          @hosts.each_value(&block)
+          self
+        else
+          @hosts.values
+        end
       end
       alias :hosts :each_host
 
@@ -81,7 +86,11 @@ module Cassandra
           notify_found(host)
         end
 
-        synchronize { @hosts = @hosts.merge(ip => host) }
+        synchronize do
+          hosts     = @hosts.dup
+          hosts[ip] = host
+          @hosts    = hosts
+        end
 
         self
       end
@@ -94,7 +103,11 @@ module Cassandra
 
         host = toggle_down(host)
 
-        synchronize { @hosts = @hosts.merge(ip => host) }
+        synchronize do
+          hosts     = @hosts.dup
+          hosts[ip] = host
+          @hosts    = hosts
+        end
 
         self
       end
@@ -107,7 +120,11 @@ module Cassandra
 
         host = toggle_up(host)
 
-        synchronize { @hosts = @hosts.merge(ip => host) }
+        synchronize do
+          hosts     = @hosts.dup
+          hosts[ip] = host
+          @hosts    = hosts
+        end
 
         self
       end
@@ -126,17 +143,17 @@ module Cassandra
 
         notify_lost(host)
 
-        self
+        host
       end
 
       private
 
       def create_host(ip, data)
-        Host.new(ip, data['host_id'], data['rack'], data['data_center'], data['release_version'], :up)
+        Host.new(ip, data['host_id'], data['rack'], data['data_center'], data['release_version'], data['tokens'].freeze, :up)
       end
 
       def toggle_up(host)
-        host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, :up)
+        host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, host.tokens, :up)
         @logger.debug("Host #{host.ip} is up")
         @listeners.each do |listener|
           listener.host_up(host) rescue nil
@@ -145,7 +162,7 @@ module Cassandra
       end
 
       def toggle_down(host)
-        host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, :down)
+        host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, host.tokens, :down)
         @logger.debug("Host #{host.ip} is down")
         @listeners.each do |listener|
           listener.host_down(host) rescue nil
@@ -156,7 +173,7 @@ module Cassandra
       def notify_lost(host)
         if host.up?
           @logger.debug("Host #{host.ip} is down and lost")
-          host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, :down)
+          host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, host.tokens, :down)
           @listeners.each do |listener|
             listener.host_down(host) rescue nil
             listener.host_lost(host) rescue nil

data/lib/cassandra/cluster/schema.rb

@@ -30,6 +30,11 @@ module Cassandra
         mon_initialize
       end
 
+      def create_partition_key(keyspace, table, values)
+        keyspace = @keyspaces[keyspace]
+        keyspace && keyspace.create_partition_key(table, values)
+      end
+
       def add_listener(listener)
         synchronize do
           @listeners = @listeners.dup.add(listener)
@@ -90,7 +95,9 @@ module Cassandra
         created = !@keyspaces.include?(keyspace_name)
 
         synchronize do
-          @keyspaces = @keyspaces.merge(keyspace_name => keyspace)
+          keyspaces = @keyspaces.dup
+          keyspaces[keyspace_name] = keyspace
+          @keyspaces = keyspaces
         end
 
         if created
@@ -127,7 +134,9 @@ module Cassandra
         keyspace = keyspace.update_table(table)
 
         synchronize do
-          @keyspaces = @keyspaces.merge(keyspace_name => keyspace)
+          keyspaces = @keyspaces.dup
+          keyspaces[keyspace_name] = keyspace
+          @keyspaces = keyspaces
         end
 
         keyspace_updated(keyspace)
@@ -144,7 +153,12 @@ module Cassandra
       end
 
       def each_keyspace(&block)
-        @keyspaces.values.each(&block)
+        if block_given?
+          @keyspaces.each_value(&block)
+          self
+        else
+          @keyspaces.values
+        end
       end
       alias :keyspaces :each_keyspace
 
@@ -235,7 +249,8 @@ module Cassandra
           end
 
           if is_dense
-            value_alias = table['value_alias'] || 'value'
+            value_alias = table['value_alias']
+            value_alias = 'value' if value_alias.nil? || value_alias.empty?
             type, order = @type_parser.parse(table['default_validator']).results.first
             other_columns << Column.new(value_alias, type, order)
           end
@@ -245,6 +260,8 @@ module Cassandra
           end
         else
           columns.each do |name, row|
+            next if row['column_name'].empty?
+
             column = create_column(row)
             type   = row['type']
             index  = row['component_index'] || 0
@@ -318,4 +335,6 @@ module Cassandra
   end
 end
 
+require 'cassandra/cluster/schema/partitioners'
+require 'cassandra/cluster/schema/replication_strategies'
 require 'cassandra/cluster/schema/type_parser'

data/lib/cassandra/cluster/schema/partitioners.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+require 'cassandra/cluster/schema/partitioners/ordered'
+require 'cassandra/cluster/schema/partitioners/random'
+require 'cassandra/cluster/schema/partitioners/murmur3'

data/lib/cassandra/cluster/schema/partitioners/murmur3.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  class Cluster
+    class Schema
+      # @private
+      module Partitioners
+        # @private
+        class Murmur3
+          def create_token(partition_key)
+            token = Cassandra::Murmur3.hash(partition_key)
+            token = LONG_MAX if token == LONG_MIN
+
+            token
+          end
+
+          def parse_token(token_string)
+            token_string.to_i
+          end
+
+          private
+
+          # @private
+          LONG_MIN = -2 ** 63
+          # @private
+          LONG_MAX = 2 ** 63 - 1
+        end
+      end
+    end
+  end
+end

data/lib/cassandra/cluster/schema/partitioners/ordered.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  class Cluster
+    class Schema
+      # @private
+      module Partitioners
+        # @private
+        class Ordered
+          def create_token(partition_key)
+            partition_key
+          end
+
+          def parse_token(token_string)
+            token_string
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cassandra/cluster/schema/partitioners/random.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  class Cluster
+    class Schema
+      # @private
+      module Partitioners
+        # @private
+        class Random
+          def create_token(partition_key)
+            Digest::MD5.hexdigest(partition_key).to_i(16)
+          end
+
+          def parse_token(token_string)
+            token_string.to_i
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cassandra/cluster/schema/replication_strategies.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+require 'cassandra/cluster/schema/replication_strategies/simple'
+require 'cassandra/cluster/schema/replication_strategies/network_topology'
+require 'cassandra/cluster/schema/replication_strategies/none'

data/lib/cassandra/cluster/schema/replication_strategies/network_topology.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  class Cluster
+    class Schema
+      # @private
+      module ReplicationStrategies
+        # @private
+        class NetworkTopology
+          def replication_map(token_hosts, token_ring, replication_options)
+            size  = token_ring.size
+            racks = ::Hash.new
+            token_hosts.each_value do |host|
+              racks[host.datacenter] ||= ::Set.new
+              racks[host.datacenter].add(host.rack)
+            end
+
+            replication_map = ::Hash.new
+
+            token_ring.each_with_index do |token, i|
+              all_replicas = ::Hash.new
+              visited = ::Hash.new
+              skipped_datacenter_hosts = ::Hash.new
+              replicas = ::Set.new
+
+              size.times do |j|
+                break if all_replicas.size == racks.size && !all_replicas.any? {|(datacenter, r)| r.size < Integer(replication_options[datacenter])}
+
+                host       = token_hosts[token_ring[(i + j) % size]]
+                datacenter = host.datacenter
+                next if datacenter.nil?
+
+                factor = replication_options[datacenter]
+                next unless factor
+
+                factor = Integer(factor) rescue next
+
+                replicas_in_datacenter = all_replicas[datacenter] ||= ::Set.new
+                next if replicas_in_datacenter.size >= factor
+
+                rack = host.rack
+                visited_racks = visited[datacenter] ||= ::Set.new
+
+                if rack.nil? || visited_racks.size == racks[datacenter].size
+                  replicas << host
+                  replicas_in_datacenter << host
+                else
+                  if visited_racks.include?(rack)
+                    skipped_hosts = skipped_datacenter_hosts[datacenter] ||= ::Set.new
+                    skipped_hosts << host
+                  else
+                    replicas << host
+                    replicas_in_datacenter << host
+                    visited_racks << rack
+
+                    if visited_racks.size == racks[datacenter].size && (skipped_hosts = skipped_datacenter_hosts[datacenter]) && replicas_in_datacenter.size < factor
+                      skipped_hosts.each do |skipped_host|
+                        replicas << skipped_host
+                        replicas_in_datacenter << skipped_host
+                        break if replicas_in_datacenter.size >= factor
+                      end
+                    end
+                  end
+                end
+              end
+
+              replication_map[token] = replicas.to_a.freeze
+            end
+
+            replication_map
+          end
+        end
+      end
+    end
+  end
+end