cassandra 0.11.4 → 0.12.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.12.0 Changed thrift_client dependency to 0.7.0
+
 v0.11.4
 - Fix get_range to invoke blocks
 - Fix current distribution urls in Rakfile. Resolves Issue# 97.

data/README.md

@@ -1,7 +1,7 @@
-# cassandra 
+# cassandra
 A Ruby client for the Cassandra distributed database.
 
-Supports 1.8.7, 1.9.2, and rubinius on Cassandra 0.6.13, 0.7.5, 0.8.0.
+Supports 1.8.7, 1.9.2, and rubinius on Cassandra 0.6.13, 0.7.8, 0.8.4.
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ API below):
 
 ## License
 
-Copyright 2009, 2010 Twitter, Inc. See included LICENSE file. Portions copyright 2004-2009 David Heinemeier Hansson, and used with permission.
+Copyright 2009-2011 Twitter, Inc. See included LICENSE file. Portions copyright 2004-2009 David Heinemeier Hansson, and used with permission.
 
 ## Cassandra Version
 
@@ -24,14 +24,14 @@ with.  We have set up an easy sure fire mechanism for selecting the
 specific version that you are connecting to while requiring the gem.
 
 #### Require Method
-The default version is the currently stable release of cassandra.  (0.7
-at this time, but 0.8 is looming in the near future.)
+The default version is the currently stable release of cassandra.  (0.8
+at this time.)
 
 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 
+To use a specific version (0.7 in this example) you would use a
 slightly differently formatted require:
 
     require 'cassandra/0.7'
@@ -42,13 +42,13 @@ 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
+    export CASSANDRA_VERSION=0.8
 
 Then you would use the default require as listed above:
 
     require 'cassandra'
 
-## Read/Write API Method Reference 
+## Read/Write API Method Reference
 
 ### insert
 
@@ -79,16 +79,18 @@ Example:
 
 ### remove
 
-* 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\_family - The column\_family that you are working with.
+* key - The row key to remove (or remove columns from).
+* columns - Either a single super_column or a list of columns to remove.
+* sub_columns - The list of sub\_columns to remove.
 * options - Valid options are:
   * :timestamp - Uses the current time if none specified.
   * :consistency - Uses the default write consistency if none specified.
 
 This method is used to delete (actually marking them as deleted with a
-tombstone) columns or super columns.
+tombstone) rows, columns, or super columns depending on the parameters
+passed.  If only a key is passed the entire row will be marked as deleted.
+If a column name is passed in that column will be deleted.
 
 Example:
 
@@ -101,11 +103,14 @@ Example:
 
 Count the columns for the provided parameters.
 
-* column\_family - The column\_family that you are inserting into.
-* key - The row key to insert.
+* column\_family - The column\_family that you are working with.
+* key - The row key.
 * columns - Either a single super_column or a list of columns.
 * sub_columns - The list of sub\_columns to select.
 * options - Valid options are:
+  * :start - The column name to start from.
+  * :stop - The column name to stop at.
+  * :count - The maximum count of columns to return. (By default cassandra will count up to 100 columns)
   * :consistency - Uses the default read consistency if none specified.
 
 Example:
@@ -117,10 +122,10 @@ Example:
 
 Return a hash (actually, a Cassandra::OrderedHash) or a single value
 representing the element at the column_family:key:[column]:[sub_column]
-path you request. 
+path you request.
 
-* column\_family - The column\_family that you are inserting into.
-* key - The row key to insert.
+* column\_family - The column\_family that you are working with.
+* key - The row key to select.
 * columns - Either a single super\_column or a list of columns.
 * sub\_columns - The list of sub\_columns to select.
 * options - Valid options are:
@@ -146,8 +151,8 @@ returned.
 
 Supports the same parameters as Cassandra#get.
 
-* column_family - The column_family that you are inserting into.
-* key - An array of keys to.
+* column_family - The column_family that you are working with.
+* key - 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.
 * options - Valid options are:
@@ -163,8 +168,8 @@ Example:
     @client.insert(:Users, '2', {'body' => 'v2', 'user' => 'v2'})
 
     expected = OrderedHash[
-                  '1', {'body' => 'v1', 'user' => 'v1'}, 
-                  '2', {'body' => 'v2', 'user' => 'v2'}, 
+                  '1', {'body' => 'v1', 'user' => 'v1'},
+                  '2', {'body' => 'v2', 'user' => 'v2'},
                   'bogus', {}
               ]
     result = @client.multi_get(:Users, ['1', '2', 'bogus'])
