cassandra 0.11.1 → 0.11.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.11.2
+- Update thrift_client gem to deal with failover bug.
+
 v0.11.1
 - Add counter support for Cassandra 0.8. (Thanks Swrve team!)
 - Add additional rake tasks to start and stop cassandra in the background.

data/README.md

@@ -1,10 +1,7 @@
 # cassandra 
 A Ruby client for the Cassandra distributed database.
 
-* [Getting Started](#getting-started)
-* [License](#license)
-* [Cassandra Version](#cassandra-version)
-* [Read/Write API Method Reference](#read-write-api-method-reference)
+Supports 1.8.7, 1.9.2, and rubinius on Cassandra 0.6.13, 0.7.5, 0.8.0.
 
 ## Getting Started
 
@@ -31,10 +28,12 @@ The default version is the currently stable release of cassandra.  (0.7
 at this time, but 0.8 is looming in the near future.)
 
 To use the default version simply use a normal require:
+
     require 'cassandra'
 
 To use a specific version (0.7 in this example) you would use a 
 slightly differently formatted require:
+
     require 'cassandra/0.7'
 
 #### Environment Variable Method
@@ -42,12 +41,14 @@ These mechanisms work well when you are using the cassandra gem in your
 own projects or irb, but if you would rather not hard code your app to a
 specific version you can always specify an environment variable with the
 version you are using:
+
     export CASSANDRA_VERSION=0.7
 
 Then you would use the default require as listed above:
+
     require 'cassandra'
 
-## Read/Write API Method Reference
+## Read/Write API Method Reference 
 
 ### insert
 
@@ -90,6 +91,7 @@ This method is used to delete (actually marking them as deleted with a
 tombstone) columns or super columns.
 
 Example:
+
     @client.insert(:Statuses, key, {'body' => 'v', 'subject' => 'v'})
 
     @client.remove(:Statuses, key, 'body')    # removes the 'body' column
@@ -107,6 +109,7 @@ Count the columns for the provided parameters.
   * :consistency - Uses the default read consistency if none specified.
 
 Example:
+
     @client.insert(:Statuses, key, {'body' => 'v1', 'user' => 'v2'})
     @client.count_columns(:Statuses, key)     # returns 2
 
@@ -129,6 +132,7 @@ path you request.
   * :consistency - Uses the default read consistency if none specified.
 
 Example:
+
     @client.insert(:Users, key, {'body' => 'v', 'user' => 'v'})
     @client.get(:Users, key))           # returns {'body' => 'v', 'user' => 'v'}
 
@@ -255,7 +259,7 @@ Return an Array containing all of the keys within a given range.
 This method just calls Cassandra#get\_range and returns the
 row keys for the records returned.
 
-See [Cassandra#get\_range](#get-range) for options.
+See Cassandra#get\_range for options.
 
 ### get\_range\_keys
 
@@ -264,7 +268,7 @@ Return an Array containing all of the keys within a given range.
 This method just calls Cassandra#get\_range and returns the
 row keys for the records returned.
 
-See [Cassandra#get\_range](#get-range) for options.
+See Cassandra#get\_range for options.
 
 ### each\_key
 Iterate through each key within the given range parameters. This function can be
@@ -272,7 +276,7 @@ used to iterate over each key in the given column family.
 
 This method just calls Cassandra#get\_range and yields each row key.
 
-See [Cassandra#get\_range](#get-range) for options.
+See Cassandra#get\_range for options.
 
 Example:
     10.times do |i|
@@ -291,7 +295,7 @@ Iterate through each row within the given column\_family.
 This method just calls Cassandra#get\_range and yields the key and
 columns.
 
-See [Cassandra#get\_range](#get-range) for options.
+See Cassandra#get\_range for options.
 
 ### get\_index\_slices
 This method is used to query a secondary index with a set of
@@ -312,6 +316,7 @@ format as below.
   * :consistency
 
 Example:
+
     @client.create_index('Twitter', 'Statuses', 'x', 'LongType')
 
     @client.insert(:Statuses, 'row1', { 'x' => [0,10].pack("NN")  })

data/Rakefile

@@ -9,7 +9,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
     p.project = "fauna"
     p.summary = "A Ruby client for the Cassandra distributed database."
     p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift_client >=0.6.0', 'json', 'rake', 'simple_uuid >=0.1.0']
+    p.dependencies = ['thrift_client >=0.6.3', 'json', 'rake', 'simple_uuid >=0.1.0']
     p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift|.*\.rbc)/
     p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
     p.retain_gemspec = true
@@ -19,7 +19,7 @@ end
 CassandraBinaries = {
   '0.6' => 'http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz',
   '0.7' => 'http://www.apache.org/dist/cassandra/0.7.5/apache-cassandra-0.7.5-bin.tar.gz',
-  '0.8' => 'http://www.apache.org/dist/cassandra/0.8.0/apache-cassandra-0.8.0-rc1-bin.tar.gz'
+  '0.8' => 'http://www.apache.org/dist/cassandra/0.8.0/apache-cassandra-0.8.0-bin.tar.gz'
 }
 
 CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"

data/cassandra.gemspec

@@ -2,40 +2,40 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.11.1"
+  s.version = "0.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Evan Weaver, Ryan King"]
-  s.date = %q{2011-06-01}
+  s.authors = [%q{Evan Weaver, Ryan King}]
+  s.date = %q{2011-06-30}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
-  s.executables = ["cassandra_helper"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "bin/cassandra_helper", "lib/cassandra.rb", "lib/cassandra/0.6.rb", "lib/cassandra/0.6/cassandra.rb", "lib/cassandra/0.6/columns.rb", "lib/cassandra/0.6/protocol.rb", "lib/cassandra/0.7.rb", "lib/cassandra/0.7/cassandra.rb", "lib/cassandra/0.7/columns.rb", "lib/cassandra/0.7/protocol.rb", "lib/cassandra/0.8.rb", "lib/cassandra/0.8/cassandra.rb", "lib/cassandra/0.8/columns.rb", "lib/cassandra/0.8/protocol.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/column_family.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/keyspace.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/cassandra_helper", "conf/0.6/cassandra.in.sh", "conf/0.6/log4j.properties", "conf/0.6/schema.json", "conf/0.6/storage-conf.xml", "conf/0.7/cassandra.in.sh", "conf/0.7/cassandra.yaml", "conf/0.7/log4j-server.properties", "conf/0.7/schema.json", "conf/0.7/schema.txt", "conf/0.8/cassandra.in.sh", "conf/0.8/cassandra.yaml", "conf/0.8/log4j-server.properties", "conf/0.8/schema.json", "conf/0.8/schema.txt", "lib/cassandra.rb", "lib/cassandra/0.6.rb", "lib/cassandra/0.6/cassandra.rb", "lib/cassandra/0.6/columns.rb", "lib/cassandra/0.6/protocol.rb", "lib/cassandra/0.7.rb", "lib/cassandra/0.7/cassandra.rb", "lib/cassandra/0.7/columns.rb", "lib/cassandra/0.7/protocol.rb", "lib/cassandra/0.8.rb", "lib/cassandra/0.8/cassandra.rb", "lib/cassandra/0.8/columns.rb", "lib/cassandra/0.8/protocol.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/column_family.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/keyspace.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb", "vendor/0.6/gen-rb/cassandra.rb", "vendor/0.6/gen-rb/cassandra_constants.rb", "vendor/0.6/gen-rb/cassandra_types.rb", "vendor/0.7/gen-rb/cassandra.rb", "vendor/0.7/gen-rb/cassandra_constants.rb", "vendor/0.7/gen-rb/cassandra_types.rb", "vendor/0.8/gen-rb/cassandra.rb", "vendor/0.8/gen-rb/cassandra_constants.rb", "vendor/0.8/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
+  s.executables = [%q{cassandra_helper}]
+  s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README.md}, %q{bin/cassandra_helper}, %q{lib/cassandra.rb}, %q{lib/cassandra/0.6.rb}, %q{lib/cassandra/0.6/cassandra.rb}, %q{lib/cassandra/0.6/columns.rb}, %q{lib/cassandra/0.6/protocol.rb}, %q{lib/cassandra/0.7.rb}, %q{lib/cassandra/0.7/cassandra.rb}, %q{lib/cassandra/0.7/columns.rb}, %q{lib/cassandra/0.7/protocol.rb}, %q{lib/cassandra/0.8.rb}, %q{lib/cassandra/0.8/cassandra.rb}, %q{lib/cassandra/0.8/columns.rb}, %q{lib/cassandra/0.8/protocol.rb}, %q{lib/cassandra/array.rb}, %q{lib/cassandra/cassandra.rb}, %q{lib/cassandra/column_family.rb}, %q{lib/cassandra/columns.rb}, %q{lib/cassandra/comparable.rb}, %q{lib/cassandra/constants.rb}, %q{lib/cassandra/debug.rb}, %q{lib/cassandra/helpers.rb}, %q{lib/cassandra/keyspace.rb}, %q{lib/cassandra/long.rb}, %q{lib/cassandra/mock.rb}, %q{lib/cassandra/ordered_hash.rb}, %q{lib/cassandra/protocol.rb}, %q{lib/cassandra/time.rb}]
+  s.files = [%q{CHANGELOG}, %q{LICENSE}, %q{Manifest}, %q{README.md}, %q{Rakefile}, %q{bin/cassandra_helper}, %q{conf/0.6/cassandra.in.sh}, %q{conf/0.6/log4j.properties}, %q{conf/0.6/schema.json}, %q{conf/0.6/storage-conf.xml}, %q{conf/0.7/cassandra.in.sh}, %q{conf/0.7/cassandra.yaml}, %q{conf/0.7/log4j-server.properties}, %q{conf/0.7/schema.json}, %q{conf/0.7/schema.txt}, %q{conf/0.8/cassandra.in.sh}, %q{conf/0.8/cassandra.yaml}, %q{conf/0.8/log4j-server.properties}, %q{conf/0.8/schema.json}, %q{conf/0.8/schema.txt}, %q{lib/cassandra.rb}, %q{lib/cassandra/0.6.rb}, %q{lib/cassandra/0.6/cassandra.rb}, %q{lib/cassandra/0.6/columns.rb}, %q{lib/cassandra/0.6/protocol.rb}, %q{lib/cassandra/0.7.rb}, %q{lib/cassandra/0.7/cassandra.rb}, %q{lib/cassandra/0.7/columns.rb}, %q{lib/cassandra/0.7/protocol.rb}, %q{lib/cassandra/0.8.rb}, %q{lib/cassandra/0.8/cassandra.rb}, %q{lib/cassandra/0.8/columns.rb}, %q{lib/cassandra/0.8/protocol.rb}, %q{lib/cassandra/array.rb}, %q{lib/cassandra/cassandra.rb}, %q{lib/cassandra/column_family.rb}, %q{lib/cassandra/columns.rb}, %q{lib/cassandra/comparable.rb}, %q{lib/cassandra/constants.rb}, %q{lib/cassandra/debug.rb}, %q{lib/cassandra/helpers.rb}, %q{lib/cassandra/keyspace.rb}, %q{lib/cassandra/long.rb}, %q{lib/cassandra/mock.rb}, %q{lib/cassandra/ordered_hash.rb}, %q{lib/cassandra/protocol.rb}, %q{lib/cassandra/time.rb}, %q{test/cassandra_client_test.rb}, %q{test/cassandra_mock_test.rb}, %q{test/cassandra_test.rb}, %q{test/comparable_types_test.rb}, %q{test/eventmachine_test.rb}, %q{test/ordered_hash_test.rb}, %q{test/test_helper.rb}, %q{vendor/0.6/gen-rb/cassandra.rb}, %q{vendor/0.6/gen-rb/cassandra_constants.rb}, %q{vendor/0.6/gen-rb/cassandra_types.rb}, %q{vendor/0.7/gen-rb/cassandra.rb}, %q{vendor/0.7/gen-rb/cassandra_constants.rb}, %q{vendor/0.7/gen-rb/cassandra_types.rb}, %q{vendor/0.8/gen-rb/cassandra.rb}, %q{vendor/0.8/gen-rb/cassandra_constants.rb}, %q{vendor/0.8/gen-rb/cassandra_types.rb}, %q{cassandra.gemspec}]
   s.homepage = %q{http://fauna.github.com/fauna/cassandra/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.md"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Cassandra}, %q{--main}, %q{README.md}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{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/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
+  s.test_files = [%q{test/cassandra_client_test.rb}, %q{test/cassandra_mock_test.rb}, %q{test/cassandra_test.rb}, %q{test/comparable_types_test.rb}, %q{test/eventmachine_test.rb}, %q{test/ordered_hash_test.rb}, %q{test/test_helper.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift_client>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0.6.3"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<simple_uuid>, [">= 0.1.0"])
     else
-      s.add_dependency(%q<thrift_client>, [">= 0.6.0"])
+      s.add_dependency(%q<thrift_client>, [">= 0.6.3"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])
     end
   else
-    s.add_dependency(%q<thrift_client>, [">= 0.6.0"])
+    s.add_dependency(%q<thrift_client>, [">= 0.6.3"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])

data/lib/cassandra.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'thrift_client', '~> 0.6.0'
+gem 'thrift_client', '~> 0.6.3'
 require 'thrift_client'
 gem 'simple_uuid' , '~> 0.1.0'
 require 'simple_uuid'

data/lib/cassandra/columns.rb

@@ -36,7 +36,7 @@ class Cassandra
     end
 
     def multi_key_slices_to_hash(column_family, array, return_empty_rows = false)
-      ret = {}
+      ret = OrderedHash.new
       array.each do |value|
         next if return_empty_rows == false && value.columns.length == 0
         ret[value.key] = columns_to_hash(column_family, value.columns)

data/lib/cassandra/mock.rb

@@ -215,7 +215,7 @@ class Cassandra
     end
 
     def count_range(column_family, options = {})
-      get_range(column_family, options).select{|k,v| v.length > 0}.keys.compact.length
+      Hash[get_range(column_family, options).select{|k,v| v.length > 0}].keys.compact.length
     end
 
     def each_key(column_family, options = {})

data/lib/cassandra/ordered_hash.rb

@@ -132,7 +132,7 @@ class Cassandra
 
   class OrderedHash < OrderedHashInt #:nodoc:
     def initialize(*args, &block)
-      @timestamps = Hash.new
+      @timestamps = OrderedHashInt.new
       super
     end
 

data/test/cassandra_test.rb

@@ -176,9 +176,10 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_get_several_super_keys
-    columns = {
-      'mentions_timelines' => {@uuids[2]  => 'v2'},
-      'user_timelines' => {@uuids[1]  => 'v1'}}
+    columns = OrderedHash[
+      'mentions_timelines', {@uuids[2]  => 'v2'},
+      'user_timelines', {@uuids[1]  => 'v1'}
+    ]
 
     @twitter.insert(:StatusRelationships, key, columns)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-06-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift_client
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 0
         - 6
-        - 0
-        version: 0.6.0
+        - 3
+        version: 0.6.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.