cassandra_client 0.1 → 0.2

data/CHANGELOG

@@ -1,2 +1,4 @@
 
+v0.2. Re-factor table vs. column family interface per discussion with jbellis.
+
 v0.1. First release.

data/Manifest

@@ -2,10 +2,11 @@ CHANGELOG
 conf/cassandra.in.sh
 conf/log4j.properties
 conf/storage-conf.xml
-lib/cassandra_client/client.rb
+lib/cassandra_client/cassandra_client.rb
+lib/cassandra_client/helper.rb
 lib/cassandra_client/ordered_hash.rb
+lib/cassandra_client/safe_client.rb
 lib/cassandra_client/serialization.rb
-lib/cassandra_client/table.rb
 lib/cassandra_client.rb
 LICENSE
 Manifest

data/README

@@ -19,7 +19,9 @@ The public certificate for this gem is here[http://rubyforge.org/frs/download.ph
 
 This is an alpha release and does not yet support the full Thrift API. 
 
-Cassandra is a rapidly moving target; this library is currently tested againt Cassandra trunk revision 789419.
+Cassandra is a rapidly moving target; this library is currently tested against {Cassandra trunk revision 789419}[http://blog.evanweaver.com/files/cassandra/cassandra-r789419.tar.bz2]. 
+
+The Github source repository is {here}[http://github.com/fauna/cassandra_client/]; patches and contributions are very welcome.
 
 == Installation
 
@@ -35,32 +37,27 @@ Require the library:
   
   require 'cassandra_client'
   
-Connect to a server:
+Connect to a server and keyspace:
   
-  client = CassandraClient.new("127.0.0.1")
+  client = CassandraClient.new('Twitter', "127.0.0.1")
   
-Get a keyspace:
-
-  users = client.table('Users')  
-
 Insert into a column family. You can insert a CassandraClient::OrderedHash, or a regular Hash, if order doesn't matter:
 
-  users.insert("5", :row, {'screen_name' => "buttonscat"})  
+  client.insert(:Users, "5", {'screen_name' => "buttonscat"})  
 
 Insert into a super column family:
 
-  users.insert("5", :relationships, {"user_timeline" => {"1" => ""}})
+  client.insert(:UserRelationships, "5", {"user_timeline" => {"1" => ""}})
 
 Query a super column:
 
-  timeline = users.get("5", :relationships, "user_timeline")
+  timeline = client.get(:UserRelationships, "5", "user_timeline")
   
 The returned result will always be a CassandraClient::OrderedHash.
 
-See CassandraClient::Table for more methods.
+See CassandraClient and CassandraClient::Table for more methods.
 
 == Reporting problems
 
 The Github issue tracker is {here}[http://github.com/fauna/cassandra_client/issues]. If you have problems with Cassandra itself, please use the {cassandra-user mailing list}[http://mail-archives.apache.org/mod_mbox/incubator-cassandra-user/].
 
-Patches and contributions are very welcome. Please note that contributors are required to assign copyright for their additions to Twitter, Inc.

data/Rakefile

@@ -7,6 +7,7 @@ Echoe.new("cassandra_client") do |p|
   p.rubygems_version = ">= 0.8"
   p.dependencies = ['json']
   p.ignore_pattern = /^(data|vendor\/cassandra|cassandra-r789419|vendor\/thrift)/
+  p.rdoc_pattern = /^(lib|bin|tasks|ext)|_types.rb|_constants.rb|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
   p.url = "http://blog.evanweaver.com/files/doc/fauna/cassandra_client/"
   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
 end

data/cassandra_client.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra_client}
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-07-04}
+  s.date = %q{2009-07-06}
   s.description = %q{A Ruby client for CassandraDB.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/cassandra_client/client.rb", "lib/cassandra_client/ordered_hash.rb", "lib/cassandra_client/serialization.rb", "lib/cassandra_client/table.rb", "lib/cassandra_client.rb", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra_client/client.rb", "lib/cassandra_client/ordered_hash.rb", "lib/cassandra_client/serialization.rb", "lib/cassandra_client/table.rb", "lib/cassandra_client.rb", "LICENSE", "Manifest", "quickstart.sh", "Rakefile", "README", "test/cassandra_client_test.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra_client.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/cassandra_client/cassandra_client.rb", "lib/cassandra_client/helper.rb", "lib/cassandra_client/ordered_hash.rb", "lib/cassandra_client/safe_client.rb", "lib/cassandra_client/serialization.rb", "lib/cassandra_client.rb", "LICENSE", "README", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb"]
+  s.files = ["CHANGELOG", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra_client/cassandra_client.rb", "lib/cassandra_client/helper.rb", "lib/cassandra_client/ordered_hash.rb", "lib/cassandra_client/safe_client.rb", "lib/cassandra_client/serialization.rb", "lib/cassandra_client.rb", "LICENSE", "Manifest", "quickstart.sh", "Rakefile", "README", "test/cassandra_client_test.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra_client.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra_client/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra_client", "--main", "README"]
   s.require_paths = ["lib"]

data/conf/storage-conf.xml

@@ -20,7 +20,7 @@
     <!--======================================================================-->
     <!-- Basic Configuration                                                  -->
     <!--======================================================================-->
-    <ClusterName>Up and Running</ClusterName>
+    <ClusterName>Test</ClusterName>
 
     <!-- Tables and ColumnFamilies                                            
          Think of a table as a namespace, not a relational table.
@@ -29,22 +29,19 @@
          There is an implicit table named 'system' for Cassandra internals.
     -->
     <Tables>
-      <Table Name="Users">
-          <ColumnFamily ColumnSort="Name" Name="row" />
-          <ColumnFamily ColumnSort="Name" Name="audit" />
-          <ColumnFamily ColumnType="Super" ColumnSort="Name" Name="relationships" />
-          <ColumnFamily ColumnSort="Time" Name="usernames" />
+      <Table Name="Twitter">
+          <ColumnFamily ColumnSort="Name" Name="Users" />
+          <ColumnFamily ColumnSort="Name" Name="UserAudits" />
+          <ColumnFamily ColumnType="Super" ColumnSort="Name" Name="UserRelationships" />
+          <ColumnFamily ColumnSort="Time" Name="Usernames" />
+          <ColumnFamily ColumnSort="Time" Name="Statuses" />
+          <ColumnFamily ColumnSort="Name" Name="StatusAudits" />
+          <ColumnFamily ColumnType="Super" ColumnSort="Name" Name="StatusRelationships" />  
       </Table>
 
-      <Table Name="Statuses">
-          <ColumnFamily ColumnSort="Time" Name="row" />
-          <ColumnFamily ColumnSort="Name" Name="audit" />
-          <ColumnFamily ColumnType="Super" ColumnSort="Name" Name="relationships" />  
-      </Table>
-
-      <Table Name="Blogs">      
-        <ColumnFamily ColumnSort="Time" Name="posts"/>
-        <ColumnFamily ColumnSort="Time" Name="comments"/>
+      <Table Name="Multiblog">      
+        <ColumnFamily ColumnSort="Time" Name="Blogs"/>
+        <ColumnFamily ColumnSort="Time" Name="Comments"/>
       </Table>
     </Tables>
 

data/lib/cassandra_client.rb

@@ -5,10 +5,11 @@ require 'thrift'
 
 HERE = File.expand_path(File.dirname(__FILE__))
 
-require "#{HERE}/cassandra_client/client"
-require "#{HERE}/cassandra_client/table"
+require "#{HERE}/cassandra_client/helper"
+require "#{HERE}/cassandra_client/safe_client"
 require "#{HERE}/cassandra_client/serialization"
 require "#{HERE}/cassandra_client/ordered_hash"
+require "#{HERE}/cassandra_client/cassandra_client"
 
 $LOAD_PATH << "#{HERE}/../vendor/gen-rb"
 require 'cassandra'

data/lib/cassandra_client/cassandra_client.rb

@@ -0,0 +1,170 @@
+class CassandraClient
+  include Helper  
+  class AccessError < StandardError; end
+  
+  MAX_INT = 2**31 - 1  
+
+  attr_reader :keyspace, :host, :port, :quorum, :serialization, :transport, :client, :schema
+
+  # Instantiate a new CassandraClient and open the connection.
+  def initialize(keyspace, host = '127.0.0.1', port = 9160, quorum = 1, serialization = CassandraClient::Serialization::JSON)
+    @keyspace = keyspace
+    @host = host
+    @port = port
+    @quorum = quorum
+    @serialization = serialization
+
+    extend(@serialization)
+    
+    @transport = Thrift::BufferedTransport.new(Thrift::Socket.new(@host, @port))
+    @transport.open    
+    @client = Cassandra::SafeClient.new(
+      Cassandra::Client.new(Thrift::BinaryProtocol.new(@transport)), 
+      @transport)
+
+    keyspaces = @client.getStringListProperty("tables")
+    unless keyspaces.include?(@keyspace)
+      raise AccessError, "Keyspace #{@keyspace.inspect} not found. Available: #{keyspaces.inspect}"
+    end
+        
+    @schema = @client.describeTable(@keyspace)
+  end
+    
+  def inspect
+    "#<CassandraClient:#{object_id}, @keyspace=#{keyspace.inspect}, @schema={#{
+      schema.map {|name, hash| ":#{name} => #{hash['type'].inspect}"}.join(', ')
+    }}, @host=#{host.inspect}, @port=#{port}, @quorum=#{quorum}, @serialization=#{serialization.name}>"
+  end
+
+  ## Write
+  
+  # Insert a row for a key. Pass a flat hash for a regular column family, and 
+  # a nested hash for a super column family.
+  def insert(column_family, key, hash, timestamp = now)
+    column_family = column_family.to_s    
+    insert = is_super(column_family) ? :insert_super : :insert_standard
+    send(insert, column_family, key, hash, timestamp)
+  end
+  
+  private
+
+  def insert_standard(column_family, key, hash, timestamp = now)
+    mutation = Batch_mutation_t.new(
+      :table => @keyspace, 
+      :key => key, 
+      :cfmap => {column_family => hash_to_columns(hash, timestamp)})
+    @client.batch_insert(mutation, @quorum)
+  end 
+
+  def insert_super(column_family, key, hash, timestamp = now)
+    mutation = Batch_mutation_super_t.new(
+      :table => @keyspace, 
+      :key => key, 
+      :cfmap => {column_family => hash_to_super_columns(hash, timestamp)})
+    @client.batch_insert_superColumn(mutation, @quorum)
+  end 
+  
+  public
+  
+  ## Delete
+  
+  # Remove the element at the column_family:key:super_column:column 
+  # path you request.
+  def remove(column_family, key, super_column = nil, column = nil, timestamp = now)
+    column_family = column_family.to_s
+    column_family += ":#{super_column}" if super_column
+    column_family += ":#{column}" if column
+    @client.remove(@keyspace, key, column_family, timestamp, @quorum)
+  end
+  
+  # Remove all rows in the column family you request.
+  def clear_column_family!(column_family)
+    get_key_range(column_family).each do |key| 
+      remove(column_family, key)
+    end
+  end
+
+  # Remove all rows in the keyspace
+  def clear_keyspace!
+    @schema.keys.each do |column_family|
+      clear_column_family!(column_family)
+    end
+  end
+  
+  ## Read
+
+  # Count the elements at the column_family:key:super_column path you 
+  # request.
+  def count_columns(column_family, key, super_column = nil)
+    column_family = column_family.to_s
+    column_family += ":#{super_column}" if super_column
+    @client.get_column_count(@keyspace, key, column_family)
+  end
+  
+  # Return a list of single values for the elements at the
+  # column_family:key:super_column:column path you request.
+  def get_columns(column_family, key, super_columns, columns = nil)
+    column_family = column_family.to_s
+    get_slice_by_names = (is_super(column_family) && !columns) ? :get_slice_super_by_names : :get_slice_by_names
+    if super_columns and columns
+      column_family += ":#{super_columns}" 
+      columns = Array(columns)
+    else
+      columns = Array(super_columns)
+    end
+        
+    hash = columns_to_hash(@client.send(get_slice_by_names, @keyspace, key, column_family, columns))
+    columns.map { |column| hash[column] }
+  end
+        
+  # Return a hash (actually, a CassandraClient::OrderedHash) or a single value 
+  # representing the element at the column_family:key:super_column:column 
+  # path you request.
+  def get(column_family, key, super_column = nil, column = nil, offset = -1, limit = 100)
+    column_family = column_family.to_s
+    column_family += ":#{super_column}" if super_column
+    column_family += ":#{column}" if column          
+    
+    # You have got to be kidding
+    if is_super(column_family)
+      if column
+        load(@client.get_column(@keyspace, key, column_family).value)
+      elsif super_column
+        columns_to_hash(@client.get_superColumn(@keyspace, key, column_family).columns)
+      else
+        columns_to_hash(@client.get_slice_super(@keyspace, key, "#{column_family}:", offset, limit))
+      end
+    else
+      if super_column
+        load(@client.get_column(@keyspace, key, column_family).value)
+      elsif is_sorted_by_time(column_family)
+        result = columns_to_hash(@client.get_columns_since(@keyspace, key, column_family, 0))
+
+        # FIXME Hack until get_slice on a time-sorted column family works again
+        result = OrderedHash[*flatten_once(result.to_a[offset, limit])] if offset > -1
+        result
+      else
+        columns_to_hash(@client.get_slice(@keyspace, key, "#{column_family}:", offset, limit))
+      end 
+    end
+  rescue NotFoundException
+    is_super(column_family) && !column ? {} : nil
+  end  
+  
+  # FIXME
+  # def get_recent(column_family, key, super_column = nil, column = nil, timestamp = 0)
+  # end
+
+  # Return a list of keys in the column_family you request. Requires the
+  # table to be partitioned with OrderPreservingHash.
+  def get_key_range(column_family, key_range = ''..'', limit = 100)      
+    column_families = Array(column_family).map {|c| c.to_s}
+    @client.get_key_range(@keyspace, column_families, key_range.begin, key_range.end, limit)
+  end
+  
+  # Count all rows in the column_family you request. Requires the table 
+  # to be partitioned with OrderPreservingHash.
+  def count(column_family, key_range = ''..'', limit = MAX_INT)
+    get_key_range(column_family, key_range, limit).size
+  end      
+end

data/lib/cassandra_client/helper.rb

@@ -0,0 +1,57 @@
+class CassandraClient
+  module Helper
+
+    private
+    
+    def is_super(column_family)
+      column_family_property(column_family, 'type') == 'Super'
+    end
+
+    def is_sorted_by_time(column_family)
+      column_family_property(column_family, 'sort') == 'Time'
+    end
+    
+    def column_family_property(column_family_or_path, key)
+      column_family = column_family_or_path.to_s.split(':').first    
+      @schema[column_family][key]
+    rescue NoMethodError
+      raise AccessError, "Invalid column family \":#{column_family}\""    
+    end
+    
+    def columns_to_hash(columns)
+      hash = ::CassandraClient::OrderedHash.new
+      Array(columns).each do |c| 
+        if c.is_a?(SuperColumn_t)
+          hash[c.name] = columns_to_hash(c.columns)
+        else
+          hash[c.columnName] = load(c.value)
+        end
+      end
+      hash
+    end  
+    
+    def hash_to_columns(hash, timestamp)
+      hash.map do |column, value|
+        Column_t.new(:columnName => column, :value => dump(value), :timestamp => timestamp)
+      end    
+    end
+    
+    def hash_to_super_columns(hash, timestamp)
+      hash.map do |super_column, columns|
+        SuperColumn_t.new(:name => super_column, :columns => hash_to_columns(columns, timestamp))
+      end
+    end
+    
+    def time_in_microseconds
+      time = Time.now
+      time.to_i * 1_000_000 + time.usec
+    end
+    alias :now :time_in_microseconds
+    
+    def flatten_once(array)
+      result = []
+      array.each { |el| result.concat(el) }
+      result
+    end    
+  end
+end

data/lib/cassandra_client/ordered_hash.rb

@@ -1,30 +1,31 @@
-#  Copyright (c) 2004-2009 David Heinemeier Hansson
-#  
-#  Permission is hereby granted, free of charge, to any person obtaining
-#  a copy of this software and associated documentation files (the
-#  "Software"), to deal in the Software without restriction, including
-#  without limitation the rights to use, copy, modify, merge, publish,
-#  distribute, sublicense, and/or sell copies of the Software, and to
-#  permit persons to whom the Software is furnished to do so, subject to
-#  the following conditions:
-#  
-#  The above copyright notice and this permission notice shall be
-#  included in all copies or substantial portions of the Software.
-#  
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-#  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class CassandraClient
   # Hash is ordered in Ruby 1.9!
   if RUBY_VERSION >= '1.9'
     OrderedHash = ::Hash
-  else
-    class OrderedHash < Hash #:nodoc:
+  else  
+    #  Copyright (c) 2004-2009 David Heinemeier Hansson
+    #  
+    #  Permission is hereby granted, free of charge, to any person obtaining
+    #  a copy of this software and associated documentation files (the
+    #  "Software"), to deal in the Software without restriction, including
+    #  without limitation the rights to use, copy, modify, merge, publish,
+    #  distribute, sublicense, and/or sell copies of the Software, and to
+    #  permit persons to whom the Software is furnished to do so, subject to
+    #  the following conditions:
+    #  
+    #  The above copyright notice and this permission notice shall be
+    #  included in all copies or substantial portions of the Software.
+    #  
+    #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    #  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    #  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    #  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    #  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    #  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    #  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+    class OrderedHash < Hash
       require 'enumerator'    
     
       def self.[](*array)

data/lib/cassandra_client/safe_client.rb

@@ -0,0 +1,18 @@
+
+module Cassandra
+  class SafeClient  
+    def initialize(client, transport)
+      @client = client 
+      @transport = transport
+    end
+    
+    def method_missing(*args)
+      @client.send(*args)
+    rescue IOError
+      @transport.open
+      raise if defined?(once)
+      once = true
+      retry
+    end
+  end
+end

data/test/cassandra_client_test.rb

@@ -6,194 +6,198 @@ begin; require 'ruby-debug'; rescue LoadError; end
 
 class CassandraClientTest < Test::Unit::TestCase
   def setup
-    @client = CassandraClient.new('127.0.0.1')
-    @client.remove_all
-    @statuses = @client.table('Statuses')
-    @users = @client.table('Users')
+    @twitter = CassandraClient.new('Twitter', '127.0.0.1')
+    @twitter.clear_keyspace!
+    @blogs = CassandraClient.new('Multiblog', '127.0.0.1')
+    @blogs.clear_keyspace!
   end
   
   def test_inspect
     assert_nothing_raised do
-      @statuses.inspect
-      @client.inspect
+      @blogs.inspect
+      @twitter.inspect
     end
   end
   
   def test_connection_reopens
     assert_raises(NoMethodError) do
-      @statuses.insert(1, :row, {'body' => 'v'})
+      @twitter.insert(:Statuses, 1, {'body' => 'v'})
     end
     assert_nothing_raised do
-      @statuses.insert(key, :row, {'body' => 'v'})
+      @twitter.insert(:Statuses, key, {'body' => 'v'})
     end
   end  
 
   def test_get_key_name_sorted
-    @users.insert(key, :row, {'body' => 'v', 'user' => 'v'})
-    assert_equal({'body' => 'v', 'user' => 'v'}, @users.get(key, :row))
-    assert_equal({}, @users.get('bogus', :row))
+    @twitter.insert(:Users, key, {'body' => 'v', 'user' => 'v'})
+    assert_equal({'body' => 'v', 'user' => 'v'}, @twitter.get(:Users, key))
+    assert_equal({}, @twitter.get(:Users, 'bogus'))
   end
   
   def test_get_key_name_sorted_preserving_order
     # In-order hash is preserved
     hash = CassandraClient::OrderedHash['a', '', 'b', '', 'c', '', 'd', '',]    
-    @users.insert(key, :row, hash)
-    assert_equal(hash.keys, @users.get(key, :row).keys)
+    @twitter.insert(:Users, key, hash)
+    assert_equal(hash.keys, @twitter.get(:Users, key).keys)
     
-    @users.remove(key, :row)
+    @twitter.remove(:Users, key)
         
     # Out-of-order hash is returned sorted
     hash = CassandraClient::OrderedHash['b', '', 'c', '', 'd', '', 'a', '']    
-    @users.insert(key, :row, hash)
-    assert_equal(hash.keys.sort, @users.get(key, :row).keys)
-    assert_not_equal(hash.keys, @users.get(key, :row).keys)
+    @twitter.insert(:Users, key, hash)
+    assert_equal(hash.keys.sort, @twitter.get(:Users, key).keys)
+    assert_not_equal(hash.keys, @twitter.get(:Users, key).keys)
   end  
 
   def test_get_key_time_sorted
-    @statuses.insert(key, :row, {'body' => 'v', 'user' => 'v'})
-    assert_equal({'body' => 'v', 'user' => 'v'}, @statuses.get(key, :row))
-    assert_equal({}, @statuses.get('bogus', :row))
+    @twitter.insert(:Statuses, key, {'body' => 'v', 'user' => 'v'})
+    assert_equal({'body' => 'v', 'user' => 'v'}, @twitter.get(:Statuses, key))
+    assert_equal({}, @twitter.get(:Statuses, 'bogus'))
   end
     
   def test_get_key_time_sorted_with_limit
-    @statuses.insert(key, :row, {'first' => 'v'})
-    @statuses.insert(key, :row, {'second' => 'v'})
-    assert_equal({'second' => 'v'}, @statuses.get(key, :row, nil, nil, 0, 1))
+    @twitter.insert(:Statuses, key, {'first' => 'v'})
+    @twitter.insert(:Statuses, key, {'second' => 'v'})
+    assert_equal({'second' => 'v'}, @twitter.get(:Statuses, key, nil, nil, 0, 1))
   end    
 
   def test_get_value
-    @statuses.insert(key, :row, {'body' => 'v'})
-    assert_equal 'v', @statuses.get(key, :row, 'body')
-    assert_nil @statuses.get('bogus', :row, 'body')
+    @twitter.insert(:Statuses, key, {'body' => 'v'})
+    assert_equal 'v', @twitter.get(:Statuses, key, 'body')
+    assert_nil @twitter.get(:Statuses, 'bogus', 'body')
   end
     
   def test_get_super_key
-    @statuses.insert(key, :relationships, {'user_timelines' => {'4' => 'v', '5' => 'v'}})
-    assert_equal({'user_timelines' => {'4' => 'v', '5' => 'v'}}, @statuses.get(key, :relationships))
-    assert_equal({}, @statuses.get('bogus', :relationships))
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'4' => 'v', '5' => 'v'}})
+    assert_equal({'user_timelines' => {'4' => 'v', '5' => 'v'}}, @twitter.get(:StatusRelationships, key))
+    assert_equal({}, @twitter.get(:StatusRelationships, 'bogus'))
   end
 
   def test_get_super_key_multi
