cassandra-driver 3.1.0-java → 3.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac761253a986cd88350b04de1d3ee90bf1f355c3
-  data.tar.gz: 6c9bbff04510173fd06518c7592d7c326534b081
+  metadata.gz: f73c580eafef3df755cad4c93c0cba0c5859d192
+  data.tar.gz: f2f5f7836ffeddda6b138619be8173e984594803
 SHA512:
-  metadata.gz: ddf9b426f9f3e2934f1dc705657af049472ef68474ce1458a80d3a5e7a33b07b75fa34ab27bfb71617e2f4b111f8c774ca96e45c98b495e0cf06cc25606d3757
-  data.tar.gz: 526e8a7fae76a17635ecadc369b62f1a175aef694a9d0d8488262e90722de6363f8243081e0e5d18c4b6c05305932c59bbf3b369511cce1fbef91746f25ebff4
+  metadata.gz: f958c3a621623e81e78bf304068e39655477f57a57e4ebb83781b2c682b86834e2cc85564a90453847e7493c3c1e005c9431002084c96d64e16f0ed83ea9aed2
+  data.tar.gz: e0a08e87fa96ff6d5f4d1cfad42d34b264da43d2431703ae6389e884bd83548a6db5e70d04ca756c1456eb7b7a3662bdd4cd17fbcd366a38ee81a4c1e5f398ec

data/README.md

@@ -9,11 +9,14 @@ version [here](http://docs.datastax.com/en/developer/ruby-driver/latest).*
 A Ruby client driver for Apache Cassandra. This driver works exclusively with
 the Cassandra Query Language version 3 (CQL3) and Cassandra's native protocol.
 
+Use the [Ruby DSE driver](https://github.com/datastax/ruby-dse-driver.git) for
+better compatibility and support for DataStax Enterprise.
+
 - Code: https://github.com/datastax/ruby-driver
 - Docs: http://docs.datastax.com/en/developer/ruby-driver
 - Jira: https://datastax-oss.atlassian.net/browse/RUBY
 - Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/ruby-driver-user
-- IRC: #datastax-drivers on [irc.freenode.net](http://freenode.net>)
+- Slack: `#datastax-drivers` channel at https://academy.datastax.com/slack
 - Twitter: Follow the latest news about DataStax Drivers - [@stamhankar999](http://twitter.com/stamhankar999), [@avalanche123](http://twitter.com/avalanche123), [@al3xandru](https://twitter.com/al3xandru)
 
 This driver is based on [the cql-rb gem](https://github.com/iconara/cql-rb) by [Theo Hultberg](https://github.com/iconara) and we added support for:
@@ -33,14 +36,13 @@ 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, 2.1, 2.2, and 3.x
-* DataStax Enterprise 4.0 and above.
-* Ruby (MRI) 2.2, 2.3
-* JRuby 1.7
+* Apache Cassandra versions 2.1, 2.2, and 3.x
+* DataStax Enterprise 4.8 and above. However, the [Ruby DSE driver](https://github.com/datastax/ruby-dse-driver.git) provides more features and is recommended for use with DataStax Enterprise.
+* Ruby (MRI) 2.2, 2.3, 2.4
+* JRuby 1.7, 9k
 
-__Note__: JRuby 1.6 is not officially supported, although 1.6.8 should work. Rubinius is not supported.
-MRI 2.0, 2.1, and JRuby 9k are not officially supported, but they should work. 1.9.3 is deprecated
-and is likely to break in the release following 3.0.
+__Note__: Rubinius is not supported. MRI 2.0, and 2.1 are not officially supported, but they should work. MRI 1.9.3 is deprecated
+and may break in any release after 3.0. 
 
 ## Feedback Requested
 
@@ -98,9 +100,18 @@ __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/v3.1.0/examples/cql-rb-wrapper.rb)
+interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/v3.2.0/examples/cql-rb-wrapper.rb)
 to assist you with gradual upgrade.
 
+If you are upgrading to DataStax Enterprise, use the [Ruby DSE driver](https://github.com/datastax/ruby-dse-driver.git) 
+for more features and better compatibility.
+
+## What's new in v3.2
+This minor release adds support for MRI 2.4.x and also contains a few miscellaneous defect fixes.
+
+See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.2.0/CHANGELOG.md) for more information on all
+changes in this version and past versions.
+
 ## What's new in v3.1
 
 This minor release introduces features and fixes around resiliency, schema metadata, usability, and performance. One
@@ -110,9 +121,6 @@ Execution profiles allow you to group various execution options into a 'profile'
 profile at execution time. Get the scoop
 [here](http://docs.datastax.com/en/developer/ruby-driver/3.1/features/basics/execution_profiles).
 
-See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.1.0/CHANGELOG.md) for more information on all
-changes in this version and past versions.
-
 ## What's new in v3.0
 
 ### Features:
@@ -159,16 +167,6 @@ batch.add(query, arguments: {p1: 'val1'})
   Specify a positive value (or nil for unlimited) for `max_remote_hosts_to_use` when initializing the policy to allow remote node use.
 * Unspecified variables in statements previously resulted in an exception. Now they are essentially ignored or treated as null.
 
-### Bug Fixes:
-
-* [[RUBY-120](https://datastax-oss.atlassian.net/browse/RUBY-120)] Tuples and UDTs can be used in sets and hash keys.
-* [[RUBY-143](https://datastax-oss.atlassian.net/browse/RUBY-143)] Retry querying system table for metadata of new hosts when prior attempts fail, ultimately enabling use of new hosts.
-* [[RUBY-150](https://datastax-oss.atlassian.net/browse/RUBY-150)] Fixed a protocol decoding error that occurred when multiple messages are available in a stream.
-* [[RUBY-151](https://datastax-oss.atlassian.net/browse/RUBY-151)] Decode incomplete UDTs properly.
-* [[RUBY-155](https://datastax-oss.atlassian.net/browse/RUBY-155)] Request timeout timer should not include request queuing time.
-* [[RUBY-161](https://datastax-oss.atlassian.net/browse/RUBY-161)] Protocol version negotiation in mixed version clusters should not fall back to v1 unless it is truly warranted.
-* [[RUBY-214](https://datastax-oss.atlassian.net/browse/RUBY-214)] Ensure client timestamps have microsecond precision in JRuby. Previously, some row updates would get lost in high transaction environments.
-
 ## Code examples
 
 The DataStax Ruby Driver uses the awesome [Cucumber Framework](http://cukes.info/) for
@@ -179,7 +177,7 @@ examples in the `features/` directory.
 ## Running tests
 
 If you don't feel like reading through the following instructions on how to run
-ruby-driver tests, feel free to [check out .travis.yml for the entire build code](https://github.com/datastax/ruby-driver/blob/v3.1.0/.travis.yml).
+ruby-driver tests, feel free to [check out .travis.yml for the entire build code](https://github.com/datastax/ruby-driver/blob/v3.2.0/.travis.yml).
 
 * Check out the driver codebase and install test dependencies:
 
@@ -197,13 +195,13 @@ bundle install --without docs
 CASSANDRA_VERSION=3.1.1 bundle exec cucumber # runs end-to-end tests (or bundle exec rake cucumber)
 CASSANDRA_VERSION=3.0.0 bundle exec rspec # runs unit tests (or bundle exec rake rspec)
 CASSANDRA_VERSION=2.1.12 bundle exec rake integration # run integration tests
-CASSANDRA_VERSION=2.0.17 bundle exec rake test # run both as well as integration tests
+CASSANDRA_VERSION=2.1.12 bundle exec rake test # run both as well as integration tests
 ```
 
 ## Changelog & versioning
 
 Check out the [releases on GitHub](https://github.com/datastax/ruby-driver/releases) and
-[changelog](https://github.com/datastax/ruby-driver/blob/v3.1.0/CHANGELOG.md). Version
+[changelog](https://github.com/datastax/ruby-driver/blob/v3.2.0/CHANGELOG.md). Version
 numbering follows the [semantic versioning](http://semver.org/) scheme.
 
 Private and experimental APIs, defined as whatever is not in the
@@ -223,7 +221,6 @@ the release.
 
 * Specifying a `protocol_version` option of 1 or 2 in cluster options will fail with a
   `NoHostsAvailable` error rather than a `ProtocolError` against Cassandra node versions 3.0-3.4.
-* JRuby 1.6 is not officially supported, although 1.6.8 should work.
 * Because the driver reactor is using `IO.select`, the maximum number of tcp connections allowed is 1024.
 * Because the driver uses `IO#write_nonblock`, Windows is not supported.
 
@@ -245,7 +242,7 @@ Driver for Apache Cassandra will continue on this project, while
 
 ## Copyright
 
-Copyright 2013-2016 DataStax, Inc.
+Copyright 2013-2017 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-2016 DataStax, Inc.
+# Copyright 2013-2017 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.rb

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

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

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

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2016 DataStax, Inc.
+# Copyright 2013-2017 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-2016 DataStax, Inc.
+# Copyright 2013-2017 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-2016 DataStax, Inc.
+# Copyright 2013-2017 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,6 +106,16 @@ module Cassandra
 
             failed_connections = connections.reject(&:connected?)
 
+            # convert Cassandra::Protocol::CqlProtocolHandler to something with a real host
+            failed_connections.map! do |c|
+              if c.host.is_a?(String)
+                host = @registry.each_host.detect { |h| h.ip.to_s == c.host } || raise("Unable to find host #{c.host}")
+                FailedConnection.new(c.error, host)
+              else
+                c
+              end
+            end
+
             if failed_connections.size == connections.size
               errors = {}
               connections.each {|c| errors[c.host] = c.error unless c.error.nil?}

data/lib/cassandra/cluster/connection_pool.rb

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2016 DataStax, Inc.
+# Copyright 2013-2017 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -225,12 +225,11 @@ module Cassandra
             else
               case event.change
               when 'UP'
-                address = event.address
-
+                address = @address_resolver.resolve(event.address)
                 if @registry.has_host?(address)
                   @registry.host_up(address)
                 else
-                  refresh_host_async_maybe_retry(address)
+                  refresh_host_async_maybe_retry(event.address)
                   refresh_schema_async_wrapper
                 end
               when 'DOWN'
@@ -238,14 +237,14 @@ module Cassandra
                 # logic in connector.rb to call host_down when all connections to a node are lost,
                 # so that covers the requirement.
               when 'NEW_NODE'
-                address = event.address
+                address = @address_resolver.resolve(event.address)
 
                 unless @registry.has_host?(address)
-                  refresh_host_async_maybe_retry(address)
+                  refresh_host_async_maybe_retry(event.address)
                   refresh_schema_async_wrapper
                 end
               when 'REMOVED_NODE'
-                @registry.host_lost(event.address)
+                @registry.host_lost(@address_resolver.resolve(event.address))
                 refresh_schema_async_wrapper
               end
             end
@@ -480,7 +479,7 @@ module Cassandra
           raise Errors::InternalError, "Unable to fetch connected host's metadata" if local.empty?
 
           data = local.first
-          @registry.host_found(IPAddr.new(connection.host), data)
+          @registry.host_found(@address_resolver.resolve(IPAddr.new(connection.host)), data)
           @metadata.update(data)
 
           @logger.info("Completed refreshing connected host's metadata")
@@ -516,6 +515,9 @@ module Cassandra
         end
       end
 
+      # @param address [IPAddr] address node address, as reported from a C* event. Thus it is *not* resolved
+      #           relative to the client, but rather is the address that other nodes would use to communicate with
+      #           this node.
       def refresh_host_async_maybe_retry(address)
         synchronize do
           return Ione::Future.resolved if @refreshing_hosts || @refreshing_host[address]
@@ -539,6 +541,9 @@ module Cassandra
         end
       end
 
+      # @param address [IPAddr] address node address, as reported from a C* event. Thus it is *not* resolved
+      #           relative to the client, but rather is the address that other nodes would use to communicate with
+      #           this node.
       def refresh_host_async_retry(address, error, schedule)
         timeout = schedule.next
         @logger.info("Failed to refresh host #{address} (#{error.class.name}: " \
@@ -560,6 +565,9 @@ module Cassandra
         end
       end
 
+      # @param address [IPAddr] address node address, as reported from a C* event. Thus it is *not* resolved
+      #           relative to the client, but rather is the address that other nodes would use to communicate with
+      #           this node.
       def refresh_host_async(address)
         connection = @connection
         return Ione::Future.failed(Errors::ClientError.new('Not connected')) if connection.nil?
@@ -581,6 +589,11 @@ module Cassandra
           raise Errors::InternalError, "Unable to find host metadata: #{ip}" if rows.empty?
 
           @logger.info("Completed refreshing host metadata: #{ip}")
+          address = if ip == connection.host
+                      @address_resolver.resolve(address)
+                    else
+                      peer_ip(rows.first, connection.host)
+                    end
           @registry.host_found(address, rows.first)
 
           self

data/lib/cassandra/cluster/failed_connection.rb

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

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

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2016 DataStax, Inc.
+# Copyright 2013-2017 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -60,14 +60,18 @@ module Cassandra
       end
       alias hosts each_host
 
+      # @param address [IPAddr] resolved address of the node
       def host(address)
         @hosts[address.to_s]
       end
 
+      # @param address [IPAddr] resolved address of the node
       def has_host?(address)
         @hosts.key?(address.to_s)
       end
 
+      # @param address [IPAddr] resolved address of the node
+      # @param data [Hash<String, String>] attributes of the host, typically a row from system.local or system.peers.
       def host_found(address, data = {})
         ip   = address.to_s
         host = @hosts[ip]
@@ -108,6 +112,7 @@ module Cassandra
         self
       end
 
+      # @param address [IPAddr] resolved address of the node
       def host_down(address)
         ip   = address.to_s
         host = @hosts[ip]
@@ -125,6 +130,7 @@ module Cassandra
         self
       end
 
+      # @param address [IPAddr] resolved address of the node
       def host_up(address)
         ip   = address.to_s
         host = @hosts[ip]
@@ -142,6 +148,7 @@ module Cassandra
         self
       end
 
+      # @param address [IPAddr] resolved address of the node
       def host_lost(address)
         ip   = address.to_s
         host = nil
@@ -161,6 +168,8 @@ module Cassandra
 
       private
 
+      # @param ip [String] resolved address of the node
+      # @param data [Hash<String, String>] attributes of the host, typically a row from system.local or system.peers.
       def create_host(ip, data)
         Host.new(ip,
                  data['host_id'],
@@ -173,6 +182,7 @@ module Cassandra
                  data['listen_address'])
       end
 
+      # @param ip [Host] host that is found to be up.
       def toggle_up(host)
         host = Host.new(host.ip,
                         host.id,
@@ -194,6 +204,7 @@ module Cassandra
         host
       end
 
+      # @param ip [Host] host that is found to be down.
       def toggle_down(host)
         host = Host.new(host.ip,
                         host.id,
@@ -215,6 +226,7 @@ module Cassandra
         host
       end
 
+      # @param ip [Host] host that is lost.
       def notify_lost(host)
         if host.up?
           @logger.debug("Host #{host.ip} is down and lost")
@@ -251,6 +263,7 @@ module Cassandra
         end
       end
 
+      # @param ip [Host] host that is found.
       def notify_found(host)
         @logger.debug("Host #{host.ip} is found and up")
         @listeners.each do |listener|