cassandra-driver 1.0.0.beta.1 → 1.0.0.beta.2

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -219,7 +219,6 @@ module Cassandra
             complete_request(id, @current_frame.body)
           end
           @current_frame = @frame_decoder.decode_frame(@read_buffer)
-          flush_request_queue
         end
       end
 
@@ -249,6 +248,7 @@ module Cassandra
         if response.is_a?(Protocol::SetKeyspaceResultResponse)
           @keyspace = response.keyspace
         end
+        flush_request_queue
         unless promise.timed_out?
           promise.fulfill(response)
         end
@@ -272,7 +272,7 @@ module Cassandra
             if @request_queue_out.any? && (id = next_stream_id)
               promise = @request_queue_out.shift
               if promise.timed_out?
-                id = nil
+                next
               else
                 frame = promise.frame
                 @promises[id] = promise

data/lib/cassandra/reconnection.rb

@@ -19,7 +19,7 @@
 module Cassandra
   module Reconnection
     # Reconnection schedule
-    # @note actual reconnection schedules returned from
+    # @abstract Actual reconnection schedules returned from
     #   {Cassandra::Reconnection::Policy} implementation don't need to inherit
     #   this class. This class exists for documentation purposes only.
     class Schedule
@@ -29,16 +29,16 @@ module Cassandra
     end
 
     # A reconnection policy
-    # @note actual reconnection policies supplied as `:reconnection_policy`
+    # @abstract Actual reconnection policies supplied as `:reconnection_policy`
     #   option to {Cassandra.connect} don't need to inherit this class, only
     #   implement its methods. This class exists for documentation purposes
     #   only.
     class Policy
       # Returns a reconnection schedule
       #
-      # @abstract implementation should be provided by an actual policy
-      # @note reconnection schedule doesn't need to extend
-      #   {Cassandra::Reconnection::Schedule}, only conform to its interface
+      # @note Reconnection schedule returned from this method doesn't need to
+      #   extend {Cassandra::Reconnection::Schedule}, only conform to its
+      #   interface.
       # @return [Cassandra::Reconnection::Schedule] reconnection schedule
       def schedule
       end

data/lib/cassandra/retry.rb

@@ -18,6 +18,9 @@
 
 module Cassandra
   module Retry
+    # @abstract Actual retry policies supplied as `:retry_policy` option to
+    #   {Cassandra.connect} don't need to inherit this class, only implement
+    #   its methods. This class exists for documentation purposes only.
     module Policy
       # Decides wether to retry a read and at what consistency level.
       # 
@@ -35,7 +38,6 @@ module Cassandra
       #   checksum) was present in the received responses.
       # @param retries [Integer] the number of retries already performed
       # 
-      # @abstract implementation should be provided by an actual policy
       # @return [Cassandra::Policies::Retry::Decision] a retry decision
       #
       # @see Cassandra::Retry::Policy#try_again
@@ -57,7 +59,6 @@ module Cassandra
       #   query timed out
       # @param retries [Integer] the number of retries already performed
       # 
-      # @abstract implementation should be provided by an actual policy
       # @return [Cassandra::Policies::Retry::Decision] a retry decision
       #
       # @see Cassandra::Retry::Policy#try_again
@@ -78,7 +79,6 @@ module Cassandra
       #   query timed out
       # @param retries [Integer] the number of retries already performed
       # 
-      # @abstract implementation should be provided by an actual policy
       # @return [Cassandra::Policies::Retry::Decision] a retry decision
       #
       # @see Cassandra::Retry::Policy#try_again

data/lib/cassandra/session.rb

@@ -19,6 +19,13 @@
 module Cassandra
   # Sessions are used for query execution. Each session tracks its current keyspace. A session should be reused as much as possible, however it is ok to create several independent session for interacting with different keyspaces in the same application.
   class Session
+    extend Forwardable
+
+    # @!method keyspace
+    #   Returns current keyspace
+    #   @return [String] current keyspace
+    def_delegators :@client, :keyspace
+
     # @private
     def initialize(client, default_options, futures_factory)
       @client  = client

data/lib/cassandra/statements/bound.rb

@@ -27,14 +27,16 @@ module Cassandra
       # @return [Array<Object>] a list of positional parameters for the cql
       attr_reader :params
       # @private
