cassandra-driver 3.0.0.rc.2 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBiZDQ4YTM2MDliN2U0N2VlNmJjY2RiYjQyOWVlOWI4MzlhNjNkZg==
+    YjE4OWU5NjliOWY2YjgwM2RkMzJlNmMyZWU0YzdlOWFlYzNkYjUxOQ==
   data.tar.gz: !binary |-
-    OGY1MDNjN2Y5ZmFjYmY2YWY0ZWI0ZGNjZjViMTA1ZDdkYzQyOTg0Yg==
+    M2E5YTgyMTllNTg2ZGI2NjgyN2VjZTJmN2Q0MGI4ZDAwNGU1YjkxMw==
 SHA512:
   metadata.gz: !binary |-
-    MTIzOTk1Nzk0NDI2NWNkZWNiZmUyMmIzZjk4YjQ2YmRjZDkwODc4YjUxY2Fj
-    N2FmYjRlOGZiMjBlNTAzY2RmOGM4OGNlZmZkZWVjN2RjNDU1ZjY4MjYxODE3
-    YWU1MTZiNWMyMjViOTVhODExODlkNmQwMzc1ODZlMjkwYWU0NDQ=
+    ZTBmMzYzMTQwMDEwYTQ4YjljNmNhMWQwMGI0ZWZjYTVlOTczMjkxNzUzNTMz
+    YzY5MzhjNjUyMjc2Mjc2NGVhODE4NDYwOTRiOTViZWY5MGE4YmQ1NTg1MGY0
+    MTYwZDgwZDg2MDQzNTViNmI0NDk2ZWRjMWRhMWMxZTQ5MTVkODQ=
   data.tar.gz: !binary |-
-    ZDI1ZDVmMWQyNzJiMGRiYzc5NTgxYjE4ZGEwNjVmZWM0Nzc0Yzk4MGJjODcx
-    YjEzYjNlNTZhOTU1YWY2M2JlZGUxZDA1YWU3NjRlMGE4ZmM4ODUyMTgyNmVj
-    NjU3NWUzYzFiMDNmOGJlZDg1ODJiYzJkMDQ3OGZhNjU3MWZlMTY=
+    ZmQ5MGM4ZTI1ZTFmN2QzNjE5OGNmNjg4MzVmZTJkYjM0NTM0MzI4MWIxNGJk
+    MDY3NTRmOWQ0YWM5NWUzY2Q2NTFmOWIwOGExZDI5MWQ0ODIyOWVmMjVkNjll
+    MGRhMWJkOGExZThlNWQzOWMzYTE1YzZmNTM5YWJjZmNhMTllNWE=

data/README.md

@@ -1,6 +1,6 @@
 # Datastax Ruby Driver for Apache Cassandra
 
