cassandra 0.7 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7.1 update thrift-generated code to 0.5
+
 v0.7 Various improvements. 
 - Compatibility with Cassandra 0.5.
 - performance improvements

data/cassandra.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.7"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-11}
   s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}

data/vendor/gen-rb/cassandra.rb

@@ -27,6 +27,7 @@ require 'cassandra_types'
             raise result.ire unless result.ire.nil?
             raise result.nfe unless result.nfe.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get failed: unknown result')
           end
 
@@ -43,8 +44,8 @@ require 'cassandra_types'
             result = receive_message(Get_slice_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
-            raise result.nfe unless result.nfe.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice failed: unknown result')
           end
 
@@ -62,6 +63,7 @@ require 'cassandra_types'
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'multiget failed: unknown result')
           end
 
@@ -79,6 +81,7 @@ require 'cassandra_types'
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'multiget_slice failed: unknown result')
           end
 
@@ -96,11 +99,11 @@ require 'cassandra_types'
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_count failed: unknown result')
           end
 
           def get_key_range(keyspace, column_family, start, finish, count, consistency_level)
-
             send_get_key_range(keyspace, column_family, start, finish, count, consistency_level)
             return recv_get_key_range()
           end
@@ -114,9 +117,28 @@ require 'cassandra_types'
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_key_range failed: unknown result')
           end
 
+          def get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
+            send_get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
+            return recv_get_range_slice()
+          end
+
+          def send_get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
+            send_message('get_range_slice', Get_range_slice_args, :keyspace => keyspace, :column_parent => column_parent, :predicate => predicate, :start_key => start_key, :finish_key => finish_key, :row_count => row_count, :consistency_level => consistency_level)
+          end
+
+          def recv_get_range_slice()
+            result = receive_message(Get_range_slice_result)
+            return result.success unless result.success.nil?
+            raise result.ire unless result.ire.nil?
+            raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_range_slice failed: unknown result')
+          end
+
           def insert(keyspace, key, column_path, value, timestamp, consistency_level)
             send_insert(keyspace, key, column_path, value, timestamp, consistency_level)
             recv_insert()
@@ -130,6 +152,7 @@ require 'cassandra_types'
             result = receive_message(Insert_result)
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             return
           end
 
@@ -146,6 +169,7 @@ require 'cassandra_types'
             result = receive_message(Batch_insert_result)
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             return
           end
 
@@ -162,6 +186,7 @@ require 'cassandra_types'
             result = receive_message(Remove_result)
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
             return
           end
 
@@ -227,6 +252,8 @@ require 'cassandra_types'
               result.nfe = nfe
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'get', seqid)
           end
@@ -238,10 +265,10 @@ require 'cassandra_types'
               result.success = @handler.get_slice(args.keyspace, args.key, args.column_parent, args.predicate, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
-            rescue CassandraThrift::NotFoundException => nfe
-              result.nfe = nfe
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'get_slice', seqid)
           end
@@ -255,6 +282,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'multiget', seqid)
           end
@@ -268,6 +297,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'multiget_slice', seqid)
           end
@@ -281,6 +312,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'get_count', seqid)
           end
@@ -294,10 +327,27 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'get_key_range', seqid)
           end
 
+          def process_get_range_slice(seqid, iprot, oprot)
+            args = read_args(iprot, Get_range_slice_args)
+            result = Get_range_slice_result.new()
+            begin
+              result.success = @handler.get_range_slice(args.keyspace, args.column_parent, args.predicate, args.start_key, args.finish_key, args.row_count, args.consistency_level)
+            rescue CassandraThrift::InvalidRequestException => ire
+              result.ire = ire
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
+            end
+            write_result(result, oprot, 'get_range_slice', seqid)
+          end
+
           def process_insert(seqid, iprot, oprot)
             args = read_args(iprot, Insert_args)
             result = Insert_result.new()
@@ -307,6 +357,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'insert', seqid)
           end
@@ -320,6 +372,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'batch_insert', seqid)
           end
@@ -333,6 +387,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
             end
             write_result(result, oprot, 'remove', seqid)
           end
@@ -397,13 +453,15 @@ require 'cassandra_types'
           IRE = 1
           NFE = 2
           UE = 3
+          TE = 4
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe, :ue
+          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe, :ue, :te
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CassandraThrift::ColumnOrSuperColumn},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
             NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -444,15 +502,15 @@ require 'cassandra_types'
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
-          NFE = 2
-          UE = 3
+          UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe, :ue
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -492,12 +550,14 @@ require 'cassandra_types'
           SUCCESS = 0
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -539,12 +599,14 @@ require 'cassandra_types'
           SUCCESS = 0
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}}},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -584,12 +646,14 @@ require 'cassandra_types'
           SUCCESS = 0
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -633,12 +697,67 @@ require 'cassandra_types'
           SUCCESS = 0
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Get_range_slice_args
+          include ::Thrift::Struct
+          KEYSPACE = 1
+          COLUMN_PARENT = 2
+          PREDICATE = 3
+          START_KEY = 4
+          FINISH_KEY = 5
+          ROW_COUNT = 6
+          CONSISTENCY_LEVEL = 7
+
+          ::Thrift::Struct.field_accessor self, :keyspace, :column_parent, :predicate, :start_key, :finish_key, :row_count, :consistency_level
+          FIELDS = {
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
+            COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => CassandraThrift::ColumnParent},
+            PREDICATE => {:type => ::Thrift::Types::STRUCT, :name => 'predicate', :class => CassandraThrift::SlicePredicate},
+            START_KEY => {:type => ::Thrift::Types::STRING, :name => 'start_key', :default => %q""},
+            FINISH_KEY => {:type => ::Thrift::Types::STRING, :name => 'finish_key', :default => %q""},
+            ROW_COUNT => {:type => ::Thrift::Types::I32, :name => 'row_count', :default => 100},
+            CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
+              raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
+            end
+          end
+
+        end
+
+        class Get_range_slice_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+          IRE = 1
+          UE = 2
+          TE = 3
+
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::KeySlice}},
+            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -681,11 +800,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :ire, :ue, :te
           FIELDS = {
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -724,11 +845,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :ire, :ue, :te
           FIELDS = {
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end
@@ -769,11 +892,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           IRE = 1
           UE = 2
+          TE = 3
 
-          ::Thrift::Struct.field_accessor self, :ire, :ue
+          ::Thrift::Struct.field_accessor self, :ire, :ue, :te
           FIELDS = {
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
           }
 
           def struct_fields; FIELDS; end

data/vendor/gen-rb/cassandra_constants.rb

@@ -7,4 +7,6 @@
 require 'cassandra_types'
 
   module CassandraThrift
+    VERSION = %q"0.5-beta2"
+
 end

data/vendor/gen-rb/cassandra_types.rb

@@ -10,11 +10,18 @@ module CassandraThrift
       ZERO = 0
       ONE = 1
       QUORUM = 2
-      ALL = 3
-      VALUE_MAP = {0 => "ZERO", 1 => "ONE", 2 => "QUORUM", 3 => "ALL"}
-      VALID_VALUES = Set.new([ZERO, ONE, QUORUM, ALL]).freeze
+      DCQUORUM = 3
+      DCQUORUMSYNC = 4
+      ALL = 5
+      VALUE_MAP = {0 => "ZERO", 1 => "ONE", 2 => "QUORUM", 3 => "DCQUORUM", 4 => "DCQUORUMSYNC", 5 => "ALL"}
+      VALID_VALUES = Set.new([ZERO, ONE, QUORUM, DCQUORUM, DCQUORUMSYNC, ALL]).freeze
     end
 
+    # Basic unit of data within a ColumnFamily.
+    # @param name. A column name can act both as structure (a label) or as data (like value). Regardless, the name of the column
+    #        is used as a key to its value.
+    # @param value. Some data
+    # @param timestamp. Used to record when data was sent to be written.
     class Column
       include ::Thrift::Struct
       NAME = 1
@@ -38,6 +45,10 @@ module CassandraThrift
 
     end
 
+    # A named list of columns.
+    # @param name. see Column.name.
+    # @param columns. A collection of standard Columns.  The columns within a super column are defined in an adhoc manner.
+    #                 Columns within a super column do not have to have matching structures (similarly named child columns).
     class SuperColumn
       include ::Thrift::Struct
       NAME = 1
@@ -58,6 +69,14 @@ module CassandraThrift
 
     end
 
+    # Methods for fetching rows/records from Cassandra will return either a single instance of ColumnOrSuperColumn or a list
+    # of ColumnOrSuperColumns (get_slice()). If you're looking up a SuperColumn (or list of SuperColumns) then the resulting
+    # instances of ColumnOrSuperColumn will have the requested SuperColumn in the attribute super_column. For queries resulting
+    # in Columns, those values will be in the attribute column. This change was made between 0.3 and 0.4 to standardize on
+    # single query methods that may return either a SuperColumn or Column.
+    # 
+    # @param column. The Column returned by get() or get_slice().
+    # @param super_column. The SuperColumn returned by get() or get_slice().
     class ColumnOrSuperColumn
       include ::Thrift::Struct
       COLUMN = 1
@@ -76,6 +95,7 @@ module CassandraThrift
 
     end
 
+    # A specific column was requested that does not exist.
     class NotFoundException < ::Thrift::Exception
       include ::Thrift::Struct
 
@@ -90,6 +110,8 @@ module CassandraThrift
 
     end
 
+    # Invalid request could mean keyspace or column family does not exist, required parameters are missing, or a parameter is malformed.
+    # why contains an associated error message.
     class InvalidRequestException < ::Thrift::Exception
       include ::Thrift::Struct
       def initialize(message=nil)
@@ -114,6 +136,7 @@ module CassandraThrift
 
     end
 
+    # Not all the replicas required could be created and/or read.
     class UnavailableException < ::Thrift::Exception
       include ::Thrift::Struct
 
@@ -128,6 +151,25 @@ module CassandraThrift
 
     end
 
+    # RPC timeout was exceeded.  either a node failed mid-operation, or load was too high, or the requested op was too large.
+    class TimedOutException < ::Thrift::Exception
+      include ::Thrift::Struct
+
+      FIELDS = {
+
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+    end
+
+    # ColumnParent is used when selecting groups of columns from the same ColumnFamily. In directory structure terms, imagine
+    # ColumnParent as ColumnPath + '/../'.
+    # 
+    # See also <a href="cassandra.html#Struct_ColumnPath">ColumnPath</a>
     class ColumnParent
       include ::Thrift::Struct
       COLUMN_FAMILY = 3
@@ -147,6 +189,14 @@ module CassandraThrift
 
     end
 
+    # The ColumnPath is the path to a single column in Cassandra. It might make sense to think of ColumnPath and
+    # ColumnParent in terms of a directory structure.
+    # 
+    # ColumnPath is used to looking up a single column.
+    # 
+    # @param column_family. The name of the CF of the column being looked up.
+    # @param super_column. The super column name.
+    # @param column. The column name.
     class ColumnPath
       include ::Thrift::Struct
       COLUMN_FAMILY = 3
@@ -168,6 +218,20 @@ module CassandraThrift
 
     end
 
+    # A slice range is a structure that stores basic range, ordering and limit information for a query that will return
+    # multiple columns. It could be thought of as Cassandra's version of LIMIT and ORDER BY
+    # 
+    # @param start. The column name to start the slice with. This attribute is not required, though there is no default value,
+    #               and can be safely set to '', i.e., an empty byte array, to start with the first column name. Otherwise, it
+    #               must a valid value under the rules of the Comparator defined for the given ColumnFamily.
+    # @param finish. The column name to stop the slice at. This attribute is not required, though there is no default value,
+    #                and can be safely set to an empty byte array to not stop until 'count' results are seen. Otherwise, it
+    #                must also be a value value to the ColumnFamily Comparator.
+    # @param reversed. Whether the results should be ordered in reversed order. Similar to ORDER BY blah DESC in SQL.
+    # @param count. How many keys to return. Similar to LIMIT 100 in SQL. May be arbitrarily large, but Thrift will
+    #               materialize the whole result into memory before returning it to the client, so be aware that you may
+    #               be better served by iterating through slices by passing the last value of one call in as the 'start'
+    #               of the next instead of increasing 'count' arbitrarily large.
     class SliceRange
       include ::Thrift::Struct
       START = 1
@@ -194,6 +258,16 @@ module CassandraThrift
 
     end
 
+    # A SlicePredicate is similar to a mathematic predicate (see http://en.wikipedia.org/wiki/Predicate_(mathematical_logic)),
+    # which is described as "a property that the elements of a set have in common."
+    # 
+    # SlicePredicate's in Cassandra are described with either a list of column_names or a SliceRange.  If column_names is
+    # specified, slice_range is ignored.
+    # 
+    # @param column_name. A list of column names to retrieve. This can be used similar to Memcached's "multi-get" feature
+    #                     to fetch N known column names. For instance, if you know you wish to fetch columns 'Joe', 'Jack',
+    #                     and 'Jim' you can pass those column names as a list to fetch all three at once.
+    # @param slice_range. A SliceRange describing how to range, order, and/or limit the slice.
     class SlicePredicate
       include ::Thrift::Struct
       COLUMN_NAMES = 1
@@ -212,4 +286,29 @@ module CassandraThrift
 
     end
 
+    # A KeySlice is key followed by the data it maps to. A collection of KeySlice is returned by the get_range_slice operation.
+    # 
+    # @param key. a row key
+    # @param columns. List of data represented by the key. Typically, the list is pared down to only the columns specified by
+    #                 a SlicePredicate.
+    class KeySlice
+      include ::Thrift::Struct
+      KEY = 1
+      COLUMNS = 2
+
+      ::Thrift::Struct.field_accessor self, :key, :columns
+      FIELDS = {
+        KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
+        COLUMNS => {:type => ::Thrift::Types::LIST, :name => 'columns', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field columns is unset!') unless @columns
+      end
+
+    end
+
   end

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�g~�t�DS�{�憟ٚ+��^��!���>5G�}B��*���6�ڠ��]����*�b��%7�+�`66���c�H��V�?�M�enڌ�	��6��#�,�[7
-��D�M�p�L�0/�e��m/�n)곜�0*�f�l���(E.�<�?��᮱����N��*<��]�ZI��*�
(%�y��#���\ME���2�U)Q��
{��}1O-�-Lq�9^
+�Ta
+x&Vt�`g�j=�Ӌ��w�����]�'-Ot	���u�i�T"XK���2:b,#�h�Yl��M�^������BO�Ϭn����ϫIг�9B�d	F�K��H$�
p�GA��>.��.��Nhh��ۜJD:3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: 0.7.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   zyKMYVRO0z/58g==
   -----END CERTIFICATE-----
 
-date: 2010-01-08 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency