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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08356521233eb103e2f2bf262476dd4c7a62895c
-  data.tar.gz: f1e63737fcd6e12d503a869cddcb70bea74bff52
+  metadata.gz: 1e6a787e376fb3c3593c39dfda36008493460d81
+  data.tar.gz: a2a29ca90926d5bd17a77c3604b79a364acd7824
 SHA512:
-  metadata.gz: 614a6ac21232965b662687fe1af769287e2d8928af0ee890ccd5ae3625c78fd667210ca694f139622b78dd10a265c3889fe35ca20a5cb0ff0252fdbc27e42b82
-  data.tar.gz: 682a1aa7519916253ee9e3c28a0b877c71c7efeab3a7616dbdfd3f9638e8840e5ddac246f8fd628d8146beaa3420dd33619553f9cbcda464b23a2b4f1f8fa66f
+  metadata.gz: d0f391e939675d5f22d8e057c9e2a75324e07762c6fd669c5768df8cb118b3d0a38daec56e81871351d80f913b3fe03d5000e3f1f5627522388780acb7accd64
+  data.tar.gz: 01e6930ee06ca09812de451671c4598119ebb2982619c3e663522e35938f3e6d3c846859b0192e28e00604e2fc00dcbc3c0fcdf51a6736241aa96db48fce591b

data/README.md

@@ -1,8 +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 view the documentation for the latest released
-version [here](http://docs.datastax.com/en/developer/ruby-driver/latest).*
+*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. v1.0.0-beta.3](https://github.com/datastax/ruby-driver/tree/v1.0.0-beta.3).*
 
 [![Build Status](https://travis-ci.org/datastax/ruby-driver.svg?branch=master)](https://travis-ci.org/datastax/ruby-driver)
 
@@ -10,36 +8,36 @@ A Ruby client driver for Apache Cassandra. This driver works exclusively with
 the Cassandra Query Language version 3 (CQL3) and Cassandra's native protocol.
 
 - Code: https://github.com/datastax/ruby-driver
-- Docs: http://docs.datastax.com/en/developer/ruby-driver
+- Docs: http://datastax.github.io/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>)
-- Twitter: Follow the latest news about DataStax Drivers - [@stamhankar999](http://twitter.com/stamhankar999), [@avalanche123](http://twitter.com/avalanche123), [@al3xandru](https://twitter.com/al3xandru)
+- Twitter: Follow the latest news about DataStax Drivers - [@avalanche123](http://twitter.com/avalanche123), [@mfiguiere](http://twitter.com/mfiguiere), [@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:
 
-* [Asynchronous execution](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/asynchronous_io/)
-* One-off, [prepared](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/basics/prepared_statements/) and [batch statements](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/basics/batch_statements/)
-* Automatic peer discovery and cluster metadata with [support for change notifications](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/state_listeners/)
-* Various [load-balancing](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/load_balancing/), [retry](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/retry_policies/) and [reconnection](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/reconnection/) policies with [ability to write your own](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/load_balancing/implementing_a_policy/)
-* [SSL encryption](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/security/ssl_encryption/)
-* [Flexible and robust error handling](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/error_handling/)
-* [Per-request execution information and tracing](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/debugging/)
-* [Configurable address resolution](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/address_resolution/)
+* [Asynchronous execution](http://datastax.github.io/ruby-driver/features/asynchronous_io/)
+* One-off, [prepared](http://datastax.github.io/ruby-driver/features/basics/prepared_statements/) and [batch statements](http://datastax.github.io/ruby-driver/features/basics/batch_statements/)
+* Automatic peer discovery and cluster metadata with [support for change notifications](http://datastax.github.io/ruby-driver/features/state_listeners/)
+* Various [load-balancing](http://datastax.github.io/ruby-driver/features/load_balancing/), [retry](http://datastax.github.io/ruby-driver/features/retry_policies/) and [reconnection](http://datastax.github.io/ruby-driver/features/reconnection/) policies with [ability to write your own](http://datastax.github.io/ruby-driver/features/load_balancing/implementing_a_policy/)
+* [SSL encryption](http://datastax.github.io/ruby-driver/features/security/ssl_encryption/)
+* [Flexible and robust error handling](http://datastax.github.io/ruby-driver/features/error_handling/)
+* [Per-request execution information and tracing](http://datastax.github.io/ruby-driver/features/debugging/)
+* [Configurable address resolution](http://datastax.github.io/ruby-driver/features/address_resolution/)
 
 [Check out the slides from Ruby Driver Explained](https://speakerdeck.com/avalanche123/ruby-driver-explained) for a detailed overview of the Ruby Driver architecture.
 
-## Compatibility
+## Compability
 
 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 2.1
-* DataStax Enterprise 3.1-4.8
-* Ruby (MRI) 2.2, 2.3
+* DataStax Enterprise 3.1, 3.2, 4.0 and 4.5
+* Ruby (MRI) 1.9.3, 2.0, 2.1 and 2.2
 * JRuby 1.7
+* Rubinius 2.2
 
-__Note__: JRuby 1.6 is not officially supported, although 1.6.8 should work. Rubinius is not supported.
-MRI 1.9.3, 2.0, 2.1, and JRuby 9k are not officially supported, but they should work.
+__Note__: JRuby 1.6 is not officially supported, although 1.6.8 should work.
 
 ## Quick start
 
@@ -68,9 +66,9 @@ __Note__: The host you specify is just a seed node, the driver will automaticall
 
 Read more:
 
-* [`Cassandra.cluster` options](http://docs.datastax.com/en/developer/ruby-driver/2.1/api/#cluster-class_method)
-* [`Session#execute_async` options](http://docs.datastax.com/en/developer/ruby-driver/2.1/api/session/#execute_async-instance_method)
-* [Usage documentation](http://docs.datastax.com/en/developer/ruby-driver/2.1/features)
+* [`Cassandra.cluster` options](http://datastax.github.io/ruby-driver/api/#cluster-class_method)
+* [`Session#execute_async` options](http://datastax.github.io/ruby-driver/api/session/#execute_async-instance_method)
+* [Usage documentation](http://datastax.github.io/ruby-driver/features)
 
 ## Installation
 
@@ -86,51 +84,30 @@ Install via Gemfile
 gem 'cassandra-driver'
 ```
 
-__Note__: if you want to use compression you should also install [snappy](http://rubygems.org/gems/snappy) or [lz4-ruby](http://rubygems.org/gems/lz4-ruby). [Read more about compression.](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/#compression)
+__Note__: if you want to use compression you should also install [snappy](http://rubygems.org/gems/snappy) or [lz4-ruby](http://rubygems.org/gems/lz4-ruby). [Read more about compression.](http://datastax.github.io/ruby-driver/features/#compression)
 
 
 ## Upgrading from cql-rb
 
-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/v2.1.7/examples/cql-rb-wrapper.rb)
-to assist you with gradual upgrade.
+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.1
-See the [changelog](https://github.com/datastax/ruby-driver/blob/master/CHANGELOG.md) for details on patch releases.
+## What's new in v2.1.3
 
 Features:
 
 * Apache Cassandra native protocol v3
-* [User-defined types](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/basics/user_defined_types/) and [tuples](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/basics/datatypes/#using-tuples)
-* [Schema metadata includes user-defined types](http://docs.datastax.com/en/developer/ruby-driver/2.1/api/keyspace/#type-instance_method)
-* [Named arguments](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/basics/prepared_statements/#an-insert-statement-is-prepared-with-named-parameters)
-* [Public types api for type definition and introspection](http://docs.datastax.com/en/developer/ruby-driver/2.1/api/types/)
-* Add support for disabling nagle algorithm (tcp nodelay), enabled by default.
-* Add support for client-side timestamps, disabled by default.
-* Add support for serial consistency in batch requests.
-* Add support for `type_hints` to override type-guessing for non-prepared statements.
-
+* [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
-* Setting `:synchronize_schema` to `true` will no longer perform the initial
-  fetching if schema metadata.
 
 Bug Fixes:
 
 * [[RUBY-93](https://datastax-oss.atlassian.net/browse/RUBY-93)] Reconnection can overflow the stack
-* [[RUBY-95](https://datastax-oss.atlassian.net/browse/RUBY-95)] Speed up generation of large token maps
-* [[RUBY-97](https://datastax-oss.atlassian.net/browse/RUBY-97)] Allow disabling of the initial population of schema metadata
-* [[RUBY-98](https://datastax-oss.atlassian.net/browse/RUBY-98)] Use of undefined class variable in `Table#create_partition_key`
-* [[RUBY-102](https://datastax-oss.atlassian.net/browse/RUBY-102)] Allow custom types in schema metadata
-* [[RUBY-103](https://datastax-oss.atlassian.net/browse/RUBY-103)] Don't regenerate schema metadata for the same replication strategies and options
-* [[RUBY-116](https://datastax-oss.atlassian.net/browse/RUBY-116)] fix thread leak on connection error
-* [[RUBY-119](https://datastax-oss.atlassian.net/browse/RUBY-119)] Use `require 'datastax/cassandra'` to avoid namespace conflicts
-* [[RUBY-128](https://datastax-oss.atlassian.net/browse/RUBY-128)] Fix decoding of large values in maps, sets and lists.
-* [[RUBY-202](https://datastax-oss.atlassian.net/browse/RUBY-202)] Allow password authenticator to be used for LDAP authentication.
-* [[RUBY-255](https://datastax-oss.atlassian.net/browse/RUBY-255)] ControlConnection.peer_ip ignores peers that are missing critical information in system.peers.
 
 ## Code examples
 
@@ -169,10 +146,11 @@ Prereleases will be stable, in the sense that they will have finished and proper
 
 ## Known bugs & limitations
 
+* JRuby 1.6 is not officially supported, although 1.6.8 should work, if you're stuck in JRuby 1.6.8 try and see if it works for you.
 * 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.
 
-Please [refer to the usage documentation for more information on common pitfalls](http://docs.datastax.com/en/developer/ruby-driver/2.1/features/)
+Please [refer to the usage documentation for more information on common pitfalls](http://datastax.github.io/ruby-driver/features/)
 
 ## Contributing
 
@@ -182,12 +160,12 @@ For contributing read [CONTRIBUTING.md](https://github.com/datastax/ruby-driver/
 
 This driver is based on the original work of [Theo Hultberg](https://github.com/iconara) on [cql-rb](https://github.com/iconara/cql-rb/) and adds a series of advanced features that are common across all other DataStax drivers for Apache Cassandra.
 
-The development effort to provide an up to date, high performance, fully featured Ruby Driver for Apache Cassandra will continue on this project, while [cql-rb](https://github.com/iconara/cql-rb/) has been discontinued.
+The development effort to provide an up to date, high performance, fully featured Ruby Driver for Apache Cassandra will continue on this project, while [cql-rb](https://github.com/iconara/cql-rb/) will be discontinued.
 
 
 ## Copyright
 
-Copyright 2013-2016 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
 
@@ -195,4 +173,4 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 
 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.
 
-  [1]: http://docs.datastax.com/en/developer/ruby-driver/2.1/api
+  [1]: http://datastax.github.io/ruby-driver/api

data/lib/cassandra.rb

@@ -31,6 +31,7 @@ require 'resolv'
 require 'openssl'
 require 'securerandom'
 require 'time'
+require 'date'
 
 module Cassandra
   # A list of all supported request consistencies
@@ -59,7 +60,7 @@ module Cassandra
   #
   # @option options [Integer] :port (9042) cassandra native protocol port.
   #
-  # @option options [Boolean] :nodelay (false) when set to `true`, disables
+  # @option options [Boolean] :nodelay (true) when set to `true`, disables
   #   nagle algorithm.
   #
   # @option options [String] :datacenter (nil) name of current datacenter.
@@ -167,8 +168,8 @@ module Cassandra
   #   initial listeners. A list of initial cluster state listeners. Note that a
   #   `:load_balancing` policy is automatically registered with the cluster.
   #
-  # @option options [Symbol] :consistency (:one) default consistency to use for
-  #   all requests. Must be one of {Cassandra::CONSISTENCIES}.
+  # @option options [Symbol] :consistency (:local_one) default consistency
+  #   to use for all requests. Must be one of {Cassandra::CONSISTENCIES}.
   #
   # @option options [Boolean] :trace (false) whether or not to trace all
   #   requests by default.
@@ -521,12 +522,27 @@ module Cassandra
 
   # @private
   EMPTY_LIST = [].freeze
+  # @private
+  NOT_SET = ::Object.new
+  # @private
+  NULL_BYTE = "\x00".freeze
+
+  # @private
+  # ensures that:
+  # ::Date.jd(DATE_OFFSET, ::Date::GREGORIAN)
+  # => -5877641-06-23
+  # ::Date.jd(DATE_OFFSET + 2 ** 31, ::Date::GREGORIAN)
+  # => 1970-1-1
+  # ::Date.jd(DATE_OFFSET + 2 ** 32, ::Date::GREGORIAN)
+  # => 5881580-07-12
+  DATE_OFFSET = (::Time.utc(1970, 1, 1).to_date.jd - 2 ** 31)
 end
 
 require 'cassandra/uuid'
 require 'cassandra/time_uuid'
 require 'cassandra/tuple'
 require 'cassandra/udt'
+require 'cassandra/time'
 
 require 'cassandra/types'
 
@@ -546,6 +562,9 @@ require 'cassandra/result'
 require 'cassandra/statement'
 require 'cassandra/statements'
 
+require 'cassandra/aggregate'
+require 'cassandra/argument'
+require 'cassandra/function'
 require 'cassandra/column'
 require 'cassandra/table'
 require 'cassandra/keyspace'

data/lib/cassandra/aggregate.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+#--
+# 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
+#
+# 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
+  # Represents a cassandra user defined aggregate
+  # @see Cassandra::Keyspace#each_aggregate
+  # @see Cassandra::Keyspace#aggregate
+  # @see Cassandra::Keyspace#has_aggregate?
+  class Aggregate
+    # @private
+    attr_reader :keyspace
+    # @return [String] aggregate name
+    attr_reader :name
+    # @return [Cassandra::Type] aggregate return type
+    attr_reader :type
+    # @return [Array<Cassandra::Type>] aggregate argument types
+    attr_reader :argument_types
+    # @return [Cassandra::Type] aggregate state type
+    attr_reader :state_type
+    # @return [Object, nil] the initial value of the aggregate state or nil
+    attr_reader :initial_state
+    # @return [Cassandra::Function] the state function used by this aggregate
+    attr_reader :state_function
+    # @return [Cassandra::Function] the final function used by this aggregate
+    attr_reader :final_function
+
+    # @private
+    def initialize(keyspace, name, type, argument_types, state_type, initial_state, state_function, final_function)
+      @keyspace       = keyspace
+      @name           = name
+      @type           = type
+      @argument_types = argument_types
+      @state_type     = state_type
+      @initial_state  = initial_state
+      @state_function = state_function
+      @final_function = final_function
+    end
+
+    # @private
+    def eql?(other)
+      other.is_a?(Aggregate) && \
+        @keyspace == other.keyspace && \
+        @name == other.name && \
+        @type == other.type && \
+        @argument_types == other.argument_types && \
+        @state_type == other.state_type && \
+        @initial_state == other.initial_state && \
+        @state_function == other.state_function && \
+        @final_function == other.final_function
+    end
+    alias :== :eql?
+
+    # @private
+    def hash
+      @hash ||= begin
+        h = 17
+        h = 31 * h + @keyspace.hash
+        h = 31 * h + @name.hash
+        h = 31 * h + @type.hash
+        h = 31 * h + @argument_types.hash
+        h = 31 * h + @state_type.hash
+        h = 31 * h + @initial_state.hash
+        h = 31 * h + @state_function.hash
+        h = 31 * h + @final_function.hash
+        h
+      end
+    end
+
+    # @private
+    def inspect
+      "#<Cassandra::Aggregate:0x#{self.object_id.to_s(16)} @keyspace=#{@keyspace.inspect}, @name=#{@name.inspect}, @type=#{@type.inspect}, @argument_types=#{@argument_types.inspect}, @initial_state=#{@initial_state.inspect}, @state_function=#{@state_function.inspect}, @final_function=#{@final_function.inspect}>"
+    end
+
+    # @return [String] a cql representation of this aggregate
+    def to_cql
+      cql = "CREATE AGGREGATE simplex.average("
+      first = true
+      @argument_types.each do |type|
+        if first
+          first = false
+        else
+          cql << ', '
+        end
+        cql << type.to_s
+      end
+      cql << ")"
+      cql << "\n  SFUNC #{@state_function.name}"
+      cql << "\n  STYPE #{@state_type}"
+      cql << "\n  FINALFUNC #{@final_function.name}" if @final_function
+      cql << "\n  INITCOND #{@initial_state}"
+      cql << ";"
+    end
+  end
+end

data/lib/cassandra/argument.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+#--
+# 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
+#
+# 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
+  # Represents a function argument
+  class Argument
+    # @return [String] column name
+    attr_reader :name
+    # @return [Cassandra::Type] column type
+    attr_reader :type
+
+    # @private
+    def initialize(name, type)
+      @name = name
+      @type = type
+    end
+
+    # @private
+    def eql?(other)
+      other.is_a?(Argument) && \
+        @name == other.name && \
+        @type == other.type
+    end
+    alias :== :eql?
+
+    # @private
+    def hash
+      @hash ||= begin
+        h = 17
+        h = 31 * h + @name.hash
+        h = 31 * h + @type.hash
+        h
+      end
+    end
+  end
+end

data/lib/cassandra/auth/providers/password.rb

@@ -53,11 +53,14 @@ module Cassandra
           @password = password
         end
 
-        # Returns a Password Authenticator
-        # @param authentication_class [String] ignored
-        # @return [Cassandra::Auth::Authenticator]
+        # Returns a Password Authenticator only if `org.apache.cassandra.auth.PasswordAuthenticator` is given.
+        # @param authentication_class [String] must equal to `org.apache.cassandra.auth.PasswordAuthenticator`
+        # @return [Cassandra::Auth::Authenticator] when `authentication_class == "org.apache.cassandra.auth.PasswordAuthenticator"`
+        # @return [nil] for all other values of `authentication_class`
         def create_authenticator(authentication_class)
-          Authenticator.new(@username, @password)
+          if authentication_class == PASSWORD_AUTHENTICATOR_FQCN
+            Authenticator.new(@username, @password)
+          end
         end
 
         private

data/lib/cassandra/cluster.rb

@@ -136,8 +136,19 @@ module Cassandra
     #   Trigger an asynchronous schema metadata refresh
     #   @return [Cassandra::Future<nil>] a future that will be fulfilled when
     #     schema metadata has been refreshed
-    def_delegator :@control_connection, :refresh_schema_async_maybe_retry, \
-                                        :refresh_schema_async
+    def refresh_schema_async
+      promise = @futures.promise
+      @control_connection.send(:refresh_maybe_retry, :schema).on_complete do |f|
+        if f.resolved?
+          promise.fulfill(nil)
+        else
+          f.on_failure do |e|
+            promise.break(e)
+          end
+        end
+      end
+      promise.future
+    end
 
     # Synchronously refresh schema metadata
     #
@@ -233,7 +244,7 @@ module Cassandra
       close_async.get
     end
 
-    # @return [String] a CLI-friendly cluster representation
+    # @private
     def inspect
       "#<#{self.class.name}:0x#{self.object_id.to_s(16)}>"
     end