-*If you're reading this on GitHub, please note that this is the readme for the development version and that some features described here might not yet have been released. You can [find the documentation for latest version through ruby driver docs](http://datastax.github.io/ruby-driver/) or via the release tags, [e.g. v3.0.0-rc.2](https://github.com/datastax/ruby-driver/tree/v3.0.0-rc.2).*
+*If you're reading this on GitHub, please note that this is the readme for the development version and that some features described here might not yet have been released. You can [find the documentation for latest version through ruby driver docs](http://datastax.github.io/ruby-driver/) or via the release tags, [e.g. v3.0.0](https://github.com/datastax/ruby-driver/tree/v3.0.0).*
 
 [![Build Status](https://travis-ci.org/datastax/ruby-driver.svg?branch=master)](https://travis-ci.org/datastax/ruby-driver)
 
@@ -31,8 +31,8 @@ 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, and 3.x
-* DataStax Enterprise 4.0, 4.5, 4.6, 4.7, and 4.8
+* 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
 
@@ -96,28 +96,33 @@ Some of the new features added to the driver have unfortunately led to changes i
 
 ### Features:
 
-* Apache Cassandra native protocol v4
-* Add support for smallint, tinyint, date (Cassandra::Date) and time (Cassandra::Time) data types.
+* Add support for Apache Cassandra native protocol v4
+* Add support for smallint, tinyint, date (`Cassandra::Date`) and time (`Cassandra::Time`) data types.
 * Include schema metadata for User Defined Functions and User Defined Aggregates.
+* Augment the `Cassandra::Table` object to expose many more attributes: `id`, `options`, `keyspace`, `partition_key`, `clustering_columns`, and `clustering_order`. This makes it significantly easier to write administration scripts that report various attributes of your schema, which may help to highlight areas for improvement.
 * Include client ip addresses in request traces, only on Cassandra 3.x.
-* Add new retry policy decision Cassandra::Retry::Policy#try_next_host.
-* Support specifying statement idempotence with the new :idempotent option when executing.
-* Support sending custom payloads when preparing or executing statements using the new :payload option.
-* Expose custom payloads received with responses on server exceptions and Cassandra::Execution::Info instances.
-* Expose server warnings on server exceptions and Cassandra::Execution::Info instances.
-* Add connections_per_local_node, connections_per_remote_node, requests_per_connection cluster configuration options to tune parallel query execution and resource usage.
-* Add Cassandra::Logger class to make it easy for users to enable debug logging in the client.
-* Add protocol_version configuration option to allow the user to force the protocol version to use for communication with nodes.
+* Add new retry policy decision `Cassandra::Retry::Policy#try_next_host`.
+* Support specifying statement idempotence with the new `idempotent` option when executing.
+* Support sending custom payloads when preparing or executing statements using the new `payload` option.
+* Expose custom payloads received with responses on server exceptions and `Cassandra::Execution::Info` instances.
+* Expose server warnings on server exceptions and `Cassandra::Execution::Info` instances.
+* Add `connections_per_local_node`, `connections_per_remote_node`, `requests_per_connection` cluster configuration options to tune parallel query execution and resource usage.
+* Add `Cassandra::Logger` class to make it easy for users to enable debug logging in the client.
+* Add `protocol_version` configuration option to allow the user to force the protocol version to use for communication with nodes.
 * Add support for materialized views and indexes in the schema metadata.
+* Support the `ReadError`, `WriteError`, and `FunctionCallError` Cassandra error responses introduced in Cassandra 2.2.
+* Add support for unset variables in bound statements.
+* Support DSE security (`DseAuthenticator`, configured for LDAP).
+* Add a timeout option to `Cassandra::Future#get`.
 
-### Breaking Changes:
+### Breaking Changes from 2.x:
 
-* Cassandra::Future#join is now an alias to Cassandra::Future#get and will raise an error if the future is resolved with one.
+* `Cassandra::Future#join` is now an alias to Cassandra::Future#get and will raise an error if the future is resolved with one.
 * Default consistency level is now LOCAL_ONE.
 * Enable tcp no-delay by default.
 * Unavailable errors are retried on the next host in the load balancing plan by default.
-* Statement execution no longer retried on timeouts, unless :idempotent => true has been specified when executing.
-* Cassandra::Statements::Batch#add signature has changed in how one specifies query parameters. Specify the query parameters array as the value of the arguments key:
+* Statement execution no longer retried on timeouts, unless the statement is marked as idempotent in the call to `Cassandra::Session#execute*` or when creating a `Cassandra::Statement` object. 
+* `Cassandra::Statements::Batch#add` and `Cassandra::Session#execute*` signatures have changed in how one specifies query parameters. Specify the query parameters array as the value of the arguments key:
  
 ```ruby
 batch.add(query, ['val1', 'val2'])
@@ -128,6 +133,10 @@ batch.add(query, {p1: 'val1'})
 # becomes
 batch.add(query, arguments: {p1: 'val1'})
 ```
+* The Datacenter-aware load balancing policy (`Cassandra::LoadBalancing::Policies::DCAwareRoundRobin`) defaults to using
+  nodes in the local DC only. In prior releases, the policy would fall back to remote nodes after exhausting local nodes.
+  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:
 
@@ -135,12 +144,13 @@ batch.add(query, arguments: {p1: 'val1'})
 * [[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-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-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.
 
 ## Feedback Requested
 
-*Help us focus our efforts!* [Provide your input](http://goo.gl/forms/pCs8PTpHLf)
-on the Ruby Driver Platform and Runtime Survey (we kept it short).
+*Help us focus our efforts!* [Provide your input](http://goo.gl/forms/pCs8PTpHLf) on the Ruby Driver Platform and Runtime Survey (we kept it short).
 
 ## Code examples
 

data/lib/cassandra.rb

@@ -187,14 +187,17 @@ module Cassandra
   #   v2 or earlier protocol.
   #
   # @option options [Integer] :protocol_version (nil) Version of protocol to speak to
-  #   nodes. By default, this is auto-negotiated to the lowest common protocol version
+  #   nodes. By default, this is auto-negotiated to the highest common protocol version
   #   that all nodes in `:hosts` speak.
   #
-  # @option options [Boolean] :client_timestamps (false) whether the driver
-  #   should send timestamps for each executed statement. Enabling this setting
-  #   allows mitigating Cassandra cluster clock skew because the timestamp of
-  #   the client machine will be used. This does not help mitigate application
-  #   cluster clock skew.
+  # @option options [Boolean, Cassandra::TimestampGenerator] :client_timestamps (false) whether the driver
+  #   should send timestamps for each executed statement and possibly which timestamp generator to use. Enabling this
+  #   setting helps mitigate Cassandra cluster clock skew because the timestamp of the client machine will be used.
+  #   This does not help mitigate application cluster clock skew. Also accepts an initialized
+  #   {Cassandra::TimestampGenerator}, `:simple` (indicating an instance of {Cassandra::TimestampGenerator::Simple}),
+  #   or `:monotonic` (indicating an instance of {Cassandra::TimestampGenerator::TickingOnDuplicate}). If set to true,
+  #   it defaults to {Cassandra::TimestampGenerator::Simple} for all Ruby flavors except JRuby. On JRuby, it defaults to
+  #   {Cassandra::TimestampGenerator::TickingOnDuplicate}.
   #
   # @option options [Boolean] :synchronize_schema (true) whether the driver
   #   should automatically keep schema metadata synchronized. When enabled, the
@@ -682,7 +685,35 @@ module Cassandra
     end
 
     options[:synchronize_schema] = !!options[:synchronize_schema] if options.key?(:synchronize_schema)
-    options[:client_timestamps] = !!options[:client_timestamps] if options.key?(:client_timestamps)
+
+    if options.key?(:client_timestamps)
+      timestamp_generator = case options[:client_timestamps]
+                            when true
+                              if RUBY_ENGINE == 'jruby'
+                                Cassandra::TimestampGenerator::TickingOnDuplicate.new
+                              else
+                                Cassandra::TimestampGenerator::Simple.new
+                              end
+                            when false
+                              nil
+                            when :simple
+                              Cassandra::TimestampGenerator::Simple.new
+                            when :monotonic
+                              Cassandra::TimestampGenerator::TickingOnDuplicate.new
+                            else
+                              # The value must be a generator instance.
+                              options[:client_timestamps]
+                            end
+
+      if timestamp_generator
+        Util.assert_responds_to(:next, timestamp_generator) do
+          ":client_timestamps #{options[:client_timestamps].inspect} must be a boolean, :simple, :monotonic, or " \
+          'an object that responds to :next'
+        end
+      end
+      options.delete(:client_timestamps)
+      options[:timestamp_generator] = timestamp_generator
+    end
 
     if options.key?(:connections_per_local_node)
       connections_per_node = options[:connections_per_local_node]
@@ -793,6 +824,7 @@ require 'cassandra/load_balancing'
 require 'cassandra/reconnection'
 require 'cassandra/retry'
 require 'cassandra/address_resolution'
+require 'cassandra/timestamp_generator'
 
 require 'cassandra/util'
 

data/lib/cassandra/cluster.rb

@@ -41,7 +41,8 @@ module Cassandra
                    retry_policy,
                    address_resolution_policy,
                    connector,
-                   futures_factory)
+                   futures_factory,
+                   timestamp_generator)
       @logger                = logger
       @io_reactor            = io_reactor
       @executor              = executor
@@ -57,6 +58,7 @@ module Cassandra
       @address_resolver      = address_resolution_policy
       @connector             = connector
       @futures               = futures_factory
+      @timestamp_generator   = timestamp_generator
 
       @control_connection.on_close do |_cause|
         begin
@@ -204,7 +206,8 @@ module Cassandra
                            @retry_policy,
                            @address_resolver,
                            @connection_options,
-                           @futures)
+                           @futures,
+                           @timestamp_generator)
       session = Session.new(client, @execution_options, @futures)
       promise = @futures.promise
 
@@ -275,7 +278,15 @@ module Cassandra
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{object_id.to_s(16)}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+      "name=#{name.inspect}, " \
+      "port=#{@connection_options.port}, " \
+      "protocol_version=#{@connection_options.protocol_version}, " \
+      "load_balancing_policy=#{@load_balancing_policy.inspect}, " \
+      "consistency=#{@execution_options.consistency.inspect}, " \
+      "timeout=#{@execution_options.timeout.inspect}, " \
+      "hosts=#{hosts.inspect}, " \
+      "keyspaces=#{keyspaces.inspect}>"
     end
   end
 end

data/lib/cassandra/cluster/client.rb

@@ -34,7 +34,8 @@ module Cassandra
                      retry_policy,
                      address_resolution_policy,
                      connection_options,
-                     futures_factory)
+                     futures_factory,
+                     timestamp_generator)
         @logger                      = logger
         @registry                    = cluster_registry
         @schema                      = cluster_schema