@@ -180,10 +185,10 @@ that specific column/super column.
 
 This method will return true or false.
 
-* column\_family - The column\_family that you are inserting into.
-* key - The row key to insert.
+* column\_family - The column\_family that you are working with.
+* key - The row key to check.
 * columns - Either a single super\_column or a list of columns.
-* sub\_columns - The list of sub\_columns to select.
+* sub\_columns - The list of sub\_columns to check.
 * options - Valid options are:
   * :consistency - Uses the default read consistency if none specified.
 
@@ -205,7 +210,7 @@ is passed in Cassandra#get\_range\_batch will be called. Otherwise
 Cassandra#get\_range\_single will be used.
 
 The start\_key and finish\_key parameters are only useful for iterating of all records
-as is done in the Cassandra#each and Cassandra#each\_key methods if you are using the 
+as is done in the Cassandra#each and Cassandra#each\_key methods if you are using the
 RandomPartitioner.
 
 If the table is partitioned with OrderPreservingPartitioner you may
@@ -216,20 +221,18 @@ If a block is passed in we will yield the row key and columns for
 each record returned.
 
 Please note that Cassandra returns a row for each row that has existed in the
-system since gc\_grace\_seconds. This is because deleted row keys are marked as 
+system since gc\_grace\_seconds. This is because deleted row keys are marked as
 deleted, but left in the system until the cluster has had resonable time to replicate the deletion.
 This function attempts to suppress deleted rows (actually any row returned without
 columns is suppressed).
 
-* 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\_family - The column\_family that you are working with.
 * options - Valid options are:
   * :start\_key    - The starting value for selecting a range of keys (only useful with OPP).
   * :finish\_key   - The final value for selecting a range of keys (only useful with OPP).
   * :key\_count    - The total number of keys to return from the query. (see note regarding deleted records)
   * :batch\_size   - The maximum number of keys to return per query. If specified will loop until :key\_count is obtained or all records have been returned.
+  * :columns      - A list of columns to return.
   * :count        - The number of columns requested to be returned.
   * :start        - The starting value for selecting a range of columns.
   * :finish       - The final value for selecting a range of columns.
@@ -335,9 +338,9 @@ Example:
     # verify that GT and LT queries perform properly
     expressions   =  [
                       { :column_name => 'x',
-                        :value => [0,20].pack("NN"),  
+                        :value => [0,20].pack("NN"),
                         :comparison => "=="},
-                      { :column_name => 'non_indexed', 
+                      { :column_name => 'non_indexed',
                         :value => [5].pack("N*"),
                         :comparison => ">"}
                     ]

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.3', 'json', 'rake', 'simple_uuid >=0.1.0']
+    p.dependencies = ['thrift_client >=0.7.0', '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
@@ -17,13 +17,13 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
 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.7/apache-cassandra-0.7.7-bin.tar.gz',
-  '0.8' => 'http://www.apache.org/dist/cassandra/0.8.1/apache-cassandra-0.8.1-bin.tar.gz'
+  '0.6' => 'http://archive.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz',
+  '0.7' => 'http://archive.apache.org/dist/cassandra/0.7.8/apache-cassandra-0.7.8-bin.tar.gz',
+  '0.8' => 'http://archive.apache.org/dist/cassandra/0.8.4/apache-cassandra-0.8.4-bin.tar.gz'
 }
 
 CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"
-CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '0.7'
+CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '0.8'
 CASSANDRA_PIDFILE = ENV['CASSANDRA_PIDFILE'] || "#{CASSANDRA_HOME}/cassandra.pid"
 
 def setup_cassandra_version(version = CASSANDRA_VERSION)
@@ -77,7 +77,7 @@ end
 
 namespace :cassandra do
   desc "Start Cassandra"
-  task :start, :daemonize, :needs => :java do |t, args|
+  task :start, [:daemonize] => :java do |t, args|
     args.with_defaults(:daemonize => true)
 
     setup_cassandra_version

data/cassandra.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.11.4"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver, Ryan King}]
-  s.date = %q{2011-07-22}
+  s.date = %q{2011-08-22}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = [%q{cassandra_helper}]
@@ -24,18 +24,18 @@ Gem::Specification.new do |s|
     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.3"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0.7.0"])
       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.3"])
+      s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
       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.3"])
+    s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])

data/conf/0.7/schema.json

@@ -22,7 +22,7 @@
       "subcomparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
       "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
       "column_type":"Super"},
