cassandra 0.11.0 → 0.11.1

data/cassandra.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.11.0"
+  s.version = "0.11.1"
 
   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-05-18}
+  s.date = %q{2011-06-01}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = ["cassandra_helper"]
-  s.extra_rdoc_files = ["bin/cassandra_helper", "CHANGELOG", "lib/cassandra/0.6/cassandra.rb", "lib/cassandra/0.6/columns.rb", "lib/cassandra/0.6/protocol.rb", "lib/cassandra/0.6.rb", "lib/cassandra/0.7/cassandra.rb", "lib/cassandra/0.7/column_family.rb", "lib/cassandra/0.7/columns.rb", "lib/cassandra/0.7/keyspace.rb", "lib/cassandra/0.7/protocol.rb", "lib/cassandra/0.7.rb", "lib/cassandra/0.8/cassandra.rb", "lib/cassandra/0.8/column_family.rb", "lib/cassandra/0.8/columns.rb", "lib/cassandra/0.8/keyspace.rb", "lib/cassandra/0.8/protocol.rb", "lib/cassandra/0.8.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/time.rb", "lib/cassandra.rb", "LICENSE", "README.rdoc"]
-  s.files = ["bin/cassandra_helper", "CHANGELOG", "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/0.6/cassandra.rb", "lib/cassandra/0.6/columns.rb", "lib/cassandra/0.6/protocol.rb", "lib/cassandra/0.6.rb", "lib/cassandra/0.7/cassandra.rb", "lib/cassandra/0.7/column_family.rb", "lib/cassandra/0.7/columns.rb", "lib/cassandra/0.7/keyspace.rb", "lib/cassandra/0.7/protocol.rb", "lib/cassandra/0.7.rb", "lib/cassandra/0.8/cassandra.rb", "lib/cassandra/0.8/column_family.rb", "lib/cassandra/0.8/columns.rb", "lib/cassandra/0.8/keyspace.rb", "lib/cassandra/0.8/protocol.rb", "lib/cassandra/0.8.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/time.rb", "lib/cassandra.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "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.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.homepage = %q{http://fauna.github.com/fauna/cassandra/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   s.rubygems_version = %q{1.7.2}

data/conf/0.6/schema.json

@@ -44,5 +44,14 @@
     "Comments":{
       "CompareWith":"org.apache.cassandra.db.marshal.LongType",
       "Type":"Standard"}
+  },
+"TypeConversions":{
+    "UUIDColumnConversion":{
+      "CompareWith":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "Type":"Standard"},
+    "SuperUUID":{
+      "CompareSubcolumnsWith":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "CompareWith":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "Type":"Super"}
   }
 }

data/conf/0.6/storage-conf.xml

@@ -91,6 +91,16 @@
       <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
     </Keyspace>
 
+    <Keyspace Name="TypeConversions">
+      <KeysCachedFraction>0.01</KeysCachedFraction>
+      <ColumnFamily CompareWith="TimeUUIDType" Name="UUIDColumnConversion"/>
+      <ColumnFamily CompareWith="TimeUUIDType" CompareSubcolumnsWith="UTF8Type" ColumnType="Super" Name="SuperUUID"/>
+
+      <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
+      <ReplicationFactor>1</ReplicationFactor>
+      <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
+    </Keyspace>
+
     <Keyspace Name="CassandraObject">
       <KeysCachedFraction>0.01</KeysCachedFraction>
       <ColumnFamily CompareWith="UTF8Type" Name="Customers" />

data/conf/0.7/schema.json

@@ -44,5 +44,14 @@
     "Comments":{
       "comparator_type":"org.apache.cassandra.db.marshal.LongType",
       "column_type":"Standard"}
+  },
+"TypeConversions":{
+    "UUIDColumnConversion":{
+      "comparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "column_type":"Standard"},
+    "SuperUUID":{
+      "subcomparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "comparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "column_type":"Super"}
   }
 }

data/conf/0.7/schema.txt

@@ -36,21 +36,10 @@ use MultiblogLong;
 create column family Blogs with comparator = 'LongType';
 create column family Comments with comparator = 'LongType';
 
-create keyspace CassandraObject with
+create keyspace TypeConversions with
   placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' AND
   replication_factor = 1;
-use CassandraObject;
-create column family Customers with comparator = 'UTF8Type';
-create column family CustomerRelationships with
-  comparator = 'UTF8Type' AND
-  column_type = 'Super' AND
-  subcomparator = 'TimeUUIDType';
-create column family CustomersByLastName with comparator = 'TimeUUIDType';
-create column family Invoices with comparator = 'UTF8Type';
-create column family InvoiceRelationships with
-  comparator = 'UTF8Type' AND
-  column_type = 'Super' AND
-  subcomparator = 'TimeUUIDType';
-create column family InvoicesByNumber with comparator = 'UTF8Type';
-create column family Payments with comparator = 'UTF8Type';
-create column family Appointments with comparator = 'UTF8Type';
+use TypeConversions;
+create column family UUIDColumnConversion with comparator = TimeUUIDType;
+create column family SuperUUID with comparator = TimeUUIDType and column_type = Super;
+

data/conf/0.8/cassandra.yaml

@@ -42,7 +42,7 @@ incremental_backups: false
 snapshot_before_compaction: false
 column_index_size_in_kb: 64
 in_memory_compaction_limit_in_mb: 64
-compaction_multithreading: false
+concurrent_compactors: 1
 compaction_throughput_mb_per_sec: 16
 compaction_preheat_key_cache: true
 rpc_timeout_in_ms: 10000

data/conf/0.8/schema.json

@@ -5,7 +5,16 @@
     "UserAudits":{
       "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
       "column_type":"Standard"},
-    "UserRelationships":{ 
+    "UserCounters":{
+      "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
+      "column_type":"Standard",
+      "default_validation_class":"CounterColumnType"},
+    "UserCounterAggregates":{
+      "subcomparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
+      "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
+      "column_type":"Super",
+      "default_validation_class":"CounterColumnType"},
+    "UserRelationships":{
       "subcomparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
       "comparator_type":"org.apache.cassandra.db.marshal.UTF8Type",
       "column_type":"Super"},
@@ -44,5 +53,14 @@
     "Comments":{
       "comparator_type":"org.apache.cassandra.db.marshal.LongType",
       "column_type":"Standard"}
+  },
+"TypeConversions":{
+    "UUIDColumnConversion":{
+      "comparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "column_type":"Standard"},
+    "SuperUUID":{
+      "subcomparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "comparator_type":"org.apache.cassandra.db.marshal.TimeUUIDType",
+      "column_type":"Super"}
   }
 }

data/conf/0.8/schema.txt

@@ -4,7 +4,13 @@ create keyspace Twitter with
 use Twitter;
 create column family Users with comparator = 'UTF8Type';
 create column family UserAudits with comparator = 'UTF8Type';
-create column family UserRelationships with 
+create column family UserCounters with comparator = 'UTF8Type' and
+  default_validation_class = CounterColumnType;
+create column family UserCounterAggregates with column_type = 'Super'
+  and comparator = 'UTF8Type' and
+  subcomparator = 'UTF8Type' and
+  default_validation_class = CounterColumnType;
+create column family UserRelationships with
   comparator = 'UTF8Type' and
   column_type = 'Super' and
   subcomparator = 'TimeUUIDType';
@@ -36,21 +42,10 @@ use MultiblogLong;
 create column family Blogs with comparator = 'LongType';
 create column family Comments with comparator = 'LongType';
 
-create keyspace CassandraObject with
+create keyspace TypeConversions with
   placement_strategy = 'org.apache.cassandra.locator.LocalStrategy' AND
   strategy_options = [{replication_factor:1}];
-use CassandraObject;
-create column family Customers with comparator = 'UTF8Type';
-create column family CustomerRelationships with
-  comparator = 'UTF8Type' AND
-  column_type = 'Super' AND
-  subcomparator = 'TimeUUIDType';
-create column family CustomersByLastName with comparator = 'TimeUUIDType';
-create column family Invoices with comparator = 'UTF8Type';
-create column family InvoiceRelationships with
-  comparator = 'UTF8Type' AND
-  column_type = 'Super' AND
-  subcomparator = 'TimeUUIDType';
-create column family InvoicesByNumber with comparator = 'UTF8Type';
-create column family Payments with comparator = 'UTF8Type';
-create column family Appointments with comparator = 'UTF8Type';
+use TypeConversions;
+create column family UUIDColumnConversion with comparator = TimeUUIDType;
+create column family SuperUUID with comparator = TimeUUIDType and column_type = Super;
+

data/lib/cassandra.rb

@@ -25,13 +25,14 @@ require 'cassandra/comparable'
 require 'cassandra/long'
 require 'cassandra/ordered_hash'
 require 'cassandra/columns'
+require 'cassandra/protocol'
 require "cassandra/#{Cassandra.VERSION}/columns"
 require "cassandra/#{Cassandra.VERSION}/protocol"
 require "cassandra/cassandra"
 require "cassandra/#{Cassandra.VERSION}/cassandra"
 unless Cassandra.VERSION.eql?("0.6")
-  require "cassandra/#{Cassandra.VERSION}/column_family"
-  require "cassandra/#{Cassandra.VERSION}/keyspace"
+  require "cassandra/column_family"
+  require "cassandra/keyspace"
 end
 require 'cassandra/constants'
 require 'cassandra/debug' if ENV['DEBUG']

data/lib/cassandra/0.6/cassandra.rb

@@ -2,13 +2,40 @@ class Cassandra
   def self.DEFAULT_TRANSPORT_WRAPPER
     Thrift::BufferedTransport
   end
-  
-  ## Delete
 
-  # Remove all rows in the column family you request. Supports options
-  # <tt>:consistency</tt> and <tt>:timestamp</tt>.
-  # FIXME May not currently delete all records without multiple calls. Waiting
-  # for ranged remove support in Cassandra.
+  ##
+  # Issues a login attempt using the username and password specified.
+  #
+  # * username
+  # * password
+  #
+  def login!(username, password)
+    @auth_request = CassandraThrift::AuthenticationRequest.new
+    @auth_request.credentials = {'username' => username, 'password' => password}
+    client.login(@keyspace, @auth_request)
+  end
+
+  def inspect
+    "#<Cassandra:#{object_id}, @keyspace=#{keyspace.inspect}, @schema={#{
+      schema(false).map {|name, hash| ":#{name} => #{hash['type'].inspect}"}.join(', ')
+    }}, @servers=#{servers.inspect}>"
+  end
+
+  ##
+  # Returns an array of available keyspaces.
+  #
+  def keyspaces
+    @keyspaces ||= client.describe_keyspaces()
+  end
+
+  ##
+  # Remove all rows in the column family you request.
+  #
+  # * column_family
+  # * options
+  #   * consitency
+  #   * timestamp
+  #
   def clear_column_family!(column_family, options = {})
     each_key(column_family) do |key|
       remove(column_family, key, options)
@@ -24,6 +51,30 @@ class Cassandra
     schema.keys.each { |column_family| clear_column_family!(column_family, options) }
   end
 
+  # Open a batch operation and yield self. Inserts and deletes will be queued
+  # until the block closes, and then sent atomically to the server.  Supports
+  # the <tt>:consistency</tt> option, which overrides the consistency set in
+  # the individual commands.
+  def batch(options = {})
+    _, _, _, options = 
+      extract_and_validate_params(schema.keys.first, "", [options], WRITE_DEFAULTS)
+
+    @batch = []
+    yield(self)
+    compacted_map,seen_clevels = compact_mutations!
+    clevel = if options[:consistency] != nil # Override any clevel from individual mutations if 
+               options[:consistency]
+             elsif seen_clevels.length > 1 # Cannot choose which CLevel to use if there are several ones
+               raise "Multiple consistency levels used in the batch, and no override...cannot pick one" 
+             else # if no consistency override has been provided but all the clevels in the batch are the same: use that one
+               seen_clevels.first
+             end
+
+    _mutate(compacted_map,clevel)
+  ensure
+    @batch = nil
+  end
+
   protected
 
   def schema(load=true)

data/lib/cassandra/0.6/columns.rb

@@ -3,6 +3,25 @@ class Cassandra
   module Columns #:nodoc:
     private
 
+    def is_super(column_family)
+      @is_super[column_family] ||= column_family_property(column_family, 'Type') == "Super"
+    end
+
+    def column_name_class(column_family)
+      @column_name_class[column_family] ||= column_name_class_for_key(column_family, "CompareWith")
+    end
+
+    def sub_column_name_class(column_family)
+      @sub_column_name_class[column_family] ||= column_name_class_for_key(column_family, "CompareSubcolumnsWith")
+    end
+
+    def column_family_property(column_family, key)
+      unless schema[column_family]
+        raise AccessError, "Invalid column family \"#{column_family}\""
+      end
+      schema[column_family][key]
+    end
+
     def _standard_insert_mutation(column_family, column_name, value, timestamp, _=nil)
       CassandraThrift::Mutation.new(
         :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(

data/lib/cassandra/0.6/protocol.rb

@@ -19,6 +19,7 @@ class Cassandra
       )
     end
 
+    # FIXME: add support for start, stop, count functionality
     def _get_columns(column_family, key, columns, sub_columns, consistency)
       result = if is_super(column_family)
         if sub_columns
@@ -60,7 +61,7 @@ class Cassandra
             :count => count, 
             :start => start, 
             :finish => finish))
-        
+
         if is_super(column_family) and column
           column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => column)
           multi_sub_columns_to_hash!(column_family, client.multiget_slice(@keyspace, keys, column_parent, predicate, consistency))

data/lib/cassandra/0.7/cassandra.rb

@@ -1,272 +1,2 @@
 class Cassandra
-
-  def self.DEFAULT_TRANSPORT_WRAPPER
-    Thrift::FramedTransport
-  end
-
-  def login!(username, password)
-    @auth_request = CassandraThrift::AuthenticationRequest.new
-    @auth_request.credentials = {'username' => username, 'password' => password}
-    client.login(@auth_request)
-  end
-
-  def inspect
-    "#<Cassandra:#{object_id}, @keyspace=#{keyspace.inspect}, @schema={#{
-      Array(schema(false).cf_defs).map {|cfdef| ":#{cfdef.name} => #{cfdef.column_type}"}.join(', ')
-    }}, @servers=#{servers.inspect}>"
-  end
-
-  def keyspace=(ks)
-    client.set_keyspace(ks)
-    @schema = nil; @keyspace = ks
-  end
-
-  def keyspaces
-    client.describe_keyspaces.to_a.collect {|ksdef| ksdef.name }
-  end
-
-  def schema(load=true)
-    if !load && !@schema
-      Cassandra::Keyspace.new
-    else
-      @schema ||= client.describe_keyspace(@keyspace)
-    end
-  end
-
-  def schema_agreement?
-    client.describe_schema_versions().length == 1
-  end
-
-  def version
-    client.describe_version()
-  end
-
-  def cluster_name
-    @cluster_name ||= client.describe_cluster_name()
-  end
-
-  def ring
-    client.describe_ring(@keyspace)
-  end
-
-  def partitioner
-    client.describe_partitioner()
-  end
-
-  ## Delete
-
-  # Remove all rows in the column family you request.
-  def truncate!(column_family)
-    client.truncate(column_family.to_s)
-  end
-  alias clear_column_family! truncate!
-
-  # Remove all rows in the keyspace.
-  def clear_keyspace!
-    schema.cf_defs.each { |cfdef| truncate!(cfdef.name) }
-  end
-
-### Read
-
-  def add_column_family(cf_def)
-    begin
-      res = client.system_add_column_family(cf_def)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    @schema = nil
-    res
-  end
-
-  def drop_column_family(cf_name)
-    begin
-      res = client.system_drop_column_family(cf_name)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    @schema = nil
-    res
-  end
-
-  def rename_column_family(old_name, new_name)
-    begin
-      res = client.system_rename_column_family(old_name, new_name)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    @schema = nil
-    res
-  end
-
-  def update_column_family(cf_def)
-    begin
-      res = client.system_update_column_family(cf_def)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    @schema = nil
-    res
-  end
-
-  def add_keyspace(ks_def)
-    begin
-      res = client.system_add_keyspace(ks_def)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    @keyspaces = nil
-    res
-  end
-
-  def drop_keyspace(ks_name)
-    begin
-      res = client.system_drop_keyspace(ks_name)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    keyspace = "system" if ks_name.eql?(@keyspace)
-    @keyspaces = nil
-    res
-  end
-
-  def rename_keyspace(old_name, new_name)
-    begin
-      res = client.system_rename_keyspace(old_name, new_name)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    keyspace = new_name if old_name.eql?(@keyspace)
-    @keyspaces = nil
-    res
-  end
-
-  def update_keyspace(ks_def)
-    begin
-      res = client.system_update_keyspace(ks_def)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    @keyspaces = nil
-    res
-  end
-
-  # Open a batch operation and yield self. Inserts and deletes will be queued
-  # until the block closes, and then sent atomically to the server.  Supports
-  # the <tt>:consistency</tt> option, which overrides the consistency set in
-  # the individual commands.
-  def batch(options = {})
-    _, _, _, options =
-      extract_and_validate_params(schema.cf_defs.first.name, "", [options], WRITE_DEFAULTS)
-
-      @batch = []
-      yield(self)
-      compacted_map,seen_clevels = compact_mutations!
-      clevel = if options[:consistency] != nil # Override any clevel from individual mutations if 
-                 options[:consistency]
-               elsif seen_clevels.length > 1 # Cannot choose which CLevel to use if there are several ones
-                 raise "Multiple consistency levels used in the batch, and no override...cannot pick one" 
-               else # if no consistency override has been provided but all the clevels in the batch are the same: use that one
-                 seen_clevels.first
-               end
-
-      _mutate(compacted_map,clevel)
-  ensure
-    @batch = nil
-  end
-
-### 2ary Indexing
-
-  def create_index(ks_name, cf_name, c_name, v_class)
-    cf_def = client.describe_keyspace(ks_name).cf_defs.find{|x| x.name == cf_name}
-    if !cf_def.nil? and !cf_def.column_metadata.find{|x| x.name == c_name}
-      c_def  = CassandraThrift::ColumnDef.new do |cd|
-        cd.name             = c_name
-        cd.validation_class = "org.apache.cassandra.db.marshal."+v_class
-        cd.index_type       = CassandraThrift::IndexType::KEYS
-      end
-      cf_def.column_metadata.push(c_def)
-      update_column_family(cf_def)
-    end
-  end
-
-  def drop_index(ks_name, cf_name, c_name)
-    cf_def = client.describe_keyspace(ks_name).cf_defs.find{|x| x.name == cf_name}
-    if !cf_def.nil? and cf_def.column_metadata.find{|x| x.name == c_name}
-      cf_def.column_metadata.delete_if{|x| x.name == c_name}
-      update_column_family(cf_def)
-    end
-  end
-
-  def create_idx_expr(c_name, value, op)
-    CassandraThrift::IndexExpression.new(
-      :column_name => c_name,
-      :value => value,
-      :op => (case op
-                when nil, "EQ", "eq", "=="
-                  CassandraThrift::IndexOperator::EQ
-                when "GTE", "gte", ">="
-                  CassandraThrift::IndexOperator::GTE
-                when "GT", "gt", ">"
-                  CassandraThrift::IndexOperator::GT
-                when "LTE", "lte", "<="
-                  CassandraThrift::IndexOperator::LTE
-                when "LT", "lt", "<"
-                  CassandraThrift::IndexOperator::LT
-              end ))
-  end
-
-  def create_idx_clause(idx_expressions, start = "")
-    CassandraThrift::IndexClause.new(
-      :start_key => start,
-      :expressions => idx_expressions)
-  end
-
-  # TODO: Supercolumn support.
-  def get_indexed_slices(column_family, idx_clause, *columns_and_options)
-    column_family, columns, _, options =
-      extract_and_validate_params(column_family, [], columns_and_options, READ_DEFAULTS)
-    key_slices = _get_indexed_slices(column_family, idx_clause, columns, options[:count], options[:start],
-      options[:finish], options[:reversed], options[:consistency])
-
-    key_slices.inject({}){|h, key_slice| h[key_slice.key] = key_slice.columns; h}
-  end
-
-  protected
-
-  def client
-    if @client.nil? || @client.current_server.nil?
-      reconnect!
-      @client.set_keyspace(@keyspace)
-    end
-    @client
-  end
-
-  def reconnect!
-    @servers = all_nodes
-    @client = new_client
-  end
-
-  def all_nodes
-    if @auto_discover_nodes && !@keyspace.eql?("system")
-      temp_client = new_client
-      begin
-        ips = (temp_client.describe_ring(@keyspace).map {|range| range.endpoints}).flatten.uniq
-        port = @servers.first.split(':').last
-        ips.map{|ip| "#{ip}:#{port}" }
-      ensure
-        temp_client.disconnect!
-      end
-    else
-      @servers
-    end
-  end
-
 end