@@ -52,6 +53,7 @@ module Cassandra
         @pending_connections         = ::Hash.new
         @keyspace                    = nil
         @state                       = :idle
+        @timestamp_generator         = timestamp_generator
 
         mon_initialize
       end
@@ -228,11 +230,7 @@ module Cassandra
               'Apache Cassandra'))
         end
 
-        timestamp = nil
-        if @connection_options.client_timestamps? &&
-           @connection_options.protocol_version > 2
-          timestamp = ::Time.now
-        end
+        timestamp = @timestamp_generator.next if @timestamp_generator && @connection_options.protocol_version > 2
         payload   = nil
         payload   = options.payload if @connection_options.protocol_version >= 4
         request   = Protocol::QueryRequest.new(statement.cql,
@@ -286,11 +284,7 @@ module Cassandra
       end
 
       def execute(statement, options)
-        timestamp = nil
-        if @connection_options.client_timestamps? &&
-           @connection_options.protocol_version > 2
-          timestamp = ::Time.now
-        end
+        timestamp = @timestamp_generator.next if @timestamp_generator && @connection_options.protocol_version > 2
         payload         = nil
         payload         = options.payload if @connection_options.protocol_version >= 4
         timeout         = options.timeout
@@ -324,11 +318,7 @@ module Cassandra
               'Apache Cassandra'))
         end
 
