cassilds 0.12.3 → 0.12.4

data/cassilds.gemspec

@@ -26,17 +26,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thrift>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<thrift_client>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<simple_uuid>, [">= 0.2.0"])
     else
+      s.add_dependency(%q<thrift>, [">= 0.7.0"])
       s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
     end
   else
+    s.add_dependency(%q<thrift>, [">= 0.7.0"])
     s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])

data/lib/cassandra/cassandra.rb

@@ -566,9 +566,16 @@ class Cassandra
   # * options - Valid options are:
   #   * :consistency - Uses the default read consistency if none specified.
   #
-  # FIXME Not real multi; needs to use a Column predicate
-  def multi_get_columns(column_family, keys, *options)
-    OrderedHash[*keys.map { |key| [key, get_columns(column_family, key, *options)] }._flatten_once]
+  def multi_get_columns(column_family, keys, *columns_and_options)
+    column_family, columns, sub_columns, options = 
+      extract_and_validate_params(column_family, keys, columns_and_options, READ_DEFAULTS)
+
+    hash = _multiget(column_family, keys, columns, sub_columns, 
+      nil, nil, nil, nil, options[:consistency])
+    # Restore order
+    ordered_hash = OrderedHash.new
+    keys.each { |key| ordered_hash[key] = hash[key] || (OrderedHash.new if is_super(column_family) and !sub_columns) }
+    ordered_hash
   end
 
   ##

data/lib/cassandra/protocol.rb

@@ -26,24 +26,14 @@ class Cassandra
 
     # FIXME: Add support for start, stop, count
     def _get_columns(column_family, key, columns, sub_columns, consistency)
-      result = if is_super(column_family)
-        if sub_columns
-          columns_to_hash(column_family, client.get_slice(key,
-            CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => columns),
-            CassandraThrift::SlicePredicate.new(:column_names => sub_columns),
-            consistency))
-        else
-          columns_to_hash(column_family, client.get_slice(key,
-            CassandraThrift::ColumnParent.new(:column_family => column_family),
-            CassandraThrift::SlicePredicate.new(:column_names => columns),
-            consistency))
-        end
-      else
-        columns_to_hash(column_family, client.get_slice(key,
-          CassandraThrift::ColumnParent.new(:column_family => column_family),
-          CassandraThrift::SlicePredicate.new(:column_names => columns),
-          consistency))
+      if is_super(column_family) and sub_columns
+        predicate = CassandraThrift::SlicePredicate.new(:column_names => sub_columns)
+        column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => columns)
+      else # Standard and SuperColumns without sub_columns specified
+        predicate = CassandraThrift::SlicePredicate.new(:column_names => columns)
+        column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
       end
+      result = columns_to_hash(column_family, client.get_slice(key, column_parent, predicate, consistency))
 
       klass = column_name_class(column_family)
       (sub_columns || columns).map { |name| result[klass.new(name)] }
@@ -52,20 +42,13 @@ class Cassandra
     def _multiget(column_family, keys, column, sub_column, start, finish, count, reversed, consistency)
       # Single values; count and range parameters have no effect
       if is_super(column_family) and sub_column
-        predicate = CassandraThrift::SlicePredicate.new(:column_names => [sub_column])
+        predicate = CassandraThrift::SlicePredicate.new(:column_names => Array(sub_column))
         column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => column)
-        column_hash = multi_sub_columns_to_hash!(column_family, client.multiget_slice(keys, column_parent, predicate, consistency))
-
-        klass = sub_column_name_class(column_family)
-        keys.inject({}){|hash, key| hash[key] = column_hash[key][klass.new(sub_column)]; hash}
+        multi_sub_columns_to_hash!(column_family, client.multiget_slice(keys, column_parent, predicate, consistency))
       elsif !is_super(column_family) and column
-        predicate = CassandraThrift::SlicePredicate.new(:column_names => [column])
+        predicate = CassandraThrift::SlicePredicate.new(:column_names => Array(column))
         column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
-        column_hash  = multi_columns_to_hash!(column_family, client.multiget_slice(keys, column_parent, predicate, consistency))
-
-        klass = column_name_class(column_family)
-        keys.inject({}){|hash, key| hash[key] = column_hash[key][klass.new(column)]; hash}
-
+        multi_columns_to_hash!(column_family, client.multiget_slice(keys, column_parent, predicate, consistency))
       # Slices
       else
         predicate = CassandraThrift::SlicePredicate.new(:slice_range =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassilds
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,9 +12,20 @@ bindir: bin
 cert_chain: []
 date: 2011-08-22 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thrift
+  requirement: &11716560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *11716560
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &11137440 !ruby/object:Gem::Requirement
+  requirement: &11716080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *11137440
+  version_requirements: *11716080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11136380 !ruby/object:Gem::Requirement
+  requirement: &11715600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11136380
+  version_requirements: *11715600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11123240 !ruby/object:Gem::Requirement
+  requirement: &11715120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11123240
+  version_requirements: *11715120
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &11121160 !ruby/object:Gem::Requirement
+  requirement: &11714640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +66,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *11121160
+  version_requirements: *11714640
 description: A Ruby client for the Cassandra distributed database.
 email:
 - contato@umanni.com