sessionm-cassandra 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8a9ab7395b368178388fd47a3dbc6a4c2098a932
-  data.tar.gz: 22d79eaee512777ab8b19a607115b4b50543cdf2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWU2YjgyNzljYzQ5YTY1ZTlhNGViYzc2ZDAyMzMxMDZlMzgyMzA2ZA==
+  data.tar.gz: !binary |-
+    YjI0MTlmNmJmNTgwNWM1NzQzNjJjZWRiMjRjMTFiOGJjZGQzNDdmOA==
 SHA512:
-  metadata.gz: 987be0cd4fa949f6cfd83cadaf2da0d4c48271224a787c490cf9c9c154515c039ea1009eec71dbd4b67e6f725c39842e99c82d1dae49b8c719f92200a73d84f8
-  data.tar.gz: e2b54edff3b53461101914989f31e7d313533770f85655c81b0f1e3ce461207c795c73f7c3efd051422522278cc3c9491b86c4f690ec629726ce4e70e377f153
+  metadata.gz: !binary |-
+    ZTc4OTFhNzVhZTg0MTBhNDY3ZDk4MzJkMDBkYjhhMTM5NmJjZWM1MGJlZTQz
+    NjI0ZGUxNDJmNjkyZGM2YWM4N2QzZTdmMjdmMWE1NjMxYmVkMmQ4NzYyMWNk
+    MDIyOGQ1ZmY4MDEyNjFiNGVhNDgzY2I4ZjEwYzNhNDVjYWRkYTM=
+  data.tar.gz: !binary |-
+    YmMxZjY2NmQ3NWFjM2U3YzI1Y2EyYjM1ODUxMTFiZWI0Mzk3MzFjYmRkOTQ4
+    MjVjYjg3YzRlN2UwZDJhYTNlMzJmODk5MWVhMmY5NmEwMGQ5OWU5MTQ4YzE4
+    N2RkNmY4YjlmMzU1MTQxYTk1MjE0ODlkNmYyMjQ1YTEwY2UzY2Q=

data/lib/cassandra/cassandra.rb

@@ -557,6 +557,25 @@ class Cassandra
     _get_columns(column_family, key, columns, sub_columns, options[:consistency])
   end
 
+  ##
+  # Return a hash of column value pairs for the path you request.
+  #
+  # * column_family - The column_family that you are inserting into.
+  # * key - The row key to insert.
+  # * columns - Either a single super_column or a list of columns.
+  # * sub_columns - The list of sub_columns to select.
+  # * options - Valid options are:
+  #   * :consistency - Uses the default read consistency if none specified.
+  #
+  def get_columns_as_hash(column_family, key, columns, options=nil)
+    consistency = options ? (options[:consistency] || READ_DEFAULTS[:consistency]) : READ_DEFAULTS[:consistency]
+    if column_family.is_a?(CassandraThrift::ColumnParent)
+      _get_columns_as_hash(column_family, key, columns, nil, consistency)
+    else
+      _get_columns_as_hash(column_family, key, columns, nil, consistency)
+    end
+  end
+
   ##
   # Multi-key version of Cassandra#get_columns. Please note that this
   # queries the server for each key passed in.
@@ -594,7 +613,27 @@ class Cassandra
   #   * :consistency - Uses the default read consistency if none specified.
   #
   def get(column_family, key, *columns_and_options)
-    multi_get(column_family, [key], *columns_and_options)[key]
+    if column_family.is_a?(CassandraThrift::ColumnParent)
+      column = columns_and_options.first
+      consistency = columns_and_options.last.is_a?(Hash) ? (columns_and_options.last[:consistency] || READ_DEFAULTS[:consistency]) : READ_DEFAULTS[:consistency]
+
+      get_slice(column_family, key, column, nil, nil, nil, nil, consistency)
+    else
+      column_family, column, sub_column, options =
+        extract_and_validate_params(column_family, key, columns_and_options, READ_DEFAULTS)
+
+      if column
+        get_value column_family, key, column, options[:consistency]
+      else
+        get_slice(column_family, key, column, options[:start], options[:finish], options[:count], options[:reversed], options[:consistency])
+      end
+    end
+  end
+
+  ##
+  # Returns the value of the column
+  def get_value(column_family, key, column, consistency)
+    _get(column_family, key, column, consistency)
   end
 
   ##
@@ -1005,9 +1044,9 @@ class Cassandra
     key_slices.inject(OrderedHash.new) {|h, key_slice| h[key_slice.key] = key_slice.columns; h }
   end
 
