cassandra 0.4 → 0.5

data/vendor/gen-rb/cassandra_types.rb

@@ -188,7 +188,7 @@ module CassandraThrift
       FIELDS = {
         COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
         SUPER_COLUMN => {:type => ::Thrift::Types::STRING, :name => 'super_column', :optional => true},
-        COLUMN => {:type => ::Thrift::Types::STRING, :name => 'column'}
+        COLUMN => {:type => ::Thrift::Types::STRING, :name => 'column', :optional => true}
       }
 
       def struct_fields; FIELDS; end
@@ -198,15 +198,19 @@ module CassandraThrift
 
     end
 
-    class SuperColumnPath
+    class SliceRange
       include ::Thrift::Struct
-      COLUMN_FAMILY = 3
-      SUPER_COLUMN = 4
+      START = 1
+      FINISH = 2
+      IS_ASCENDING = 3
+      COUNT = 4
 
-      ::Thrift::Struct.field_accessor self, :column_family, :super_column
+      ::Thrift::Struct.field_accessor self, :start, :finish, :is_ascending, :count
       FIELDS = {
-        COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
-        SUPER_COLUMN => {:type => ::Thrift::Types::STRING, :name => 'super_column'}
+        START => {:type => ::Thrift::Types::STRING, :name => 'start'},
+        FINISH => {:type => ::Thrift::Types::STRING, :name => 'finish'},
+        IS_ASCENDING => {:type => ::Thrift::Types::BOOL, :name => 'is_ascending', :default => true},
+        COUNT => {:type => ::Thrift::Types::I32, :name => 'count', :default => 100}
       }
 
       def struct_fields; FIELDS; end
@@ -216,17 +220,33 @@ module CassandraThrift
 
     end
 
-    class ColumnPathOrParent
+    class SlicePredicate
       include ::Thrift::Struct
-      COLUMN_FAMILY = 3
-      SUPER_COLUMN = 4
-      COLUMN = 5
+      COLUMN_NAMES = 1
+      SLICE_RANGE = 2
 
-      ::Thrift::Struct.field_accessor self, :column_family, :super_column, :column
+      ::Thrift::Struct.field_accessor self, :column_names, :slice_range
       FIELDS = {
-        COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
-        SUPER_COLUMN => {:type => ::Thrift::Types::STRING, :name => 'super_column', :optional => true},
-        COLUMN => {:type => ::Thrift::Types::STRING, :name => 'column', :optional => true}
+        COLUMN_NAMES => {:type => ::Thrift::Types::LIST, :name => 'column_names', :element => {:type => ::Thrift::Types::STRING}, :optional => true},
+        SLICE_RANGE => {:type => ::Thrift::Types::STRUCT, :name => 'slice_range', :class => CassandraThrift::SliceRange, :optional => true}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+    end
+
+    class ColumnOrSuperColumn
+      include ::Thrift::Struct
+      COLUMN = 1
+      SUPER_COLUMN = 2
+
+      ::Thrift::Struct.field_accessor self, :column, :super_column
+      FIELDS = {
+        COLUMN => {:type => ::Thrift::Types::STRUCT, :name => 'column', :class => CassandraThrift::Column, :optional => true},
+        SUPER_COLUMN => {:type => ::Thrift::Types::STRUCT, :name => 'super_column', :class => CassandraThrift::SuperColumn, :optional => true}
       }
 
       def struct_fields; FIELDS; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,17 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: A Ruby client for CassandraDB.
+- !ruby/object:Gem::Dependency 
+  name: thrift
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: A Ruby client for the Cassandra distributed database.
 email: ""
 executables: []
 
@@ -53,20 +63,18 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/cassandra/array.rb
 - lib/cassandra/cassandra.rb
+- lib/cassandra/columns.rb
 - lib/cassandra/comparable.rb
 - lib/cassandra/constants.rb
-- lib/cassandra/helper.rb
 - lib/cassandra/long.rb
 - lib/cassandra/ordered_hash.rb
+- lib/cassandra/protocol.rb
 - lib/cassandra/safe_client.rb
-- lib/cassandra/serialization.rb
 - lib/cassandra/time.rb
 - lib/cassandra/uuid.rb
 - lib/cassandra.rb
 - LICENSE
 - README
-- vendor/gen-rb/cassandra_constants.rb
-- vendor/gen-rb/cassandra_types.rb
 files: 
 - CHANGELOG
 - conf/cassandra.in.sh
@@ -74,23 +82,23 @@ files:
 - conf/storage-conf.xml
 - lib/cassandra/array.rb
 - lib/cassandra/cassandra.rb
+- lib/cassandra/columns.rb
 - lib/cassandra/comparable.rb
 - lib/cassandra/constants.rb
-- lib/cassandra/helper.rb
 - lib/cassandra/long.rb
 - lib/cassandra/ordered_hash.rb
+- lib/cassandra/protocol.rb
 - lib/cassandra/safe_client.rb
-- lib/cassandra/serialization.rb
 - lib/cassandra/time.rb
 - lib/cassandra/uuid.rb
 - lib/cassandra.rb
 - LICENSE
 - Manifest
-- quickstart.sh
 - Rakefile
 - README
-- test/cassandra_client_test.rb
+- test/cassandra_test.rb
 - test/comparable_types_test.rb
+- test/test_helper.rb
 - vendor/gen-rb/cassandra.rb
 - vendor/gen-rb/cassandra_constants.rb
 - vendor/gen-rb/cassandra_types.rb
@@ -127,7 +135,8 @@ rubyforge_project: fauna
 rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
-summary: A Ruby client for CassandraDB.
+summary: A Ruby client for the Cassandra distributed database.
 test_files: 
-- test/cassandra_client_test.rb
+- test/cassandra_test.rb
 - test/comparable_types_test.rb
+- test/test_helper.rb

data/lib/cassandra/serialization.rb

@@ -1,57 +0,0 @@
-
-class Cassandra
-  module Serialization
-    module String
-      def self.dump(object);
-        object.to_s
-      end
-
-      def self.load(object)
-        object
-      end
-    end
-
-    module Marshal
-      def self.dump(object)
-        ::Marshal.dump(object)
-      end
-
-      def self.load(object)
-        ::Marshal.load(object)
-      end
-    end
-
-    module JSON
-      def self.dump(object)
-        ::JSON.dump(object)
-      end
-
-      begin
-        require 'yajl/json_gem'
-        def self.load(object)
-          ::JSON.load(object)
-        end
-      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
-  end
-end
-

data/quickstart.sh

@@ -1,12 +0,0 @@
-
-if [ ! -e cassandra ]; then
-  rm -rf data
-  cd vendor
-  tar xjf cassandra.tar.bz2
-  mv cassandra ..
-  cd ../cassandra
-  ant
-  cd ..
-fi
-
-env CASSANDRA_INCLUDE=`pwd`/conf/cassandra.in.sh cassandra/bin/cassandra -f