cassandra 0.12.1 → 0.13.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.12.2
+- Respect the start_key in get_range. Resolves Issue #127.
+- Fix issue with differences in gemspec and what is required. Resolves Issue #125.
+- Update to Cassandra 0.8.7 and 1.0.2.
+
 v0.12.1
 - Fix issue with simple_uuid dependency.
 - Fix issue with get_range & get_range_batch keeping all results when a block is given. Resolves Issue# 112.

data/README.md

@@ -1,7 +1,7 @@
 # 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.8, 0.8.4.
+Supports 1.8.7, 1.9.2, and rubinius on Cassandra 0.6.13, 0.7.9, 0.8.6, 1.0.0-rc2.
 
 ## Getting Started
 
@@ -31,10 +31,10 @@ 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 (1.0 in this example) you would use a
 slightly differently formatted require:
 
-    require 'cassandra/0.7'
+    require 'cassandra/1.0'
 
 #### Environment Variable Method
 These mechanisms work well when you are using the cassandra gem in your
@@ -349,4 +349,4 @@ Example:
 
 ## Reporting Problems
 
-The Github issue tracker is [here](http://github.com/fauna/cassandra/issues). If you have problems with this library or Cassandra itself, please use the [cassandra-user mailing list](http://mail-archives.apache.org/mod_mbox/incubator-cassandra-user/).
+The Github issue tracker is [here](http://github.com/twitter/cassandra/issues). If you have problems with this library or Cassandra itself, please use the [cassandra-user mailing list](http://mail-archives.apache.org/mod_mbox/incubator-cassandra-user/).

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.7.0', 'json', 'rake', 'simple_uuid >=0.2.0']
+    p.dependencies = ['thrift_client >=0.7.0 <0.9', 'json', 'rake', 'simple_uuid ~>0.2.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
@@ -18,8 +18,9 @@ end
 
 CassandraBinaries = {
   '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'
+  '0.7' => 'http://archive.apache.org/dist/cassandra/0.7.9/apache-cassandra-0.7.9-bin.tar.gz',
+  '0.8' => 'http://archive.apache.org/dist/cassandra/0.8.7/apache-cassandra-0.8.7-bin.tar.gz',
+  '1.0' => 'http://archive.apache.org/dist/cassandra/1.0.6/apache-cassandra-1.0.6-bin.tar.gz'
 }
 
 CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"
@@ -153,10 +154,12 @@ task :test => 'data:load'
 # desc "Regenerate thrift bindings for Cassandra" # Dev only
 task :thrift do
   puts "Generating Thrift bindings"
+  FileUtils.mkdir_p "vendor/#{CASSANDRA_VERSION}"
+
   system(
-    "cd vendor &&
+    "cd vendor/#{CASSANDRA_VERSION} &&
     rm -rf gen-rb &&
-    thrift -gen rb #{CASSANDRA_HOME}/interface/cassandra.thrift")
+    thrift -gen rb #{File.join(CASSANDRA_HOME, "cassandra-#{CASSANDRA_VERSION}")}/interface/cassandra.thrift")
 end
 
 task :fix_perms do

data/cassandra.gemspec

@@ -1,43 +1,43 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cassandra}
-  s.version = "0.12.1"
+  s.name = "cassandra"
+  s.version = "0.13.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-08-22}
-  s.description = %q{A Ruby client for the Cassandra distributed database.}
-  s.email = %q{}
-  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 = [%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.8.5}
-  s.summary = %q{A Ruby client for the Cassandra distributed database.}
-  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}]
+  s.authors = ["Evan Weaver, Ryan King"]
+  s.date = "2012-07-19"
+  s.description = "A Ruby client for the Cassandra distributed database."
+  s.email = ""
+  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/1.0/cassandra.rb", "lib/cassandra/1.0/columns.rb", "lib/cassandra/1.0/protocol.rb", "lib/cassandra/1.0.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/column_family.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/composite.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/1.0/cassandra.rb", "lib/cassandra/1.0/columns.rb", "lib/cassandra/1.0/protocol.rb", "lib/cassandra/1.0.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/column_family.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/composite.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/composite_type_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", "vendor/1.0/gen-rb/cassandra.rb", "vendor/1.0/gen-rb/cassandra_constants.rb", "vendor/1.0/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
+  s.homepage = "http://github.com/twitter/cassandra/"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.md"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "fauna"
+  s.rubygems_version = "1.8.10"
+  s.summary = "A Ruby client for the Cassandra distributed database."
+  s.test_files = ["test/cassandra_mock_test.rb", "test/ordered_hash_test.rb", "test/cassandra_client_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/test_helper.rb", "test/eventmachine_test.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.7.0"])
+      s.add_runtime_dependency(%q<thrift_client>, ["< 0.9", ">= 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.2.0"])
+      s.add_runtime_dependency(%q<simple_uuid>, ["~> 0.2.0"])
     else
