hallelujah-cassandra 0.12.3

data/lib/cassandra/column_family.rb

@@ -0,0 +1,3 @@
+class Cassandra
+  class ColumnFamily < CassandraThrift::CfDef ; end
+end

data/lib/cassandra/columns.rb

@@ -0,0 +1,147 @@
+
+class Cassandra
+  # A bunch of crap, mostly related to introspecting on column types
+  module Columns #:nodoc:
+    private
+
+    def is_super(column_family)
+      @is_super[column_family] ||= column_family_property(column_family, 'column_type') == "Super"
+    end
+
+    def column_name_class(column_family)
+      @column_name_class[column_family] ||= column_name_class_for_key(column_family, "comparator_type")
+    end
+
+    def sub_column_name_class(column_family)
+      @sub_column_name_class[column_family] ||= column_name_class_for_key(column_family, "subcomparator_type")
+    end
+
+    def column_name_class_for_key(column_family, comparator_key)
+      property = column_family_property(column_family, comparator_key)
+      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
+    end
+
+    def column_family_property(column_family, key)
+      cfdef = schema.cf_defs.find {|cfdef| cfdef.name == column_family }
+      unless cfdef
+        raise AccessError, "Invalid column family \"#{column_family}\""
+      end
+      cfdef.send(key)
+    end
+
+    def multi_key_slices_to_hash(column_family, array, return_empty_rows = false)
+      ret = OrderedHash.new
+      array.each do |value|
+        next if return_empty_rows == false && value.columns.length == 0
+        ret[value.key] = columns_to_hash(column_family, value.columns)
+      end
+      ret
+    end
+
+    def multi_column_to_hash!(hash)
+      hash.each do |key, column_or_supercolumn|
+        hash[key] = (column_or_supercolumn.column.value if column_or_supercolumn.column)
+      end
+    end
+
+    def multi_columns_to_hash!(column_family, hash)
+      hash.each do |key, columns|
+        hash[key] = columns_to_hash(column_family, columns)
+      end
+    end
+
+    def multi_sub_columns_to_hash!(column_family, hash)
+      hash.each do |key, sub_columns|
+        hash[key] = sub_columns_to_hash(column_family, sub_columns)
+      end
+    end
+
+    def columns_to_hash(column_family, columns)
+      columns_to_hash_for_classes(columns, column_name_class(column_family), sub_column_name_class(column_family))
+    end
+
+    def sub_columns_to_hash(column_family, columns)
+      columns_to_hash_for_classes(columns, sub_column_name_class(column_family))
+    end
+
+    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 || 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
+          hash.[]=(column_name_class.new(c.name), c.value, c.timestamp)
+        when CassandraThrift::CounterColumn
+          hash.[]=(column_name_class.new(c.name), c.value, 0)
+        end
+      end
+      hash
+    end
+
+    def _standard_insert_mutation(column_family, column_name, value, timestamp, ttl = nil)
+      CassandraThrift::Mutation.new(
+        :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
+          :column => CassandraThrift::Column.new(
+            :name      => column_name_class(column_family).new(column_name).to_s,
+            :value     => value,
+            :timestamp => timestamp,
+            :ttl       => ttl
+          )
+        )
+      )
+    end
+
+    def _super_insert_mutation(column_family, super_column_name, sub_columns, timestamp, ttl = nil)
+      CassandraThrift::Mutation.new(:column_or_supercolumn => 
+        CassandraThrift::ColumnOrSuperColumn.new(
+          :super_column => CassandraThrift::SuperColumn.new(
+            :name => column_name_class(column_family).new(super_column_name).to_s,
+            :columns => sub_columns.collect { |sub_column_name, sub_column_value|
+              CassandraThrift::Column.new(
+                :name      => sub_column_name_class(column_family).new(sub_column_name).to_s,
+                :value     => sub_column_value.to_s,
+                :timestamp => timestamp,
+                :ttl       => ttl
+              )
+            }
+          )
+        )
+      )
+    end
+
+    # General info about a deletion object within a mutation
+    # timestamp - required. If this is the only param, it will cause deletion of the whole key at that TS
+    # supercolumn - opt. If passed, the deletes will only occur within that supercolumn (only subcolumns 
+    #               will be deleted). Otherwise the normal columns will be deleted.
+    # predicate - opt. Defines how to match the columns to delete. if supercolumn passed, the slice will 
+    #               be scoped to subcolumns of that supercolumn.
+    
+    # Deletes a single column from the containing key/CF (and possibly supercolumn), at a given timestamp. 
+    # Although mutations (as opposed to 'remove' calls) support deleting slices and lists of columns in one shot, this is not implemented here.
+    # The main reason being that the batch function takes removes, but removes don't have that capability...so we'd need to change the remove
+    # methods to use delete mutation calls...although that might have performance implications. We'll leave that refactoring for later.
+    def _delete_mutation(cf, column, subcolumn, timestamp, options={})
+      deletion_hash = {:timestamp => timestamp}
+      if is_super(cf)
+        deletion_hash[:super_column] = column if column
+        deletion_hash[:predicate] = CassandraThrift::SlicePredicate.new(:column_names => [subcolumn]) if subcolumn
+      else
+        deletion_hash[:predicate] = CassandraThrift::SlicePredicate.new(:column_names => [column]) if column
+      end
+      CassandraThrift::Mutation.new(
+        :deletion => CassandraThrift::Deletion.new(deletion_hash)
+      )
+    end
+  end
+end

data/lib/cassandra/comparable.rb

@@ -0,0 +1,28 @@
+
+class Cassandra
+  # Abstract base class for comparable numeric column name types
+  class Comparable
+    class TypeError < ::TypeError #:nodoc:
+    end
+  
+    def <=>(other)
+      self.to_i <=> other.to_i
+    end
+    
+    def hash
+      @bytes.hash
+    end
+    
+    def eql?(other)
+      other.is_a?(Comparable) and @bytes == other.to_s
+    end    
+    
+    def ==(other)
+      other.respond_to?(:to_i) && self.to_i == other.to_i
+    end
+    
+    def to_s
+      @bytes
+    end
+  end
+end

data/lib/cassandra/composite.rb

@@ -0,0 +1,118 @@
+
+class Cassandra
+  class Composite
+    include ::Comparable
+    attr_reader :parts
+    attr_reader :column_slice
+
+    def initialize(*parts)
+      options = {}
+      if parts.last.is_a?(Hash)
+        options = parts.pop
+      end
+      @column_slice = options[:slice]
+      raise ArgumentError if @column_slice != nil && ![:before, :after].include?(@column_slice)
+
+      if parts.length == 1 && parts[0].instance_of?(self.class)
+        @column_slice = parts[0].column_slice
+        @parts = parts[0].parts
+      elsif parts.length == 1 && parts[0].instance_of?(String) && @column_slice.nil? && valid_packed_composite?(parts[0])
+        unpack(parts[0])
+      else
+        @parts = parts
+      end
+    end
+
+    def [](*args)
+      return @parts[*args]
+    end
+
+    def pack
+      packed = @parts.map do |part|
+        [part.length].pack('n') + part + "\x00"
+      end
+      if @column_slice
+        part = @parts[-1]
+        packed[-1] = [part.length].pack('n') + part + slice_end_of_component
+      end
+      return packed.join('')
+    end
+
+    def to_s
+      return pack
+    end
+
+    def <=>(other)
+      if !other.instance_of?(self.class)
+        return @parts.first <=> other
+      end
+      eoc = slice_end_of_component.unpack('c')[0]
+      other_eoc = other.slice_end_of_component.unpack('c')[0]
+      @parts.zip(other.parts).each do |a, b|
+        next if a == b
+        if a.nil? && b.nil?
+          return eoc <=> other_eoc
+        end
+
+        if a.nil?
+          return @column_slice == :after ? 1 : -1
+        end
+        if b.nil?
+          return other.column_slice == :after ? -1 : 1
+        end
+        return -1 if a < b
+        return 1 if a > b
+      end
+      return 0
+    end
+
+    def inspect
+      return "#<Composite:#{@column_slice} #{@parts.inspect}>"
+    end
+
+    def slice_end_of_component
+      return "\x01" if @column_slice == :after
+      return "\xFF" if @column_slice == :before
+      return "\x00"
+    end
+
+    private
+    def unpack(packed_string)
+      parts = []
+      end_of_component = nil
+      while packed_string.length > 0
+        length = packed_string.slice(0, 2).unpack('n')[0]
+        parts << packed_string.slice(2, length)
+        end_of_component = packed_string.slice(2 + length, 1)
+
+        packed_string = packed_string.slice(3 + length, packed_string.length)
+      end
+      @column_slice = :after if end_of_component == "\x01"
+      @column_slice = :before if end_of_component == "\xFF"
+      @parts = parts
+    end
+
+    def valid_packed_composite?(packed_string)
+      while packed_string.length > 0
+        length = packed_string.slice(0, 2).unpack('n')[0]
+        return false if length.nil? || length + 3 > packed_string.length
+
+        end_of_component = packed_string.slice(2 + length, 1)
+        if length + 3 != packed_string.length
+          return false if end_of_component != "\x00"
+        end
+
+        packed_string = packed_string.slice(3 + length, packed_string.length)
+      end
+      return true
+    end
+
+    def hash
+      return to_s.hash
+    end
+
+    def eql?(other)
+      return to_s == other.to_s
+    end
+  end
+end

data/lib/cassandra/constants.rb

@@ -0,0 +1,11 @@
+
+class Cassandra
+  # A helper module you can include in your own class. Makes it easier 
+  # to work with Cassandra subclasses.
+  module Constants
+    include Cassandra::Consistency
+        
+    Long = Cassandra::Long
+    OrderedHash = Cassandra::OrderedHash
+  end
+end

data/lib/cassandra/debug.rb

@@ -0,0 +1,9 @@
+
+require 'pp'
+
+class CassandraThrift::Cassandra::Client
+  def send_message(*args)
+    pp args
+    super
+  end
+end

data/lib/cassandra/helpers.rb

@@ -0,0 +1,41 @@
+class Cassandra
+  module Helpers
+    def extract_and_validate_params(column_family, keys, args, options)
+      options = options.dup
+      column_family = column_family.to_s
+      # Keys
+      [keys].flatten.each do |key|
+        raise ArgumentError, "Key #{key.inspect} must be a String for #{caller[2].inspect}." unless key.is_a?(String)
+      end
+
+      # Options
+      if args.last.is_a?(Hash)
+        extras = args.last.keys - options.keys
+        raise ArgumentError, "Invalid options #{extras.inspect[1..-2]} for #{caller[1]}" if extras.any?
+        options.merge!(args.pop)      
+      end
+
+      # Ranges
+      column, sub_column = args[0], args[1]
+      raise ArgumentError, "Invalid arguments: subcolumns specified for a non-supercolumn family" if sub_column && !is_super(column_family)      
+      klass, sub_klass = column_name_class(column_family), sub_column_name_class(column_family)
+      range_class = column ? sub_klass : klass
+
+      [:start, :finish].each do |opt|
+        options[opt] = options[opt] ? range_class.new(options[opt]).to_s : ''
+      end
+
+      [column_family, s_map(column, klass), s_map(sub_column, sub_klass), options]
+    end
+
+    # Convert stuff to strings.
+    def s_map(el, klass)
+      case el
+      when Array then el.map { |i| s_map(i, klass) }
+      when NilClass then nil
+      else
+        klass.new(el).to_s
+      end
+    end
+  end
+end

data/lib/cassandra/keyspace.rb

@@ -0,0 +1,3 @@
+class Cassandra
+  class Keyspace < CassandraThrift::KsDef ; end
+end

data/lib/cassandra/long.rb

@@ -0,0 +1,58 @@
+
+class Cassandra
+  # A temporally-ordered Long class for use in Cassandra column names
+  class Long < Comparable
+
+    # FIXME Should unify with or subclass Cassandra::UUID
+    def initialize(bytes = nil)
+      case bytes
+      when self.class # Long
+        @bytes = bytes.to_s
+      when String
+        case bytes.size
+        when 8 # Raw byte array
+          @bytes = bytes
+        when 18 # Human-readable UUID-like representation; inverse of #to_guid
+          elements = bytes.split("-")
+          raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (malformed UUID-like representation)" if elements.size != 3
+          @bytes = [elements.join].pack('H32')
+        else
+          raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (invalid bytecount)"
+        end
+      when Integer
+        raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (integer out of range)" if bytes < 0 or bytes > 2**64
+        @bytes = [bytes >> 32, bytes % 2**32].pack("NN")
+      when NilClass, Time
+        # Time.stamp is 52 bytes, so we have 12 bytes of entropy left over
+        int = ((bytes || Time).stamp << 12) + rand(2**12)
+        @bytes = [int >> 32, int % 2**32].pack("NN")
+      else
+        raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (unknown source class)"
+      end
+    end
+
+    def to_i
+      @to_i ||= begin
+        ints = @bytes.unpack("NN")
+        (ints[0] << 32) +
+        ints[1]
+      end
+    end
+
+    def to_guid
+      "%08x-%04x-%04x" % @bytes.unpack("Nnn")
+    end    
+
+    def inspect
+      "<Cassandra::Long##{object_id} time: #{
+        Time.at((to_i >> 12) / 1_000_000).utc.inspect
+      }, usecs: #{
+        (to_i >> 12) % 1_000_000
+      }, jitter: #{
+        to_i % 2**12
+      }, guid: #{
+        to_guid
+      }>"
+    end
+  end
+end

data/lib/cassandra/mock.rb

@@ -0,0 +1,511 @@
+class SimpleUUID::UUID
+  def >=(other)
+    (self <=> other) >= 0
+  end
+
+  def <=(other)
+    (self <=> other) <= 0
+  end
+end
+
+class Cassandra
+  class Mock
+    include ::Cassandra::Helpers
+    include ::Cassandra::Columns
+
+    attr_reader :keyspace
+
+    def initialize(keyspace, schema)
+      @is_super = {}
+      @keyspace = keyspace
+      @column_name_class = {}
+      @sub_column_name_class = {}
+      @indexes = {}
+      @schema = schema[keyspace]
+      clear_keyspace!
+    end
+
+    def disconnect!
+    end
+
+    def clear_keyspace!
+      @data = {}
+    end
+
+    def clear_column_family!(column_family)
+      @data[column_family.to_sym] = OrderedHash.new
+    end
+
+    def default_write_consistency=(value)
+      WRITE_DEFAULTS[:consistency] = value
+    end
+
+    def default_read_consistency=(value)
+      READ_DEFAULTS[:consistency] = value
+    end
+
+    def insert(column_family, key, hash_or_array, options = {})
+      if @batch
+        @batch << [:insert, column_family, key, hash_or_array, options]
+      else
+        raise ArgumentError if key.nil?
+        if !is_super(column_family)
+          insert_standard(column_family, key, hash_or_array)
+        else
+          insert_super(column_family, key, hash_or_array)
+        end
+      end
+    end
+
+    def insert_standard(column_family, key, hash_or_array)
+      old = cf(column_family)[key] || OrderedHash.new
+      cf(column_family)[key] = merge_and_sort(old, hash_or_array)
+    end
+
+    def insert_super(column_family, key, hash)
+      raise ArgumentError unless hash.is_a?(Hash)
+      cf(column_family)[key] ||= OrderedHash.new
+
+      hash.keys.each do |sub_key|
+        old = cf(column_family)[key][sub_key] || OrderedHash.new
+        cf(column_family)[key][sub_key] = merge_and_sort(old, hash[sub_key])
+      end
+    end
+
+    def batch
+      @batch = []
+      yield
+      b = @batch
+      @batch = nil
+      b.each do |mutation|
+        send(*mutation)
+      end
+    ensure
+      @batch = nil
+    end
+
+    def get(column_family, key, *columns_and_options)
+      column_family, column, sub_column, options =
+        extract_and_validate_params_for_real(column_family, [key], columns_and_options, READ_DEFAULTS)
+      if !is_super(column_family)
+        get_standard(column_family, key, column, options)
+      else
+        get_super(column_family, key, column, sub_column, options)
+      end
+    end
+
+    def get_standard(column_family, key, column, options)
+      columns = cf(column_family)[key] || OrderedHash.new
+      row = columns_to_hash(column_family, columns)
+
+      if column
+        row[column]
+      else
+        row = apply_range(row, column_family, options[:start], options[:finish])
+        row = apply_count(row, options[:count], options[:reversed])
+      end
+    end
+
+    def get_super(column_family, key, column, sub_column, options)
+      columns = cf(column_family)[key] || OrderedHash.new
+      row = columns_to_hash(column_family, columns)
+
+      if column
+        if sub_column
+          if row[column] &&
+            row[column][sub_column]
+            row[column][sub_column]
+          else
+            nil
+          end
+        else
+          row = row[column] || OrderedHash.new
+          row = apply_range(row, column_family, options[:start], options[:finish], false)
+          row = apply_count(row, options[:count], options[:reversed])
+        end
+      else
+        row
+      end
+    end
+
+    def exists?(column_family, key, *columns_and_options)
+      column_family, column, sub_column, options = extract_and_validate_params_for_real(column_family, [key], columns_and_options, READ_DEFAULTS)
+      results = get(column_family, key, column, sub_column)
+
+      ![{}, nil].include?(results)
+    end
+
+    def multi_get(column_family, keys, *columns_and_options)
+      column_family, column, sub_column, options = extract_and_validate_params_for_real(column_family, keys, columns_and_options, READ_DEFAULTS)
+      keys.inject(OrderedHash.new) do |hash, key|
+        hash[key] = get(column_family, key)
+        hash
+      end
+    end
+
+    def remove(column_family, key, *columns_and_options)
+      column_family, column, sub_column, options = extract_and_validate_params_for_real(column_family, key, columns_and_options, WRITE_DEFAULTS)
+      if @batch
+        @batch << [:remove, column_family, key, column, sub_column]
+      else
+        if column
+          if sub_column
+            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)  if cf(column_family)[key]
+          end
+        else
+          cf(column_family).delete(key)
+        end
+      end
+    end
+
+    def get_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)
+      d = get(column_family, key)
+
+      if sub_columns
+        sub_columns.collect do |sub_column|
+          d[columns][sub_column]
+        end
+      else
+        columns.collect do |column|
+          d[column]
+        end
+      end
+    end
+
+    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)
+      keys.inject(OrderedHash.new) do |hash, key|
+        hash[key] = get_columns(column_family, key, columns)
+        hash
+      end
+    end
+
+    def multi_count_columns(column_family, keys)
+      keys.inject(OrderedHash.new) do |hash, key|
+        hash[key] = count_columns(column_family, key)
+        hash
+      end
+    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  => nil,
+                                                                                              :finish_key => nil,
+                                                                                              :key_count  => 100,
+                                                                                              :columns    => nil,
+                                                                                              :reversed   => false
+                                                                                             )
+                                                                         )
+      res = _get_range(column_family,
+                 options[:start_key],
+                 options[:finish_key],
+                 options[:key_count],
+                 options[:columns],
+                 options[:start],
+                 options[:finish],
+                 options[:count],
+                 options[:consistency],
+                 options[:reversed], &blk)
+
+      if blk.nil?
+        res
+      else
+        nil
+      end
+    end
+
+    def get_range_keys(column_family, options = {})
+      get_range(column_family,options.merge!(:columns => [])).keys
+    end
+
+    def count_range(column_family, options = {})
+      Hash[get_range(column_family, options).select{|k,v| v.length > 0}].keys.compact.length
+    end
+
+    def each_key(column_family, options = {})
+      each(column_family, options.merge!(:columns => [])) do |key, value|
+        yield key
+      end
+    end
+
+    def each(column_family, options = {})
+      batch_size    = options.delete(:batch_size) || 100
+      count         = options.delete(:key_count)
+      yielded_count = 0
+
+      options[:start_key] ||= ''
+      last_key  = nil
+
+      while options[:start_key] != last_key && (count.nil? || count > yielded_count)
+        options[:start_key] = last_key
+        res = get_range(column_family, options.merge!(:start_key => last_key, :key_count => batch_size))
+        res.each do |key, columns|
+          next if options[:start_key] == key
+          next if yielded_count == count
+          yield key, columns
+          yielded_count += 1
+          last_key = key
+        end
+      end
+    end
+
+    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]
+        nil
+
+      else
+        @indexes[ks_name] ||= {}
+        @indexes[ks_name][cf_name] ||= {}
+        @indexes[ks_name][cf_name][c_name] = true
+      end
+    end
+
+    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].delete(c_name)
+      else
+        nil
+      end
+    end
+
+    def create_index_expression(c_name, value, op)
+      {:column_name => c_name, :value => value, :comparison => op}
+    end
+    alias :create_idx_expr :create_index_expression
+
+    def create_index_clause(idx_expressions, start = "", count = 100)
+      {:start => start, :index_expressions => idx_expressions, :count => count, :type => :index_clause}
+    end
+    alias :create_idx_clause :create_index_clause
+
+    def get_indexed_slices(column_family, idx_clause, *columns_and_options)
+      column_family, columns, _, options =
+        extract_and_validate_params_for_real(column_family, [], columns_and_options, READ_DEFAULTS.merge(:key_count => 100, :key_start => ""))
+
+      unless [Hash, OrderedHash].include?(idx_clause.class) && idx_clause[:type] == :index_clause
+        idx_clause = create_index_clause(idx_clause, options[:key_start], options[:key_count])
+      end
+
+      ret = {}
+      cf(column_family).each do |key, row|
+        next if idx_clause[:start] != '' && key < idx_clause[:start]
+        next if ret.length == idx_clause[:count]
+
+        matches = []
+        idx_clause[:index_expressions].each do |expr|
+          next if row[expr[:column_name]].nil?
+          next unless row[expr[:column_name]].send(expr[:comparison].to_sym, expr[:value])
+
+          matches << expr
+        end
+
+        ret[key] = row if matches.length == idx_clause[:index_expressions].length
+      end
+
+      ret
+    end
+
+    def add(column_family, key, value, *columns_and_options)
+      column_family, column, sub_column, options = extract_and_validate_params_for_real(column_family, key, columns_and_options, WRITE_DEFAULTS)
+
+      if is_super(column_family)
+        cf(column_family)[key]                      ||= OrderedHash.new
+        cf(column_family)[key][column]              ||= OrderedHash.new
+        cf(column_family)[key][column][sub_column]  ||= 0
+        cf(column_family)[key][column][sub_column]  += value
+      else
+        cf(column_family)[key]                      ||= OrderedHash.new
+        cf(column_family)[key][column]              ||= 0
+        cf(column_family)[key][column]              += value
+      end
+
+      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
+
+    def column_family_property(column_family, key)
+      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, reversed, &blk)
+      ret = OrderedHash.new
+      start  = to_compare_with_type(start,  column_family)
+      finish = to_compare_with_type(finish, column_family)
+      cf(column_family).keys.sort.each do |key|
+        break if ret.keys.size >= key_count
+        if (start_key.nil? || key >= start_key) && (finish_key.nil? || key <= finish_key)
+          if columns
+            #ret[key] = columns.inject(OrderedHash.new){|hash, column_name| hash[column_name] = cf(column_family)[key][column_name]; hash;}
+            selected_hash = OrderedHash.new
+            cf(column_family)[key].each do |k, v|
+              selected_hash.[]=(k, v, cf(column_family)[key].timestamps[k]) if columns.include?(k)
+            end
+            ret[key] = columns_to_hash(column_family, selected_hash)
+            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))
+            start, finish = finish, start if reversed
+            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
+      end
+      ret
+    end
+
+    def extract_and_validate_params_for_real(column_family, keys, args, options)
+      column_family, columns, sub_column, options = extract_and_validate_params(column_family, keys, args, options)
+      options[:start] = nil if options[:start] == ''
+      options[:finish] = nil if options[:finish] == ''
+      [column_family, to_compare_with_types(columns, column_family), to_compare_with_types(sub_column, column_family, false), options]
+    end
+
+    def to_compare_with_types(column_names, column_family, standard=true)
+      if column_names.is_a?(Array)
+        column_names.collect do |name|
+          to_compare_with_type(name, column_family, standard)
+        end
+      else
+        to_compare_with_type(column_names, column_family, standard)
+      end
+    end
+
+    def to_compare_with_type(column_name, column_family, standard=true)
+      return column_name if column_name.nil?
+      klass = if standard
+        column_name_class(column_family)
+      else
+        sub_column_name_class(column_family)
+      end
+
+      klass.new(column_name)
+    end
+
+    def cf(column_family)
+      @data[column_family.to_sym] ||= OrderedHash.new
+    end
+
+    def merge_and_sort(old_stuff, new_stuff)
+      if new_stuff.is_a?(Array)
+        new_stuff = new_stuff.inject({}){|h,k| h[k] = nil; h }
+      end
+
+      new_stuff = new_stuff.to_a.inject({}){|h,k| h[k[0].to_s] = k[1]; h }
+
+      new_stuff.each { |k,v| old_stuff.[]=(k, v, (Time.now.to_f * 1000000).to_i) }
+      hash = OrderedHash.new
+      old_stuff.sort{ |a,b| a[0] <=> b[0] }.each do |k, v|
+        hash.[]=(k, v, old_stuff.timestamps[k])
+      end
+      hash
+    end
+
+    def columns_to_hash(column_family, columns)
+      column_class, sub_column_class = column_name_class(column_family), sub_column_name_class(column_family)
+      output = OrderedHash.new
+
+      columns.each do |column_name, value|
+        timestamp = columns.timestamps[column_name]
+        column = column_class.new(column_name)
+
+        if [Hash, OrderedHash].include?(value.class)
+          output[column] ||= OrderedHash.new
+          value.each do |sub_column, sub_column_value|
+            timestamp = value.timestamps[sub_column]
+            output[column].[]=(sub_column_class.new(sub_column), sub_column_value, timestamp)
+          end
+        else
+          output.[]=(column_class.new(column_name), value, timestamp)
+        end
+      end
+
+      output
+    end
+
+    def apply_count(row, count, reversed=false)
+      if count
+        keys = row.keys.sort
+        keys = keys.reverse if reversed
+        keys = keys[0...count]
+        keys.inject(OrderedHash.new) do |memo, key|
+          memo.[]=(key, row[key], row.timestamps[key])
+          memo
+        end
+      else
+        row
+      end
+    end
+
+    def apply_range(row, column_family, strt, fin, standard=true)
+      start  = to_compare_with_type(strt, column_family, standard)
+      finish = to_compare_with_type(fin,  column_family, standard)
+      ret = OrderedHash.new
+      row.keys.each do |key|
+        if (start.nil? || key >= start) && (finish.nil? || key <= finish)
+          ret.[]=(key, row[key], row.timestamps[key])
+        end
+      end
+      ret
+    end
+
+  end
+end