-    "Index":{
+    "Indexes":{
       "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
       "column_type":"Super"},
     "TimelinishThings":{

data/conf/0.7/schema.txt

@@ -15,7 +15,7 @@ create column family StatusRelationships with
   comparator = 'UTF8Type' and
   column_type = 'Super' and
   subcomparator = 'TimeUUIDType';
-create column family Index with
+create column family Indexes with
   comparator = 'UTF8Type' and
   column_type = 'Super';
 create column family TimelinishThings with

data/conf/0.8/schema.json

@@ -31,7 +31,7 @@
       "subcomparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
       "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
       "column_type":"Super"},
-    "Index":{
+    "Indexes":{
       "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
       "column_type":"Super"},
     "TimelinishThings":{

data/conf/0.8/schema.txt

@@ -21,7 +21,7 @@ create column family StatusRelationships with
   comparator = 'UTF8Type' and
   column_type = 'Super' and
   subcomparator = 'TimeUUIDType';
-create column family Index with
+create column family Indexes with
   comparator = 'UTF8Type' and
   column_type = 'Super';
 create column family TimelinishThings with

data/lib/cassandra.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'thrift_client', '~> 0.6.3'
+gem 'thrift_client', '~> 0.7.0'
 require 'thrift_client'
 gem 'simple_uuid' , '~> 0.1.0'
 require 'simple_uuid'
@@ -10,7 +10,7 @@ here = File.expand_path(File.dirname(__FILE__))
 
 class Cassandra ; end
 unless Cassandra.respond_to?(:VERSION)
-  require "#{here}/cassandra/0.7"
+  require "#{here}/cassandra/0.8"
 end
 
 $LOAD_PATH << "#{here}/../vendor/#{Cassandra.VERSION}/gen-rb"

data/lib/cassandra/cassandra.rb

@@ -60,8 +60,8 @@ class Cassandra
   }
 
   THRIFT_DEFAULTS = {
-    :transport_wrapper => Thrift::BufferedTransport,
-    :thrift_client_class => ThriftClient
+    :transport_wrapper    => Thrift::FramedTransport,
+    :thrift_client_class  => ThriftClient
   }
 
   attr_reader :keyspace, :servers, :schema, :thrift_client_options, :thrift_client_class, :auth_request
@@ -154,6 +154,15 @@ class Cassandra
     client.describe_keyspaces.to_a.collect {|ksdef| ksdef.name }
   end
 
+  ##
+  # Return a hash of column_family definitions indexed by their
+  # names
+  def column_families
+    return false if Cassandra.VERSION.to_f < 0.7
+
+    schema.cf_defs.inject(Hash.new){|memo, cf_def| memo[cf_def.name] = cf_def; memo;}
+  end
+
   ##
   # Return a Cassandra::Keyspace object loaded with the current
   # keyspaces schema.
@@ -290,7 +299,7 @@ class Cassandra
   # * new_name - The desired column_family name.
   #
   def rename_column_family(old_name, new_name)
-    return false if Cassandra.VERSION.to_f < 0.7
+    return false if Cassandra.VERSION.to_f != 0.7
 
     begin
       res = client.system_rename_column_family(old_name, new_name)
@@ -453,7 +462,9 @@ class Cassandra
 
   ##
   # This method is used to delete (actually marking them as deleted with a
-  # tombstone) columns or super columns.
+  # tombstone)  rows, columns, or super columns depending on the parameters 
+  # passed.  If only a key is passed the entire row will be marked as deleted.
+  # If a column name is passed in that column will be deleted.
   #
   # This method can also be used in batch mode. If in batch mode then we
   # queue up the mutations (a deletion in this case)
@@ -497,12 +508,15 @@ class Cassandra
   # * columns - Either a single super_column or a list of columns.
   # * sub_columns - The list of sub_columns to select.
   # * options - Valid options are:
+  #   * :start - The column name to start from.
+  #   * :stop - The column name to stop at.
+  #   * :count - The maximum count of columns to return. (By default cassandra will count up to 100 columns)
   #   * :consistency - Uses the default read consistency if none specified.
   #
   def count_columns(column_family, key, *columns_and_options)
     column_family, super_column, _, options = 
       extract_and_validate_params(column_family, key, columns_and_options, READ_DEFAULTS)      
-    _count_columns(column_family, key, super_column, options[:consistency])
+    _count_columns(column_family, key, super_column, options[:start], options[:stop], options[:count], options[:consistency])
   end
 
   ##
@@ -587,16 +601,16 @@ class Cassandra
   #
   # Supports the same parameters as Cassandra#get.
   #
-  # * column_family - The column_family that you are inserting into.
-  # * key - An array of keys to.
-  # * columns - Either a single super_column or a list of columns.
-  # * sub_columns - The list of sub_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.
-  #   * :finish   - The final value for selecting a range of columns.
-  #   * :reversed - If set to true the results will be returned in reverse order.
-  #   * :consistency - Uses the default read consistency if none specified.
+  # * 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.
+  # * options         - Valid options are:
+  #   * :count        - The number of columns requested to be returned.
+  #   * :start        - The starting value for selecting a range of columns.
+  #   * :finish       - The final value for selecting a range of columns.
+  #   * :reversed     - If set to true the results will be returned in reverse order.
+  #   * :consistency  - Uses the default read consistency if none specified.
   #
   def multi_get(column_family, keys, *columns_and_options)
     column_family, column, sub_column, options = 
@@ -664,16 +678,17 @@ class Cassandra
   # deleted, but left in the system until the cluster has had resonable time to replicate the deletion.
   # This function attempts to suppress deleted rows (actually any row returned without
   # columns is suppressed).
+  # 
+  # Please note that when enabling the :reversed option, :start and :finish should be swapped (e.g.
+  # reversal happens before selecting the range).
   #
   # * 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.
   # * options - Valid options are:
   #   * :start_key    - The starting value for selecting a range of keys (only useful with OPP).
   #   * :finish_key   - The final value for selecting a range of keys (only useful with OPP).
   #   * :key_count    - The total number of keys to return from the query. (see note regarding deleted records)
   #   * :batch_size   - The maximum number of keys to return per query. If specified will loop until :key_count is obtained or all records have been returned.
+  #   * :columns 	    - A list of columns to return.
   #   * :count        - The number of columns requested to be returned.
   #   * :start        - The starting value for selecting a range of columns.
   #   * :finish       - The final value for selecting a range of columns.
@@ -700,9 +715,10 @@ class Cassandra
     column_family, _, _, options = 
       extract_and_validate_params(column_family, "", [options], 
                                   READ_DEFAULTS.merge(:start_key  => '',
-                                                      :end_key    => '',
+                                                      :finish_key => '',
                                                       :key_count  => 100,
-                                                      :columns    => nil
+                                                      :columns    => nil,
+                                                      :reversed   => false
                                                      )
                                  )
 
@@ -714,7 +730,8 @@ class Cassandra
                           options[:start].to_s,
                           options[:finish].to_s,
                           options[:count],
-                          options[:consistency] )
+                          options[:consistency],
+                          options[:reversed] )
 
     multi_key_slices_to_hash(column_family, results, return_empty_rows)
   end

