cassandra 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.5.2. Update server version so CommitLog replay is fixed.
+
 v0.5.1. Add bin/cassandra_helper script, to build and start the server for you. Improve build error reporting.
 
 v0.5. More API changes. Working temporal comparators.

data/README

@@ -15,8 +15,6 @@ The public certificate for this gem is here[http://rubyforge.org/frs/download.ph
 * compatible UUID and Long classes, for GUID generation
 * Ruby 1.9 compatibility
 
-This is an alpha release and may not yet support the full set of Cassandra features.
-
 The Github source repository is {here}[http://github.com/fauna/cassandra/]. Patches and contributions are very welcome.
 
 == Installation
@@ -25,7 +23,7 @@ You need Ruby 1.8 or 1.9. If you have those, just run:
 
   sudo gem install cassandra
   
-Cassandra is a rapidly moving target. In order to get a working server, use the <tt>bin/cassandra_helper</tt> script (requires <tt>git</tt>):
+Cassandra itself is a rapidly moving target. In order to get a working server, use the <tt>bin/cassandra_helper</tt> script:
 
   cassandra_helper cassandra
   

data/Rakefile

@@ -16,13 +16,9 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "15354b4906fd654d58fe50fd01ebf95b69434ba9"
+REVISION = "007df950fc9e9fad255167db74517095a8326f25"
 
-PATCHES = [
-  "http://issues.apache.org/jira/secure/attachment/12416014/0001-CASSANDRA-356-rename-clean-up-collectColumns-methods.txt",
-  "http://issues.apache.org/jira/secure/attachment/12416073/0002-v3.patch",
-  "http://issues.apache.org/jira/secure/attachment/12416074/357-v2.patch",
-  "http://issues.apache.org/jira/secure/attachment/12416086/357-3.patch"]
+PATCHES = []
 
 CASSANDRA_HOME = "#{ENV['HOME']}/cassandra/r#{REVISION[0, 8]}"
 

data/cassandra.gemspec

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

data/conf/storage-conf.xml

@@ -179,26 +179,36 @@
     <ConcurrentReads>8</ConcurrentReads>
     <ConcurrentWrites>32</ConcurrentWrites>
 
-    <!-- Turn on CommitLogSync to improve durability.
-         When enabled, Cassandra won't ack writes until the commit log
-         has been synced to disk.  This is less necessary in Cassandra
+    <!-- CommitLogSync may be either "periodic" or "batch."
+         When in batch mode, Cassandra won't ack writes until the commit log
+         has been fsynced to disk.  It will wait up to CommitLogSyncBatchWindowInMS
+         milliseconds for other writes, before performing the sync.
+
+         This is less necessary in Cassandra
          than in traditional databases since replication reduces the
          odds of losing data from a failure after writing the log
-         entry but before it actually reaches the disk.
+         entry but before it actually reaches the disk.  So the other
+         option is "timed," where wirtes may be acked immediately
+         and the CommitLog is simply synced every CommitLogSyncPeriodInMS
+         milliseconds.
+    -->
+    <CommitLogSync>periodic</CommitLogSync>
+    <!-- Interval at which to perform syncs of the CommitLog in periodic
+         mode.  Usually the default of 1000ms is fine; increase it
+         only if the CommitLog PendingTasks backlog in jmx shows that
+         you are frequently scheduling a second sync while the first
+         has not yet been processed.
     -->
-    <CommitLogSync>false</CommitLogSync>
+    <CommitLogSyncPeriodInMS>1000</CommitLogSyncPeriodInMS>
     <!-- Delay (in microseconds) during which additional commit log
-         entries may be written before fsync.  This will increase
+         entries may be written before fsync in batch mode.  This will increase
          latency slightly, but can vastly improve throughput where
          there are many writers.  Set to zero to disable
          (each entry will be synced individually).
-	 Reasonable values range from a minimal 100 to even 10000
-         if throughput matters more than latency.  (10000us = 10ms
-         write latency isn't even that bad by traditional db
-         standards.)
+	 Reasonable values range from a minimal 0.1 to 10 or even more
+         if throughput matters more than latency.
     -->
-    <CommitLogSyncDelay>1000</CommitLogSyncDelay>
-         
+    <!-- <CommitLogSyncBatchWindowInMS>1</CommitLogSyncBatchWindowInMS> -->         
 
     <!-- Time to wait before garbage-collection deletion markers.
          Set this to a large enough value that you are confident

data/lib/cassandra/protocol.rb

@@ -63,7 +63,7 @@ class Cassandra
         # FIXME Comparable types in range are not enforced
         predicate = CassandraThrift::SlicePredicate.new(:slice_range => 
           CassandraThrift::SliceRange.new(
-            :is_ascending => !reversed, 
+            :reversed => reversed, 
             :count => count, 
             :start => start.to_s, 
             :finish => finish.to_s))

data/vendor/gen-rb/cassandra.rb

@@ -12,7 +12,7 @@ require 'cassandra_types'
         class Client
           include ::Thrift::Client
 
-          def get_slice(keyspace, key, column_parent, predicate, consistency_level)          
+          def get_slice(keyspace, key, column_parent, predicate, consistency_level)
             send_get_slice(keyspace, key, column_parent, predicate, consistency_level)
             return recv_get_slice()
           end
@@ -188,21 +188,6 @@ require 'cassandra_types'
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_keyspace failed: unknown result')
           end
 
-          def execute_query(query)
-            send_execute_query(query)
-            return recv_execute_query()
-          end
-
-          def send_execute_query(query)
-            send_message('execute_query', Execute_query_args, :query => query)
-          end
-
-          def recv_execute_query()
-            result = receive_message(Execute_query_result)
-            return result.success unless result.success.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'execute_query failed: unknown result')
-          end
-
         end
 
         class Processor
@@ -333,13 +318,6 @@ require 'cassandra_types'
             write_result(result, oprot, 'describe_keyspace', seqid)
           end
 
-          def process_execute_query(seqid, iprot, oprot)
-            args = read_args(iprot, Execute_query_args)
-            result = Execute_query_result.new()
-            result.success = @handler.execute_query(args.query)
-            write_result(result, oprot, 'execute_query', seqid)
-          end
-
         end
 
         # HELPER FUNCTIONS AND STRUCTURES
@@ -793,38 +771,6 @@ require 'cassandra_types'
 
         end
 
-        class Execute_query_args
-          include ::Thrift::Struct
-          QUERY = 1
-
-          ::Thrift::Struct.field_accessor self, :query
-          FIELDS = {
-            QUERY => {:type => ::Thrift::Types::STRING, :name => 'query'}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-          end
-
-        end
-
-        class Execute_query_result
-          include ::Thrift::Struct
-          SUCCESS = 0
-
-          ::Thrift::Struct.field_accessor self, :success
-          FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CassandraThrift::CqlResult}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-          end
-
-        end
-
       end
 
     end

data/vendor/gen-rb/cassandra_types.rb

@@ -89,26 +89,6 @@ module CassandraThrift
 
     end
 
-    class CqlResult
-      include ::Thrift::Struct
-      ERROR_CODE = 1
-      ERROR_TXT = 2
-      RESULT_SET = 3
-
-      ::Thrift::Struct.field_accessor self, :error_code, :error_txt, :result_set
-      FIELDS = {
-        ERROR_CODE => {:type => ::Thrift::Types::I32, :name => 'error_code'},
-        ERROR_TXT => {:type => ::Thrift::Types::STRING, :name => 'error_txt'},
-        RESULT_SET => {:type => ::Thrift::Types::LIST, :name => 'result_set', :element => {:type => ::Thrift::Types::MAP, :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-    end
-
     class NotFoundException < ::Thrift::Exception
       include ::Thrift::Struct
 
@@ -202,14 +182,14 @@ module CassandraThrift
       include ::Thrift::Struct
       START = 1
       FINISH = 2
-      IS_ASCENDING = 3
+      REVERSED = 3
       COUNT = 4
 
-      ::Thrift::Struct.field_accessor self, :start, :finish, :is_ascending, :count
+      ::Thrift::Struct.field_accessor self, :start, :finish, :reversed, :count
       FIELDS = {
         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},
+        REVERSED => {:type => ::Thrift::Types::BOOL, :name => 'reversed', :default => false},
         COUNT => {:type => ::Thrift::Types::I32, :name => 'count', :default => 100}
       }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Evan Weaver