cassilds 0.9.2 → 0.12.1

data/test/cassandra_test.rb

@@ -4,15 +4,21 @@ class CassandraTest < Test::Unit::TestCase
   include Cassandra::Constants
 
   def setup
-    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :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')
+    @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')
+    @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 => 0.1, :exception_classes => [])
+    @type_conversions.clear_keyspace!
+
+    Cassandra::WRITE_DEFAULTS[:consistency] = Cassandra::Consistency::ONE
+    Cassandra::READ_DEFAULTS[:consistency]  = Cassandra::Consistency::ONE
+
     @uuids = (0..6).map {|i| SimpleUUID::UUID.new(Time.at(2**(24+i))) }
     @longs = (0..6).map {|i| Long.new(Time.at(2**(24+i))) }
   end
@@ -24,13 +30,37 @@ class CassandraTest < Test::Unit::TestCase
     end
   end
 
+  def test_setting_default_consistency
+    assert_nothing_raised do
+      @twitter.default_read_consistency = Cassandra::Consistency::ALL
+    end
+    assert_equal(Cassandra::READ_DEFAULTS[:consistency], Cassandra::Consistency::ALL)
+
+    assert_nothing_raised do
+      @twitter.default_write_consistency = Cassandra::Consistency::ALL
+    end
+    assert_equal(Cassandra::WRITE_DEFAULTS[:consistency], Cassandra::Consistency::ALL)
+  end
+
   def test_get_key
+    
     @twitter.insert(:Users, key, {'body' => 'v', 'user' => 'v'})
     assert_equal({'body' => 'v', 'user' => 'v'}, @twitter.get(:Users, key))
     assert_equal(['body', 'user'].sort, @twitter.get(:Users, key).timestamps.keys.sort)
     assert_equal({}, @twitter.get(:Users, 'bogus'))
   end
 
+  def test_get_single_column_returns_single_value
+    @twitter.insert(:Users, key, {'body' => 'body_text', 'user' => 'user_name'})
+    assert_equal('body_text', @twitter.get(:Users, key, 'body'))
+    assert_equal('user_name', @twitter.get(:Users, key, 'user'))
+
+    @blogs.insert(:Blogs, key,
+      {@uuids[0] => 'I like this cat', @uuids[1] => 'Buttons is cuter', @uuids[2] => 'I disagree'})
+
+    assert_equal('I like this cat', @blogs.get(:Blogs, key, @uuids[0]))
+  end
+
   def test_get_key_preserving_order
     # In-order hash is preserved
     hash = OrderedHash['a', '', 'b', '', 'c', '', 'd', '',]
@@ -43,7 +73,7 @@ class CassandraTest < Test::Unit::TestCase
     hash = OrderedHash['b', '', 'c', '', 'd', '', 'a', '']
     @twitter.insert(:Users, key, hash)
     assert_equal(hash.keys.sort, @twitter.get(:Users, key).keys)
-    assert_equal(hash.timestamps.keys.sort, @twitter.get(:Users, key).timestamps.keys.sort)
+    assert_equal(hash.timestamps.keys.sort, @twitter.get(:Users, key).timestamps.keys)
     assert_not_equal(hash.keys, @twitter.get(:Users, key).keys)
   end
 
@@ -102,9 +132,39 @@ class CassandraTest < Test::Unit::TestCase
     assert !@twitter.exists?(:Statuses, 'bogus', 'body')
   end
 
-  def test_exists_with_only_key
+  def test_get_value_with_range
+    k = key
+
+    10.times do |i|
+      @twitter.insert(:Statuses, k, {"body-#{i}" => 'v'})
+    end
+
+    assert_equal 5, @twitter.get(:Statuses, k, :count => 5).length
+    assert_equal 5, @twitter.get(:Statuses, k, :start => "body-5").length
+    assert_equal 5, @twitter.get(:Statuses, k, :finish => "body-4").length
+    assert_equal 5, @twitter.get(:Statuses, k, :start => "body-1", :count => 5).length
+    assert_equal 5, @twitter.get(:Statuses, k, :start => "body-0", :finish => "body-4", :count => 7).length
+  end
+
+  def test_exists
     @twitter.insert(:Statuses, key, {'body' => 'v'})
-    assert @twitter.exists?(:Statuses, key)
+    assert_equal true, @twitter.exists?(:Statuses, key)
+    assert_equal false, @twitter.exists?(:Statuses, 'bogus')
+
+    columns = {@uuids[1] => 'v1', @uuids[2] => 'v2'}
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => columns})
+
+    # verify return value when searching by key
+    assert_equal true, @twitter.exists?(:StatusRelationships, key)
+    assert_equal false, @twitter.exists?(:StatusRelationships, 'bogus')
+
+    # verify return value when searching by key and column
+    assert_equal true, @twitter.exists?(:StatusRelationships, key, 'user_timelines')
+    assert_equal false, @twitter.exists?(:StatusRelationships, key, 'bogus')
+
+    # verify return value when searching by key and column and subcolumn
+    assert_equal true, @twitter.exists?(:StatusRelationships, key, 'user_timelines', @uuids[1])
+    assert_equal false, @twitter.exists?(:StatusRelationships, key, 'user_timelines', @uuids[3])
   end
 
   def test_get_super_key
@@ -116,9 +176,11 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_get_several_super_keys
-    columns = {
-      'user_timelines' => {@uuids[1]  => 'v1'},
-      'mentions_timelines' => {@uuids[2]  => 'v2'}}
+    columns = OrderedHash[
+      'mentions_timelines', {@uuids[2]  => 'v2'},
+      'user_timelines', {@uuids[1]  => 'v1'}
+    ]
+
     @twitter.insert(:StatusRelationships, key, columns)
 
     assert_equal(columns, @twitter.get(:StatusRelationships, key))
@@ -165,7 +227,7 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal(columns.keys.sort, @twitter.get(:StatusRelationships, key, 'user_timelines').timestamps.keys.sort)
     assert_equal({}, @twitter.get(:StatusRelationships, 'bogus', 'user_timelines'))
     # FIXME Not sure if this is valid
-    # assert_nil @twitter.exists?(:StatusRelationships, 'bogus', 'user_timelines')
+    assert_equal false, @twitter.exists?(:StatusRelationships, 'bogus', 'user_timelines')
   end
 
   def test_get_super_value
@@ -175,24 +237,129 @@ class CassandraTest < Test::Unit::TestCase
     assert_nil @twitter.get(:StatusRelationships, 'bogus', 'user_timelines', columns.keys.first)
   end
 
+#  def test_get_range_with_key_range
+#    skip('This test requires the use of OrderPreservingPartitioner on the cluster to work properly.')
+#    k = key
+#    @twitter.insert(:Statuses, k + '2', {'body' => '1'})
+#    @twitter.insert(:Statuses, k + '3', {'body' => '1'})
+#    @twitter.insert(:Statuses, k + '4', {'body' => '1'})
+#    @twitter.insert(:Statuses, k + '5', {'body' => '1'})
+#    @twitter.insert(:Statuses, k + '6', {'body' => '1'})
+#    assert_equal([k + '3', k + '4', k + '5'], @twitter.get_range(:Statuses, :start_key => k + '3', :finish_key => k + '5').keys)
+#  end
+
+  def test_get_range
+    # make sure that deleted rows are not included in the iteration
+    10.times do |i|
+      @twitter.insert(:Statuses, i.to_s, {'body' => '1'})
+      @twitter.insert(:Statuses, i.to_s + '_delete_me', {'test' => 'value'})
+      @twitter.remove(:Statuses, i.to_s + '_delete_me')
+    end
 
-  #TODO: add a OPP keyspace for this
-  # def test_get_range
-  #   @twitter.insert(:Statuses, '2', {'body' => '1'})
-  #   @twitter.insert(:Statuses, '3', {'body' => '1'})
-  #   @twitter.insert(:Statuses, '4', {'body' => '1'})
-  #   @twitter.insert(:Statuses, '5', {'body' => '1'})
-  #   @twitter.insert(:Statuses, '6', {'body' => '1'})
-  #   assert_equal(['3', '4', '5'], @twitter.get_range(:Statuses, :start => '3', :finish => '5'))
-  # end
+    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
 
-  def test_get_range_count
-     @twitter.insert(:Statuses, '2', {'body' => '1'})
-     @twitter.insert(:Statuses, '3', {'body' => '1'})
-     @twitter.insert(:Statuses, '4', {'body' => '1'})
-     @twitter.insert(:Statuses, '5', {'body' => '1'})
-     @twitter.insert(:Statuses, '6', {'body' => '1'})
-     assert_equal(3, @twitter.get_range(:Statuses, :count => 3).size)
+  end
+
+  def test_get_range_block
+    k = key
+    5.times do |i|
+      @twitter.insert(:Statuses, k+i.to_s, {"body-#{i.to_s}" => 'v'})
+    end
+
+    values = (0..4).collect{|n| { :key => "test_get_range_block#{n}", :columns => { "body-#{n}" => "v" }} }.reverse
+
+    returned_value = @twitter.get_range(:Statuses, :start_key => k.to_s, :key_count => 5) do |key,columns|
+       expected = values.pop
+       assert_equal expected[:key], key
+       assert_equal expected[:columns], columns
+    end
+
+    assert_equal [], values
+    assert_nil returned_value
+  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
+    keys_yielded = []
+
+    10.times do |i|
+      @twitter.insert(:Statuses, k + i.to_s, {"body-#{i.to_s}" => 'v'})
+    end
+
+    # make sure that deleted rows are not included in the iteration
+    @twitter.insert(:Statuses, k + '_delete_me', {'test' => 'value'})
+    @twitter.remove(:Statuses, k + '_delete_me')
+
+    @twitter.each_key(:Statuses) do |key|
+      keys_yielded << key
+    end
+
+    assert_equal 10, keys_yielded.length
+  end
+
+  def test_each
+    k = key
+    key_columns  = {}
+
+    10.times do |i|
+      key_columns[k + i.to_s]   = {"body-#{i.to_s}" => 'v', 'single_column_lookup' => "value = #{i.to_s}"}
+      @twitter.insert(:Statuses, k + i.to_s, key_columns[k + i.to_s])
+    end
+
+    keys_yielded = []
+    @twitter.each(:Statuses, :batch_size => 5) do |key, columns|
+      assert_equal key_columns[key], columns
+      keys_yielded << key
+    end
+
+    assert_equal 10, keys_yielded.length
+
+    keys_yielded = []
+    @twitter.each(:Statuses, :key_count => 7, :batch_size => 5) do |key, columns|
+      assert_equal key_columns[key], columns
+      keys_yielded << key
+    end
+
+    assert_equal 7, keys_yielded.length, 'each limits to specified count'
+
+    keys_yielded = []
+    @twitter.each(:Statuses, :columns => ['single_column_lookup'], :batch_size => 5) do |key, columns|
+      assert_equal key_columns[key].reject {|k2,v| k2 != 'single_column_lookup'}, columns
+      keys_yielded << key
+    end
+
+    assert_equal 10, keys_yielded.length
   end
 
   def test_multi_get
@@ -220,6 +387,13 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal({}, @twitter.get(:Statuses, key))
   end
 
+  def test_remove_super_sub_key_errors_for_normal_column_family
+    @twitter.insert(:Statuses, key, {'body' => 'v'})
+    assert_equal({'body' => 'v'}, @twitter.get(:Statuses, key))
+
+    assert_raise( ArgumentError) { @twitter.remove(:Statuses, key, 'body' , 'subcolumn') }
+  end
+
   def test_remove_value
     @twitter.insert(:Statuses, key, {'body' => 'v'})
     @twitter.remove(:Statuses, key, 'body')
@@ -240,11 +414,12 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_remove_super_value
-    columns = {@uuids[1] => 'v1'}
+    columns = {@uuids[1] => 'v1', @uuids[2] => 'v2'}
+    column_name_to_remove = @uuids[2]
     @twitter.insert(:StatusRelationships, key, {'user_timelines' => columns})
-    @twitter.remove(:StatusRelationships, key, 'user_timelines', columns.keys.first)
-    assert_nil @twitter.get(:StatusRelationships, key, 'user_timelines', columns.keys.first)
-    assert_nil @twitter.get(:StatusRelationships, key, 'user_timelines').timestamps[columns.keys.first]
+    @twitter.remove(:StatusRelationships, key, 'user_timelines', column_name_to_remove)
+    assert_equal( columns.reject{|k,v| k == column_name_to_remove}, @twitter.get(:StatusRelationships, key, 'user_timelines') )
+    assert_nil @twitter.get(:StatusRelationships, key, 'user_timelines').timestamps[column_name_to_remove]
   end
 
   def test_clear_column_family
@@ -306,15 +481,21 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_count_keys
-    @twitter.insert(:Statuses, key + "1", {'body' => '1'})
-    @twitter.insert(:Statuses, key + "2", {'body' => '2'})
-    @twitter.insert(:Statuses, key + "3", {'body' => '3'})
+    k = key
+    @twitter.insert(:Statuses, k + "1", {'body' => '1'})
+    @twitter.insert(:Statuses, k + "2", {'body' => '2'})
+    @twitter.insert(:Statuses, k + "3", {'body' => '3'})
     assert_equal 3, @twitter.count_range(:Statuses)
   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
@@ -343,24 +524,45 @@ class CassandraTest < Test::Unit::TestCase
   def test_batch_mutate
     k = key
 
+    @twitter.insert(:Users, k + '0', {'delete_me' => 'v0', 'keep_me' => 'v0'})
     @twitter.insert(:Users, k + '1', {'body' => 'v1', 'user' => 'v1'})
+    initial_subcolumns = {@uuids[1] => 'v1', @uuids[2] => 'v2'}
+    @twitter.insert(:StatusRelationships, k, {'user_timelines' => initial_subcolumns, 'dummy_supercolumn' => {@uuids[5] => 'value'}})
+    assert_equal(initial_subcolumns, @twitter.get(:StatusRelationships, k, 'user_timelines'))
+    assert_equal({@uuids[5] => 'value'}, @twitter.get(:StatusRelationships, k, 'dummy_supercolumn'))
+    new_subcolumns = {@uuids[3] => 'v3', @uuids[4] => 'v4'}
+    subcolumn_to_delete = initial_subcolumns.keys.first # the first column of the initial set
 
     @twitter.batch do
+      # Normal Columns
       @twitter.insert(:Users, k + '2', {'body' => 'v2', 'user' => 'v2'})
       @twitter.insert(:Users, k + '3', {'body' => 'bogus', 'user' => 'v3'})
       @twitter.insert(:Users, k + '3', {'body' => 'v3', 'location' => 'v3'})
       @twitter.insert(:Statuses, k + '3', {'body' => 'v'})
 
+      assert_equal({'delete_me' => 'v0', 'keep_me' => 'v0'}, @twitter.get(:Users, k + '0')) # Written
       assert_equal({'body' => 'v1', 'user' => 'v1'}, @twitter.get(:Users, k + '1')) # Written
       assert_equal({}, @twitter.get(:Users, k + '2')) # Not yet written
       assert_equal({}, @twitter.get(:Statuses, k + '3')) # Not yet written
 
-      @twitter.remove(:Users, k + '1')
+      @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
+      assert_equal({'delete_me' => 'v0', 'keep_me' => 'v0'}, @twitter.get(:Users, k + '0')) # Not yet removed
+      
       @twitter.remove(:Users, k + '4')
       @twitter.insert(:Users, k + '4', {'body' => 'v4', 'user' => 'v4'})
       assert_equal({}, @twitter.get(:Users, k + '4')) # Not yet written
+
+      # SuperColumns
+      # Add and delete new sub columns to the user timeline supercolumn
+      @twitter.insert(:StatusRelationships, k, {'user_timelines' => new_subcolumns }) 
+      @twitter.remove(:StatusRelationships, k, 'user_timelines' , subcolumn_to_delete ) # Delete the first of the initial_subcolumns from the user_timeline supercolumn
+      assert_equal(initial_subcolumns, @twitter.get(:StatusRelationships, k, 'user_timelines')) # No additions or deletes reflected yet
+      # Delete a complete supercolumn 
+      @twitter.remove(:StatusRelationships, k, 'dummy_supercolumn' ) # Delete the full dummy supercolumn
+      assert_equal({@uuids[5] => 'value'}, @twitter.get(:StatusRelationships, k, 'dummy_supercolumn')) # dummy supercolumn not yet deleted 
     end
 
     assert_equal({'body' => 'v2', 'user' => 'v2'}, @twitter.get(:Users, k + '2')) # Written
@@ -368,11 +570,20 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal({'body' => 'v4', 'user' => 'v4'}, @twitter.get(:Users, k + '4')) # Written
     assert_equal({'body' => 'v'}, @twitter.get(:Statuses, k + '3')) # Written
     assert_equal({}, @twitter.get(:Users, k + '1')) # Removed
+    
+    assert_equal({ 'keep_me' => 'v0'}, @twitter.get(:Users, k + '0')) # 'delete_me' column removed
+    
 
     assert_equal({'body' => 'v2', 'user' => 'v2'}.keys.sort, @twitter.get(:Users, k + '2').timestamps.keys.sort) # Written
     assert_equal({'body' => 'v3', 'user' => 'v3', 'location' => 'v3'}.keys.sort, @twitter.get(:Users, k + '3').timestamps.keys.sort) # Written and compacted
     assert_equal({'body' => 'v4', 'user' => 'v4'}.keys.sort, @twitter.get(:Users, k + '4').timestamps.keys.sort) # Written
     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{|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 
+
   end
 
   def test_complain_about_nil_key
@@ -381,15 +592,8 @@ class CassandraTest < Test::Unit::TestCase
     end
   end
 
-  def test_raise_access_error_on_nonexistent_keyspace
-    nonexistent = Cassandra.new('Nonexistent')
-    assert_raises(Cassandra::AccessError) do
-      nonexistent.get "foo", "bar"
-    end
-  end
-
   def test_nil_sub_column_value
-    @twitter.insert(:Index, 'asdf', {"thing" => {'jkl' => ''} })
+    @twitter.insert(:Indexes, 'asdf', {"thing" => {'jkl' => ''} })
   end
 
   def test_disconnect!
@@ -397,6 +601,13 @@ class CassandraTest < Test::Unit::TestCase
     assert_nil @twitter.instance_variable_get(:@client)
   end
 
+  def test_disconnect_when_not_connected!
+    assert_nothing_raised do
+      @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :exception_classes => [])
+      @twitter.disconnect!
+    end
+  end
+
   def test_super_allows_for_non_string_values_while_normal_does_not
     columns = {'user_timelines' => {@uuids[4] => '4', @uuids[5] => '5'}}
 
@@ -404,6 +615,216 @@ class CassandraTest < Test::Unit::TestCase
     @twitter.insert(:Statuses, key, { 'body' => '1' })
   end
 
+  def test_batch_over_deletes
+    k = key
+
+    @twitter.batch do
+      @twitter.insert(:Users, k, {'body' => 'body', 'user' => 'user'})
+      @twitter.remove(:Users, k, 'body')
+    end
+
+    assert_equal({'user' => 'user'}, @twitter.get(:Users, k))
+  end
+
+  def test_each_key
+    num_users = rand(60)
+    num_users.times do |twit_counter|
+      @twitter.insert(:Users, "Twitter : #{twit_counter}", {'body' => 'v1', 'user' => 'v1'})
+    end
+    counter = 0
+    @twitter.each_key(:Users) do |_, _|
+      counter += 1
+    end
+    assert_equal num_users, counter
+  end
+
+  def test_each_with_column_predicate
+    num_users = rand(60)
+    num_users.times do |twit_counter|
+      @twitter.insert(:Users, "Twitter : #{twit_counter}", {'body' => 'v1', 'user' => 'v1'})
+    end
+    counter = 0
+    @twitter.each(:Users, :batch_size => 10, :start => 'body', :finish => 'body') do |key, columns|
+      assert_equal 1, columns.length
+      counter += 1
+    end
+    assert_equal num_users, counter
+  end
+
+  def test_each_with_super_column
+    num_users = rand(50)
+    block_name = key
+    num_users.times do |twit_counter|
+      @twitter.insert(:StatusRelationships, block_name + twit_counter.to_s, {
+      'user_timelines' => {@uuids[1] => 'v1', @uuids[2] => 'v2'},
+      'mentions_timelines' => {@uuids[3] => 'v3'}})
+    end
+
+    counter = 0
+    # Restrict to one super column ::
+    @twitter.each(:StatusRelationships, :batch_size => 10, :start => 'user_timelines', :finish => 'user_timelines') do |key, columns|
+      columns.each do |_, column_value|
+          assert_equal 2, column_value.length
+      end
+      counter += 1
+    end
+
+    #Both super columns
+    @twitter.each(:StatusRelationships, :batch_size => 10, :start => 'mentions_timelines', :finish => 'user_timelines') do |key,columns|
+      assert_equal 2, columns.length
+      counter += 1
+    end
+
+    assert_equal num_users*2, counter
+
+  end
+
+  def test_each_column_types
+    num_users = rand(60)
+    num_users.times do |twit_counter|
+      @type_conversions.insert(:UUIDColumnConversion, twit_counter.to_s, {@uuids[1] => 'v1'})
+    end
+    counter = 0
+     @type_conversions.each(:UUIDColumnConversion) do |_, columns|
+      counter += 1
+      columns.keys.each {|column_name| assert_equal SimpleUUID::UUID, column_name.class}
+    end
+    assert_equal num_users, counter
+  end
+
+
+  if CASSANDRA_VERSION.to_f >= 0.7
+    def test_creating_and_dropping_new_index
+      @twitter.create_index('Twitter', 'Statuses', 'column_name', 'LongType')
+      assert_nil @twitter.create_index('Twitter', 'Statuses', 'column_name', 'LongType')
+
+      @twitter.drop_index('Twitter', 'Statuses', 'column_name')
+      assert_nil @twitter.drop_index('Twitter', 'Statuses', 'column_name')
+
+      # Recreating and redropping the same index should not error either.
+      @twitter.create_index('Twitter', 'Statuses', 'column_name', 'LongType')
+      @twitter.drop_index('Twitter', 'Statuses', 'column_name')
+    end
+
+    def test_get_indexed_slices
+      @twitter.create_index('Twitter', 'Statuses', 'x', 'LongType')
+
+      @twitter.insert(:Statuses, 'row1', { 'x' => [0,10].pack("NN")  })
+
+      (2..10).to_a.each do |i|
+        @twitter.insert(:Statuses, 'row' + i.to_s, { 'x' => [0,20].pack("NN"), 'non_indexed' => [i].pack('N*') })
+      end
+
+      @twitter.insert(:Statuses, 'row11', { 'x' => [0,30].pack("NN")  })
+
+      expressions = [{:column_name => 'x', :value => [0,20].pack("NN"), :comparison => "=="}]
+
+      # verify multiples will be returned
+      assert_equal 9, @twitter.get_indexed_slices(:Statuses, expressions).length
+
+      # verify that GT and LT queries perform properly
+      expressions   =  [
+                          {:column_name => 'x',           :value => [0,20].pack("NN"),  :comparison => "=="},
+                          {:column_name => 'non_indexed', :value => [5].pack("N*"),     :comparison => ">"}
+                       ]
+      assert_equal(5, @twitter.get_indexed_slices(:Statuses, expressions).length)
+    end
+
+    def test_old_get_indexed_slices
+      @twitter.create_index('Twitter', 'Statuses', 'x', 'LongType')
+
+      @twitter.insert(:Statuses, 'row1', { 'x' => [0,10].pack("NN")  })
+
+      (2..10).to_a.each do |i|
+        @twitter.insert(:Statuses, 'row' + i.to_s, { 'x' => [0,20].pack("NN"), 'non_indexed' => [i].pack('N*') })
+      end
+
+      @twitter.insert(:Statuses, 'row11', { 'x' => [0,30].pack("NN")  })
+
+      idx_expr   = @twitter.create_idx_expr('x', [0,20].pack("NN"), "==")
+
+      # verify count is observed
+      idx_clause = @twitter.create_idx_clause([idx_expr], "", 1)
+      assert_equal 1, @twitter.get_indexed_slices(:Statuses, idx_clause).length
+
+      # verify multiples will be returned
+      idx_clause = @twitter.create_idx_clause([idx_expr])
+      assert_equal 9, @twitter.get_indexed_slices(:Statuses, idx_clause).length
+
+      # verify that GT and LT queries perform properly
+      idx_expr   =  [
+                      @twitter.create_idx_expr('x', [0,20].pack("NN"), "=="),
+                      @twitter.create_idx_expr('non_indexed', [5].pack("N*"), ">")
+                    ]
+      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
+    def test_adding_getting_value_in_counter
+      assert_nil @twitter.add(:UserCounters, 'bob', 5, 'tweet_count')
+      assert_equal(5, @twitter.get(:UserCounters, 'bob', 'tweet_count'))
+      assert_nil @twitter.get(:UserCounters, 'bogus', 'tweet_count')
+    end
+
+    def test_get_counter_slice
+      assert_nil @twitter.add(:UserCounters, 'bob', 5, 'tweet_count')
+      assert_equal({'tweet_count' => 5}, @twitter.get(:UserCounters, 'bob', :start => "tweet_count", :finish => "tweet_count"))
+    end
+
+    def test_adding_getting_value_in_multiple_counters
+      assert_nil @twitter.add(:UserCounters, 'bob', 5, 'tweet_count')
+      assert_nil @twitter.add(:UserCounters, 'bob', 7, 'follower_count')
+      assert_equal(5, @twitter.get(:UserCounters, 'bob', 'tweet_count'))
+      assert_nil @twitter.get(:UserCounters, 'bogus', 'tweet_count')
+      assert_equal([5, 7], @twitter.get_columns(:UserCounters, 'bob', ['tweet_count', 'follower_count']))
+      assert_equal([5, 7, nil], @twitter.get_columns(:UserCounters, 'bob', ['tweet_count', 'follower_count', 'bogus']))
+    end
+
+    def test_adding_getting_value_in_multiple_counters_with_super_columns
+      assert_nil @twitter.add(:UserCounterAggregates, 'bob', 1, 'DAU', 'today')
+      assert_nil @twitter.add(:UserCounterAggregates, 'bob', 2, 'DAU', 'tomorrow')
+      assert_equal(1, @twitter.get(:UserCounterAggregates, 'bob', 'DAU', 'today'))
+      assert_equal(2, @twitter.get(:UserCounterAggregates, 'bob', 'DAU', 'tomorrow'))
+    end
+  end
+
   private
 
   def key