cassandra 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e09d9ef5ec124d616ed409e7b58f318a648b27c
-  data.tar.gz: 9b02d2de7fb9665de9da5a669182afd59dd86b68
+  metadata.gz: 5daf0bcf89a1be06c7a378c60ee41c037e2a5c23
+  data.tar.gz: f054a9ea46806ebaae4cf3d24602eb3a1462e942
 SHA512:
-  metadata.gz: a5b30fed29b2e3f77f9ffa3d9ff732c1b7518547beca98d5475098dbc108ed0d354613ae73c77c24b32bc1884df8c1d8dc4e80de16ff973fee7297fb66b46512
-  data.tar.gz: f4dd071c59d3d8cbafcfa27a0cb7316fedbb98f71a0883a891a1cdae5959bad823c025b00f274fd323073d883ee47feb263c4b79538f484faf9ce35c557cca19
+  metadata.gz: ac367f6fe75340bae0019c46c59415bb541d1df7cef5d45bc49bde9b4beed9c6d759f49077c761ed0eedced549104bab13ac8239cd85d2087c618c6468d37cb7
+  data.tar.gz: 62b7dfa25c51cafdd5426e4c4e1b156ee5d107ee3c86e54e8cbd770cbb1651d85fe41d035e223c7337c293c657f6826bf918d53aba5800fcd36f39a9e3ce36aa

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.22.0
+- Add new composite API to resolve ambiguity between unpacking a composite and packing a composite with one element (issue #196, courtesy @kevinkehl)
+- Breaking change: schema change methods no longer catch exceptions internally.  They work the same as everything else.
+
 v0.21.0
 - Add 1.2 libs to gem
 

data/cassandra.gemspec

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

data/lib/cassandra/cassandra.rb

@@ -269,13 +269,8 @@ class Cassandra
   def add_column_family(cf_def)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_add_column_family(cf_def)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
     @schema = nil
-    res
+    return client.system_add_column_family(cf_def)
   end
 
   ##
@@ -286,13 +281,8 @@ class Cassandra
   def drop_column_family(column_family)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_drop_column_family(column_family)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
     @schema = nil
-    res
+    return client.system_drop_column_family(column_family)
   end
 
   ##
@@ -304,13 +294,8 @@ class Cassandra
   def rename_column_family(old_name, new_name)
     return false if Cassandra.VERSION.to_f != 0.7
 
-    begin
-      res = client.system_rename_column_family(old_name, new_name)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
     @schema = nil
-    res
+    return client.system_rename_column_family(old_name, new_name)
   end
 
   ##
@@ -319,13 +304,8 @@ class Cassandra
   def update_column_family(cf_def)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_update_column_family(cf_def)
-    rescue CassandraThrift::TimedOutException => te
-      puts "Timed out: #{te.inspect}"
-    end
     @schema = nil
-    res
+    return client.system_update_column_family(cf_def)
   end
 
   ##
@@ -336,15 +316,8 @@ class Cassandra
   def add_keyspace(ks_def)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_add_keyspace(ks_def)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
     @keyspaces = nil
-    res
+    return client.system_add_keyspace(ks_def)
   end
 
   ##
@@ -355,16 +328,10 @@ class Cassandra
   def drop_keyspace(keyspace=@keyspace)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_drop_keyspace(keyspace)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    keyspace = "system" if keyspace.eql?(@keyspace)
     @keyspaces = nil
-    res
+    ret = client.system_drop_keyspace(keyspace)
+    keyspace = "system" if keyspace.eql?(@keyspace)
+    return ret
   end
 
   ##
@@ -377,16 +344,10 @@ class Cassandra
   def rename_keyspace(old_name, new_name)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_rename_keyspace(old_name, new_name)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
-    keyspace = new_name if old_name.eql?(@keyspace)
     @keyspaces = nil
-    res
+    ret = client.system_rename_keyspace(old_name, new_name)
+    keyspace = new_name if old_name.eql?(@keyspace)
+    return ret
   end
 
   ##
@@ -395,15 +356,8 @@ class Cassandra
   def update_keyspace(ks_def)
     return false if Cassandra.VERSION.to_f < 0.7
 
-    begin
-      res = client.system_update_keyspace(ks_def)
-    rescue CassandraThrift::TimedOutException => toe
-      puts "Timed out: #{toe.inspect}"
-    rescue Thrift::TransportException => te
-      puts "Timed out: #{te.inspect}"
-    end
     @keyspaces = nil
-    res
+    return client.system_update_keyspace(ks_def)
   end
   ##
   # The initial default consistency is set to ONE, but you can use this method

data/lib/cassandra/composite.rb

@@ -11,16 +11,13 @@ class Cassandra
       if parts.last.is_a?(Hash)
         options = parts.pop
       end
-      @column_slice = options[:slice]
-      raise ArgumentError if @column_slice != nil && ![:before, :after].include?(@column_slice)
 
       if parts.length == 1 && parts[0].instance_of?(self.class)
-        @column_slice = parts[0].column_slice
-        @parts = parts[0].parts
+        make_from_parts(parts[0].parts, :slice => parts[0].column_slice)
       elsif parts.length == 1 && parts[0].instance_of?(String) && @column_slice.nil? && try_packed_composite(parts[0])
         @hash = parts[0].hash
       else
-        @parts = parts
+        make_from_parts(parts, options)
       end
     end
 
@@ -30,6 +27,13 @@ class Cassandra
       return obj
     end
 
+    def self.new_from_parts(parts, args={})
+      obj = new
+      obj.make_from_parts(parts, args)
+
+      return obj
+    end
+
     def [](*args)
       return @parts[*args]
     end
@@ -102,6 +106,12 @@ class Cassandra
       @column_slice = :before if end_of_component == "\xFF"
     end
 
+    def make_from_parts(parts, args)
+      @parts = parts
+      @column_slice = args[:slice]
+      raise ArgumentError if @column_slice != nil && ![:before, :after].include?(@column_slice)
+    end
+
     private
     def try_packed_composite(packed_string)
       parts = []

data/test/cassandra_test.rb

@@ -1244,6 +1244,9 @@ class CassandraTest < Test::Unit::TestCase
 
     def test_composite_column_type_conversion
       columns = {}
+      @composites.push(
+        Cassandra::Composite.new_from_parts([[20].pack('N'), "meerkat"])
+      )
       @composites.each_with_index do |c, index|
         columns[c] = "value-#{index}"
       end
@@ -1253,12 +1256,13 @@ class CassandraTest < Test::Unit::TestCase
         Cassandra::Composite.new([5].pack('N'), "aardvark"),
         Cassandra::Composite.new([5].pack('N'), "zebra"),
         Cassandra::Composite.new([10].pack('N'), "kangaroo"),
+        Cassandra::Composite.new([20].pack('N'), "meerkat"),
       ]
       assert_equal(columns_in_order, @type_conversions.get(:CompositeColumnConversion, key).keys)
 
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
         :start => Cassandra::Composite.new([1].pack('N')),
-        :finish => Cassandra::Composite.new([10].pack('N'))
+        :finish => Cassandra::Composite.new([20].pack('N'))
       ).keys
       assert_equal(columns_in_order[0..-2], column_slice)
 
@@ -1271,12 +1275,12 @@ class CassandraTest < Test::Unit::TestCase
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
         :start => Cassandra::Composite.new([5].pack('N'), :slice => :after).to_s
       ).keys
-      assert_equal([columns_in_order[-1]], column_slice)
+      assert_equal(columns_in_order[-2..-1], column_slice)
 
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
         :finish => Cassandra::Composite.new([10].pack('N'), :slice => :before).to_s
       ).keys
-      assert_equal(columns_in_order[0..-2], column_slice)
+      assert_equal(columns_in_order[0..-3], column_slice)
 
       assert_equal('value-2', @type_conversions.get(:CompositeColumnConversion, key, columns_in_order.first))
     end

data/test/composite_type_test.rb

@@ -24,6 +24,11 @@ class CompositeTypesTest < Test::Unit::TestCase
       assert_equal(@col_parts[i], @dycol[i])
       assert_equal(@col_parts[i], @dycol_alias[i])
     end
+
+    col2 = Cassandra::Composite.new_from_parts(@col_parts)
+    (0..2).each do |i|
+      assert_equal(@col_parts[i], col2[i].to_s)
+    end
   end
 
   def test_packing_and_unpacking

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassandra
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift_client