-    @statuses.insert(key, :relationships, {
+    @twitter.insert(:StatusRelationships, key, {
       'user_timelines' => {'1' => 'v1'}, 
       'mentions_timelines' => {'2' => 'v2'}})
     assert_equal({
       'user_timelines' => {'1' => 'v1'}, 
-      'mentions_timelines' => {'2' => 'v2'}}, @statuses.get(key, :relationships))
-    assert_equal({}, @statuses.get('bogus', :relationships))
+      'mentions_timelines' => {'2' => 'v2'}}, @twitter.get(:StatusRelationships, key))
+    assert_equal({}, @twitter.get(:StatusRelationships, 'bogus'))
   end
 
   def test_get_super_sub_key
-    @statuses.insert(key, :relationships, {'user_timelines' => {'4' => 'v', '5' => 'v'}})
-    assert_equal({'4' => 'v', '5' => 'v'}, @statuses.get(key, :relationships, 'user_timelines'))
-    assert_equal({}, @statuses.get('bogus', :relationships, 'user_timelines'))
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'4' => 'v', '5' => 'v'}})
+    assert_equal({'4' => 'v', '5' => 'v'}, @twitter.get(:StatusRelationships, key, 'user_timelines'))
+    assert_equal({}, @twitter.get(:StatusRelationships, 'bogus', 'user_timelines'))
   end
   
   def test_get_super_value
-    @statuses.insert(key, :relationships, {'user_timelines' => {'1' => 'v'}})
-    assert_equal('v', @statuses.get(key, :relationships, 'user_timelines', '1'))
-    assert_nil @statuses.get('bogus', :relationships, 'user_timelines', '1')
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'1' => 'v'}})
+    assert_equal('v', @twitter.get(:StatusRelationships, key, 'user_timelines', '1'))
+    assert_nil @twitter.get(:StatusRelationships, 'bogus', 'user_timelines', '1')
   end  
   
   def test_get_key_range
-    @statuses.insert('3', :row, {'body' => 'v'})
-    @statuses.insert('4', :row, {'body' => 'v'})
-    @statuses.insert('5', :row, {'body' => 'v'})
-    assert_equal(['3', '4', '5'], @statuses.get_key_range('3'..'5', :row))
+    @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_key_range(:Statuses, '3'..'5'))
   end
 
   # Not supported
   #  def test_get_key_range_super
-  #    @statuses.insert('3', :relationships, {'user_timelines' => {'1' => 'v'}})
-  #    @statuses.insert('4', :relationships, {'user_timelines' => {'1' => 'v'}})
-  #    @statuses.insert('5', :relationships, {'user_timelines' => {'1' => 'v'}})
-  #    assert_equal(['3', '4', '5'], @statuses.get_key_range('3'..'5', :relationships, 'user_timelines'))
+  #    @twitter.insert(:StatusRelationships, '2', {'user_timelines' => {'1' => 'v'}})
+  #    @twitter.insert(:StatusRelationships, '3', {'user_timelines' => {'1' => 'v'}})
+  #    @twitter.insert(:StatusRelationships, '4', {'user_timelines' => {'1' => 'v'}})
+  #    @twitter.insert(:StatusRelationships, '5', {'user_timelines' => {'1' => 'v'}})
+  #    @twitter.insert(:StatusRelationships, '6', {'user_timelines' => {'1' => 'v'}})
+  #    assert_equal(['3', '4', '5'], @twitter.get_key_range(:StatusRelationships, '3'..'5', 'user_timelines'))
   #  end
   
   def test_remove_key
-    @statuses.insert(key, :row, {'body' => 'v'})
-    @statuses.remove(key, :row)
-    assert_equal({}, @statuses.get(key, :row))
+    @twitter.insert(:Statuses, key, {'body' => 'v'})
+    @twitter.remove(:Statuses, key)
+    assert_equal({}, @twitter.get(:Statuses, key))
   end
 
   def test_remove_value
-    @statuses.insert(key, :row, {'body' => 'v'})
-    @statuses.remove(key, :row, 'body')
-    assert_nil @statuses.get(key, :row, 'body')    
+    @twitter.insert(:Statuses, key, {'body' => 'v'})
+    @twitter.remove(:Statuses, key, 'body')
+    assert_nil @twitter.get(:Statuses, key, 'body')    
   end
 
   def test_remove_super_key
-    @statuses.insert(key, :relationships, {'user_timelines' => {'1' => 'v'}})
-    @statuses.remove(key, :relationships)
-    assert_equal({}, @statuses.get(key, :relationships))
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'1' => 'v'}})
+    @twitter.remove(:StatusRelationships, key)
+    assert_equal({}, @twitter.get(:StatusRelationships, key))
   end
 
   def test_remove_super_sub_key
-    @statuses.insert(key, :relationships, {'user_timelines' => {'1' => 'v'}})
-    @statuses.remove(key, :relationships, 'user_timelines')
-    assert_equal({}, @statuses.get(key, :relationships, 'user_timelines'))
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'1' => 'v'}})
+    @twitter.remove(:StatusRelationships, key, 'user_timelines')
+    assert_equal({}, @twitter.get(:StatusRelationships, key, 'user_timelines'))
   end
 
   def test_remove_super_value
-    @statuses.insert(key, :relationships, {'user_timelines' => {'1' => 'v'}})
-    @statuses.remove(key, :relationships, 'user_timelines', '1')
-    assert_nil @statuses.get(key, :relationships, 'user_timelines', '1')    
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'1' => 'v'}})
+    @twitter.remove(:StatusRelationships, key, 'user_timelines', '1')
+    assert_nil @twitter.get(:StatusRelationships, key, 'user_timelines', '1')    
   end
 
   def test_insert_key
-    @statuses.insert(key, :row, {'body' => 'v', 'user' => 'v'})
-    assert_equal({'body' => 'v', 'user' => 'v'}, @statuses.get(key, :row))  
+    @twitter.insert(:Statuses, key, {'body' => 'v', 'user' => 'v'})
+    assert_equal({'body' => 'v', 'user' => 'v'}, @twitter.get(:Statuses, key))  
   end
 
   def test_insert_super_key
-    @statuses.insert(key, :relationships, {'user_timelines' => {'1' => 'v', key => 'v'}})
-    assert_equal({'1' => 'v' , key => 'v'}, @statuses.get(key, :relationships, 'user_timelines'))  
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'1' => 'v', key => 'v'}})
+    assert_equal({'1' => 'v' , key => 'v'}, @twitter.get(:StatusRelationships, key, 'user_timelines'))  
   end
   
   def test_get_column_values
-    @statuses.insert(key, :row, {'body' => 'v1', 'user' => 'v2'})
-    assert_equal(['v1' , 'v2'], @statuses.get_columns(key, :row, ['body', 'user']))
+    @twitter.insert(:Statuses, key, {'body' => 'v1', 'user' => 'v2'})
+    assert_equal(['v1' , 'v2'], @twitter.get_columns(:Statuses, key,['body', 'user']))
   end  
 
   def test_get_column_values_super
-    @statuses.insert(key, :relationships, {
+    @twitter.insert(:StatusRelationships, key, {
       'user_timelines' => {'1' => 'v1'}, 
       'mentions_timelines' => {'2' => 'v2'}})
     assert_equal [{'1' => 'v1'}, {'2' => 'v2'}], 
-      @statuses.get_columns(key, :relationships, ['user_timelines', 'mentions_timelines'])
+      @twitter.get_columns(:StatusRelationships, key, ['user_timelines', 'mentions_timelines'])
   end  
 
   # Not supported
   #  def test_get_columns_super_sub
-  #    @statuses.insert(key, :relationships, {
+  #    @twitter.insert(:StatusRelationships, key, {
   #      'user_timelines' => {'1' => 'v1'}, 
   #      'mentions_timelines' => {'2' => 'v2'}})
   #    assert_equal ['v1', 'v2'], 
-  #      @statuses.get_columns(key, :relationships, 'user_timelines', ['1', key])
+  #      @twitter.get_columns(:StatusRelationships, key, 'user_timelines', ['1', key])
   #  end    
   
   def test_count_keys
-    @statuses.insert(key + "1", :row, {'body' => 'v1'})
-    @statuses.insert(key + "2", :row, {'body' => 'v1'})
-    @statuses.insert(key + "3", :row, {'body' => 'v1'})
-    assert_equal 3, @statuses.count(:row)  
+    @twitter.insert(:Statuses, key + "1", {'body' => '1'})
+    @twitter.insert(:Statuses, key + "2", {'body' => '2'})
+    @twitter.insert(:Statuses, key + "3", {'body' => '3'})
+    assert_equal 3, @twitter.count(:Statuses)  
   end
   
   def test_count_columns
-    @statuses.insert(key, :row, {'body' => 'v1', 'user' => 'v2'})
-    assert_equal 2, @statuses.count_columns(key, :row)
+    @twitter.insert(:Statuses, key, {'body' => 'v1', 'user' => 'v2'})
+    assert_equal 2, @twitter.count_columns(:Statuses, key)
   end 
 
   def test_count_super_columns
-    @statuses.insert(key, :relationships, {
+    @twitter.insert(:StatusRelationships, key, {
       'user_timelines' => {'1' => 'v1'}, 
       'mentions_timelines' => {'2' => 'v2'}})
-    assert_equal 2, @statuses.count_columns(key, :relationships)
+    assert_equal 2, @twitter.count_columns(:StatusRelationships, key)
   end 
 
   def test_count_super_sub_columns
-    @statuses.insert(key, :relationships, {'user_timelines' => {'1' => 'v1', key => 'v2'}})
-    assert_equal 2, @statuses.count_columns(key, :relationships, 'user_timelines')
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => {'1' => 'v1', key => 'v2'}})
+    assert_equal 2, @twitter.count_columns(:StatusRelationships, key, 'user_timelines')
   end
   
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra_client
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-07-04 00:00:00 -07:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,22 +51,26 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
-- lib/cassandra_client/client.rb
+- lib/cassandra_client/cassandra_client.rb
+- lib/cassandra_client/helper.rb
 - lib/cassandra_client/ordered_hash.rb
+- lib/cassandra_client/safe_client.rb
 - lib/cassandra_client/serialization.rb
-- lib/cassandra_client/table.rb
 - lib/cassandra_client.rb
 - LICENSE
 - README
+- vendor/gen-rb/cassandra_constants.rb
+- vendor/gen-rb/cassandra_types.rb
 files: 
 - CHANGELOG
 - conf/cassandra.in.sh
 - conf/log4j.properties
 - conf/storage-conf.xml
-- lib/cassandra_client/client.rb
+- lib/cassandra_client/cassandra_client.rb
+- lib/cassandra_client/helper.rb
 - lib/cassandra_client/ordered_hash.rb
+- lib/cassandra_client/safe_client.rb
 - lib/cassandra_client/serialization.rb
-- lib/cassandra_client/table.rb
 - lib/cassandra_client.rb
 - LICENSE
 - Manifest

data/lib/cassandra_client/client.rb

@@ -1,65 +0,0 @@
-class CassandraClient
-  attr_reader :client, :transport, :tables, :host, :port, :block_for, :serialization
-
-  class AccessError < StandardError; end
-
-  # Instantiate a new CassandraClient and open the connection.
-  def initialize(host = '127.0.0.1', port = 9160, block_for = 1, serialization = CassandraClient::Serialization::JSON)
-    @host = host
-    @port = port
-    @serialization = serialization
-    @block_for = block_for
-    
-    @transport = Thrift::BufferedTransport.new(Thrift::Socket.new(@host, @port))
-    @transport.open
-
-    @client = SafeClient.new(
-      Cassandra::Client.new(Thrift::BinaryProtocol.new(@transport)), 
-      @transport)
-
-    @tables = @client.getStringListProperty("tables").map do |table_name|
-      ::CassandraClient::Table.new(table_name, self)
-    end
-  end
-
-  def inspect(full = true)
-    string = "#<CassandraClient:#{object_id}, @host=#{host.inspect}, @port=#{@port.inspect}"
-    string += ", @block_for=#{block_for.inspect}, @tables=[#{tables.map {|t| t.inspect(false) }.join(', ')}]" if full
-    string + ">"
-  end
-
-  # Return the CassandraClient::Table instance for the table_name you
-  # request. You can get an array of all available tables with the #tables
-  # method.
-  def table(table_name)
-    table = @tables.detect {|table| table.name == table_name }
-    raise AccessError, "No such table #{table_name.inspect}" unless table
-    table
-  end
-
-  # Remove all rows in all column families in all tables.
-  def remove_all
-    tables.each do |table|
-      table.schema.keys.each do |column_family|
-        table.remove_all(column_family)
-      end
-    end
-  end
-  
-  class SafeClient  
-    def initialize(client, transport)
-      @client = client 
-      @transport = transport
-    end
-    
-    def method_missing(*args)
-      @client.send(*args)
-    rescue IOError
-      @transport.open
-      raise if defined?(once)
-      once = true
-      retry
-    end
-  end
-  
-end

data/lib/cassandra_client/table.rb

@@ -1,202 +0,0 @@
-class CassandraClient
-  class Table
-    attr_reader :name, :schema, :parent
-    
-    MAX_INT = 2**31 - 1
-  
-    def initialize(name, parent)
-      @parent = parent
-      @client = parent.client
-      @block_for = parent.block_for
-
-      @name = name
-      @schema = @client.describeTable(@name)
-      extend(parent.serialization)
-    end
-    
-    def inspect(full = true)
-      string = "#<CassandraClient::Table:#{object_id}, @name=#{name.inspect}"
-      string += ", @schema={#{schema.map {|name, hash| ":#{name} => #{hash['type'].inspect}"}.join(', ')}}, @parent=#{parent.inspect(false)}" if full
-      string + ">"
-    end
-  
-    ## Write
-    
-    # Insert a row for a key. Pass a flat hash for a regular column family, and 
-    # a nested hash for a super column family.
-    def insert(key, column_family, hash, timestamp = now)
-      column_family = column_family.to_s    
-      insert = is_super(column_family) ? :insert_super : :insert_standard
-      send(insert, key, column_family, hash, timestamp)
-    end
-    
-    private
-  
-    def insert_standard(key, column_family, hash, timestamp = now)
-      mutation = Batch_mutation_t.new(
-        :table => @name, 
-        :key => key, 
-        :cfmap => {column_family => hash_to_columns(hash, timestamp)})
-      @client.batch_insert(mutation, @block_for)
-    end 
-  
-    def insert_super(key, column_family, hash, timestamp = now)
-      mutation = Batch_mutation_super_t.new(
-        :table => @name, 
-        :key => key, 
-        :cfmap => {column_family => hash_to_super_columns(hash, timestamp)})
-      @client.batch_insert_superColumn(mutation, @block_for)
-    end 
-    
-    public
-    
-    ## Delete
-    
-    # Remove the element at the column_family:key:super_column:column 
-    # path you request.
-    def remove(key, column_family, super_column = nil, column = nil, timestamp = now)
-      column_family = column_family.to_s
-      column_family += ":#{super_column}" if super_column
-      column_family += ":#{column}" if column
-      @client.remove(@name, key, column_family, timestamp, @block_for )
-    end
-    
-    # Remove all rows in the column family you request.
-    def remove_all(column_family)
-      get_key_range(column_family).each do |key| 
-        remove(key, column_family)
-      end
-    end
-    
-    ## Read
-  
-    # Count the elements at the column_family:key:super_column path you 
-    # request.
-    def count_columns(key, column_family, super_column = nil)
-      column_family = column_family.to_s
-      column_family += ":#{super_column}" if super_column
-      @client.get_column_count(@name, key, column_family)
-    end
-    
-    # Return a list of single values for the elements at the
-    # column_family:key:super_column:column path you request.
-    def get_columns(key, column_family, super_columns, columns = nil)
-      column_family = column_family.to_s
-      get_slice_by_names = (is_super(column_family) && !columns) ? :get_slice_super_by_names : :get_slice_by_names
-      if super_columns and columns
-        column_family += ":#{super_columns}" 
-        columns = Array(columns)
-      else
-        columns = Array(super_columns)
-      end
-          
-      hash = columns_to_hash(@client.send(get_slice_by_names, @name, key, column_family, columns))
-      columns.map { |column| hash[column] }
-    end
-          
-    # Return a hash (actually, a CassandraClient::OrderedHash) or a single value 
-    # representing the element at the column_family:key:super_column:column 
-    # path you request.
-    def get(key, column_family, super_column = nil, column = nil, offset = -1, limit = 100)
-      column_family = column_family.to_s
-      column_family += ":#{super_column}" if super_column
-      column_family += ":#{column}" if column          
-      
-      # You have got to be kidding
-      if is_super(column_family)
-        if column
-          load(@client.get_column(@name, key, column_family).value)
-        elsif super_column
-          columns_to_hash(@client.get_superColumn(@name, key, column_family).columns)
-        else
-          columns_to_hash(@client.get_slice_super(@name, key, "#{column_family}:", offset, limit))
-        end
-      else
-        if super_column
-          load(@client.get_column(@name, key, column_family).value)
-        elsif is_sorted_by_time(column_family)
-          result = columns_to_hash(@client.get_columns_since(@name, key, column_family, 0))
-
-          # FIXME Hack until get_slice on a time-sorted column family works again
-          result = OrderedHash[*flatten_once(result.to_a[offset, limit])] if offset > -1
-          result
-        else
-          columns_to_hash(@client.get_slice(@name, key, "#{column_family}:", offset, limit))
-        end 
-      end
-    rescue NotFoundException
-      is_super(column_family) && !column ? {} : nil
-    end  
-    
-    # FIXME
-    # def get_recent(key, column_family, super_column = nil, column = nil, timestamp = 0)
-    # end
-  
-    # Return a list of keys in the column_family you request. Requires the
-    # table to be partitioned with OrderPreservingHash.
-    def get_key_range(key_range, column_family = nil, limit = 100)      
-      column_family, key_range = key_range, ''..'' unless column_family
-      column_families = Array(column_family).map {|c| c.to_s}
-      @client.get_key_range(@name, column_families, key_range.begin, key_range.end, limit)
-    end
-    
-    # Count all rows in the column_family you request. Requires the table 
-    # to be partitioned with OrderPreservingHash.
-    def count(key_range, column_family = nil, limit = MAX_INT)
-      get_key_range(key_range, column_family, limit).size
-    end
-      
-    private
-    
-    def is_super(column_family)
-      column_family_property(column_family, 'type') == 'Super'
-    end
-
-    def is_sorted_by_time(column_family)
-      column_family_property(column_family, 'sort') == 'Time'
-    end
-    
-    def column_family_property(column_family_or_path, key)
-      column_family = column_family_or_path.to_s.split(':').first    
-      @schema[column_family][key]
-    rescue NoMethodError
-      raise AccessError, "Invalid column family \":#{column_family}\""    
-    end
-    
-    def columns_to_hash(columns)
-      hash = ::CassandraClient::OrderedHash.new
-      Array(columns).each do |c| 
-        if c.is_a?(SuperColumn_t)
-          hash[c.name] = columns_to_hash(c.columns)
-        else
-          hash[c.columnName] = load(c.value)
-        end
-      end
-      hash
-    end  
-    
-    def hash_to_columns(hash, timestamp)
-      hash.map do |column, value|
-        Column_t.new(:columnName => column, :value => dump(value), :timestamp => timestamp)
-      end    
-    end
-    
-    def hash_to_super_columns(hash, timestamp)
-      hash.map do |super_column, columns|
-        SuperColumn_t.new(:name => super_column, :columns => hash_to_columns(columns, timestamp))
-      end
-    end
-    
-    def time_in_microseconds
-      time = Time.now
-      time.to_i * 1_000_000 + time.usec
-    end
-    alias :now :time_in_microseconds
-    
-    def flatten_once(array)
-      result = []
-      array.each { |el| result.concat(el) }
-      result
-    end    
-  end
-end