cassandra_client 0.2 → 0.2.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.2.1. Don't write serialization overhead on nulls.
+
 v0.2. Re-factor table vs. column family interface per discussion with jbellis.
 
 v0.1. First release.

data/README

@@ -55,7 +55,7 @@ Query a super column:
   
 The returned result will always be a CassandraClient::OrderedHash.
 
-See CassandraClient and CassandraClient::Table for more methods.
+See CassandraClient for more methods.
 
 == Reporting problems
 

data/cassandra_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra_client}
-  s.version = "0.2"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]

data/lib/cassandra_client/cassandra_client.rb

@@ -2,20 +2,18 @@ class CassandraClient
   include Helper  
   class AccessError < StandardError; end
   
-  MAX_INT = 2**31 - 1  
-
-  attr_reader :keyspace, :host, :port, :quorum, :serialization, :transport, :client, :schema
+  MAX_INT = 2**31 - 1
+  
+  attr_reader :keyspace, :host, :port, :quorum, :serializer, :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)
+  def initialize(keyspace, host = '127.0.0.1', port = 9160, quorum = 1, serializer = CassandraClient::Serialization::JSON)
     @keyspace = keyspace
     @host = host
     @port = port
     @quorum = quorum
-    @serialization = serialization
+    @serializer = serializer
 
-    extend(@serialization)
-    
     @transport = Thrift::BufferedTransport.new(Thrift::Socket.new(@host, @port))
     @transport.open    
     @client = Cassandra::SafeClient.new(
@@ -33,7 +31,7 @@ class CassandraClient
   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}>"
+    }}, @host=#{host.inspect}, @port=#{port}, @quorum=#{quorum}, @serializer=#{serializer.name}>"
   end
 
   ## Write
@@ -167,4 +165,17 @@ class CassandraClient
   def count(column_family, key_range = ''..'', limit = MAX_INT)
     get_key_range(column_family, key_range, limit).size
   end      
+  
+  private
+    
+  def dump(object)
+    # Special-case the empty string, so we don't store worthless serializer overhead on nulls
+    return "" if object == ""
+    @serializer.dump(object)
+  end
+  
+  def load(object)
+    return "" if object == ""  
+    @serializer.load(object)
+  end  
 end

data/lib/cassandra_client/serialization.rb

@@ -2,63 +2,56 @@
 class CassandraClient
   module Serialization
     module String
-      def dump(object); 
+      def self.dump(object);
         object.to_s
       end
-      
-      def load(object)
+
+      def self.load(object)
         object
       end
     end
-  
+
     module Marshal
-      def dump(object)
+      def self.dump(object)
         ::Marshal.dump(object)
       end
 
-      def load(object)
+      def self.load(object)
         ::Marshal.load(object)
       end
     end
 
     module JSON
-      def dump(object)
+      def self.dump(object)
         ::JSON.dump(object)
       end
 
       begin
         require 'yajl/json_gem'
-        def load(object)
+        def self.load(object)
           ::JSON.load(object)
         end
-      rescue LoadError      
-        require 'json/ext'        
-        def load(object)
+      rescue LoadError
+        require 'json/ext'
+        def self.load(object)
           ::JSON.load("[#{object}]").first # :-(
         end
       end
     end
-      
+    
+    module CompressedJSON
+      def self.dump(object)
+        Zlib::Deflate.deflate(JSON.dump(object))
+      end
+
+      def self.load(object)
+        JSON.load(Zlib::Inflate.inflate(object))
+      end    
+    end
+
     # module Avro
     #  # Someday!
     # end
-    
-    # Decorate all available modules with compression
-    self.constants.each do |module_name|
-      eval <<-MODULE
-        module Compressed#{module_name}
-          include #{module_name}
-          def dump(object)
-            Zlib::Deflate.deflate(super(object))
-          end
-    
-          def load(object)        
-            super(Zlib::Inflate.inflate(object))
-          end
-        end
-      MODULE
-    end
-    
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra_client
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Evan Weaver