data/lib/cassandra/mock.rb

@@ -13,6 +13,8 @@ class Cassandra
     include ::Cassandra::Helpers
     include ::Cassandra::Columns
 
+    attr_reader :keyspace
+
     def initialize(keyspace, schema)
       @is_super = {}
       @keyspace = keyspace
@@ -100,7 +102,7 @@ class Cassandra
         row[column]
       else
         row = apply_range(row, column_family, options[:start], options[:finish])
-        apply_count(row, options[:count], options[:reversed])
+        row = apply_count(row, options[:count], options[:reversed])
       end
     end
 
@@ -119,7 +121,7 @@ class Cassandra
         else
           row = row[column] || OrderedHash.new
           row = apply_range(row, column_family, options[:start], options[:finish], false)
-          apply_count(row, options[:count], options[:reversed])
+          row = apply_count(row, options[:count], options[:reversed])
         end
       else
         row
@@ -148,9 +150,9 @@ class Cassandra
       else
         if column
           if sub_column
-            cf(column_family)[key][column].delete(sub_column.to_s)
+            cf(column_family)[key][column].delete(sub_column.to_s) if cf(column_family)[key][column]
           else
-            cf(column_family)[key].delete(column.to_s)
+            cf(column_family)[key].delete(column.to_s)  if cf(column_family)[key]
           end
         else
           cf(column_family).delete(key)
@@ -173,8 +175,10 @@ class Cassandra
       end
     end
 
-    def count_columns(column_family, key, column=nil)
-      get(column_family, key, column).keys.length
+    def count_columns(column_family, key, *columns_and_options)
+      column_family, columns, sub_columns, options = extract_and_validate_params_for_real(column_family, key, columns_and_options, READ_DEFAULTS)
+
+      get(column_family, key, columns, options).keys.length
     end
 
     def multi_get_columns(column_family, keys, columns)
@@ -192,11 +196,12 @@ class Cassandra
     end
 
     def get_range(column_family, options = {}, &blk)