-  # Selecting a slice of a super column
-  def get_slice(column_family, key, start, finish, count, reversed, consistency)
-    _get_slice(column_family, key, start, finish, count, reversed, consistency)
+  # Selecting a slice of a column
+  def get_slice(column_family, key, column, start, finish, count, reversed, consistency)
+    _get_slice(column_family, key, column, start, finish, count, reversed, consistency)
   end
 
   protected

data/lib/cassandra/protocol.rb

@@ -26,7 +26,26 @@ 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)
+      result = _get_columns_as_hash(column_family, key, columns, sub_columns, consistency)
+      klass = column_name_class(column_family)
+      (sub_columns || columns).map { |name| result[klass.new(name)] }
+    end
+
+    def _get_columns_as_hash(column_family, key, columns, sub_columns, consistency)
+      if column_family.is_a?(CassandraThrift::ColumnParent)
+        client.get_slice(key,
+                         column_family,
+                         columns,
+                         consistency)
+          .inject(OrderedHash.new) do |hsh, row|
+          if column = row.column
+            hsh.send :[]=, column.name, column.value, column.timestamp
+          elsif column = row.counter_column
+            hsh.send :[]=, column.name, column.value, 0
+          end
+          hsh
+        end
+      elsif 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),
@@ -44,11 +63,8 @@ class Cassandra
           CassandraThrift::SlicePredicate.new(:column_names => columns),
           consistency))
       end
-
-      klass = column_name_class(column_family)
-      (sub_columns || columns).map { |name| result[klass.new(name)] }
     end
-    
+
     def _multi_get_columns(column_family, keys, columns, sub_columns, consistency)
       result = if is_super(column_family) and sub_columns
         predicate = CassandraThrift::SlicePredicate.new(:column_names => sub_columns)
@@ -67,8 +83,10 @@ class Cassandra
     end
 
     def _multiget(column_family, keys, column, sub_column, count, start, finish, reversed, consistency)
+      if column_family.is_a?(CassandraThrift::ColumnParent)
+        multi_columns_to_hash!(column_family.column_family, client.multiget_slice(keys, column_family, column, consistency))
       # Single values; count and range parameters have no effect
-      if is_super(column_family) and sub_column
+      elsif is_super(column_family) and sub_column
         predicate = CassandraThrift::SlicePredicate.new(:column_names => [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))
@@ -134,19 +152,39 @@ class Cassandra
       client.get_indexed_slices(column_parent, index_clause, predicate, consistency)
     end
 
-    def _get_slice(column_family, key, start, finish, count, reversed, consistency)
-      parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
-      predicate = CassandraThrift::SlicePredicate.
-        new(:slice_range =>
-            CassandraThrift::SliceRange.new(:start => start,
-                                            :finish => finish,
-                                            :count => count,
-                                            :reversed => reversed))
-      {}.tap do |result|
-        client.get_slice(key, parent, predicate, consistency).each do |column|
-          result[column.counter_super_column.name] = _columns_to_hash(column.counter_super_column.columns)
+    def _get_slice(column_family, key, column, start, finish, count, reversed, consistency)
+      if column_family.is_a?(CassandraThrift::ColumnParent)
+        parent = column_family
+        predicate = column
+      else
+        parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
+        predicate = if column
+                      CassandraThrift::SlicePredicate.new(:column_names => [column])
+                    else
+                      CassandraThrift::SlicePredicate.
+                        new(:slice_range =>
+                            CassandraThrift::SliceRange.new(:start => start,
+                                                            :finish => finish,
+                                                            :count => count,
+                                                            :reversed => reversed))
+                    end
+      end
+
+      OrderedHash.new.tap do |result|
+        client.get_slice(key, parent, predicate, consistency).each do |row|
+          if column = row.column
+            result.send :[]=, column.name, column.value, column.timestamp
+          elsif column = row.counter_column
+            result.send :[]=, column.name, column.value, 0
+          end
         end
       end
     end
+
+    def _get(column_family, key, column, consistency)
+      column_path = CassandraThrift::ColumnPath.new(:column_family => column_family, :column => column)
+      result = client.get(key, column_path, consistency)
+      (result.column || result.counter_column).value
+    end
   end
 end

data/sessionm-cassandra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sessionm-cassandra"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.authors = ["Evan Weaver, Ryan King", "Kris Lange"]
   s.date = "2012-09-26"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Evan Weaver, Ryan King
@@ -163,28 +163,28 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--line-numbers"
-- "--inline-source"
-- "--title"
+- --line-numbers
+- --inline-source
+- --title
 - Cassandra
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 - ext
 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'
 requirements: []
 rubyforge_project: cassandra
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby client for the Cassandra distributed database.