cassandra 0.16.0 → 0.17.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.17.0
+- multi_get_columns with only one query (courtesy @christian-blades-cb)
+- documentation fixes for get and multi_get (issue #136, courtesy @christian-blades-cb)
+
 v0.16.0
 - New :queue_size option for batch mode (courtesy @vicentllongo)
 - Cassandra 1.1 support (courtesy @hawknewton)

data/Rakefile

@@ -78,18 +78,39 @@ def running?(pid_file = nil)
   false
 end
 
+def listening?(host, port)
+  TCPSocket.new(host, port).close
+  true
+rescue Errno::ECONNREFUSED => e
+  false
+end
+
 namespace :cassandra do
   desc "Start Cassandra"
   task :start, [:daemonize] => :java do |t, args|
     args.with_defaults(:daemonize => true)
 
     setup_cassandra_version
-
     env = setup_environment
 
     Dir.chdir(File.join(CASSANDRA_HOME, "cassandra-#{CASSANDRA_VERSION}")) do
       sh("env #{env} bin/cassandra #{'-f' unless args.daemonize} -p #{CASSANDRA_PIDFILE}")
     end
+
+    if args.daemonize
+      end_time = Time.now + 30
+      host     = '127.0.0.1'
+      port     = 9160
+
+      until Time.now >= end_time || listening?(host, port)
+        puts "waiting for 127.0.0.1:9160"
+        sleep 0.1
+      end
+
+      unless listening?(host, port)
+        raise "timed out waiting for cassandra to start"
+      end
+    end
   end
 
   desc "Stop Cassandra"
@@ -118,7 +139,9 @@ end
 
 desc "Check Java version"
 task :java do
-  unless `java -version 2>&1`.split("\n").first =~ /java version "1.6/ #"
+  is_java16 = `java -version 2>&1`.split("\n").first =~ /java version "1.6/
+
+  if ['0.6', '0.7'].include?(CASSANDRA_VERSION) && !java16
     puts "You need to configure your environment for Java 1.6."
     puts "If you're on OS X, just export the following environment variables:"
     puts '  JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"'

data/cassandra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandra"
-  s.version = "0.16.0"
+  s.version = "0.17.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.md"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "cassandra"
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.17"
   s.summary = "A Ruby client for the Cassandra distributed database."
   s.test_files = ["test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/composite_type_test.rb", "test/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
 

data/lib/cassandra/cassandra.rb

@@ -570,9 +570,10 @@ class Cassandra
   # * options - Valid options are:
   #   * :consistency - Uses the default read consistency if none specified.
   #
-  # FIXME Not real multi; needs to use a Column predicate
-  def multi_get_columns(column_family, keys, *options)
-    OrderedHash[*keys.map { |key| [key, get_columns(column_family, key, *options)] }._flatten_once]
+  def multi_get_columns(column_family, keys, *columns_and_options)
+    column_family, columns, sub_columns, options = 
+      extract_and_validate_params(column_family, keys, columns_and_options, READ_DEFAULTS)
+    _multi_get_columns(column_family, keys, columns, sub_columns, options[:consistency])
   end
 
   ##
@@ -582,8 +583,8 @@ class Cassandra
   #
   # * column_family - The column_family that you are inserting into.
   # * key - The row key to insert.
-  # * columns - Either a single super_column or a list of columns.
-  # * sub_columns - The list of sub_columns to select.
+  # * column - Either a single super_column or single column.
+  # * sub_column - A single sub_column to select.
   # * options - Valid options are:
   #   * :count    - The number of columns requested to be returned.
   #   * :start    - The starting value for selecting a range of columns.
@@ -607,8 +608,8 @@ class Cassandra
   #
   # * column_family   - The column_family that you are inserting into.
   # * keys            - An array of keys to select.
-  # * columns         - Either a single super_column or a list of columns.
-  # * sub_columns     - The list of sub_columns to select.
+  # * column         - Either a single super_column or a single column.
+  # * sub_column     - A single ub_columns to select.
   # * options         - Valid options are:
   #   * :count        - The number of columns requested to be returned.
   #   * :start        - The starting value for selecting a range of columns.

data/lib/cassandra/protocol.rb

@@ -48,6 +48,23 @@ class Cassandra
       klass = column_name_class(column_family)
       (sub_columns || columns).map { |name| result[klass.new(name)] }
     end
+    
+    def _multi_get_columns(column_family, keys, columns, sub_columns, consistency)
+      result = if is_super(column_family) and sub_columns
+        predicate = CassandraThrift::SlicePredicate.new(:column_names => sub_columns)
+        column_parent = CassandraThrift::ColumnParent.new(
+          :column_family => column_family, 
+          :super_column => columns.kind_of?(Array) ? columns[0] : columns )
+        multi_sub_columns_to_hash!(column_family, client.multiget_slice(keys, column_parent, predicate, consistency))
+      else
+        predicate = CassandraThrift::SlicePredicate.new(:column_names => columns)
+        column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
+        multi_columns_to_hash!(column_family, client.multiget_slice(keys, column_parent, predicate, consistency))
+      end 
+      
+      klass = column_name_class(column_family)
+      OrderedHash[result.keys.map { |key| [key, (sub_columns || columns).map { |column| result[key][klass.new(column)] }] }]
+    end
 
     def _multiget(column_family, keys, column, sub_column, count, start, finish, reversed, consistency)
       # Single values; count and range parameters have no effect

metadata

@@ -1,109 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cassandra
-version: !ruby/object:Gem::Version
-  version: 0.16.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 17
+  - 0
+  version: 0.17.0
 platform: ruby
-authors:
+authors: 
 - Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-26 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thrift_client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_uuid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: simple_uuid
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: echoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: A Ruby client for the Cassandra distributed database.
-email: ''
-executables:
+email: ""
+executables: 
 - cassandra_helper
-extensions:
+extensions: 
 - ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.md
@@ -148,7 +138,7 @@ extra_rdoc_files:
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
 - lib/cassandra/time.rb
-files:
+files: 
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -244,38 +234,44 @@ files:
 - vendor/1.1/gen-rb/cassandra_constants.rb
 - vendor/1.1/gen-rb/cassandra_types.rb
 - cassandra.gemspec
+has_rdoc: true
 homepage: http://github.com/twitter/cassandra
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Cassandra
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0.8'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      - 8
+      version: "0.8"
 requirements: []
+
 rubyforge_project: cassandra
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.
-test_files:
+test_files: 
 - test/cassandra_client_test.rb
 - test/cassandra_mock_test.rb
 - test/cassandra_test.rb