-        timestamp = nil
-        if @connection_options.client_timestamps? &&
-           @connection_options.protocol_version > 2
-          timestamp = ::Time.now
-        end
+        timestamp = @timestamp_generator.next if @timestamp_generator && @connection_options.protocol_version > 2
         payload   = nil
         payload   = options.payload if @connection_options.protocol_version >= 4
         timeout   = options.timeout
@@ -644,7 +634,15 @@ module Cassandra
                                            errors,
                                            hosts)
         cql = statement.cql
-        id  = synchronize { @prepared_statements[host][cql] }
+        id = nil
+        host_is_up = true
+        synchronize do
+          if @prepared_statements[host].nil?
+            host_is_up = false
+          else
+            id = @prepared_statements[host][cql]
+          end
+        end
 
         if id
           request.id = id
@@ -659,6 +657,19 @@ module Cassandra
                                   timeout,
                                   errors,
                                   hosts)
+        elsif !host_is_up
+          # We've hit a race condition where the plan says we can query this host, but the host has gone
+          # down in the mean time. Just execute the plan again on the next host.
+          @logger.debug("#{host} is down; executing plan on next host")
+          execute_by_plan(promise,
+                          keyspace,
+                          statement,
+                          options,
+                          request,
+                          plan,
+                          timeout,
+                          errors,
+                          hosts)
         else
           prepare = prepare_statement(host, connection, cql, timeout)
           prepare.on_complete do |_|
@@ -816,10 +827,29 @@ module Cassandra
           cql = statement.cql
 
           if statement.is_a?(Statements::Bound)
-            id = synchronize { @prepared_statements[host][cql] }
+            host_is_up = true
+            id = nil
+            synchronize do
+              if @prepared_statements[host].nil?
+                host_is_up = false
+              else
+                id = @prepared_statements[host][cql]
+              end
+            end
 
             if id
               request.add_prepared(id, statement.params, statement.params_types)
+            elsif !host_is_up
+              @logger.debug("#{host} is down; executing on next host in plan")
+              return batch_by_plan(promise,
+                                   keyspace,
+                                   batch_statement,
+                                   options,
+                                   request,
+                                   plan,
+                                   timeout,
+                                   errors,
+                                   hosts)
             else
               unprepared[cql] << statement
             end
@@ -1156,17 +1186,17 @@ module Cassandra
               end
             when Protocol::SetKeyspaceResultResponse
               @keyspace = r.keyspace
-              promise.fulfill(Results::Void.new(r.custom_payload,
-                                                r.warnings,
-                                                r.trace_id,
-                                                keyspace,
-                                                statement,
-                                                options,
-                                                hosts,
-                                                request.consistency,
-                                                retries,
-                                                self,
-                                                @futures))
+              promise.fulfill(Cassandra::Results::Void.new(r.custom_payload,
+                                                           r.warnings,
+                                                           r.trace_id,
+                                                           keyspace,
+                                                           statement,
+                                                           options,
+                                                           hosts,
+                                                           request.consistency,
+                                                           retries,
+                                                           self,
+                                                           @futures))
             when Protocol::PreparedResultResponse
               cql = request.cql
               synchronize do
