cassandra-driver 1.0.0.rc.1-java → 1.1.0-java

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -190,7 +190,10 @@ module Cassandra
           @terminate = nil
         end
 
-        @connection.close(cause)
+        @scheduler.schedule_timer(0).on_value do
+          @connection.close(cause)
+        end
+
         @closed_promise.future
       end
 
@@ -344,6 +347,8 @@ module Cassandra
       end
 
       def schedule_heartbeat
+        return unless @heartbeat_interval
+
         timer = nil
 
         @lock.synchronize do
@@ -360,6 +365,8 @@ module Cassandra
       end
 
       def reschedule_termination
+        return unless @idle_timeout
+
         timer = nil
 
         @lock.synchronize do

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

@@ -39,11 +39,7 @@ module Cassandra
       end
 
       def write(protocol_version, buffer)
-        if protocol_version > 1
-          buffer.append_long_string(@cql)
-        else
-          buffer.append_long_string(serialized_cql)
-        end
+        buffer.append_long_string(@cql)
         buffer.append_consistency(@consistency)
         if protocol_version > 1
           flags  = 0
@@ -108,12 +104,6 @@ module Cassandra
 
       private
 
-      def serialized_cql
-        return @cql if @values.nil? || @values.empty?
-        i = -1
-        @cql.gsub('?') { Util.encode(@values[i += 1]) }
-      end
-
       def self.guess_type(value)
         type = TYPE_GUESSES[value.class]
         if type == :map

data/lib/cassandra/result.rb

@@ -51,6 +51,8 @@ module Cassandra
     # @param options [Hash] additional options, just like the ones for
     #   {Cassandra::Session#execute}
     #
+    # @note `:paging_state` option will be ignored.
+    #
     # @return [Cassandra::Result, nil] returns `nil` if last page
     #
     # @see Cassandra::Session#execute
@@ -62,17 +64,38 @@ module Cassandra
     # @param options [Hash] additional options, just like the ones for
     #   {Cassandra::Session#execute_async}
     #
+    # @note `:paging_state` option will be ignored.
+    #
     # @return [Cassandra::Future<Cassandra::Result, nil>] `nil` if last
     #   page
     #
     # @see Cassandra::Session#execute
     def next_page_async(options = nil)
     end
+
+    # Exposes current paging state for stateless pagination.
+    #
+    # @return [String, nil] current paging state as a `String` or `nil`.
+    #
+    # @note Although this feature exists to allow web applications to store
+    #   paging state in an [HTTP cookie](http://en.wikipedia.org/wiki/HTTP_cookie), **it is not safe to
+    #   expose without encrypting or otherwise securing it**. Paging state
+    #   contains information internal to the Apache Cassandra cluster, such as
+    #   partition key and data. Additionally, if a paging state is sent with CQL
+    #   statement, different from the original, the behavior of Cassandra is
+    #   undefined and will likely cause a server process of the coordinator of
+    #   such request to abort.
+    #
+    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v2.spec#L482-L487 Paging State description in Cassandra Native Protocol v2 specification
+    def paging_state
+    end
   end
 
   # @private
   module Results
     class Paged < Result
+      attr_reader :paging_state
+
       def initialize(rows, paging_state, trace_id, keyspace, statement, options, hosts, consistency, retries, client, futures_factory)
         @rows           = rows
         @paging_state   = paging_state
@@ -124,12 +147,12 @@ module Cassandra
       def next_page_async(options = nil)
         return @futures.value(nil) if @paging_state.nil?
 
-        options = options ? @options.override(options) : @options
+        options = @options.override(options, paging_state: @paging_state)
 
         if @statement.is_a?(Statements::Simple)
-          @client.query(@statement, options, @paging_state)
+          @client.query(@statement, options)
         else
-          @client.execute(@statement, options, @paging_state)
+          @client.execute(@statement, options)
         end
       end
 
@@ -180,10 +203,9 @@ module Cassandra
       # Returns true when there are no more pages to load.
       #
       # This is only relevant when you have requested paging of the results with
-      # the `:page_size` option to {Cassandra::Client::Client#execute} or
-      # {Cassandra::Client::PreparedStatement#execute}.
+      # the `:page_size` option to {Cassandra::Session#execute}.
       #
-      # @see Cassandra::Client::Client#execute
+      # @see Cassandra::Session#execute
       def last_page?
         true
       end
@@ -191,10 +213,9 @@ module Cassandra
       # Returns the next page or nil when there is no next page.
       #
       # This is only relevant when you have requested paging of the results with
-      # the `:page_size` option to {Cassandra::Client::Client#execute} or
-      # {Cassandra::Client::PreparedStatement#execute}.
+      # the `:page_size` option to {Cassandra::Session#execute_async}.
       #
-      # @see Cassandra::Client::Client#execute
+      # @see Cassandra::Session#execute_async
       def next_page_async(options = nil)
         @futures.value(nil)
       end
@@ -203,6 +224,10 @@ module Cassandra
         nil
       end
 
+      def paging_state
+        nil
+      end
+
       def inspect
         "#<Cassandra::Result:0x#{self.object_id.to_s(16)} @rows=[] @last_page=true>"
       end

data/lib/cassandra/session.rb

@@ -53,6 +53,9 @@ module Cassandra
     # @option options [Symbol] :serial_consistency (nil) this option is only
     #   relevant for conditional updates and specifies a serial consistency to
     #   be used, one of {Cassandra::SERIAL_CONSISTENCIES}
+    # @option options [String] :paging_state (nil) this option is used for
+    #   stateless paging, where result paging is resumed some time after the
+    #   initial request.
     #
     # @see Cassandra.cluster Options that can be specified on the cluster-level
     #   and their default values.
@@ -61,6 +64,9 @@ module Cassandra
     #   Therefore, make sure to pass empty `options` when executing a statement
     #   with the last parameter required to be a map datatype.
     #
+    # @note Positional arguments are only supported on Apache Cassandra 2.0 and
+    #   above.
+    #
     # @return [Cassandra::Future<Cassandra::Result>]
     #
     # @see Cassandra::Session#execute A list of errors this future can be

data/lib/cassandra/statements/prepared.rb

@@ -50,7 +50,11 @@ module Cassandra
       #   original cql passed to {Cassandra::Session#prepare}
       # @return [Cassandra::Statements::Bound] bound statement
       def bind(*args)
-        raise ::ArgumentError, "expecting exactly #{@params_metadata.size} bind parameters, #{args.size} given" if args.size != @params_metadata.size
+        Util.assert_equal(@params_metadata.size, args.size) { "expecting exactly #{@params_metadata.size} bind parameters, #{args.size} given" }
+
+        @params_metadata.each_with_index do |metadata, i|
+          Util.assert_type(metadata[3], args[i]) { "argument for #{metadata[2].inspect} must be #{metadata[3].inspect}, #{args[i]} given" }
+        end
 
         return Bound.new(@cql, @params_metadata, @result_metadata, args) if @params_metadata.empty?
 

data/lib/cassandra/table.rb

@@ -231,6 +231,11 @@ module Cassandra
       cql << ';'
     end
 
+    # @return [String] a CLI-friendly table representation
+    def inspect
+      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @keyspace=#{@keyspace} @name=#{@name}>"
+    end
+
     # @return [Boolean] whether this table is equal to the other
     def eql?(other)
       other.is_a?(Table) &&

data/lib/cassandra/util.rb

@@ -137,6 +137,136 @@ module Cassandra
       DBL_QUOT + name + DBL_QUOT
     end
 
