cassandra-driver 3.0.0.beta.1 → 3.0.0.rc.1

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,31 +26,31 @@ module Cassandra
         Result = Struct.new(:results, :collections)
 
         @@types = {
-          "org.apache.cassandra.db.marshal.AsciiType"         => :ascii,
-          "org.apache.cassandra.db.marshal.LongType"          => :bigint,
-          "org.apache.cassandra.db.marshal.BytesType"         => :blob,
-          "org.apache.cassandra.db.marshal.BooleanType"       => :boolean,
-          "org.apache.cassandra.db.marshal.CounterColumnType" => :counter,
-          "org.apache.cassandra.db.marshal.DecimalType"       => :decimal,
-          "org.apache.cassandra.db.marshal.DoubleType"        => :double,
-          "org.apache.cassandra.db.marshal.FloatType"         => :float,
-          "org.apache.cassandra.db.marshal.InetAddressType"   => :inet,
-          "org.apache.cassandra.db.marshal.Int32Type"         => :int,
-          "org.apache.cassandra.db.marshal.UTF8Type"          => :text,
-          "org.apache.cassandra.db.marshal.TimestampType"     => :timestamp,
-          "org.apache.cassandra.db.marshal.DateType"          => :timestamp,
-          "org.apache.cassandra.db.marshal.UUIDType"          => :uuid,
-          "org.apache.cassandra.db.marshal.IntegerType"       => :varint,
-          "org.apache.cassandra.db.marshal.TimeUUIDType"      => :timeuuid,
-          "org.apache.cassandra.db.marshal.MapType"           => :map,
-          "org.apache.cassandra.db.marshal.SetType"           => :set,
-          "org.apache.cassandra.db.marshal.ListType"          => :list,
-          "org.apache.cassandra.db.marshal.UserType"          => :udt,
-          "org.apache.cassandra.db.marshal.TupleType"         => :tuple,
-          "org.apache.cassandra.db.marshal.ShortType"         => :smallint,
-          "org.apache.cassandra.db.marshal.ByteType"          => :tinyint,
-          "org.apache.cassandra.db.marshal.TimeType"          => :time,
-          "org.apache.cassandra.db.marshal.SimpleDateType"    => :date,
+          'org.apache.cassandra.db.marshal.AsciiType'         => :ascii,
+          'org.apache.cassandra.db.marshal.LongType'          => :bigint,
+          'org.apache.cassandra.db.marshal.BytesType'         => :blob,
+          'org.apache.cassandra.db.marshal.BooleanType'       => :boolean,
+          'org.apache.cassandra.db.marshal.CounterColumnType' => :counter,
+          'org.apache.cassandra.db.marshal.DecimalType'       => :decimal,
+          'org.apache.cassandra.db.marshal.DoubleType'        => :double,
+          'org.apache.cassandra.db.marshal.FloatType'         => :float,
+          'org.apache.cassandra.db.marshal.InetAddressType'   => :inet,
+          'org.apache.cassandra.db.marshal.Int32Type'         => :int,
+          'org.apache.cassandra.db.marshal.UTF8Type'          => :text,
+          'org.apache.cassandra.db.marshal.TimestampType'     => :timestamp,
+          'org.apache.cassandra.db.marshal.DateType'          => :timestamp,
+          'org.apache.cassandra.db.marshal.UUIDType'          => :uuid,
+          'org.apache.cassandra.db.marshal.IntegerType'       => :varint,
+          'org.apache.cassandra.db.marshal.TimeUUIDType'      => :timeuuid,
+          'org.apache.cassandra.db.marshal.MapType'           => :map,
+          'org.apache.cassandra.db.marshal.SetType'           => :set,
+          'org.apache.cassandra.db.marshal.ListType'          => :list,
+          'org.apache.cassandra.db.marshal.UserType'          => :udt,
+          'org.apache.cassandra.db.marshal.TupleType'         => :tuple,
+          'org.apache.cassandra.db.marshal.ShortType'         => :smallint,
+          'org.apache.cassandra.db.marshal.ByteType'          => :tinyint,
+          'org.apache.cassandra.db.marshal.TimeType'          => :time,
+          'org.apache.cassandra.db.marshal.SimpleDateType'    => :date
         }.freeze
 
         def parse(string)
@@ -63,15 +63,16 @@ module Cassandra
           collections = nil
           results     = []
 
-          if node.name == "org.apache.cassandra.db.marshal.CompositeType"
+          if node.name == 'org.apache.cassandra.db.marshal.CompositeType'
             collections = {}
 
-            if node.children.last.name == "org.apache.cassandra.db.marshal.ColumnToCollectionType"
+            if node.children.last.name ==
+               'org.apache.cassandra.db.marshal.ColumnToCollectionType'
               node.children.pop.children.each do |child|
-                key, name  = child.name.split(":")
+                key, name  = child.name.split(':')
                 key        = [key].pack('H*').force_encoding(::Encoding::UTF_8)
 
-                if name == "org.apache.cassandra.db.marshal.ReversedType"
+                if name == 'org.apache.cassandra.db.marshal.ReversedType'
                   collections[key] = lookup_type(child.children.first)
                 else
                   child.name = name
@@ -94,12 +95,12 @@ module Cassandra
           order  = :asc
           frozen = false
 
-          if node.name == "org.apache.cassandra.db.marshal.ReversedType"
+          if node.name == 'org.apache.cassandra.db.marshal.ReversedType'
             order = :desc
             node  = node.children.first
           end
 
-          if node.name == "org.apache.cassandra.db.marshal.FrozenType"
+          if node.name == 'org.apache.cassandra.db.marshal.FrozenType'
             frozen = true
             node   = node.children.first
           end
@@ -108,11 +109,13 @@ module Cassandra
         end
 
         def lookup_type(node)
-          if node.name == "org.apache.cassandra.db.marshal.FrozenType"
+          if node.name == 'org.apache.cassandra.db.marshal.FrozenType'
             return lookup_type(node.children.first)
           end
 
-          type = @@types.fetch(node.name) { return Cassandra::Types.custom(dump_node(node)) }
+          type = @@types.fetch(node.name) do
+            return Cassandra::Types.custom(dump_node(node))
+          end
 
           case type
           when :set, :list
@@ -123,7 +126,7 @@ module Cassandra
             keyspace = node.children.shift.name
             name     = [node.children.shift.name].pack('H*')
             fields   = node.children.map do |child|
-              field_name, child_name = child.name.split(":")
+              field_name, child_name = child.name.split(':')
 
               child.name = child_name
               field_name = [field_name].pack('H*').force_encoding(::Encoding::UTF_8)
@@ -166,7 +169,9 @@ module Cassandra
 
         def dump_node(node)
           str = node.name
-          str << '(' + node.children.map {|n| dump_node(n)}.join(',') + ')' unless node.children.empty?
+          unless node.children.empty?
+            str << '(' + node.children.map { |n| dump_node(n) }.join(',') + ')'
+          end
           str
         end
       end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,9 +37,9 @@ module Cassandra
           private
 
           # @private
-          LONG_MIN = -2 ** 63
+          LONG_MIN = -2**63
           # @private
-          LONG_MAX = 2 ** 63 - 1
+          LONG_MAX = 2**63 - 1
         end
       end
     end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ module Cassandra
               racks[host.datacenter] ||= ::Set.new
               racks[host.datacenter].add(host.rack)
 
-              datacenter_token_rings[host.datacenter]  ||= Hash.new
+              datacenter_token_rings[host.datacenter]  ||= {}
               datacenter_token_rings[host.datacenter][i] = token
             end
 
@@ -48,8 +48,11 @@ module Cassandra
               replication_options.each do |datacenter, factor|
                 ring = datacenter_token_rings[datacenter]
                 next unless ring
-                factor = [Integer(factor), ring.size].min rescue next
-
+                factor = begin
+                           [Integer(factor), ring.size].min
+                         rescue
+                           next
+                         end
 
                 total_racks    = racks[datacenter].size
                 visited_racks  = visited[datacenter] ||= ::Set.new
@@ -68,21 +71,19 @@ module Cassandra
                   if rack.nil? || visited_racks.size == total_racks
                     replicas << host
                     added_replicas << host
+                  elsif visited_racks.include?(rack)
+                    skipped_hosts << host
                   else
-                    if visited_racks.include?(rack)
-                      skipped_hosts << host
-                    else
-                      replicas << host
-                      visited_racks << rack
-                      added_replicas << host
-
-                      if visited_racks.size == total_racks
-                        skipped_hosts.each do |skipped_host|
-                          break if added_replicas.size >= factor
-
-                          replicas << skipped_host
-                          added_replicas << host
-                        end
+                    replicas << host
+                    visited_racks << rack
+                    added_replicas << host
+
+                    if visited_racks.size == total_racks
+                      skipped_hosts.each do |skipped_host|
+                        break if added_replicas.size >= factor
+
+                        replicas << skipped_host
+                        added_replicas << host
                       end
                     end
                   end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/column.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ module Cassandra
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @name=#{@name} @type=#{@type}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} @name=#{@name} @type=#{@type}>"
     end
 
     # @private
@@ -80,6 +80,6 @@ module Cassandra
         @static == other.static? &&
         @frozen == other.frozen?
     end
-    alias :== :eql?
+    alias == eql?
   end
 end

data/lib/cassandra/compression.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/compression/compressors/lz4.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,12 +33,13 @@ module Cassandra
 
         # @param [Integer] min_size (64) Don't compress frames smaller than
         #   this size (see {#compress?}).
-        def initialize(min_size=64)
+        def initialize(min_size = 64)
           unless defined?(::LZ4::Raw)
             begin
               require 'lz4-ruby'
             rescue LoadError => e
