cassandra 0.18.0 → 0.19.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0a23f0b09b8e2fa2d98f2d5f1574f1014089a04
+  data.tar.gz: 4bd4c264e1b03836219ae41b06ad5bf4ff275f73
+SHA512:
+  metadata.gz: 3dfe8d4d0adfbc7b99c2154bf3abb7997fa492169e77ffa9b629f65630acfaecbbe86f2a6d89ad45717dc1e2d28dbf8a1042b526b6d9df4428d0cb8f7213f897
+  data.tar.gz: 9db54828890bda117a3db3c094b8238fa092c6f894f226ef76b1788fb8ca47836fb3f9a1dca8f67c2865e5c705b1d916b68d4e6c16e15cd7b503369d8d01bcab

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.19.0
+- Fixed windows build by disabling native extensions (issue #188, courtesy @jacek99)
+- Speed improvement to native composite column extension (issue #186, courtesy @muirmanders)
+- Fix OrderedHash iterator return values (issue #185, courtesy @fester)
+- Native support for dynamic composite decoding (issue #184, courtesy @muirmanders)
+
 v0.18.0
 - Cassandra 1.2 support (issue #175, courtesy @brainopia)
 - drop_keyspace defaults to current keyspace (issue #176, courtesy @brianopia)

data/cassandra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandra"
-  s.version = "0.18.0"
+  s.version = "0.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]

data/ext/cassandra_native.c

@@ -1,10 +1,9 @@
 #include <ruby.h>
 #include <arpa/inet.h>
 
-VALUE parts_ivar_id;
+VALUE parts_ivar_id, types_ivar_id, hash_ivar_id;
 
 VALUE rb_cassandra_composite_fast_unpack(VALUE self, VALUE packed_string_value) {
-  int i = 0;
   int index = 0;
   int message_length = RSTRING_LEN(packed_string_value);
   char *packed_string = (char *)RSTRING_PTR(packed_string_value);
@@ -12,15 +11,46 @@ VALUE rb_cassandra_composite_fast_unpack(VALUE self, VALUE packed_string_value)
   VALUE parts = rb_ary_new();
   while (index < message_length) {
     uint16_t length = ntohs(((uint16_t *)(packed_string+index))[0]);
-    VALUE part = rb_str_new("", length);
-    for (i = 0; i < length; i++) {
-      ((char *)RSTRING_PTR(part))[i] = packed_string[index+2+i];
+    VALUE part = rb_str_new(packed_string+index+2, length);
+    rb_ary_push(parts, part);
+    index += length + 3;
+  }
+
+  rb_ivar_set(self, parts_ivar_id, parts);
+  rb_ivar_set(self, hash_ivar_id, rb_funcall(packed_string_value, rb_intern("hash"), 0));
+
+  return Qnil;
+}
+
+VALUE rb_cassandra_dynamic_composite_fast_unpack(VALUE self, VALUE packed_string_value) {
+  int index = 0;
+  int message_length = RSTRING_LEN(packed_string_value);
+  char *packed_string = (char *)RSTRING_PTR(packed_string_value);
+  uint16_t length;
+
+  VALUE parts = rb_ary_new();
+  VALUE types = rb_ary_new();
+  while (index < message_length) {
+    if (packed_string[index] & 0x80) {
+      VALUE type = rb_str_new(packed_string + index + 1, 1);
+      rb_ary_push(types, type);
+      index += 2;
+    } else {
+      length = ntohs(((uint16_t *)(packed_string+index))[0]);
+      VALUE type = rb_str_new(packed_string + index + 2, length);
+      rb_ary_push(types, type);
+      index += 2 + length;
     }
+
+    length = ntohs(((uint16_t *)(packed_string+index))[0]);
+    VALUE part = rb_str_new(packed_string + index + 2, length);
     rb_ary_push(parts, part);
     index += length + 3;
   }
 
   rb_ivar_set(self, parts_ivar_id, parts);
+  rb_ivar_set(self, types_ivar_id, types);
+  rb_ivar_set(self, hash_ivar_id, rb_funcall(packed_string_value, rb_intern("hash"), 0));
 
   return Qnil;
 }
@@ -30,5 +60,10 @@ void Init_cassandra_native(void) {
   VALUE cassandra_composite_class = rb_define_class_under(cassandra_module, "Composite", rb_cObject);
   rb_define_method(cassandra_composite_class, "fast_unpack", rb_cassandra_composite_fast_unpack, 1);
 
+  VALUE dynamic_composite = rb_const_get(cassandra_module, rb_intern("DynamicComposite"));
+  rb_define_method(dynamic_composite, "fast_unpack", rb_cassandra_dynamic_composite_fast_unpack, 1);
+
   parts_ivar_id = rb_intern("@parts");
+  types_ivar_id = rb_intern("@types");
+  hash_ivar_id = rb_intern("@hash");
 }

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+if (defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/) or ENV['OS'] == "Windows_NT"
   File.open('Makefile', 'w'){|f| f.puts "all:\n\ninstall:\n" }
 else
   require 'mkmf'

data/lib/cassandra.rb

@@ -39,3 +39,9 @@ unless Cassandra.VERSION.eql?("0.6")
 end
 require 'cassandra/constants'
 require 'cassandra/debug' if ENV['DEBUG']
+
+begin
+  require "cassandra_native"
+rescue LoadError
+  puts "Unable to load cassandra_native extension. Defaulting to pure Ruby libraries."
+end

data/lib/cassandra/columns.rb

@@ -20,7 +20,7 @@ class Cassandra
       @column_name_maker[column_family] ||=
         begin
           klass = column_name_class(column_family)
-          if klass == Composite
+          if klass == Composite || klass == DynamicComposite
             lambda {|name| klass.new_from_packed(name) }
           else
             lambda {|name| klass.new(name) }
@@ -32,7 +32,7 @@ class Cassandra
       @sub_column_name_maker[column_family] ||=
         begin
           klass = sub_column_name_class(column_family)
-          if klass == Composite
+          if klass == Composite || klass == DynamicComposite
             lambda {|name| klass.new_from_packed(name) }
           else
             lambda {|name| klass.new(name) }

data/lib/cassandra/composite.rb

@@ -132,9 +132,3 @@ class Cassandra
     end
   end
 end
-
-begin
-  require "cassandra_native"
-rescue LoadError
-  puts "Unable to load cassandra_native extension. Defaulting to pure Ruby libraries."
-end

data/lib/cassandra/dynamic_composite.rb

@@ -45,9 +45,31 @@ class Cassandra
     end
 
     def fast_unpack(packed_string)
-      result = try_packed_composite(packed_string)
-      raise ArgumentError.new("Invalid DynamicComposite column") if !result
       @hash = packed_string.hash
+
+      @types = []
+      @parts = []
+
+      offset = 0
+      length = nil
+      while offset < packed_string.length
+        if packed_string[offset].ord & 0x80 != 0
+          @types << packed_string[offset+1]
+          offset += 2
+        else
+          length = packed_string.slice(offset, 2).unpack('n')[0]
+          offset += 2
+          @types << packed_string.slice(offset, length)
+          offset += length
+        end
+        length = packed_string.slice(offset, 2).unpack('n')[0]
+        offset += 2
+        @parts << packed_string.slice(offset, length)
+        offset += length + 1
+      end
+
+      @column_slice = :after if packed_string[-1] == "\x01"
+      @column_slice = :before if packed_string[-1] == "\xFF"
     end
 
     private

data/lib/cassandra/ordered_hash.rb

@@ -83,14 +83,17 @@ class Cassandra
 
       def each_key
         @keys.each { |key| yield key }
+        self
       end
 
       def each_value
         @keys.each { |key| yield self[key]}
+        self
       end
 
       def each
         @keys.each {|key| yield [key, self[key]]}
+        self
       end
 
       alias_method :each_pair, :each

data/test/cassandra_test.rb

@@ -93,6 +93,13 @@ class CassandraTest < Test::Unit::TestCase
     assert_not_equal(hash.keys, @twitter.get(:Users, key).keys)
   end
 
+  def test_ordered_hash_iteration_functions_return_values
+    hash = OrderedHash['a', '', 'b', '', 'c', '', 'd', '',]
+    assert_instance_of OrderedHash, hash.each{|_| true}
+    assert_instance_of OrderedHash, hash.each_value{|_| true}
+    assert_instance_of OrderedHash, hash.each_key{|_| true}
+  end
+
   def test_get_first_time_uuid_column
     @blogs.insert(:Blogs, key,
       {@uuids[0] => 'I like this cat', @uuids[1] => 'Buttons is cuter', @uuids[2] => 'I disagree'})

data/test/composite_type_test.rb

@@ -29,6 +29,14 @@ class CompositeTypesTest < Test::Unit::TestCase
   def test_packing_and_unpacking
     assert_equal(@part0_length + @part1_length + @part2_length, @col.pack.length)
 
+    col2 = Cassandra::Composite.new_from_packed(@col.pack)
+    assert_equal(@col_parts[0], col2[0])
+    assert_equal(@col_parts[1], col2[1])
+    assert_equal(@col_parts[2], col2[2])
+    assert_equal(@col, col2)
+    # make sure we set this while we have the packed string handy
+    assert_equal(@col.pack.hash, col2.instance_variable_get(:@hash))
+
     col2 = Cassandra::Composite.new(@col.pack)
     assert_equal(@col_parts[0], col2[0])
     assert_equal(@col_parts[1], col2[1])
@@ -42,6 +50,14 @@ class CompositeTypesTest < Test::Unit::TestCase
     part2_length = @part2_length + 2 + @types[2].length
     assert_equal(part0_length + part1_length + part2_length, @dycol.pack.length)
 
+    col2 = Cassandra::DynamicComposite.new_from_packed(@dycol.pack)
+    assert_equal(@col_parts[0], col2[0])
+    assert_equal(@col_parts[1], col2[1])
+    assert_equal(@col_parts[2], col2[2])
+    assert_equal(@dycol, col2)
+    # make sure we set this while we have the packed string handy
+    assert_equal(@dycol.pack.hash, col2.instance_variable_get(:@hash))
+
     col2 = Cassandra::DynamicComposite.new(@dycol.pack)
     assert_equal(@col_parts[0], col2[0])
     assert_equal(@col_parts[1], col2[1])
@@ -55,6 +71,12 @@ class CompositeTypesTest < Test::Unit::TestCase
     part2_length = @part2_length + 2
     assert_equal(part0_length + part1_length + part2_length, @dycol_alias.pack.length)
 
+    col2 = Cassandra::DynamicComposite.new_from_packed(@dycol_alias.pack)
+    assert_equal(@col_parts[0], col2[0])
+    assert_equal(@col_parts[1], col2[1])
+    assert_equal(@col_parts[2], col2[2])
+    assert_equal(@dycol_alias, col2)
+
     col2 = Cassandra::DynamicComposite.new(@dycol_alias.pack)
     assert_equal(@col_parts[0], col2[0])
     assert_equal(@col_parts[1], col2[1])

metadata

@@ -1,99 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cassandra
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 18
-  - 0
-  version: 0.18.0
+version: !ruby/object:Gem::Version
+  version: 0.19.0
 platform: ruby
-authors: 
+authors:
 - Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-26 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thrift_client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: simple_uuid
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: echoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: echoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby client for the Cassandra distributed database.
-email: ""
-executables: 
+email: ''
+executables:
 - cassandra_helper
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
@@ -138,7 +137,7 @@ extra_rdoc_files:
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
 - lib/cassandra/time.rb
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -234,44 +233,37 @@ files:
 - vendor/1.1/gen-rb/cassandra_constants.rb
 - vendor/1.1/gen-rb/cassandra_types.rb
 - cassandra.gemspec
-has_rdoc: true
 homepage: http://github.com/twitter/cassandra
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Cassandra
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      - 8
-      version: "0.8"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0.8'
 requirements: []
-
 rubyforge_project: cassandra
-rubygems_version: 1.3.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.
-test_files: 
+test_files:
 - test/cassandra_client_test.rb
 - test/cassandra_mock_test.rb
 - test/cassandra_test.rb