@@ -1328,7 +1358,7 @@ module Cassandra
                 promise.fulfill(
                   Results::Void.new(r.custom_payload,
                                     r.warnings,
-                                    r.trace_id,
+                                    nil,
                                     keyspace,
                                     statement,
                                     options,

data/lib/cassandra/cluster/metadata.rb

@@ -61,7 +61,7 @@ module Cassandra
       end
 
       def update(data)
-        @name        = data['name']
+        @name        = data['cluster_name']
         @partitioner = @partitioners[data['partitioner']]
 
         self

data/lib/cassandra/cluster/options.rb

@@ -25,7 +25,7 @@ module Cassandra
       attr_reader :auth_provider, :compressor, :connect_timeout, :credentials,
                   :heartbeat_interval, :idle_timeout, :port, :schema_refresh_delay,
                   :schema_refresh_timeout, :ssl
-      attr_boolean :protocol_negotiable, :synchronize_schema, :client_timestamps, :nodelay
+      attr_boolean :protocol_negotiable, :synchronize_schema, :nodelay
 
       attr_accessor :protocol_version
 
@@ -44,7 +44,6 @@ module Cassandra
                      synchronize_schema,
                      schema_refresh_delay,
                      schema_refresh_timeout,
-                     client_timestamps,
                      nodelay,
                      requests_per_connection)
         @logger                 = logger
@@ -60,7 +59,6 @@ module Cassandra
         @synchronize_schema     = synchronize_schema
         @schema_refresh_delay   = schema_refresh_delay
         @schema_refresh_timeout = schema_refresh_timeout
-        @client_timestamps      = client_timestamps
         @nodelay                = nodelay
 
         @connections_per_local_node  = connections_per_local_node

data/lib/cassandra/driver.rb

@@ -107,7 +107,8 @@ module Cassandra
                   retry_policy,
                   address_resolution_policy,
                   connector,
-                  futures_factory)
+                  futures_factory,
+                  timestamp_generator)
     end
 
     let(:execution_options) do
@@ -135,7 +136,6 @@ module Cassandra
         synchronize_schema,
         schema_refresh_delay,
         schema_refresh_timeout,
-        client_timestamps,
         nodelay,
         requests_per_connection
       )
@@ -165,15 +165,14 @@ module Cassandra
     let(:page_size)                 { 10000 }
     let(:heartbeat_interval)        { 30 }
     let(:idle_timeout)              { 60 }
-    let(:timeout)                   { 10 }
+    let(:timeout)                   { 12 }
     let(:synchronize_schema)        { true }
     let(:schema_refresh_delay)      { 1 }
     let(:schema_refresh_timeout)    { 10 }
     let(:thread_pool_size)          { 4 }
     let(:shuffle_replicas)          { true }
-    let(:client_timestamps)         { false }
     let(:nodelay)                   { true }
-
+    let(:timestamp_generator)       { nil }
     let(:connections_per_local_node)  { nil }
     let(:connections_per_remote_node) { nil }
     let(:requests_per_connection) { nil }

data/lib/cassandra/index.rb

@@ -39,8 +39,17 @@ module Cassandra
       @table = table
       @name = name.freeze
       @kind = kind
-      @target = target.freeze
       @options = options.freeze
+
+      # Target is a bit tricky; it may be an escaped name or not
+      # depending on C* version. Unify to be unescaped since a user
+      # who wants to know the target would want the bare column name.
+
+      @target = if target[0] == '"'
+                  target[1..-2]
+                else
+                  target
+                end.freeze
     end
 
     # @return [Boolean] whether or not this index uses a custom class.
@@ -57,13 +66,18 @@ module Cassandra
     def to_cql
       keyspace_name = Util.escape_name(@table.keyspace.name)
       table_name = Util.escape_name(@table.name)
-      index_name = Util.escape_name(name)
+      index_name = Util.escape_name(@name)
+
+      # Target is interesting in that it's not necessarily a column name,
+      # so we can't simply escape it. If it contains a paren, we take it as is,
+      # otherwise assume it's a column name and escape accordingly.
+      escaped_target = @target.include?('(') ? @target : Util.escape_name(@target)
 
       if custom_index?
-        "CREATE CUSTOM INDEX #{index_name} ON #{keyspace_name}.#{table_name} (#{target}) " \
-        "USING '#{@options['class_name']}' #{options_cql};"
+        "CREATE CUSTOM INDEX #{index_name} ON #{keyspace_name}.#{table_name} (#{escaped_target}) " \
+        "USING '#{@options['class_name']}'#{options_cql};"
       else
-        "CREATE INDEX #{index_name} ON #{keyspace_name}.#{table_name} (#{target});"
+        "CREATE INDEX #{index_name} ON #{keyspace_name}.#{table_name} (#{escaped_target});"
       end
     end
 
@@ -81,7 +95,7 @@ module Cassandra
     # @private
     def inspect
       "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
-          "@name=#{@name} table_name=#{@table.name} kind=#{@kind} target=#{@target}>"
+          "@name=#{@name.inspect} @table=#{@table.inspect} @kind=#{@kind.inspect} @target=#{@target.inspect}>"
     end
 
     private
@@ -93,9 +107,9 @@ module Cassandra
       end
       return '' if filtered_options.empty?
 
-      result = 'WITH OPTIONS = {'
+      result = ' WITH OPTIONS = {'
       result << filtered_options.map do |key, value|
-        "'#{key}':'#{value}'"
+        "'#{key}': '#{value}'"
       end.join(', ')
       result << '}'
       result

data/lib/cassandra/load_balancing/policies/dc_aware_round_robin.rb

@@ -62,7 +62,7 @@ module Cassandra
         include MonitorMixin
 
         def initialize(datacenter = nil,
-                       max_remote_hosts_to_use = nil,
+                       max_remote_hosts_to_use = 0,
                        use_remote_hosts_for_local_consistency = false)
           datacenter              &&= String(datacenter)
           max_remote_hosts_to_use &&= Integer(max_remote_hosts_to_use)
@@ -75,6 +75,13 @@ module Cassandra
             end
           end
 
+          # If use_remote* is true, max_remote* must be > 0
+          if use_remote_hosts_for_local_consistency
+            Util.assert(max_remote_hosts_to_use.nil? || max_remote_hosts_to_use > 0,
+                        'max_remote_hosts_to_use must be nil (meaning unlimited) or > 0 when ' \
+                        'use_remote_hosts_for_local_consistency is true')
+          end
+
           @datacenter = datacenter
           @max_remote = max_remote_hosts_to_use
           @local      = ::Array.new
@@ -148,6 +155,17 @@ module Cassandra
 
           Plan.new(local, remote, position)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "datacenter=#{@datacenter.inspect}, " \
+          "use_remote=#{@use_remote.inspect}, " \
+          "max_remote=#{@max_remote.inspect}, " \
+          "local=#{@local.inspect}, " \
+          "remote=#{@remote.inspect}, " \
+          "position=#{@position.inspect}>"
+        end
       end
     end
   end

data/lib/cassandra/load_balancing/policies/round_robin.rb

@@ -128,6 +128,13 @@ module Cassandra
 
           Plan.new(hosts, position)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "hosts=#{@hosts.inspect}, " \
+          "position=#{@position.inspect}>"
+        end
       end
     end
   end

data/lib/cassandra/load_balancing/policies/token_aware.rb

@@ -136,6 +136,13 @@ module Cassandra
 
           Plan.new(replicas, @policy, keyspace, statement, options)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "policy=#{@policy.inspect}, " \
+          "shuffle=#{@shuffle.inspect}>"
+        end
       end
     end
   end

data/lib/cassandra/load_balancing/policies/white_list.rb

@@ -87,6 +87,13 @@ module Cassandra
         def host_down(host)
           @policy.host_down(host) if @ips.include?(host.ip)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "policy=#{@policy.inspect}, " \
+          "ips=#{@ips.inspect}>"
+        end
       end
     end
   end

data/lib/cassandra/protocol/cql_byte_buffer.rb

@@ -324,10 +324,6 @@ module Cassandra
         self
       end
 
-      def append_timestamp(timestamp)
-        append_long(timestamp.tv_sec * 1000000 + timestamp.tv_usec)
-      end
-
       def append_long(n)
         top = n >> 32
         bottom = n & 0xffffffff

data/lib/cassandra/protocol/requests/batch_request.rb

@@ -81,7 +81,7 @@ module Cassandra
 
           buffer.append(flags.chr)
           buffer.append_consistency(@serial_consistency) if @serial_consistency
-          buffer.append_timestamp(@timestamp) if @timestamp
+          buffer.append_long(@timestamp) if @timestamp
         end
 
         buffer

data/lib/cassandra/protocol/requests/execute_request.rb

@@ -78,7 +78,7 @@ module Cassandra
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state
           buffer.append_consistency(@serial_consistency) if @serial_consistency
-          buffer.append_timestamp(@timestamp) if protocol_version > 2 && @timestamp
+          buffer.append_long(@timestamp) if protocol_version > 2 && @timestamp
         else
           encoder.write_parameters(buffer, @values, @metadata)
           buffer.append_consistency(@consistency)

data/lib/cassandra/protocol/requests/query_request.rb

@@ -71,7 +71,7 @@ module Cassandra
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state
           buffer.append_consistency(@serial_consistency) if @serial_consistency
-          buffer.append_timestamp(@timestamp) if protocol_version > 2 && @timestamp
+          buffer.append_long(@timestamp) if protocol_version > 2 && @timestamp
         end
         buffer
       end

data/lib/cassandra/session.rb

@@ -238,7 +238,9 @@ module Cassandra
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{object_id.to_s(16)}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+      "@keyspace=#{keyspace.inspect}, " \
+      "@options=#{@options.inspect}>"
     end
   end
 end

data/lib/cassandra/table.rb

@@ -80,14 +80,14 @@ module Cassandra
         else
           cql << ",\n"
         end
-        cql << "  #{column.name} #{type_to_cql(column.type, column.frozen?)}"
+        cql << "  #{Util.escape_name(column.name)} #{type_to_cql(column.type, column.frozen?)}"
         cql << ' PRIMARY KEY' if primary_key && column.name == primary_key
       end
 
       unless primary_key
         cql << ",\n  PRIMARY KEY ("
         if @partition_key.one?
-          cql << @partition_key.first.name
+          cql << Util.escape_name(@partition_key.first.name)
         else
           cql << '('
           first = true
@@ -97,12 +97,12 @@ module Cassandra
             else
               cql << ', '
             end
-            cql << column.name
+            cql << Util.escape_name(column.name)
           end
           cql << ')'
         end
         @clustering_columns.each do |column|
-          cql << ", #{column.name}"
+          cql << ", #{Util.escape_name(column.name)}"
         end
         cql << ')'
       end
@@ -118,7 +118,7 @@ module Cassandra
           else
             cql << ', '
           end
-          cql << "#{column.name} #{order.to_s.upcase}"
+          cql << "#{Util.escape_name(column.name)} #{order.to_s.upcase}"
         end
         cql << ")\n AND "
       end

data/lib/cassandra/timestamp_generator.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+#--
+# 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.
+# 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
+  # A generator is used to create client-timestamps (in the form of long integers) to send with C* requests when
+  # the `:client_timestamps` cluster option is set to true.
+  #
+  # @abstract A timestamp generator given to {Cassandra.cluster} doesn't need to include this module, but needs to
+  #   implement the same methods. This module exists only for documentation purposes.
+  module TimestampGenerator
+    # Create a new timestamp, as a 64-bit integer. Calls must return monotonically increasing values.
+    #
+    # @return [Integer] an integer representing a timestamp in microseconds.
+    # @raise [NotImplementedError] if a class including this module does not define this method.
+    def next
+      raise NotImplementedError, "#{self.class} class must implement the 'next' method"
+    end
+  end
+end
+
+require 'cassandra/timestamp_generator/ticking_on_duplicate'
+require 'cassandra/timestamp_generator/simple'

data/lib/cassandra/timestamp_generator/simple.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+#--
+# 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.
+# 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
+  module TimestampGenerator
+    # Generate long integer timestamps from current time. This implementation relies on the {::Time} class to return
+    # microsecond precision time.
+    # @note It is not appropriate for use with JRuby because its {::Time#now} returns millisecond precision time.
+    class Simple
+      include TimestampGenerator
+
+      # Create a new timestamp, as a 64-bit integer. This is just a wrapper around Time::now.
+      #
+      # @return [Integer] an integer representing a timestamp in microseconds.
+      def next
+        # Use Time.now, which has microsecond precision on MRI (and probably Rubinius) to make an int representing
+        # client timestamp in protocol requests.
+        timestamp = ::Time.now
+        timestamp.tv_sec * 1000000 + timestamp.tv_usec
+      end
+    end
+  end
+end

data/lib/cassandra/timestamp_generator/ticking_on_duplicate.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+#--
+# 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.
+# 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
+  module TimestampGenerator
+    # In JRuby, {::Time} has millisecond precision. We require client timestamps to have microsecond precision to
+    # minimize clashes in C*. This generator keeps track of the last generated timestamp, and if the current-time
+    # is within the same millisecond as the last, it fills the microsecond portion of the new timestamp with the
+    # value of an incrementing counter.
+    #
+    # For example, if the generator triggers twice at time 12345678000 (microsecond granularity, but ms precisions
+    # as shown by 0's for the three least-significant digits), it'll return 12345678000 and 12345678001.
+    class TickingOnDuplicate
+      include MonitorMixin
+      include TimestampGenerator
+
+      # @private
+      def initialize
+        mon_initialize
+        @last = 0
+      end
+
+      # Create a new timestamp, as a 64-bit integer.
+      #
+      # @return [Integer] an integer representing a timestamp in microseconds.
+      def next
+        now = ::Time.now
+        now_millis = now.tv_sec * 1000 + now.tv_usec / 1000
+        synchronize do
+          millis = @last / 1000
+          counter = @last % 1000
+          if millis >= now_millis
+            counter += 1
+          else
+            millis = now_millis
+            counter = 0
+          end
+          @last = millis * 1000 + counter
+        end
+      end
+    end
+  end
+end

data/lib/cassandra/util.rb

@@ -162,8 +162,13 @@ module Cassandra
     end
 
     def escape_name(name)
-      return name if name[LOWERCASE_REGEXP] == name
-      DBL_QUOT + name + DBL_QUOT
+      # If name only contains lower-case chars and it's not a reserved word, return it
+      # as-is. Otherwise, quote.
+      return name if name[LOWERCASE_REGEXP] == name && !RESERVED_WORDS.include?(name)
+
+      # Replace double-quotes within name with two double-quotes (if any) and surround the whole
+      # thing with double-quotes
+      DBL_QUOT + name.gsub('"', '""') + DBL_QUOT
     end
 
     def guess_type(object)
@@ -327,5 +332,133 @@ module Cassandra
     PRN_OPN = '('.freeze
     # @private
     PRN_CLS = ')'.freeze
+    RESERVED_WORDS = Set.new(%w(
+                               add
+                               aggregate
+                               all
+                               allow
+                               alter
+                               and
+                               apply
+                               as
+                               asc
+                               ascii
+                               authorize
+                               batch
+                               begin
+                               bigint
+                               blob
+                               boolean
+                               by
+                               called
+                               clustering
+                               columnfamily
+                               compact
+                               contains
+                               count
+                               counter
+                               create
+                               custom
+                               date
+                               decimal
+                               delete
+                               desc
+                               describe
+                               distinct
+                               double
+                               drop
+                               entries
+                               execute
+                               exists
+                               filtering
+                               finalfunc
+                               float
+                               from
+                               frozen
+                               full
+                               function
+                               functions
+                               grant
+                               if
+                               in
+                               index
+                               inet
+                               infinity
+                               initcond
+                               input
+                               insert
+                               int
+                               into
+                               is
+                               json
+                               key
+                               keys
+                               keyspace
+                               keyspaces
+                               language
+                               limit
+                               list
+                               login
+                               map
+                               materialized
+                               modify
+                               nan
+                               nologin
+                               norecursive
+                               nosuperuser
+                               not
+                               null
+                               of
+                               on
+                               options
+                               or
+                               order
+                               password
+                               permission
+                               permissions
+                               primary
+                               rename
+                               replace
+                               returns
+                               revoke
+                               role
+                               roles
+                               schema
+                               select
+                               set
+                               sfunc
+                               smallint
+                               static
+                               storage
+                               stype
+                               superuser
+                               table
+                               text
+                               time
+                               timestamp
+                               timeuuid
+                               tinyint
+                               to
+                               token
+                               trigger
+                               truncate
+                               ttl
+                               tuple
+                               type
+                               unlogged
+                               update
+                               use
+                               user
+                               users
+                               using
+                               uuid
+                               values
+                               varchar
+                               varint
+                               view
+                               where
+                               with
+                               writetime
+                             )).freeze
   end
 end

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.0.0.rc.2'.freeze
+  VERSION = '3.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Theo Hultberg
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -193,6 +193,9 @@ files:
 - lib/cassandra/table.rb
 - lib/cassandra/time.rb
 - lib/cassandra/time_uuid.rb
+- lib/cassandra/timestamp_generator.rb
+- lib/cassandra/timestamp_generator/simple.rb
+- lib/cassandra/timestamp_generator/ticking_on_duplicate.rb
 - lib/cassandra/tuple.rb
 - lib/cassandra/types.rb
 - lib/cassandra/udt.rb
@@ -221,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.0