-      column_family, _, _, options = extract_and_validate_params_for_real(column_family, "", [options], 
-                                                                          READ_DEFAULTS.merge(:start_key  => '',
-                                                                                              :end_key    => '',
+      column_family, _, _, options = extract_and_validate_params_for_real(column_family, "", [options],
+                                                                          READ_DEFAULTS.merge(:start_key  => nil,
+                                                                                              :finish_key => nil,
                                                                                               :key_count  => 100,
-                                                                                              :columns    => nil
+                                                                                              :columns    => nil,
+                                                                                              :reversed   => false
                                                                                              )
                                                                          )
       _get_range(column_family,
@@ -207,7 +212,8 @@ class Cassandra
                  options[:start],
                  options[:finish],
                  options[:count],
-                 options[:consistency], &blk)
+                 options[:consistency],
+                 options[:reversed], &blk)
     end
 
     def get_range_keys(column_family, options = {})
@@ -248,7 +254,7 @@ class Cassandra
     def create_index(ks_name, cf_name, c_name, v_class)
       if @indexes[ks_name] &&
         @indexes[ks_name][cf_name] &&
-        @indexes[ks_name][cf_name][c_name] 
+        @indexes[ks_name][cf_name][c_name]
         nil
 
       else
@@ -261,7 +267,7 @@ class Cassandra
     def drop_index(ks_name, cf_name, c_name)
       if @indexes[ks_name] &&
         @indexes[ks_name][cf_name] &&
-        @indexes[ks_name][cf_name][c_name] 
+        @indexes[ks_name][cf_name][c_name]
 
         @indexes[ks_name][cf_name].delete(c_name)
       else
@@ -323,6 +329,21 @@ class Cassandra
       nil
     end
 
+    def column_families
+      cf_defs = {}
+      schema.each do |key, value|
+        cf_def = Cassandra::ColumnFamily.new
+
+        value.each do |property, property_value|
+          cf_def.send(:"#{property}=", property_value)
+        end
+
+        cf_defs[key] = cf_def
+      end
+
+      cf_defs
+    end
+
     def schema(load=true)
       @schema
     end
@@ -331,13 +352,33 @@ class Cassandra
       schema[column_family.to_s][key]
     end
 
+    def add_column_family(cf)
+      @schema[cf.name.to_s] ||= OrderedHash.new
+
+      cf.instance_variables.each do |var|
+        @schema[cf.name.to_s][var.slice(1..-1)] = cf.instance_variable_get(var)
+      end
+    end
+
+    def update_column_family(cf)
+      return false unless @schema.include?(cf.name.to_s)
+
+      cf.instance_variables.each do |var|
+        @schema[cf.name.to_s][var.slice(1..-1)] = cf.instance_variable_get(var)
+      end
+    end
+
+    def drop_column_family(column_family_name)
+      @schema.delete(column_family_name)
+    end
+
     private
 
     def schema_for_keyspace(keyspace)
       @schema
     end
 
-    def _get_range(column_family, start_key, finish_key, key_count, columns, start, finish, count, consistency, &blk)
+    def _get_range(column_family, start_key, finish_key, key_count, columns, start, finish, count, consistency, reversed, &blk)
       ret = OrderedHash.new
       start  = to_compare_with_type(start,  column_family)
       finish = to_compare_with_type(finish, column_family)
@@ -347,10 +388,12 @@ class Cassandra
           if columns
             #ret[key] = columns.inject(OrderedHash.new){|hash, column_name| hash[column_name] = cf(column_family)[key][column_name]; hash;}
             ret[key] = columns_to_hash(column_family, cf(column_family)[key].select{|k,v| columns.include?(k)})
+            ret[key] = apply_count(ret[key], count, reversed)
             blk.call(key,ret[key]) unless blk.nil?
           else
             #ret[key] = apply_range(cf(column_family)[key], column_family, start, finish, !is_super(column_family))
             ret[key] = apply_range(columns_to_hash(column_family, cf(column_family)[key]), column_family, start, finish)
+            ret[key] = apply_count(ret[key], count, reversed)
             blk.call(key,ret[key]) unless blk.nil?
           end
         end

data/lib/cassandra/ordered_hash.rb

@@ -122,6 +122,10 @@ class Cassandra
         @keys = other.keys
         self
       end
+      
+      def reverse
+        OrderedHashInt[self.to_a.reverse]
+      end
 
     private
 

data/lib/cassandra/protocol.rb

@@ -11,14 +11,14 @@ class Cassandra
       client.remove(key, column_path, timestamp, consistency_level)
     end
 
-    # FIXME: Add support for start, stop, count
-    def _count_columns(column_family, key, super_column, consistency)
+    def _count_columns(column_family, key, super_column, start, stop, count, consistency)
       client.get_count(key,
         CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => super_column),
         CassandraThrift::SlicePredicate.new(:slice_range =>
                                             CassandraThrift::SliceRange.new(
-                                              :start => '',
-                                              :finish => ''
+                                              :start  => start  || '',
+                                              :finish => stop   || '',
+                                              :count  => count  || 100
                                             )),
         consistency
       )
@@ -85,7 +85,7 @@ class Cassandra
       end
     end
 
-    def _get_range(column_family, start_key, finish_key, key_count, columns, start, finish, count, consistency)
+    def _get_range(column_family, start_key, finish_key, key_count, columns, start, finish, count, consistency, reversed=false)
       column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
       predicate = if columns
                     CassandraThrift::SlicePredicate.new(:column_names => columns)
@@ -94,7 +94,8 @@ class Cassandra
                       CassandraThrift::SliceRange.new(
                         :start  => start, 
                         :finish => finish,
-                        :count  => count))
+                        :count  => count,
+                        :reversed => reversed))
                   end
       range = CassandraThrift::KeyRange.new(:start_key => start_key, :end_key => finish_key, :count => key_count)
       client.get_range_slices(column_parent, predicate, range, consistency)

data/test/cassandra_mock_test.rb

@@ -43,6 +43,29 @@ class CassandraMockTest < CassandraTest
     @twitter.insert(:Statuses, 'a', {:text => 'foo'})
     assert_equal ['a'], @twitter.get_range(:Statuses, :key_count => 1).keys
   end
+  
+  def test_get_range_reversed
+    data = 3.times.map { |i| ["body-#{i.to_s}", "v"] }
+    hash = Cassandra::OrderedHash[data]
+    reversed_hash = Cassandra::OrderedHash[data.reverse]
+    
+    @twitter.insert(:Statuses, "all-keys", hash)
+    
+    columns = @twitter.get_range(:Statuses, :reversed => true)["all-keys"]
+    columns.each do |column|
+      assert_equal reversed_hash.shift, column
+    end
+  end
+  
+  def test_get_range_count
+    data = 3.times.map { |i| ["body-#{i.to_s}", "v"] }
+    hash = Cassandra::OrderedHash[data]
+    
+    @twitter.insert(:Statuses, "all-keys", hash)
+    
+    columns = @twitter.get_range(:Statuses, :count => 2)["all-keys"]
+    assert_equal 2, columns.count
+  end
 
   def test_inserting_array_for_indices
     @twitter.insert(:TimelinishThings, 'a', ['1','2'])

data/test/cassandra_test.rb

@@ -4,16 +4,16 @@ class CassandraTest < Test::Unit::TestCase
   include Cassandra::Constants
 
   def setup
-    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :connect_timeout => 1, :exception_classes => [])
+    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :connect_timeout => 0.1, :exception_classes => [])
     @twitter.clear_keyspace!
 
-    @blogs = Cassandra.new('Multiblog', "127.0.0.1:9160", :retries => 2, :connect_timeout => 1, :exception_classes => [])
+    @blogs = Cassandra.new('Multiblog', "127.0.0.1:9160", :retries => 2, :connect_timeout => 0.1, :exception_classes => [])
     @blogs.clear_keyspace!
 
-    @blogs_long = Cassandra.new('MultiblogLong', "127.0.0.1:9160", :retries => 2, :connect_timeout => 1, :exception_classes => [])
+    @blogs_long = Cassandra.new('MultiblogLong', "127.0.0.1:9160", :retries => 2, :connect_timeout => 0.1, :exception_classes => [])
     @blogs_long.clear_keyspace!
 
-    @type_conversions = Cassandra.new('TypeConversions', "127.0.0.1:9160", :retries => 2, :connect_timeout => 1, :exception_classes => [])
+    @type_conversions = Cassandra.new('TypeConversions', "127.0.0.1:9160", :retries => 2, :connect_timeout => 0.1, :exception_classes => [])
     @type_conversions.clear_keyspace!
 
     Cassandra::WRITE_DEFAULTS[:consistency] = Cassandra::Consistency::ONE
@@ -259,6 +259,25 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal(4, @twitter.get_range_keys(:Statuses, :key_count => 4).size)
   end
 