+    def assert_type(type, value, message = nil, &block)
+      return if value.nil?
+
+      case type
+      when ::Array
+        case type.first
+        when :list
+          assert_instance_of(::Array, value, message, &block)
+          value.each do |v|
+            assert_type(type[1], v)
+          end
+        when :set
+          assert_instance_of(::Set, value, message, &block)
+          value.each do |v|
+            assert_type(type[1], v)
+          end
+        when :map
+          assert_instance_of(::Hash, value, message, &block)
+          value.each do |k, v|
+            assert_type(type[1], k)
+            assert_type(type[2], v)
+          end
+        else
+          raise ::RuntimeError, "unsupported complex type #{type.inspect}"
+        end
+      else
+        case type
+        when :ascii then assert_instance_of(::String, value, message, &block)
+        when :bigint then assert_instance_of(::Numeric, value, message, &block)
+        when :blob then assert_instance_of(::String, value, message, &block)
+        when :boolean then assert_instance_of_one_of([::TrueClass, ::FalseClass], value, message, &block)
+        when :counter then assert_instance_of(::Numeric, value, message, &block)
+        when :decimal then assert_instance_of(::BigDecimal, value, message, &block)
+        when :double then assert_instance_of(::Float, value, message, &block)
+        when :float then assert_instance_of(::Float, value, message, &block)
+        when :inet then assert_instance_of(::IPAddr, value, message, &block)
+        when :int then assert_instance_of(::Numeric, value, message, &block)
+        when :text then assert_instance_of(::String, value, message, &block)
+        when :varchar then assert_instance_of(::String, value, message, &block)
+        when :timestamp then assert_instance_of(::Time, value, message, &block)
+        when :timeuuid then assert_instance_of(TimeUuid, value, message, &block)
+        when :uuid then assert_instance_of(Uuid, value, message, &block)
+        when :varint then assert_instance_of(::Numeric, value, message, &block)
+        else
+          raise ::RuntimeError, "unsupported type #{type.inspect}"
+        end
+      end
+    end
+
+    def assert_instance_of(kind, value, message = nil, &block)
+      unless value.is_a?(kind)
+        message   = yield if block_given?
+        message ||= "value must be an instance of #{kind}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_instance_of_one_of(kinds, value, message = nil, &block)
+      unless kinds.any? {|kind| value.is_a?(kind)}
+        message   = yield if block_given?
+        message ||= "value must be an instance of one of #{kinds.inspect}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_responds_to(method, value, message = nil, &block)
+      unless value.respond_to?(method)
+        message   = yield if block_given?
+        message ||= "value #{value.inspect} must respond to #{method.inspect}, but doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_responds_to_all(methods, value, message = nil, &block)
+      unless methods.all? {|method| value.respond_to?(method)}
+        message   = yield if block_given?
+        message ||= "value #{value.inspect} must respond to all methods #{methods.inspect}, but doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_not_empty(value, message = nil, &block)
+      if value.empty?
+        message   = yield if block_given?
+        message ||= "value cannot be empty"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_file_exists(path, message = nil, &block)
+      unless ::File.exists?(path)
+        message   = yield if block_given?
+        message ||= "expected file at #{path.inspect} to exist, but it doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_one_of(range, value, message = nil, &block)
+      unless range.include?(value)
+        message   = yield if block_given?
+        message ||= "value must be included in #{value.inspect}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert(condition, message = nil, &block)
+      unless condition
+        message   = yield if block_given?
+        message ||= "assertion failed"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_equal(expected, actual, message = nil, &block)
+      unless expected == actual
+        message   = yield if block_given?
+        message ||= "expected #{actual.inspect} to equal #{expected.inspect}"
+
+        raise ::ArgumentError, message
+      end
+    end
+
     # @private
     LOWERCASE_REGEXP = /[[:lower:]\_]*/
     # @private

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '1.0.0.rc.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.1.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -17,12 +17,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0.pre9
+        version: '1.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0.pre9
+        version: '1.2'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -62,72 +62,73 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .yardopts
-- README.md
 - lib/cassandra.rb
 - lib/cassandra/address_resolution.rb
+- lib/cassandra/auth.rb
+- lib/cassandra/cluster.rb
+- lib/cassandra/column.rb
+- lib/cassandra/compression.rb
+- lib/cassandra/driver.rb
+- lib/cassandra/errors.rb
+- lib/cassandra/executors.rb
+- lib/cassandra/future.rb
+- lib/cassandra/host.rb
+- lib/cassandra/keyspace.rb
+- lib/cassandra/listener.rb
+- lib/cassandra/load_balancing.rb
+- lib/cassandra/null_logger.rb
+- lib/cassandra/protocol.rb
+- lib/cassandra/reconnection.rb
+- lib/cassandra/result.rb
+- lib/cassandra/retry.rb
+- lib/cassandra/session.rb
+- lib/cassandra/statement.rb
+- lib/cassandra/statements.rb
+- lib/cassandra/table.rb
+- lib/cassandra/time_uuid.rb
+- lib/cassandra/util.rb
+- lib/cassandra/uuid.rb
+- lib/cassandra/version.rb
 - lib/cassandra/address_resolution/policies.rb
 - lib/cassandra/address_resolution/policies/ec2_multi_region.rb
 - lib/cassandra/address_resolution/policies/none.rb
-- lib/cassandra/auth.rb
 - lib/cassandra/auth/providers.rb
 - lib/cassandra/auth/providers/password.rb
-- lib/cassandra/client.rb
-- lib/cassandra/client/batch.rb
-- lib/cassandra/client/client.rb
-- lib/cassandra/client/column_metadata.rb
-- lib/cassandra/client/connection_manager.rb
-- lib/cassandra/client/connector.rb
-- lib/cassandra/client/execute_options_decoder.rb
-- lib/cassandra/client/null_logger.rb
-- lib/cassandra/client/peer_discovery.rb
-- lib/cassandra/client/prepared_statement.rb
-- lib/cassandra/client/query_result.rb
-- lib/cassandra/client/request_runner.rb
-- lib/cassandra/client/result_metadata.rb
-- lib/cassandra/client/void_result.rb
-- lib/cassandra/cluster.rb
 - lib/cassandra/cluster/client.rb
+- lib/cassandra/cluster/connection_pool.rb
 - lib/cassandra/cluster/connector.rb
 - lib/cassandra/cluster/control_connection.rb
+- lib/cassandra/cluster/failed_connection.rb
 - lib/cassandra/cluster/metadata.rb
 - lib/cassandra/cluster/options.rb
 - lib/cassandra/cluster/registry.rb
 - lib/cassandra/cluster/schema.rb
 - lib/cassandra/cluster/schema/partitioners.rb
+- lib/cassandra/cluster/schema/replication_strategies.rb
+- lib/cassandra/cluster/schema/type_parser.rb
 - lib/cassandra/cluster/schema/partitioners/murmur3.rb
 - lib/cassandra/cluster/schema/partitioners/ordered.rb
 - lib/cassandra/cluster/schema/partitioners/random.rb
-- lib/cassandra/cluster/schema/replication_strategies.rb
 - lib/cassandra/cluster/schema/replication_strategies/network_topology.rb
 - lib/cassandra/cluster/schema/replication_strategies/none.rb
 - lib/cassandra/cluster/schema/replication_strategies/simple.rb
-- lib/cassandra/cluster/schema/type_parser.rb
-- lib/cassandra/column.rb
-- lib/cassandra/compression.rb
 - lib/cassandra/compression/compressors/lz4.rb
 - lib/cassandra/compression/compressors/snappy.rb
-- lib/cassandra/driver.rb
-- lib/cassandra/errors.rb
 - lib/cassandra/execution/info.rb
 - lib/cassandra/execution/options.rb
 - lib/cassandra/execution/trace.rb
-- lib/cassandra/future.rb
-- lib/cassandra/host.rb
-- lib/cassandra/keyspace.rb
-- lib/cassandra/listener.rb
-- lib/cassandra/load_balancing.rb
 - lib/cassandra/load_balancing/policies.rb
 - lib/cassandra/load_balancing/policies/dc_aware_round_robin.rb
 - lib/cassandra/load_balancing/policies/round_robin.rb
 - lib/cassandra/load_balancing/policies/token_aware.rb
 - lib/cassandra/load_balancing/policies/white_list.rb
-- lib/cassandra/protocol.rb
 - lib/cassandra/protocol/cql_byte_buffer.rb
 - lib/cassandra/protocol/cql_protocol_handler.rb
 - lib/cassandra/protocol/frame_decoder.rb
 - lib/cassandra/protocol/frame_encoder.rb
 - lib/cassandra/protocol/request.rb
+- lib/cassandra/protocol/response.rb
+- lib/cassandra/protocol/type_converter.rb
 - lib/cassandra/protocol/requests/auth_response_request.rb
 - lib/cassandra/protocol/requests/batch_request.rb
 - lib/cassandra/protocol/requests/credentials_request.rb
@@ -138,7 +139,6 @@ files:
 - lib/cassandra/protocol/requests/register_request.rb
 - lib/cassandra/protocol/requests/startup_request.rb
 - lib/cassandra/protocol/requests/void_query_request.rb
-- lib/cassandra/protocol/response.rb
 - lib/cassandra/protocol/responses/auth_challenge_response.rb
 - lib/cassandra/protocol/responses/auth_success_response.rb
 - lib/cassandra/protocol/responses/authenticate_response.rb
@@ -157,31 +157,21 @@ files:
 - lib/cassandra/protocol/responses/supported_response.rb
 - lib/cassandra/protocol/responses/topology_change_event_response.rb
 - lib/cassandra/protocol/responses/void_result_response.rb
-- lib/cassandra/protocol/type_converter.rb
-- lib/cassandra/reconnection.rb
 - lib/cassandra/reconnection/policies.rb
 - lib/cassandra/reconnection/policies/constant.rb
 - lib/cassandra/reconnection/policies/exponential.rb
-- lib/cassandra/result.rb
-- lib/cassandra/retry.rb
 - lib/cassandra/retry/policies.rb
 - lib/cassandra/retry/policies/default.rb
 - lib/cassandra/retry/policies/downgrading_consistency.rb
 - lib/cassandra/retry/policies/fallthrough.rb
-- lib/cassandra/session.rb
-- lib/cassandra/statement.rb
-- lib/cassandra/statements.rb
 - lib/cassandra/statements/batch.rb
 - lib/cassandra/statements/bound.rb
 - lib/cassandra/statements/prepared.rb
 - lib/cassandra/statements/simple.rb
 - lib/cassandra/statements/void.rb
-- lib/cassandra/table.rb
-- lib/cassandra/time_uuid.rb
-- lib/cassandra/util.rb
-- lib/cassandra/uuid.rb
 - lib/cassandra/uuid/generator.rb
-- lib/cassandra/version.rb
+- README.md
+- .yardopts
 - lib/cassandra_murmur3.jar
 homepage: http://datastax.github.io/ruby-driver
 licenses:
@@ -203,12 +193,12 @@ 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.4.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Datastax Ruby Driver for Apache Cassandra