-              raise LoadError, %[LZ4 support requires the "lz4-ruby" gem: #{e.message}], e.backtrace
+              raise LoadError, %(LZ4 support requires the "lz4-ruby" gem: #{e.message}),
+                    e.backtrace
             end
           end
 

data/lib/cassandra/compression/compressors/snappy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,12 +33,13 @@ module Cassandra
 
         # @param [Integer] min_size (64) Don't compress frames smaller than
         #   this size (see {#compress?}).
-        def initialize(min_size=64)
+        def initialize(min_size = 64)
           unless defined?(::Snappy)
             begin
               require 'snappy'
             rescue LoadError => e
-              raise LoadError, %[Snappy support requires the "snappy" gem: #{e.message}], e.backtrace
+              raise LoadError, %(Snappy support requires the "snappy" gem: #{e.message}),
+                    e.backtrace
             end
           end
 

data/lib/cassandra/driver.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,28 +20,33 @@ module Cassandra
   # @private
   class Driver
     def self.let(name, &block)
-      define_method(name)        { @instances.has_key?(name) ? @instances[name] : @instances[name] = instance_eval(&block) }
+      define_method(name) do
+        @instances.key?(name) ?
+            @instances[name] :
+            @instances[name] = instance_eval(&block)
+      end
       define_method(:"#{name}=") { |object| @instances[name] = object }
     end
 
     let(:io_reactor)       { Ione::Io::IoReactor.new }
     let(:cluster_registry) { Cluster::Registry.new(logger) }
     let(:cluster_schema)   { Cluster::Schema.new }
-    let(:cluster_metadata) { Cluster::Metadata.new(
-                               cluster_registry,
-                               cluster_schema,
-                               {
-                                 'org.apache.cassandra.dht.Murmur3Partitioner'     => murmur3_partitioner,
-                                 'org.apache.cassandra.dht.ByteOrderedPartitioner' => ordered_partitioner,
-                                 'org.apache.cassandra.dht.RandomPartitioner'      => random_partitioner
-                               }.freeze,
-                               {
-                                 'SimpleStrategy'          => simple_replication_strategy,
-                                 'NetworkTopologyStrategy' => network_topology_replication_strategy
-                               }.freeze,
-                               no_replication_strategy
-                              )
-                           }
+    let(:cluster_metadata) do
+      Cluster::Metadata.new(
+        cluster_registry,
+        cluster_schema,
+        {
+          'org.apache.cassandra.dht.Murmur3Partitioner' => murmur3_partitioner,
+          'org.apache.cassandra.dht.ByteOrderedPartitioner' => ordered_partitioner,
+          'org.apache.cassandra.dht.RandomPartitioner' => random_partitioner
+        }.freeze,
+        {
+          'SimpleStrategy' => simple_replication_strategy,
+          'NetworkTopologyStrategy' => network_topology_replication_strategy
+        }.freeze,
+        no_replication_strategy
+      )
+    end
 
     let(:executor)         { Executors::ThreadPool.new(thread_pool_size) }
     let(:futures_factory)  { Future::Factory.new(executor) }
@@ -49,34 +54,73 @@ module Cassandra
     let(:schema_fqcn_type_parser) { Cluster::Schema::FQCNTypeParser.new }
     let(:schema_cql_type_parser)  { Cluster::Schema::CQLTypeParser.new }
 
-    let(:simple_replication_strategy)           { Cluster::Schema::ReplicationStrategies::Simple.new }
-    let(:network_topology_replication_strategy) { Cluster::Schema::ReplicationStrategies::NetworkTopology.new }
-    let(:no_replication_strategy)               { Cluster::Schema::ReplicationStrategies::None.new }
+    let(:simple_replication_strategy) do
+      Cluster::Schema::ReplicationStrategies::Simple.new
+    end
+    let(:network_topology_replication_strategy) do
+      Cluster::Schema::ReplicationStrategies::NetworkTopology.new
+    end
+    let(:no_replication_strategy) do
+      Cluster::Schema::ReplicationStrategies::None.new
+    end
 
     let(:murmur3_partitioner) { Cluster::Schema::Partitioners::Murmur3.new }
     let(:ordered_partitioner) { Cluster::Schema::Partitioners::Ordered.new }
     let(:random_partitioner)  { Cluster::Schema::Partitioners::Random.new }
 
-    let(:connector) { Cluster::Connector.new(logger, io_reactor, cluster_registry, connection_options, execution_options) }
+    let(:connector) do
+      Cluster::Connector.new(logger,
+                             io_reactor,
+                             cluster_registry,
+                             connection_options,
+                             execution_options)
+    end
 
     let(:schema_fetcher) { create_schema_fetcher_picker }
 
-    let(:control_connection) { Cluster::ControlConnection.new(logger, io_reactor, cluster_registry, cluster_schema, cluster_metadata, load_balancing_policy, reconnection_policy, address_resolution_policy, connector, connection_options, schema_fetcher) }
+    let(:control_connection) do
+      Cluster::ControlConnection.new(logger,
+                                     io_reactor,
+                                     cluster_registry,
+                                     cluster_schema,
+                                     cluster_metadata,
+                                     load_balancing_policy,
+                                     reconnection_policy,
+                                     address_resolution_policy,
+                                     connector,
+                                     connection_options,
+                                     schema_fetcher)
+    end
 
-    let(:cluster) { Cluster.new(logger, io_reactor, executor, control_connection, cluster_registry, cluster_schema, cluster_metadata, execution_options, connection_options, load_balancing_policy, reconnection_policy, retry_policy, address_resolution_policy, connector, futures_factory) }
+    let(:cluster) do
+      Cluster.new(logger,
+                  io_reactor,
+                  executor,
+                  control_connection,
+                  cluster_registry,
+                  cluster_schema,
+                  cluster_metadata,
+                  execution_options,
+                  connection_options,
+                  load_balancing_policy,
+                  reconnection_policy,
+                  retry_policy,
+                  address_resolution_policy,
+                  connector,
+                  futures_factory)
+    end
 
     let(:execution_options) do
-      Execution::Options.new({
-        :consistency => consistency,
-        :trace       => trace,
-        :page_size   => page_size,
-        :timeout     => timeout,
-        :idempotent  => false
-      })
+      Execution::Options.new(consistency: consistency,
+                             trace: trace,
+                             page_size: page_size,
+                             timeout: timeout,
+                             idempotent: false)
     end
 
     let(:connection_options) do
       Cluster::Options.new(
+        logger,
         protocol_version,
         credentials,
         auth_provider,
@@ -92,7 +136,8 @@ module Cassandra
         schema_refresh_delay,
         schema_refresh_timeout,
         client_timestamps,
-        nodelay
+        nodelay,
+        requests_per_connection
       )
     end
 
@@ -100,13 +145,19 @@ module Cassandra
     let(:protocol_version)          { 4 }
     let(:connect_timeout)           { 10 }
     let(:ssl)                       { false }
-    let(:logger)                    { NullLogger.new  }
+    let(:logger)                    { NullLogger.new }
     let(:compressor)                { nil }
     let(:credentials)               { nil }
     let(:auth_provider)             { nil }
     let(:datacenter)                { nil }
-    let(:load_balancing_policy)     { LoadBalancing::Policies::TokenAware.new(LoadBalancing::Policies::DCAwareRoundRobin.new(datacenter, 0), shuffle_replicas) }
-    let(:reconnection_policy)       { Reconnection::Policies::Exponential.new(0.5, 30, 2) }
+    let(:load_balancing_policy)     do
+      LoadBalancing::Policies::TokenAware.new(
+        LoadBalancing::Policies::DCAwareRoundRobin.new(datacenter, 0),
+        shuffle_replicas)
+    end
+    let(:reconnection_policy) do
+      Reconnection::Policies::Exponential.new(0.5, 30, 2)
+    end
     let(:retry_policy)              { Retry::Policies::Default.new }
     let(:address_resolution_policy) { AddressResolution::Policies::None.new }
     let(:consistency)               { :local_one }
@@ -123,8 +174,9 @@ module Cassandra
     let(:client_timestamps)         { false }
     let(:nodelay)                   { true }
 
-    let(:connections_per_local_node)  { 2 }
-    let(:connections_per_remote_node) { 1 }
+    let(:connections_per_local_node)  { nil }
+    let(:connections_per_remote_node) { nil }
+    let(:requests_per_connection) { nil }
 
     let(:listeners) { [] }
 
@@ -166,11 +218,21 @@ module Cassandra
     def create_schema_fetcher_picker
       picker = Cluster::Schema::Fetchers::MultiVersion.new(cluster_registry)
 
-      picker.when('1.2') { Cluster::Schema::Fetchers::V1_2_x.new(schema_fqcn_type_parser, cluster_schema) }
-      picker.when('2.0') { Cluster::Schema::Fetchers::V2_0_x.new(schema_fqcn_type_parser, cluster_schema) }
-      picker.when('2.1') { Cluster::Schema::Fetchers::V2_1_x.new(schema_fqcn_type_parser, cluster_schema) }
-      picker.when('2.2') { Cluster::Schema::Fetchers::V2_2_x.new(schema_fqcn_type_parser, cluster_schema) }
-      picker.when('3.0') { Cluster::Schema::Fetchers::V3_0_x.new(schema_cql_type_parser, cluster_schema) }
+      picker.when('1.2') do
+        Cluster::Schema::Fetchers::V1_2_x.new(schema_fqcn_type_parser, cluster_schema)
+      end
+      picker.when('2.0') do
+        Cluster::Schema::Fetchers::V2_0_x.new(schema_fqcn_type_parser, cluster_schema)
+      end
+      picker.when('2.1') do
+        Cluster::Schema::Fetchers::V2_1_x.new(schema_fqcn_type_parser, cluster_schema)
+      end
+      picker.when('2.2') do
+        Cluster::Schema::Fetchers::V2_2_x.new(schema_fqcn_type_parser, cluster_schema)
+      end
+      picker.when('3.') do
+        Cluster::Schema::Fetchers::V3_0_x.new(schema_cql_type_parser, cluster_schema)
+      end
 
       picker
     end