-      s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
+      s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
+      s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
     end
   else
-    s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
+    s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
+    s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
   end
 end

data/conf/0.8/log4j-server.properties

@@ -18,7 +18,7 @@
 # (%l is slower.)
 
 # output messages into a rolling log file as well as stdout
-log4j.rootLogger=DEBUG,stdout,R
+log4j.rootLogger=INFO,stdout,R
 
 # stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

data/conf/0.8/schema.json

@@ -61,6 +61,9 @@
     "SuperUUID":{
       "subcomparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
       "comparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
-      "column_type":"Super"}
+      "column_type":"Super"},
+    "CompositeColumnConversion":{
+      "comparator_type":"org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.IntegerType,org.apache.cassandra.db.marshal.UTF8Type)",
+      "column_type":"Standard"}
   }
 }

data/conf/0.8/schema.txt

@@ -1,5 +1,5 @@
 create keyspace Twitter with
-  placement_strategy = 'org.apache.cassandra.locator.LocalStrategy' AND
+  placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' AND
   strategy_options = [{replication_factor:1}];
 use Twitter;
 create column family Users with comparator = 'UTF8Type';
@@ -17,7 +17,7 @@ create column family UserRelationships with
 create column family Usernames with comparator = 'UTF8Type';
 create column family Statuses with comparator = 'UTF8Type';
 create column family StatusAudits with comparator = 'UTF8Type';
-create column family StatusRelationships with 
+create column family StatusRelationships with
   comparator = 'UTF8Type' and
   column_type = 'Super' and
   subcomparator = 'TimeUUIDType';
@@ -28,7 +28,7 @@ create column family TimelinishThings with
   comparator = 'BytesType';
 
 create keyspace Multiblog with
-  placement_strategy = 'org.apache.cassandra.locator.LocalStrategy' AND
+  placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' AND
   strategy_options = [{replication_factor:1}];
 use Multiblog;
 create column family Blogs with comparator = 'TimeUUIDType';
@@ -36,16 +36,16 @@ create column family Comments with comparator = 'TimeUUIDType';
 
 
 create keyspace MultiblogLong with
-  placement_strategy = 'org.apache.cassandra.locator.LocalStrategy' AND
+  placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' AND
   strategy_options = [{replication_factor:1}];
 use MultiblogLong;
 create column family Blogs with comparator = 'LongType';
 create column family Comments with comparator = 'LongType';
 
 create keyspace TypeConversions with
-  placement_strategy = 'org.apache.cassandra.locator.LocalStrategy' AND
+  placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' AND
   strategy_options = [{replication_factor:1}];
 use TypeConversions;
 create column family UUIDColumnConversion with comparator = TimeUUIDType;
 create column family SuperUUID with comparator = TimeUUIDType and column_type = Super;
-
+create column family CompositeColumnConversion with comparator = 'CompositeType(IntegerType, UTF8Type)';

data/lib/cassandra.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'thrift_client', '~> 0.7.0'
+gem 'thrift_client', '>= 0.7.0', '< 0.9'
 require 'thrift_client'
 gem 'simple_uuid' , '~> 0.2.0'
 require 'simple_uuid'
@@ -23,6 +23,7 @@ require 'cassandra/array'
 require 'cassandra/time'
 require 'cassandra/comparable'
 require 'cassandra/long'
+require 'cassandra/composite'
 require 'cassandra/ordered_hash'
 require 'cassandra/columns'
 require 'cassandra/protocol'