-      attr_reader :params_metadata, :result_metadata
+      attr_reader :params_metadata, :result_metadata, :keyspace, :partition_key
 
       # @private
-      def initialize(cql, params_metadata, result_metadata, params)
+      def initialize(cql, params_metadata, result_metadata, params, keyspace = nil, partition_key = nil)
         @cql             = cql
         @params_metadata = params_metadata
         @result_metadata = result_metadata
         @params          = params
+        @keyspace        = keyspace
+        @partition_key   = partition_key
       end
 
       # @return [String] a CLI-friendly bound statement representation

data/lib/cassandra/statements/prepared.rb

@@ -23,20 +23,25 @@ module Cassandra
 
       # @return [String] original cql used to prepare this statement
       attr_reader :cql
-      # @return [Cassandra::Execution::Info] execution info for PREPARE request
-      attr_reader :execution_info
-
       # @private
       attr_reader :params_metadata
       # @private
       attr_reader :result_metadata
 
       # @private
-      def initialize(cql, params_metadata, result_metadata, execution_info)
+      def initialize(cql, params_metadata, result_metadata, trace_id, keyspace, statement, options, hosts, consistency, retries, client, futures_factory, schema)
         @cql             = cql
         @params_metadata = params_metadata
         @result_metadata = result_metadata
-        @execution_info  = execution_info
+        @trace_id        = trace_id
+        @keyspace        = keyspace
+        @statement       = statement
+        @options         = options
+        @hosts           = hosts
+        @consistency     = consistency
+        @retries         = retries
+        @client          = client
+        @schema          = schema
       end
 
       # Creates a statement bound with specific arguments
@@ -47,7 +52,24 @@ module Cassandra
       def bind(*args)
         raise ::ArgumentError, "expecting exactly #{@params_metadata.size} bind parameters, #{args.size} given" if args.size != @params_metadata.size
 
-        Bound.new(@cql, @params_metadata, @result_metadata, args)
+        return Bound.new(@cql, @params_metadata, @result_metadata, args) if @params_metadata.empty?
+
+        keyspace, table, _, _ = @params_metadata.first
+        return Bound.new(@cql, @params_metadata, @result_metadata, args, keyspace) unless keyspace && table
+
+        values = ::Hash.new
+        @params_metadata.zip(args) do |(keyspace, table, column, type), value|
+          values[column] = value
+        end
+
+        partition_key = @schema.create_partition_key(keyspace, table, values)
+
+        Bound.new(@cql, @params_metadata, @result_metadata, args, keyspace, partition_key)
+      end
+
+      # @return [Cassandra::Execution::Info] execution info for PREPARE request
+      def execution_info
+        @info ||= Execution::Info.new(@keyspace, @statement, @options, @hosts, @consistency, @retries, @trace_id ? Execution::Trace.new(@trace_id, @client) : nil)
       end
 
       # @return [String] a CLI-friendly prepared statement representation

data/lib/cassandra/table.rb

@@ -164,11 +164,16 @@ module Cassandra
     # Yield or enumerate each column defined in this table
     # @overload each_column
     #   @yieldparam column [Cassandra::Column] current column
-    #   @return [Array<Cassandra::Column>] a list of columns
+    #   @return [Cassandra::Table] self
     # @overload each_column
-    #   @return [Enumerator<Cassandra::Column>] an enumerator
+    #   @return [Array<Cassandra::Column>] a list of columns
     def each_column(&block)
-      @columns.values.each(&block)
+      if block_given?
+        @columns.each_value(&block)
+        self
+      else
+        @columns.values
+      end
     end
     alias :columns :each_column
 
@@ -177,7 +182,6 @@ module Cassandra
       cql   = "CREATE TABLE #{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)} (\n"
       first = true
       @columns.each do |(_, column)|
-        next if column.name.empty?
         if first
           first = false
         else
@@ -241,6 +245,47 @@ module Cassandra
     alias :== :eql?
 
     # @private
