cassandra-driver 2.0.1-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d782a7b9279adb3048c9016528c985711a1ff8
-  data.tar.gz: 7d34349798d149e436b0b15cd091cb5f843b100a
+  metadata.gz: dd542f743d228a5e67cba4fe1536b37a9de0cc83
+  data.tar.gz: 92081e939206f9b8b5acb80b7014236fc9087218
 SHA512:
-  metadata.gz: afe2e6d1a624d68f2e5b6912a23376b604f7535cd983693cfa58529e195cff5e19f7688557231855597ccc8c83a9614a67c7465dc51cf9bf0cf1d880c9d67a33
-  data.tar.gz: 2ac2b96751e6af10fc3f0377d8bcf3d5a0bc8c4a17a0b57bdcee3e2e2f4942259337433978d8281ca7b359f9665eb9df2a5e6242a62ba728336a77e3dfc90bf8
+  metadata.gz: f48958fb98132a2f2fbde354680cdbce0e466b56cf2cbcd5aac666cd19897a0ff69f5ae943ddf80f54f7b7c59f8c2588e97f540089986b1603b43fbfe64e15b8
+  data.tar.gz: 72cd3882ad8be07b18b647f64142682e67cde2238f3096582efd3f38daf76db7b36fe49798c4e746770a93776b606889511608d06f28871fb0006f8cb4d2066f

data/README.md

@@ -31,14 +31,12 @@ This driver is based on [the cql-rb gem](https://github.com/iconara/cql-rb) by [
 
 This driver works exclusively with the Cassandra Query Language v3 (CQL3) and Cassandra's native protocol. The current version works with:
 
-* Apache Cassandra versions 1.2, 2.0 and partially 2.1
+* Apache Cassandra versions 1.2, 2.0 and 2.1
 * DataStax Enterprise 3.1, 3.2, 4.0 and 4.5
-* Ruby (MRI) 1.9.3, 2.0 and 2.1
+* Ruby (MRI) 1.9.3, 2.0, 2.1 and 2.2
 * JRuby 1.7
 * Rubinius 2.2
 
-__Note__: Apache Cassandra 2.1 support is limited to the Cassandra 2.0 API, e.g. no user-defined types.
-
 __Note__: JRuby 1.6 is not officially supported, although 1.6.8 should work.
 
 ## Quick start
@@ -93,12 +91,23 @@ __Note__: if you want to use compression you should also install [snappy](http:/
 
 Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API. In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/master/examples/cql-rb-wrapper.rb) to assist you with gradual upgrade.
 
-## What's new in v2.0.1
+## What's new in v2.1.0
+
+Features:
+
+* Apache Cassandra native protocol v3
+* [User-defined types](http://datastax.github.io/ruby-driver/features/basics/user_defined_types/) and [tuples](http://datastax.github.io/ruby-driver/features/basics/datatypes/#using-tuples)
+* [Schema metadata includes user-defined types](http://datastax.github.io/ruby-driver/api/keyspace/#type-instance_method)
+* [Named arguments](http://datastax.github.io/ruby-driver/features/basics/prepared_statements/#an-insert-statement-is-prepared-with-named-parameters)
+* [Public types api for type definition and introspection](http://datastax.github.io/ruby-driver/api/types/)
+
+Breaking Changes:
+
+* Splat style positional arguments support, deprecated in 2.0.0, has been dropped
 
-Current release lays groundwork for the upcoming support of native protocol v3 and Apache Cassandra 2.1. This release introduces the following major public API changes:
+Bug Fixes:
 
-* Positional arguments to `Session#execute` must be passed via `:arguments` option key.
-* `Batch#add` and `Prepared#bind` accept an array of arguments instead of variable arguments (`args` instead of `*args`).
+* [[RUBY-93](https://datastax-oss.atlassian.net/browse/RUBY-93)] Reconnection can overflow the stack
 
 ## Code examples
 
@@ -156,7 +165,7 @@ The development effort to provide an up to date, high performance, fully feature
 
 ## Copyright
 
-Copyright 2013-2014 DataStax, Inc.
+Copyright 2013-2015 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
 

data/lib/cassandra.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -510,6 +510,10 @@ end
 
 require 'cassandra/uuid'
 require 'cassandra/time_uuid'
+require 'cassandra/tuple'
+require 'cassandra/udt'
+
+require 'cassandra/types'
 
 require 'cassandra/errors'
 require 'cassandra/compression'

data/lib/cassandra/address_resolution.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/address_resolution/policies/ec2_multi_region.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/address_resolution/policies/none.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/auth.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/auth/providers.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/auth/providers/password.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/client.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -93,10 +93,16 @@ module Cassandra
             connections.flatten!
             raise NO_HOSTS if connections.empty?
 
-            unless connections.any?(&:connected?)
+            failed_connections = connections.reject(&:connected?)
+
+            if failed_connections.size == connections.size
               errors = {}
               connections.each {|c| errors[c.host] = c.error}
               raise Errors::NoHostsAvailable.new(errors)
+            else
+              failed_connections.each do |f|
+                connect_to_host_with_retry(f.host, connecting_hosts[f.host], @reconnection_policy.schedule)
+              end
             end
 
             self
@@ -199,7 +205,9 @@ module Cassandra
 
 
       def query(statement, options)
-        request = Protocol::QueryRequest.new(statement.cql, statement.params, statement.params_types, options.consistency, options.serial_consistency, options.page_size, options.paging_state, options.trace?)
+        return @futures.error(Errors::ClientError.new("Positional arguments are not supported by the current version of Apache Cassandra")) if !statement.params.empty? && @connection_options.protocol_version == 1
+
+        request = Protocol::QueryRequest.new(statement.cql, statement.params, statement.params_types, options.consistency, options.serial_consistency, options.page_size, options.paging_state, options.trace?, statement.params_names)
         timeout = options.timeout
         promise = @futures.promise
 
@@ -375,9 +383,24 @@ module Cassandra
         end
 
         @logger.debug("Creating #{size} connections to #{host.ip}")
-        f = @connector.connect_many(host, size)
+        futures = size.times.map do
+          @connector.connect(host).recover do |e|
+            FailedConnection.new(e, host)
+          end
+        end
+
+        Ione::Future.all(*futures).flat_map do |connections|
+          error = nil
+
+          connections.reject! do |connection|
+            if connection.connected?
+              false
+            else
+              error = connection.error
+              true
+            end
+          end
 
-        f.on_value do |connections|
           @logger.debug("Created #{connections.size} connections to #{host.ip}")
 
           pool = nil
@@ -403,16 +426,13 @@ module Cassandra
           else
             connections.each {|c| c.close}
           end
-        end
 
-        f.on_failure do |error|
-          synchronize do
-            @pending_connections[host] -= size
-            @pending_connections.delete(host) unless @pending_connections[host] > 0 || @connections.include?(host)
+          if error
+            Ione::Future.failed(error)
+          else
+            Ione::Future.resolved(connections)
           end
         end
-
-        f
       end
 
       def execute_by_plan(promise, keyspace, statement, options, request, plan, timeout, errors = nil, hosts = [])
@@ -713,7 +733,7 @@ module Cassandra
               when Protocol::RowsResultResponse
                 promise.fulfill(Results::Paged.new(r.rows, r.paging_state, r.trace_id, keyspace, statement, options, hosts, request.consistency, retries, self, @futures))
               when Protocol::SchemaChangeResultResponse
-                @schema.delete_keyspace(r.keyspace) if r.change == 'DROPPED' && r.table.empty?
+                @schema.delete_keyspace(r.keyspace) if r.change == 'DROPPED' && r.target == Protocol::Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
 
                 @logger.debug('Waiting for schema to propagate to all hosts after a change')
                 wait_for_schema_agreement(connection, @reconnection_policy.schedule).on_complete do |f|

data/lib/cassandra/cluster/connection_pool.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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/connector.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -106,10 +106,6 @@ module Cassandra
         f
       end
 
-      def connect_many(host, count)
-        create_additional_connections(host, count, [])
-      end
-
       private
 
       NO_CONNECTIONS    = Ione::Future.resolved([])
@@ -241,37 +237,6 @@ module Cassandra
         end
       end
 
-      def create_additional_connections(host, count, established_connections, error = nil)
-        futures = count.times.map do
-          connect(host).recover do |e|
-            FailedConnection.new(e, host)
-          end
-        end
-
-        Ione::Future.all(*futures).flat_map do |connections|
-          established_connections.select!(&:connected?)
-
-          connections.each do |connection|
-            if connection.connected?
-              established_connections << connection
-            else
-              error = connection.error
-            end
-          end
-
-          if !established_connections.empty?
-            connections_left = count - established_connections.size
-            if connections_left == 0
-              Ione::Future.resolved(established_connections)
-            else
-              create_additional_connections(host, connections_left, established_connections, error)
-            end
-          else
-            Ione::Future.failed(error)
-          end
-        end
-      end
-
       def connected(host)
         notify = false
 

data/lib/cassandra/cluster/control_connection.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -248,10 +248,16 @@ module Cassandra
         tables    = send_select_request(connection, SELECT_TABLES)
         columns   = send_select_request(connection, SELECT_COLUMNS)
 
-        Ione::Future.all(keyspaces, tables, columns).map do |(keyspaces, tables, columns)|
+        if @connection_options.protocol_version > 2
+          types = send_select_request(connection, SELECT_TYPES)
+        else
+          types = Ione::Future.resolved(EMPTY_LIST)
+        end
+
+        Ione::Future.all(keyspaces, tables, columns, types).map do |(keyspaces, tables, columns, types)|
           host = @registry.host(connection.host)
 
-          @schema.update_keyspaces(host, keyspaces, tables, columns)
+          @schema.update_keyspaces(host, keyspaces, tables, columns, types)
           @metadata.rebuild_token_map
         end
       end
@@ -319,13 +325,19 @@ module Cassandra
         tables    = send_select_request(connection, Protocol::QueryRequest.new("SELECT * FROM system.schema_columnfamilies WHERE keyspace_name = '%s'" % keyspace, EMPTY_LIST, EMPTY_LIST, :one))
         columns   = send_select_request(connection, Protocol::QueryRequest.new("SELECT * FROM system.schema_columns WHERE keyspace_name = '%s'" % keyspace, EMPTY_LIST, EMPTY_LIST, :one))
 
-        Ione::Future.all(keyspaces, tables, columns).map do |(keyspaces, tables, columns)|
+        if @connection_options.protocol_version > 2
+          types = send_select_request(connection, Protocol::QueryRequest.new("SELECT * FROM system.schema_usertypes WHERE keyspace_name = '%s'" % keyspace, EMPTY_LIST, EMPTY_LIST, :one))
+        else
+          types = Ione::Future.resolved(EMPTY_LIST)
+        end
+
+        Ione::Future.all(keyspaces, tables, columns, types).map do |(keyspaces, tables, columns, types)|
           host = @registry.host(connection.host)
 
           if keyspaces.empty?
             @schema.delete_keyspace(keyspace)
           else
-            @schema.update_keyspace(host, keyspaces.first, tables, columns)
+            @schema.update_keyspace(host, keyspaces.first, tables, columns, types)
           end
         end
       end
@@ -384,6 +396,59 @@ module Cassandra
         end
       end
 
+      def refresh_type_async_maybe_retry(keyspace, type)
+        refresh_type_async(keyspace, type).fallback do |e|
+          case e
+          when Errors::HostError
+            refresh_keyspace_async_retry(keyspace, e, @reconnection_policy.schedule)
+          else
+            connection = @connection
+            connection && connection.close(e)
+
+            Ione::Future.failed(e)
+          end
+        end
+      end
+
+      def refresh_type_async_retry(keyspace, type, error, schedule)
+        timeout = schedule.next
+        @logger.info("Failed to refresh type #{keyspace}.#{type} (#{error.class.name}: #{error.message}), retrying in #{timeout}")
+
+        timer = @io_reactor.schedule_timer(timeout)
+        timer.flat_map do
+          refresh_keyspace_async(keyspace).fallback do |e|
+            case e
+            when Errors::HostError
+              refresh_keyspace_async_retry(keyspace, e, schedule)
+            else
+              connection = @connection
+              connection && connection.close(e)
+
+              Ione::Future.failed(e)
+            end
+          end
+        end
+      end
+
+      def refresh_type_async(keyspace, type)
+        connection = @connection
+
+        return Ione::Future.failed(Errors::ClientError.new('Not connected')) if connection.nil?
+
+        params   = [keyspace, type]
+        types    = send_select_request(connection, Protocol::QueryRequest.new("SELECT * FROM system.schema_usertypes WHERE keyspace_name = '%s' AND type_name = '%s'" % params, EMPTY_LIST, EMPTY_LIST, :one))
+
+        types.map do |types|
+          host = @registry.host(connection.host)
+
+          if types.empty?
+            @schema.delete_type(keyspace, type)
+          else
+            @schema.udpate_type(host, keyspace, types.first)
+          end
+        end
+      end
+
       def refresh_hosts_async_maybe_retry
         synchronize do
           return Ione::Future.resolved if @refreshing_hosts
@@ -644,19 +709,24 @@ Control connection failed and is unlikely to recover.
       def process_schema_changes(schema_changes)
         refresh_keyspaces = ::Hash.new
         refresh_tables    = ::Hash.new
+        refresh_types     = ::Hash.new
 
         schema_changes.each do |change|
           keyspace = change.keyspace
-          table    = change.table
 
           next if refresh_keyspaces.has_key?(keyspace)
 
-          if table.empty?
+          case change.target
+          when Protocol::Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
             refresh_tables.delete(keyspace)
+            refresh_types.delete(keyspace)
             refresh_keyspaces[keyspace] = true
-          else
+          when Protocol::Constants::SCHEMA_CHANGE_TARGET_TABLE
             tables = refresh_tables[keyspace] ||= ::Hash.new
-            tables[table] = true
+            tables[change.table] = true
+          when Protocol::Constants::SCHEMA_CHANGE_TARGET_UDT
+            types = refresh_types[keyspace] ||= ::Hash.new
+            types[change.type] = true
           end
         end
 
@@ -672,6 +742,12 @@ Control connection failed and is unlikely to recover.
           end
         end
 
+        refresh_types.each do |(keyspace, types)|
+          types.each_key do |type|
+            futures << refresh_type_async_maybe_retry(keyspace, type)
+          end
+        end
+
         Ione::Future.all(*futures)
       end