data/lib/cassandra/0.8/cassandra.rb

@@ -5,6 +5,21 @@ class Cassandra
   # Add a value to the counter in cf:key:super column:column
   def add(column_family, key, value, *columns_and_options)
     column_family, column, sub_column, options = extract_and_validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
-    _add(column_family, key, column, sub_column, value, options[:consistency])
+
+    mutation_map = if is_super(column_family)
+      {
+        key => {
+          column_family => [_super_counter_mutation(column_family, column, sub_column, value)]
+        }
+      }
+    else
+      {
+        key => {
+          column_family => [_standard_counter_mutation(column_family, column, value)]
+        }
+      }
+    end
+
+    @batch ? @batch << [mutation_map, options[:consistency]] : _mutate(mutation_map, options[:consistency])
   end
 end

data/lib/cassandra/0.8/columns.rb

@@ -1,4 +1,28 @@
 class Cassandra
   module Columns #:nodoc:
+    def _standard_counter_mutation(column_family, column_name, value)
+      CassandraThrift::Mutation.new(
+        :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
+          :counter_column => CassandraThrift::CounterColumn.new(
+            :name      => column_name_class(column_family).new(column_name).to_s,
+            :value     => value,
+          )
+        )
+      )
+    end
+
+    def _super_counter_mutation(column_family, super_column_name, sub_column, value)
+      CassandraThrift::Mutation.new(:column_or_supercolumn =>
+        CassandraThrift::ColumnOrSuperColumn.new(
+          :counter_super_column => CassandraThrift::SuperColumn.new(
+            :name => column_name_class(column_family).new(super_column_name).to_s,
+            :columns => [CassandraThrift::CounterColumn.new(
+              :name      => sub_column_name_class(column_family).new(sub_column).to_s,
+              :value     => value
+            )]
+          )
+        )
+      )
+    end
   end
 end

data/lib/cassandra/0.8/protocol.rb

@@ -1,5 +1,3 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/../0.7/protocol"
-
 class Cassandra
   # Inner methods for actually doing the Thrift calls
   module Protocol #:nodoc:
@@ -8,16 +6,5 @@ class Cassandra
     def _remove_counter(key, column_path, consistency_level)
       client.remove_counter(key, column_path, consistency_level)
     end
-
-    def _add(column_family, key, column, sub_column, value, consistency)
-      if is_super(column_family)
-        column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => column)
-        counter_column = CassandraThrift::CounterColumn.new(:name => sub_column, :value => value)
-      else
-        column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
-        counter_column = CassandraThrift::CounterColumn.new(:name => column, :value => value)
-      end
-      client.add(key, column_parent, counter_column, consistency)
-    end
   end
 end

data/lib/cassandra/1.0.rb

@@ -0,0 +1,7 @@
+class Cassandra
+  def self.VERSION
+    "1.0"
+  end
+end
+
+require "#{File.expand_path(File.dirname(__FILE__))}/../cassandra"

data/lib/cassandra/1.0/cassandra.rb

@@ -0,0 +1,25 @@
+class Cassandra
+
+  ## Counters
+
+  # Add a value to the counter in cf:key:super column:column
+  def add(column_family, key, value, *columns_and_options)
+    column_family, column, sub_column, options = extract_and_validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
+
+    mutation_map = if is_super(column_family)
+      {
+        key => {
+          column_family => [_super_counter_mutation(column_family, column, sub_column, value)]
+        }
+      }
+    else
+      {
+        key => {
+          column_family => [_standard_counter_mutation(column_family, column, value)]
+        }
+      }
+    end
+
+    @batch ? @batch << [mutation_map, options[:consistency]] : _mutate(mutation_map, options[:consistency])
+  end
+end

data/lib/cassandra/1.0/columns.rb

@@ -0,0 +1,28 @@
+class Cassandra
+  module Columns #:nodoc:
+    def _standard_counter_mutation(column_family, column_name, value)
+      CassandraThrift::Mutation.new(
+        :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
+          :counter_column => CassandraThrift::CounterColumn.new(
+            :name      => column_name_class(column_family).new(column_name).to_s,
+            :value     => value,
+          )
+        )
+      )
+    end
+
+    def _super_counter_mutation(column_family, super_column_name, sub_column, value)
+      CassandraThrift::Mutation.new(:column_or_supercolumn =>
+        CassandraThrift::ColumnOrSuperColumn.new(
+          :counter_super_column => CassandraThrift::SuperColumn.new(
+            :name => column_name_class(column_family).new(super_column_name).to_s,
+            :columns => [CassandraThrift::CounterColumn.new(
+              :name      => sub_column_name_class(column_family).new(sub_column).to_s,
+              :value     => value
+            )]
+          )
+        )
+      )
+    end
+  end
+end

data/lib/cassandra/1.0/protocol.rb

@@ -0,0 +1,12 @@
+require "#{File.expand_path(File.dirname(__FILE__))}/../0.7/protocol"
+
+class Cassandra
+  # Inner methods for actually doing the Thrift calls
+  module Protocol #:nodoc:
+    private
+
+    def _remove_counter(key, column_path, consistency_level)
+      client.remove_counter(key, column_path, consistency_level)
+    end
+  end
+end

data/lib/cassandra/cassandra.rb

@@ -741,27 +741,29 @@ class Cassandra
   # range of keys in the column_family you request.
   #
   # If a block is passed in we will yield the row key and columns for
-  # each record returned.
+  # each record returned and return a nil value instead of a Cassandra::OrderedHash.
   #
   # See Cassandra#get_range for more details.
   #
   def get_range_batch(column_family, options = {})
     batch_size    = options.delete(:batch_size) || 100
     count         = options.delete(:key_count)
-    result        = {}
+    result        = (!block_given? && {}) || nil
+    num_results   = 0
 
     options[:start_key] ||= ''
     last_key  = nil
 
-    while options[:start_key] != last_key && (count.nil? || count > result.length)
-      options[:start_key] = last_key
-      res = get_range_single(column_family, options.merge!(:start_key => last_key,
+    while count.nil? || count > num_results
+      res = get_range_single(column_family, options.merge!(:start_key => last_key || options[:start_key],
                                                            :key_count => batch_size,
                                                            :return_empty_rows => true
                                                           ))
+      break if res.keys.last == last_key
+
       res.each do |key, columns|
-        next if options[:start_key] == key
-        next if result.length == count
+        next if last_key == key
+        next if num_results == count
 
         unless columns == {}
           if block_given?
@@ -769,12 +771,14 @@ class Cassandra
           else
             result[key] = columns
           end
+          num_results += 1
         end
+
         last_key = key
       end
     end
 
-    result if !block_given?
+    result
   end
 
   ##

data/lib/cassandra/columns.rb

@@ -18,10 +18,11 @@ class Cassandra
 
     def column_name_class_for_key(column_family, comparator_key)
       property = column_family_property(column_family, comparator_key)
-      property =~ /.*\.(.*?)$/
+      property =~ /[^(]*\.(.*?)$/
       case $1
       when "LongType" then Long
       when "LexicalUUIDType", "TimeUUIDType" then SimpleUUID::UUID
+      when /^CompositeType\(/ then Composite
       else
         String # UTF8, Ascii, Bytes, anything else
       end
@@ -73,8 +74,10 @@ class Cassandra
     def columns_to_hash_for_classes(columns, column_name_class, sub_column_name_class = nil)
       hash = OrderedHash.new
       Array(columns).each do |c|
-        c = c.super_column || c.column || c.counter_column if c.is_a?(CassandraThrift::ColumnOrSuperColumn)
+        c = c.super_column || c.column || c.counter_column || c.counter_super_column if c.is_a?(CassandraThrift::ColumnOrSuperColumn)
         case c
+        when CassandraThrift::CounterSuperColumn
+          hash.[]=(column_name_class.new(c.name), columns_to_hash_for_classes(c.columns, sub_column_name_class)) # Pop the class stack, and recurse
         when CassandraThrift::SuperColumn
           hash.[]=(column_name_class.new(c.name), columns_to_hash_for_classes(c.columns, sub_column_name_class)) # Pop the class stack, and recurse
         when CassandraThrift::Column