+    def create_partition_key(values)
+      partition_key = @partition_key
+      return nil unless partition_key.size == values.size
+
+      if partition_key.one?
+        column      = partition_key.first
+        column_name = column.name
+        return nil unless values.has_key?(column_name)
+
+        buffer = Protocol::CqlByteBuffer.new
+
+        TYPE_CONVERTER.to_bytes(buffer, column.type, values[column_name])
+        buffer.discard(4)
+      else
+        buf    = nil
+        buffer = nil
+
+        partition_key.each do |column|
+          column_name = column.name
+          return nil unless values.has_key?(column_name)
+
+          buf    ||= Protocol::CqlByteBuffer.new
+          buffer ||= Protocol::CqlByteBuffer.new
+
+          TYPE_CONVERTER.to_bytes(buf, column.type, values[column_name])
+          buf.discard(4) # discard size
+
+          size = buf.length
+          buffer.append_short(size)
+          buffer << buf.read(size) << NULL_BYTE
+        end
+      end
+
+      buffer.to_str
+    end
+
+    private
+
+    NULL_BYTE = "\x00".freeze
+    TYPE_CONVERTER = Protocol::TypeConverter.new
+
     attr_reader :partition_key, :clustering_columns, :clustering_order
     protected :partition_key, :clustering_columns, :clustering_order
 

data/lib/cassandra/time_uuid.rb

@@ -33,6 +33,7 @@ module Cassandra
     end
 
     def <=>(other)
+      return nil unless other.kind_of?(Cassandra::Uuid)
       c = self.value <=> other.value
       return c if c == 0
       self.time_bits <=> other.time_bits

data/lib/cassandra/util.rb

@@ -16,8 +16,6 @@
 # limitations under the License.
 #++
 
-require 'stringio'
-
 module Cassandra
   # @private
   module Util extend self

data/lib/cassandra/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Theo Hultberg
@@ -10,68 +9,69 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ione
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0.pre4
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.0.pre4
+  name: ione
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
+        version: '1.6'
   type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+  name: bundler
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
+        version: '10.0'
   type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
 description: A pure Ruby driver for Apache Cassandra
 email:
 - theo@iconara.net
 - bulat.shakirzyanov@datastax.com
 executables: []
-extensions: []
+extensions:
+- ext/cassandra_murmur3/extconf.rb
 extra_rdoc_files:
 - README.md
 files:
-- lib/cassandra/auth/providers/password.rb
-- lib/cassandra/auth/providers.rb
+- .yardopts
+- README.md
+- ext/cassandra_murmur3/cassandra_murmur3.c
+- ext/cassandra_murmur3/extconf.rb
+- lib/cassandra.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
@@ -85,19 +85,27 @@ files:
 - lib/cassandra/client/request_runner.rb
 - lib/cassandra/client/result_metadata.rb
 - lib/cassandra/client/void_result.rb
-- lib/cassandra/client.rb
+- lib/cassandra/cluster.rb
 - lib/cassandra/cluster/client.rb
 - lib/cassandra/cluster/connector.rb
 - lib/cassandra/cluster/control_connection.rb
+- lib/cassandra/cluster/metadata.rb
 - lib/cassandra/cluster/options.rb
 - lib/cassandra/cluster/registry.rb
-- lib/cassandra/cluster/schema/type_parser.rb
 - lib/cassandra/cluster/schema.rb
-- lib/cassandra/cluster.rb
+- lib/cassandra/cluster/schema/partitioners.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/compression.rb
 - lib/cassandra/driver.rb
 - lib/cassandra/errors.rb
 - lib/cassandra/execution/info.rb
@@ -107,11 +115,13 @@ files:
 - 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/load_balancing/policies.rb
-- lib/cassandra/load_balancing.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
@@ -147,36 +157,33 @@ files:
 - 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/protocol.rb
+- lib/cassandra/reconnection.rb
+- lib/cassandra/reconnection/policies.rb
 - lib/cassandra/reconnection/policies/constant.rb
 - lib/cassandra/reconnection/policies/exponential.rb
-- lib/cassandra/reconnection/policies.rb
-- lib/cassandra/reconnection.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/retry/policies.rb
-- lib/cassandra/retry.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/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.rb
-- README.md
-- .yardopts
 homepage: http://datastax.github.io/ruby-driver
 licenses:
 - Apache License 2.0
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -187,22 +194,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Datastax Ruby Driver for Apache Cassandra
 test_files: []
 has_rdoc: