cassandra 0.7.4 → 0.7.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7.5 Another packaging error.
+
 v0.7.4 Fix thrift_client dependency
 
 v0.7.3 New Cassandra::Mock - a pure ruby mock of cassanra; bugfixes.

data/Manifest

@@ -14,10 +14,13 @@ 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/protocol.rb
 lib/cassandra/time.rb
+test/cassandra_mock_test.rb
 test/cassandra_test.rb
 test/comparable_types_test.rb
 test/ordered_hash_test.rb

data/cassandra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = ["cassandra_helper"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "bin/cassandra_helper", "lib/cassandra.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/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.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/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec", "test/cassandra_mock_test.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "bin/cassandra_helper", "lib/cassandra.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/protocol.rb", "lib/cassandra/time.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.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/protocol.rb", "lib/cassandra/time.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/cassandra.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'thrift_client'
 require 'json'
 require 'simple_uuid'
+include SimpleUUID
 here = File.expand_path(File.dirname(__FILE__))
 
 $LOAD_PATH << "#{here}/../vendor/gen-rb"

data/lib/cassandra/helpers.rb

@@ -0,0 +1,38 @@
+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 #{calling_method}" 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 #{calling_method}" if extras.any?
+        options.merge!(args.pop)      
+      end
+
+      # Ranges
+      column, sub_column = args[0], args[1]
+      klass, sub_klass = column_name_class(column_family), sub_column_name_class(column_family)
+      range_class = column ? sub_klass : klass
+      options[:start] = options[:start] ? range_class.new(options[:start]).to_s : ""
+      options[:finish] = options[:finish] ? range_class.new(options[:finish]).to_s : ""
+
+      [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/mock.rb

@@ -0,0 +1,300 @@
+require 'nokogiri'
+
+class UUID
+  def >=(other)
+    (self <=> other) >= 0
+  end
+
+  def <=(other)
+    (self <=> other) <= 0
+  end
+end
+
+class Cassandra
+  class Mock
+    include ::Cassandra::Helpers
+    include ::Cassandra::Columns
+
+    def initialize(keyspace, servers=nil, options={})
+      @keyspace = keyspace
+      @column_name_class = {}
+      @sub_column_name_class = {}
+      @storage_xml = options[:storage_xml]
+    end
+
+    def clear_keyspace!
+      @data = {}
+    end
+
+    def clear_column_family!(column_family)
+      @data[column_family.to_sym] = OrderedHash.new
+    end
+
+    def insert(column_family, key, hash, options = {})
+      if @batch
+        @batch << [:insert, column_family, key, hash, options]
+      else
+        raise ArgumentError if key.nil?
+        if column_family_type(column_family) == 'Standard'
+          insert_standard(column_family, key, hash)
+        else
+          insert_super(column_family, key, hash)
+        end
+      end
+    end
+
+    def insert_standard(column_family, key, hash)
+      if cf(column_family)[key]
+        cf(column_family)[key] = merge_and_sort(cf(column_family)[key], hash)
+      else
+        cf(column_family)[key] = OrderedHash[hash.sort{|a,b| a[0] <=> b[0]}]
+      end
+    end
+
+    def insert_super(column_family, key, hash)
+      cf(column_family)[key] ||= OrderedHash.new
+      hash.keys.each do |sub_key|
+        if cf(column_family)[key][sub_key]
+          cf(column_family)[key][sub_key] = merge_and_sort(cf(column_family)[key][sub_key], hash[sub_key])
+        else
+          cf(column_family)[key][sub_key] = OrderedHash[hash[sub_key].sort{|a,b| a[0] <=> b[0]}]
+        end
+      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 column_family_type(column_family) == 'Standard'
+        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)
+      row = cf(column_family)[key] || OrderedHash.new
+      if column
+        row[column]
+      else
+        apply_count(row, options[:count], options[:reversed])
+      end
+    end
+
+    def get_super(column_family, key, column, sub_column, options)
+      if column
+        if sub_column
+          if cf(column_family)[key] &&
+             cf(column_family)[key][column] &&
+             cf(column_family)[key][column][sub_column]
+            cf(column_family)[key][column][sub_column]
+          else
+            nil
+          end
+        else
+          row = cf(column_family)[key] && cf(column_family)[key][column] ?
+            cf(column_family)[key][column] :
+            OrderedHash.new
+          if options[:start] || options[:finish]
+            start  = to_compare_with_type(options[:start],  column_family, false)
+            finish = to_compare_with_type(options[:finish], column_family, false)
+            ret = OrderedHash.new
+            row.keys.each do |key|
+              if (start.nil? || key >= start) && (finish.nil? || key <= finish)
+                ret[key] = row[key]
+              end
+            end
+            row = ret
+          end
+          apply_count(row, options[:count], options[:reversed])
+        end
+      elsif cf(column_family)[key]
+        cf(column_family)[key]
+      else
+        OrderedHash.new
+      end
+    end
+
+    def exists?(column_family, key, column=nil)
+      !!get(column_family, key, column)
+    end
+
+    def multi_get(column_family, keys)
+      keys.inject(OrderedHash.new) do |hash, key|
+        hash[key] = get(column_family, key)
+        hash
+      end
+    end
+
+    def remove(column_family, key, column=nil, sub_column=nil)
+      if @batch
+        @batch << [:remove, column_family, key, column]
+      else
+        if column
+          if sub_column
+            cf(column_family)[key][column].delete(sub_column)
+          else
+            cf(column_family)[key].delete(column)
+          end
+        else
+          cf(column_family).delete(key)
+        end
+      end
+    end
+
+    def get_columns(column_family, key, columns)
+      d = get(column_family, key)
+      columns.collect do |column|
+        d[column]
+      end
+    end
+
+    def count_columns(column_family, key, column=nil)
+      get(column_family, key, column).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 = {})
+      column_family, _, _, options = 
+        extract_and_validate_params_for_real(column_family, "", [options], READ_DEFAULTS)
+      _get_range(column_family, options[:start], options[:finish], options[:count]).keys
+    end
+
+    def count_range(column_family, options={})
+      count = 0
+      l = []
+      start_key = ''
+      while (l = get_range(column_family, options.merge(:count => 1000, :start => start_key))).size > 0
+        count += l.size
+        start_key = l.last.succ
+      end
+      count
+    end
+
+    def schema(load=true)
+      if !load && !@schema
+        []
+      else
+        @schema ||= schema_for_keyspace(@keyspace)
+      end
+    end
+
+    private
+
+    def _get_range(column_family, start, finish, count)
+      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 >= count
+        if (start.nil? || key >= start) && (finish.nil? || key <= finish)
+          ret[key] = cf(column_family)[key]
+        end
+      end
+      ret
+    end
+
+    def schema_for_keyspace(keyspace)
+      doc = read_storage_xml
+      ret = {}
+      doc.css("Keyspaces Keyspace[@Name='#{keyspace}']").css('ColumnFamily').each do |cf|
+        ret[cf['Name']] = {}
+        if cf['CompareSubcolumnsWith']
+          ret[cf['Name']]['CompareSubcolumnsWith'] = 'org.apache.cassandra.db.marshal.' + cf['CompareSubcolumnsWith']
+        end
+        if cf['CompareWith']
+          ret[cf['Name']]['CompareWith'] = 'org.apache.cassandra.db.marshal.' + cf['CompareWith']
+        end
+        if cf['ColumnType']
+          ret[cf['Name']]['Type'] = 'Super'
+        else
+          ret[cf['Name']]['Type'] = 'Standard'
+        end
+      end
+      ret
+    end
+
+    def read_storage_xml
+      @doc ||= Nokogiri::XML(open(@storage_xml))
+    end
+
+    def extract_and_validate_params_for_real(column_family, keys, args, options)
+      column_family, column, 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_type(column, column_family), to_compare_with_type(sub_column, column_family, false), options]
+    end
+
+    def to_compare_with_type(column_name, column_family, standard=true)
+      return column_name if column_name.nil?
+      klass = if standard
+        schema[column_family.to_s]["CompareWith"]
+      else
+        schema[column_family.to_s]["CompareSubcolumnsWith"]
+      end
+
+      case klass
+      when "org.apache.cassandra.db.marshal.UTF8Type"
+        column_name
+      when "org.apache.cassandra.db.marshal.TimeUUIDType"
+        UUID.new(column_name)
+      when "org.apache.cassandra.db.marshal.LongType"
+        Long.new(column_name)
+      else
+        p klass
+        raise
+      end
+    end
+
+    def column_family_type(column_family)
+      schema[column_family.to_s]['Type']
+    end
+
+    def cf(column_family)
+      @data[column_family.to_sym] ||= OrderedHash.new
+    end
+
+    def merge_and_sort(old_stuff, new_stuff)
+      OrderedHash[old_stuff.merge(new_stuff).sort{|a,b| a[0] <=> b[0]}]
+    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]
+          memo
+        end
+      else
+        row
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -97,7 +97,9 @@ extra_rdoc_files:
 - 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/protocol.rb
 - lib/cassandra/time.rb
@@ -118,10 +120,13 @@ files:
 - 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/protocol.rb
 - lib/cassandra/time.rb
+- test/cassandra_mock_test.rb
 - test/cassandra_test.rb
 - test/comparable_types_test.rb
 - test/ordered_hash_test.rb