+  def test_get_range_with_count
+    @twitter.insert(:Statuses, key + '1', {'test_column1' => '1', 'test_column2' => '2', 'test_column3' => '2', 'deleted_column' => '1'})
+    @twitter.insert(:Statuses, key + '2', {'test_column4' => '3', 'test_column5' => '4', 'test_column6' => '2', 'deleted_column' => '2'})
+
+    @twitter.get_range(:Statuses, :count => 3) do |key, columns|
+      assert_equal columns.count, 3
+    end
+
+    assert_equal 2, @twitter.get_range(:Statuses, :start_key => key + '1', :finish_key => key + '1', :count => 2)[key + '1'].count
+
+    @twitter.remove(:Statuses, key + '1', 'deleted_column')
+    @twitter.remove(:Statuses, key + '2', 'deleted_column')
+
+    @twitter.get_range(:Statuses, :count => 2) do |key, columns|
+      assert_equal columns.count, 2
+    end
+
+  end
+
   def test_get_range_block
     k = key
     5.times do |i|
@@ -275,6 +294,19 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal [],values
 
   end
+  
+  def test_get_range_reversed
+    data = 3.times.map { |i| ["body-#{i.to_s}", "v"] }
+    hash = Cassandra::OrderedHash[data]
+    reversed_hash = Cassandra::OrderedHash[data.reverse]
+    
+    @twitter.insert(:Statuses, "all-keys", hash)
+    
+    columns = @twitter.get_range(:Statuses, :reversed => true)["all-keys"]
+    columns.each do |column|
+      assert_equal reversed_hash.shift, column
+    end
+  end
 
   def test_each_key
     k = key
@@ -322,7 +354,7 @@ class CassandraTest < Test::Unit::TestCase
 
     keys_yielded = []
     @twitter.each(:Statuses, :columns => ['single_column_lookup'], :batch_size => 5) do |key, columns|
-      assert_equal key_columns[key].reject {|k,v| k != 'single_column_lookup'}, columns
+      assert_equal key_columns[key].reject {|k2,v| k2 != 'single_column_lookup'}, columns
       keys_yielded << key
     end
 
@@ -456,8 +488,13 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_count_columns
-    @twitter.insert(:Statuses, key, {'body' => 'v1', 'user' => 'v2'})
-    assert_equal 2, @twitter.count_columns(:Statuses, key)
+    columns = (1..200).inject(Hash.new){|h,v| h['column' + v.to_s] = v.to_s; h;}
+    
+    @twitter.insert(:Statuses, key, columns)
+    assert_equal 200, @twitter.count_columns(:Statuses, key, :count => 200)
+    assert_equal 100, @twitter.count_columns(:Statuses, key)    
+    assert_equal 55, @twitter.count_columns(:Statuses, key, :count => 55)
+    
   end
 
   def test_count_super_columns
@@ -510,7 +547,7 @@ class CassandraTest < Test::Unit::TestCase
       @twitter.remove(:Users, k + '1') # Full row 
       assert_equal({'body' => 'v1', 'user' => 'v1'}, @twitter.get(:Users, k + '1')) # Not yet removed
 
-      @twitter.remove(:Users, k +'0', 'delete_me') # A single column of the row
+      @twitter.remove(:Users, k + '0', 'delete_me') # A single column of the row
       assert_equal({'delete_me' => 'v0', 'keep_me' => 'v0'}, @twitter.get(:Users, k + '0')) # Not yet removed
       
       @twitter.remove(:Users, k + '4')
@@ -542,7 +579,7 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal({'body' => 'v'}.keys.sort, @twitter.get(:Statuses, k + '3').timestamps.keys.sort) # Written
 
     # Final result: initial_subcolumns - initial_subcolumns.first + new_subcolumns
-    resulting_subcolumns = initial_subcolumns.merge(new_subcolumns).reject{|k,v| k == subcolumn_to_delete }
+    resulting_subcolumns = initial_subcolumns.merge(new_subcolumns).reject{|k2,v| k2 == subcolumn_to_delete }
     assert_equal(resulting_subcolumns, @twitter.get(:StatusRelationships, key, 'user_timelines'))
     assert_equal({}, @twitter.get(:StatusRelationships, key, 'dummy_supercolumn')) # dummy supercolumn deleted 
 
@@ -555,7 +592,7 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_nil_sub_column_value
-    @twitter.insert(:Index, 'asdf', {"thing" => {'jkl' => ''} })
+    @twitter.insert(:Indexes, 'asdf', {"thing" => {'jkl' => ''} })
   end
 
   def test_disconnect!
@@ -721,6 +758,41 @@ class CassandraTest < Test::Unit::TestCase
       idx_clause = @twitter.create_idx_clause(idx_expr)
       assert_equal(5, @twitter.get_indexed_slices(:Statuses, idx_clause).length)
     end
+
+    def test_column_family_mutation
+      k = key
+
+      if @twitter.column_families.include?(k)
+        @twitter.drop_column_family(k)
+      end
+
+      # Verify add_column_family works as desired.
+      @twitter.add_column_family(
+        Cassandra::ColumnFamily.new(
+          :keyspace => 'Twitter',
+          :name     => k
+        )
+      )
+      assert @twitter.column_families.include?(k)
+
+      if CASSANDRA_VERSION.to_f == 0.7
+        # Verify rename_column_family works properly
+        @twitter.rename_column_family(k, k + '_renamed')
+        assert @twitter.column_families.include?(k + '_renamed')
+
+        # Change it back and validate
+        @twitter.rename_column_family(k + '_renamed', k)
+        assert @twitter.column_families.include?(k)
+      end
+
+      temp_cf_def = @twitter.column_families[k]
+      temp_cf_def.comment = k
+      @twitter.update_column_family(temp_cf_def)
+      assert @twitter.column_families.include?(k)
+
+      @twitter.drop_column_family(k)
+      assert !@twitter.column_families.include?(k)
+    end
   end
 
   if CASSANDRA_VERSION.to_f >= 0.8

data/test/ordered_hash_test.rb

@@ -198,6 +198,11 @@ class OrderedHashTestInt < Test::Unit::TestCase
     assert_same original, @ordered_hash
     assert_equal @other_ordered_hash.keys, @ordered_hash.keys
   end
+  
+  def test_reverse
+    assert_equal @keys.reverse, @ordered_hash.reverse.keys
+    assert_equal @values.reverse, @ordered_hash.reverse.values
+  end
 end
 
 class OrderedHashTest < Test::Unit::TestCase

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '0.7' unless defined?(CASSANDRA_VERSION)
+CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '0.8' unless defined?(CASSANDRA_VERSION)
 
 require 'test/unit'
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra/#{CASSANDRA_VERSION}"

data/vendor/0.7/gen-rb/cassandra.rb

@@ -6,7 +6,6 @@
 
 require 'thrift'
 require 'cassandra_types'
-require 'cassandra_constants'
 
     module CassandraThrift
       module Cassandra

data/vendor/0.7/gen-rb/cassandra_types.rb

@@ -13,8 +13,10 @@ module CassandraThrift
       EACH_QUORUM = 4
       ALL = 5
       ANY = 6
-      VALUE_MAP = {1 => "ONE", 2 => "QUORUM", 3 => "LOCAL_QUORUM", 4 => "EACH_QUORUM", 5 => "ALL", 6 => "ANY"}
-      VALID_VALUES = Set.new([ONE, QUORUM, LOCAL_QUORUM, EACH_QUORUM, ALL, ANY]).freeze
+      TWO = 7
+      THREE = 8
+      VALUE_MAP = {1 => "ONE", 2 => "QUORUM", 3 => "LOCAL_QUORUM", 4 => "EACH_QUORUM", 5 => "ALL", 6 => "ANY", 7 => "TWO", 8 => "THREE"}
+      VALID_VALUES = Set.new([ONE, QUORUM, LOCAL_QUORUM, EACH_QUORUM, ALL, ANY, TWO, THREE]).freeze
     end
 
     module IndexOperator

data/vendor/0.8/gen-rb/cassandra_types.rb

@@ -745,6 +745,7 @@ module CassandraThrift
       STRATEGY_OPTIONS = 3
       REPLICATION_FACTOR = 4
       CF_DEFS = 5
+      DURABLE_WRITES = 6
 
       FIELDS = {
         NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
@@ -752,7 +753,8 @@ module CassandraThrift
         STRATEGY_OPTIONS => {:type => ::Thrift::Types::MAP, :name => 'strategy_options', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
         # @deprecated
         REPLICATION_FACTOR => {:type => ::Thrift::Types::I32, :name => 'replication_factor', :optional => true},
-        CF_DEFS => {:type => ::Thrift::Types::LIST, :name => 'cf_defs', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::CfDef}}
+        CF_DEFS => {:type => ::Thrift::Types::LIST, :name => 'cf_defs', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::CfDef}},
+        DURABLE_WRITES => {:type => ::Thrift::Types::BOOL, :name => 'durable_writes', :default => true, :optional => true}
       }
 
       def struct_fields; FIELDS; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 47
   prerelease: 
   segments: 
   - 0
-  - 11
-  - 4
-  version: 0.11.4
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift_client
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 6
-        - 3
-        version: 0.6.3
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency