cassandra-driver 2.1.7-java → 3.0.0.beta.1-java

data/lib/cassandra/cluster/schema/{type_parser.rb → fqcn_type_parser.rb}

@@ -19,7 +19,7 @@
 module Cassandra
   class Cluster
     class Schema
-      class TypeParser
+      class FQCNTypeParser
         # @private
         Node   = Struct.new(:parent, :name, :children)
         # @private
@@ -36,7 +36,7 @@ module Cassandra
           "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"          => :varchar,
+          "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,
@@ -46,7 +46,11 @@ module Cassandra
           "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.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)

data/lib/cassandra/column.rb

@@ -65,12 +65,12 @@ module Cassandra
       @frozen
     end
 
-    # @return [String] a CLI-friendly column representation
+    # @private
     def inspect
       "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @name=#{@name} @type=#{@type}>"
     end
 
-    # @return [Boolean] whether this column is equal to the other
+    # @private
     def eql?(other)
       other.is_a?(Column) &&
         @name == other.name &&

data/lib/cassandra/driver.rb

@@ -26,7 +26,7 @@ module Cassandra
 
     let(:io_reactor)       { Ione::Io::IoReactor.new }
     let(:cluster_registry) { Cluster::Registry.new(logger) }
-    let(:cluster_schema)   { Cluster::Schema.new(schema_type_parser) }
+    let(:cluster_schema)   { Cluster::Schema.new }
     let(:cluster_metadata) { Cluster::Metadata.new(
                                cluster_registry,
                                cluster_schema,
@@ -36,8 +36,8 @@ module Cassandra
                                  'org.apache.cassandra.dht.RandomPartitioner'      => random_partitioner
                                }.freeze,
                                {
-                                 'org.apache.cassandra.locator.SimpleStrategy'          => simple_replication_strategy,
-                                 'org.apache.cassandra.locator.NetworkTopologyStrategy' => network_topology_replication_strategy
+                                 'SimpleStrategy'          => simple_replication_strategy,
+                                 'NetworkTopologyStrategy' => network_topology_replication_strategy
                                }.freeze,
                                no_replication_strategy
                               )
@@ -46,7 +46,8 @@ module Cassandra
     let(:executor)         { Executors::ThreadPool.new(thread_pool_size) }
     let(:futures_factory)  { Future::Factory.new(executor) }
 
-    let(:schema_type_parser) { Cluster::Schema::TypeParser.new }
+    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 }
@@ -58,7 +59,9 @@ module Cassandra
 
     let(:connector) { Cluster::Connector.new(logger, io_reactor, cluster_registry, connection_options, execution_options) }
 
-    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) }
+    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(: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) }
 
@@ -67,7 +70,8 @@ module Cassandra
         :consistency => consistency,
         :trace       => trace,
         :page_size   => page_size,
-        :timeout     => timeout
+        :timeout     => timeout,
+        :idempotent  => false
       })
     end
 
@@ -93,7 +97,7 @@ module Cassandra
     end
 
     let(:port)                      { 9042 }
-    let(:protocol_version)          { 3 }
+    let(:protocol_version)          { 4 }
     let(:connect_timeout)           { 10 }
     let(:ssl)                       { false }
     let(:logger)                    { NullLogger.new  }
@@ -105,7 +109,7 @@ module Cassandra
     let(:reconnection_policy)       { Reconnection::Policies::Exponential.new(0.5, 30, 2) }
     let(:retry_policy)              { Retry::Policies::Default.new }
     let(:address_resolution_policy) { AddressResolution::Policies::None.new }
-    let(:consistency)               { :one }
+    let(:consistency)               { :local_one }
     let(:trace)                     { false }
     let(:page_size)                 { 10000 }
     let(:heartbeat_interval)        { 30 }
@@ -117,7 +121,7 @@ module Cassandra
     let(:thread_pool_size)          { 4 }
     let(:shuffle_replicas)          { true }
     let(:client_timestamps)         { false }
-    let(:nodelay)                   { false }
+    let(:nodelay)                   { true }
 
     let(:connections_per_local_node)  { 2 }
     let(:connections_per_remote_node) { 1 }
@@ -156,5 +160,19 @@ module Cassandra
 
       promise.future
     end
+
+    private
+
+    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
+    end
   end
 end

data/lib/cassandra/errors.rb

@@ -46,6 +46,25 @@ module Cassandra
     # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L654-L655 Description of Server Error in Apache Cassandra native protocol spec v1
     class ServerError < ::StandardError
       include Error, HostError
+
+      # @private
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries)
+        super(message)
+        @payload     = payload
+        @warnings    = warnings
+        @keyspace    = keyspace
+        @statement   = statement
+        @options     = options
+        @hosts       = hosts
+        @consistency = consistency
+        @retries     = retries
+      end
+
+      # Query execution information, such as number of retries and all tried hosts, etc.
+      # @return [Cassandra::Execution::Info]
+      def execution_info
+        @info ||= Execution::Info.new(@payload, @warnings, @keyspace, @statement, @options, @hosts, @consistency, @retries, nil)
+      end
     end
 
     # Mixed into all internal driver errors.
@@ -70,21 +89,30 @@ module Cassandra
 
     # Raised when a timeout has occured.
     class TimeoutError < ::Timeout::Error
-      include Error, HostError
+      include Error
     end
 
     # Mixed into all request execution errors.
     module ExecutionError
       include Error
 
-      # @return [Cassandra::Statement] statement that triggered the error.
-      attr_reader :statement
-
       # @private
-      def initialize(message, statement)
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries)
         super(message)
+        @payload     = payload
+        @warnings    = warnings
+        @keyspace    = keyspace
+        @statement   = statement
+        @options     = options
+        @hosts       = hosts
+        @consistency = consistency
+        @retries     = retries
+      end
 
-        @statement = statement
+      # Query execution information, such as number of retries and all tried hosts, etc.
+      # @return [Cassandra::Execution::Info]
+      def execution_info
+        @info ||= Execution::Info.new(@payload, @warnings, @keyspace, @statement, @options, @hosts, @consistency, @retries, nil)
       end
     end
 
@@ -112,9 +140,8 @@ module Cassandra
       attr_reader :alive
 
       # @private
-      def initialize(message, statement, consistency, required, alive)
-        super(message, statement)
-
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries, consistency, required, alive)
+        super(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries)
         @consistency = consistency
         @required    = required
         @alive       = alive
@@ -164,9 +191,8 @@ module Cassandra
       attr_reader :received
 
       # @private
-      def initialize(message, statement, type, consistency, required, received)
-        super(message, statement)
-
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries, type, consistency, required, received)
+        super(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries)
         @type        = type
         @consistency = consistency
         @required    = required
@@ -194,12 +220,75 @@ module Cassandra
       attr_reader :received
 
       # @private
-      def initialize(message, statement, retrieved, consistency, required, received)
-        super(message, statement)
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries, retrieved, consistency, required, received)
+        super(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries)
+        @retrieved   = retrieved
+        @consistency = consistency
+        @required    = required
+        @received    = received
+      end
+
+      def retrieved?
+        @retrieved
+      end
+    end
+
+    # Raised when a write request fails.
+    #
+    # @see https://github.com/apache/cassandra/blob/33f1edcce97779c971d4f78712a9a8bf014ffbbc/doc/native_protocol_v4.spec#L1111-L1138 Description of Write Failure Error in Apache Cassandra native protocol spec v4
+    class WriteError < ::StandardError
+      include ExecutionError
+
+      # @return [Symbol] the type of write request that timed out, one of
+      #   {Cassandra::WRITE_TYPES}
+      attr_reader :type
+      # @return [Symbol] the original consistency level for the request, one of
+      #   {Cassandra::CONSISTENCIES}
+      attr_reader :consistency
+      # @return [Integer] the number of acks required
+      attr_reader :required
+      # @return [Integer] the number of acks received
+      attr_reader :received
+      # @return [Integer] the number of writes failed
+      attr_reader :failed
+
+      # @private
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries, type, consistency, required, failed, received)
+        super(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries)
+        @type        = type
+        @consistency = consistency
+        @required    = required
+        @failed      = failed
+        @received    = received
+      end
+    end
+
+    # Raised when a read request fails.
+    #
+    # @see https://github.com/apache/cassandra/blob/33f1edcce97779c971d4f78712a9a8bf014ffbbc/doc/native_protocol_v4.spec#L1089-L1103 Description of Read Failure Error in Apache Cassandra native protocol spec v4
+    class ReadError < ::StandardError
+      include ExecutionError
 
+      # @return [Boolean] whether actual data (as opposed to data checksum) was
+      #   present in the received responses.
+      attr_reader :retrieved
+      # @return [Symbol] the original consistency level for the request, one of
+      #   {Cassandra::CONSISTENCIES}
+      attr_reader :consistency
+      # @return [Integer] the number of responses required
+      attr_reader :required
+      # @return [Integer] the number of responses received
+      attr_reader :received
+      # @return [Integer] the number of reads failed
+      attr_reader :failed
+
+      # @private
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries, retrieved, consistency, required, failed, received)
+        super(message, payload, warnings, keyspace, statement, options, hosts, r_consistency, retries)
         @retrieved   = retrieved
         @consistency = consistency
         @required    = required
+        @failed      = failed
         @received    = received
       end
 
@@ -208,6 +297,28 @@ module Cassandra
       end
     end
 
+    # Raised when function execution fails.
+    #
+    # @see https://github.com/apache/cassandra/blob/33f1edcce97779c971d4f78712a9a8bf014ffbbc/doc/native_protocol_v4.spec#L1104-L1110 Description of Function Failure Error in Apache Cassandra native protocol spec v4
+    class FunctionCallError < ::StandardError
+      include ExecutionError
+
+      # @return [String] keyspace
+      attr_reader :keyspace
+      # @return [String] name
+      attr_reader :name
+      # @return [String] signature
+      attr_reader :signature
+
+      # @private
+      def initialize(message, payload, warnings, r_keyspace, statement, options, hosts, consistency, retries, keyspace, name, signature)
+        super(message, payload, warnings, r_keyspace, statement, options, hosts, consistency, retries)
+        @keyspace  = keyspace
+        @name      = name
+        @signature = signature
+      end
+    end
+
     # Client error represents bad driver state or mis-configuration
     class ClientError < ::StandardError
       include Error
@@ -218,26 +329,71 @@ module Cassandra
     #
     # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L656-L658 Description of Protocol Error in Apache Cassandra native protocol spec v1
     class ProtocolError < ClientError
+      # @private
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries)
+        super(message)
+        @payload     = payload
+        @warnings    = warnings
+        @keyspace    = keyspace
+        @statement   = statement
+        @options     = options
+        @hosts       = hosts
+        @consistency = consistency
+        @retries     = retries
+      end
+
+      # Query execution information, such as number of retries and all tried hosts, etc.
+      # @return [Cassandra::Execution::Info]
+      def execution_info
+        @info ||= Execution::Info.new(@payload, @warnings, @keyspace, @statement, @options, @hosts, @consistency, @retries, nil)
+      end
     end
 
     # Raised when cannot authenticate to Cassandra
     #
     # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L659-L660 Description of Bad Credentials Error in Apache Cassandra native protocol spec v1
     class AuthenticationError < ClientError
+      # @private
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries)
+        super(message)
+        @payload     = payload
+        @warnings    = warnings
+        @keyspace    = keyspace
+        @statement   = statement
+        @options     = options
+        @hosts       = hosts
+        @consistency = consistency
+        @retries     = retries
+      end
+
+      # Query execution information, such as number of retries and all tried hosts, etc.
+      # @return [Cassandra::Execution::Info]
+      def execution_info
+        @info ||= Execution::Info.new(@payload, @warnings, @keyspace, @statement, @options, @hosts, @consistency, @retries, nil)
+      end
     end
 
     # Mixed into all request validation errors.
     module ValidationError
       include Error
 
-      # @return [Cassandra::Statement] statement that triggered the error.
-      attr_reader :statement
-
       # @private
-      def initialize(message, statement)
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries)
         super(message)
+        @payload     = payload
+        @warnings    = warnings
+        @keyspace    = keyspace
+        @statement   = statement
+        @options     = options
+        @hosts       = hosts
+        @consistency = consistency
+        @retries     = retries
+      end
 
-        @statement = statement
+      # Query execution information, such as number of retries and all tried hosts, etc.
+      # @return [Cassandra::Execution::Info]
+      def execution_info
+        @info ||= Execution::Info.new(@payload, @warnings, @keyspace, @statement, @options, @hosts, @consistency, @retries, nil)
       end
     end
 
@@ -254,9 +410,8 @@ module Cassandra
       attr_reader :id
 
       # @private
-      def initialize(message, statement, id)
-        super(message, statement)
-
+      def initialize(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries, id)
+        super(message, payload, warnings, keyspace, statement, options, hosts, consistency, retries)
         @id = id
       end
     end
@@ -322,9 +477,8 @@ module Cassandra
       attr_reader :table
 
       # @private
-      def initialize(message, statement, keyspace, table)
-        super(message, statement)
-
+      def initialize(message, payload, warnings, r_keyspace, statement, options, hosts, consistency, retries, keyspace, table)
+        super(message, payload, warnings, r_keyspace, statement, options, hosts, consistency, retries)
         @keyspace = keyspace
         @table    = table
       end

data/lib/cassandra/execution/info.rb

@@ -19,6 +19,11 @@
 module Cassandra
   module Execution
     class Info
+      # @return [Hash<String, String>] a map of string keys and byte buffer
+      #   values, containing custom payloads sent by custom query handlers
+      attr_reader :payload
+      # @return [Array<String>] a list of string warnings from the server
+      attr_reader :warnings
       # @return [String] keyspace used for the query
       attr_reader :keyspace
       # @return [Cassandra::Statement] original statement
@@ -37,7 +42,9 @@ module Cassandra
       attr_reader :trace
 
       # @private
-      def initialize(keyspace, statement, options, hosts, consistency, retries, trace)
+      def initialize(payload, warnings, keyspace, statement, options, hosts, consistency, retries, trace)
+        @payload     = payload
+        @warnings    = warnings
         @keyspace    = keyspace
         @statement   = statement
         @options     = options