right_support 2.8.12 → 2.8.15

data/.rspec

@@ -1,4 +1,3 @@
 --colour
 --format=nested
 --backtrace
---debugger

data/Gemfile

@@ -1,30 +1,24 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Gems that RightSupport can optionally make use of, but which it does
-# not require to be installed. These would be "optional dependencies"
+# not require to be installed. These would be 'optional dependencies'
 # if gemspecs allowed for them.
 group :optional do
-  gem "net-ssh", "~> 2.0"
-  gem "rest-client", "~> 1.6"
-  gem "addressable", "~> 2.2.7"
-  gem "uuidtools", "~> 2.0", :require => nil
-  gem "simple_uuid", "~> 0.2", :require => nil
-  gem "uuid", "~> 2.3", :require => nil
-  gem "yajl-ruby", "~> 1.1"
-  gem "iconv", :platforms => :ruby_18
+  gem 'net-ssh', '~> 2.0'
+  gem 'mime-types', '~> 1.0' # mime-types 2.x is no longer compatible with Ruby 1.8 and mime-types 1.x is only being maintained for security issues
+  gem 'rest-client', '~> 1.6'
+  gem 'addressable', '~> 2.2.7'
+  gem 'uuidtools', '~> 2.0', :require => nil
+  gem 'simple_uuid', '~> 0.2', :require => nil
+  gem 'uuid', '~> 2.3', :require => nil
+  gem 'yajl-ruby', '~> 1.1'
+  gem 'iconv', :platforms => :ruby_18
 end
 
 # Gems used during test and development of RightSupport.
 group :development do
-  gem "rake", "~> 0.9"
-  gem "jeweler", "~> 1.8.3"
-  gem "right_develop", "~> 1.0",
-	 :git => "git@github.com:rightscale/right_develop.git",
-	 :branch => "master"
-  gem "ruby-debug", ">= 0.10", :platforms => :ruby_18
-  gem "ruby-debug19", ">= 0.11.6", :platforms => :ruby_19
-  gem "rdoc", ">= 2.4.2"
-  gem "flexmock", "~> 1.0"
-  gem "syntax", "~> 1.0.0" #rspec will syntax-highlight code snippets if this gem is available
-  gem "nokogiri", "~> 1.5"
+  gem 'jeweler', '~> 2.0'
+  gem 'flexmock', '~> 1.0'
+  gem 'rspec', '~> 2.13.0'
+  gem 'cucumber', ['~> 1.0', '< 1.3.3'] # Cuke >= 1.3.3 depends on RubyGems > 2.0 without specifying that in its gemspec
 end

data/Gemfile.lock

@@ -1,115 +1,91 @@
-GIT
-  remote: git@github.com:rightscale/right_develop.git
-  revision: dedba69a68e8b56cc88db7d6dc518d42747b0586
-  branch: master
-  specs:
-    right_develop (1.2.2)
-      actionpack (>= 2.3.0, < 4.0)
-      builder (~> 3.0)
-      cucumber (~> 1.0)
-      rake (>= 0.8.7, < 0.10)
-      right_support (~> 2.0)
-      rspec (>= 1.3, < 3.0)
-      trollop (>= 1.0, < 3.0)
-
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activesupport (2.3.18)
     addressable (2.2.8)
-    archive-tar-minitar (0.5.2)
     builder (3.2.2)
-    columnize (0.3.6)
-    cucumber (1.3.3)
+    cucumber (1.3.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.0)
-      multi_json (~> 1.7.5)
-      multi_test (~> 0.0.1)
-    diff-lcs (1.2.4)
-    flexmock (1.3.2)
-    gherkin (2.12.0)
       multi_json (~> 1.3)
-    git (1.2.5)
+    diff-lcs (1.2.5)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    flexmock (1.3.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
     iconv (1.0.4)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
-    mime-types (1.22)
-    multi_json (1.7.7)
-    multi_test (0.0.1)
-    net-ssh (2.6.6)
-    nokogiri (1.5.9)
-    rack (1.1.6)
-    rake (0.9.6)
-    rbx-require-relative (0.0.9)
-    rdoc (4.0.1)
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    macaddr (1.6.5)
+      systemu (~> 2.6.2)
+    mime-types (1.25.1)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    net-ssh (2.8.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    right_support (2.7.0)
-    rspec (2.14.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.0)
-    rspec-expectations (2.14.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    simple_uuid (0.3.0)
-    syntax (1.0.0)
-    systemu (2.5.2)
-    trollop (2.0)
+    rspec-mocks (2.13.1)
+    simple_uuid (0.4.0)
+    systemu (2.6.3)
     uuid (2.3.7)
       macaddr (~> 1.0)
-    uuidtools (2.1.3)
-    yajl-ruby (1.1.0)
+    uuidtools (2.1.4)
+    yajl-ruby (1.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   addressable (~> 2.2.7)
+  cucumber (~> 1.0, < 1.3.3)
   flexmock (~> 1.0)
   iconv
-  jeweler (~> 1.8.3)
+  jeweler (~> 2.0)
+  mime-types (~> 1.0)
   net-ssh (~> 2.0)
-  nokogiri (~> 1.5)
-  rake (~> 0.9)
-  rdoc (>= 2.4.2)
   rest-client (~> 1.6)
-  right_develop (~> 1.0)!
-  ruby-debug (>= 0.10)
-  ruby-debug19 (>= 0.11.6)
+  rspec (~> 2.13.0)
   simple_uuid (~> 0.2)
-  syntax (~> 1.0.0)
   uuid (~> 2.3)
   uuidtools (~> 2.0)
   yajl-ruby (~> 1.1)

data/Rakefile

@@ -10,8 +10,6 @@ require 'rake/clean'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-require 'right_develop/ci/rake_task'
-
 # But, we have a very special need, because OUR Cucumbers need to run with a pristine
 # environment that isn't polluted by RVM or RubyGems or anyone else, in order to validate
 # that RightSupport's CI harness doesn't break your app if those gems are unavailable.
@@ -63,5 +61,3 @@ tasks.jeweler.commit = false
 Jeweler::RubygemsDotOrgTasks.new
 
 CLEAN.include('pkg')
-
-RightDevelop::CI::RakeTask.new

data/VERSION

@@ -1 +1 @@
-2.8.12
+2.8.15

data/features/hash_tools.feature

@@ -0,0 +1,27 @@
+Feature: tools for hash manipulation
+  In order to successfully work with hashes
+  RightSupport should have a tested set of tools
+  So the developers can trust each method
+
+  Scenario: getting a value from a path
+    Given a hash map with the form {"key1":"val1", "key2":{"key3":"val2"}}
+    And a path array ["key2", "key3"]
+    When I call the deep_get method
+    Then The deep_get method response should be: val2
+
+  Scenario: setting a value on a path
+    Given a hash map with the form {"key1":{"key4":{"key5":"no"}}, "key2":{"key3":"val2"}}
+    And a path array ["key1", "key4", "key5"]
+    And a value val3
+    When I call the deep_set! method
+    Then The hash should be: {"key1":{"key4":{"key5":"val3"}}, "key2":{"key3":"val2"}}
+
+  Scenario: merging two hashes
+    Given a hash map with the form {"key1":"val1", "key2":{"key3":"val2"}}
+    When I call the deep_merge! method with the source: {"key1":{"key4":"val3"}}
+    Then The hash should be: {"key1":{"key4":"val3"}, "key2":{"key3":"val2"}}
+
+  Scenario: subtracting a hash
+    Given a hash map with the form {"key1":"val1", "key2":{"key3":"val2"}}
+    When I call the deep_remove! method with the source: {"key1":"val1"}
+    Then The hash should be: {"key2":{"key3":"val2"}}

data/features/step_definitions/hash_tools_steps.rb

@@ -0,0 +1,41 @@
+require 'json'
+
+Given /^a hash map with the form (.*)$/ do |hash|
+  @hash = JSON.parse(hash)
+end
+
+Given /^a path array (.*)$/ do |path|
+  @path = JSON.parse(path)
+end
+
+Given /^a value (.*)$/ do |value|
+  @value = value
+end
+
+When /^I call the deep_get method$/ do
+  @deep_get_value = RightSupport::Data::HashTools.deep_get(@hash, @path)
+end
+
+When /^I call the deep_set! method$/ do
+  RightSupport::Data::HashTools.deep_set!(@hash, @path, @value)
+end
+
+When /^I call the deep_merge! method with the source: (.*)$/ do |source|
+  RightSupport::Data::HashTools.deep_merge!(@hash, JSON.parse(source))
+end
+
+When /^I call the deep_remove! method with the source: (.*)$/ do |source|
+  RightSupport::Data::HashTools.deep_remove!(@hash, JSON.parse(source))
+end
+
+Then /^The hash should be: (.*)$/ do |hash|
+  @hash == JSON.parse(hash)
+end
+
+Then /^The deep_get method response should be: (.*)$/ do |expression|
+  @deep_get_value == expression
+end
+
+Then /^The generate method response should be: (.*)$/ do |expression|
+  @generated_value == expression
+end

data/lib/right_support/db/cassandra_model.rb

@@ -34,11 +34,11 @@ if require_succeeds?('cassandra/0.8')
           predicate = CassandraThrift::SlicePredicate.new(:column_names => [columns].flatten)
         else
           predicate = CassandraThrift::SlicePredicate.new(:slice_range =>
-            CassandraThrift::SliceRange.new(
-              :reversed => reversed,
-              :count => count,
-              :start => start,
-              :finish => finish))
+                                                            CassandraThrift::SliceRange.new(
+                                                              :reversed => reversed,
+                                                              :count    => count,
+                                                              :start    => start,
+                                                              :finish   => finish))
         end
         client.get_indexed_slices(column_parent, index_clause, predicate, consistency)
       end
@@ -48,7 +48,7 @@ if require_succeeds?('cassandra/0.8')
     # rather than converting it to a Hash
     def get_range_single(column_family, options = {})
       return_empty_rows = options.delete(:return_empty_rows) || false
-      slices_please = options.delete(:slices_not_hash) || false
+      slices_please     = options.delete(:slices_not_hash) || false
 
       column_family, _, _, options =
         extract_and_validate_params(column_family, "", [options],
@@ -57,19 +57,19 @@ if require_succeeds?('cassandra/0.8')
                                                         :key_count  => 100,
                                                         :columns    => nil,
                                                         :reversed   => false
-                                                       )
-                                   )
-
-      results = _get_range( column_family,
-                            options[:start_key].to_s,
-                            options[:finish_key].to_s,
-                            options[:key_count],
-                            options[:columns],
-                            options[:start].to_s,
-                            options[:finish].to_s,
-                            options[:count],
-                            options[:consistency],
-                            options[:reversed] )
+                                    )
+        )
+
+      results = _get_range(column_family,
+                           options[:start_key].to_s,
+                           options[:finish_key].to_s,
+                           options[:key_count],
+                           options[:columns],
+                           options[:start].to_s,
+                           options[:finish].to_s,
+                           options[:count],
+                           options[:consistency],
+                           options[:reversed])
 
       unless slices_please
         multi_key_slices_to_hash(column_family, results, return_empty_rows)
@@ -95,9 +95,9 @@ if require_succeeds?('cassandra/0.8')
       end
 
       key_slices = _get_indexed_slices(column_family, index_clause, columns, options[:count], options[:start],
-        options[:finish], options[:reversed], options[:consistency])
+                                       options[:finish], options[:reversed], options[:consistency])
 
-      key_slices.inject(OrderedHash.new){|h, key_slice| h[key_slice.key] = key_slice.columns; h}
+      key_slices.inject(OrderedHash.new) { |h, key_slice| h[key_slice.key] = key_slice.columns; h }
     end
   end
 end
@@ -110,12 +110,12 @@ if (RUBY_PLATFORM =~ /java/) && require_succeeds?('thrift')
       def open
         begin
           addrinfo = ::Socket::getaddrinfo(@host, @port).first
-          @handle = ::Socket.new(addrinfo[4], ::Socket::SOCK_STREAM, 0)
+          @handle  = ::Socket.new(addrinfo[4], ::Socket::SOCK_STREAM, 0)
           sockaddr = ::Socket.sockaddr_in(addrinfo[1], addrinfo[3])
           begin
             @handle.connect_nonblock(sockaddr)
           rescue Errno::EINPROGRESS
-            resp = IO.select(nil, [ @handle ], nil, @timeout) # 3 lines removed here, 1 line added
+            resp = IO.select(nil, [@handle], nil, @timeout) # 3 lines removed here, 1 line added
             begin
               @handle.connect_nonblock(sockaddr)
             rescue Errno::EISCONN
@@ -132,8 +132,10 @@ end
 
 module RightSupport::DB
   # Exception that indicates database configuration info is missing.
-  class MissingConfiguration < Exception; end
-  class UnsupportedRubyVersion < Exception; end
+  class MissingConfiguration < Exception;
+  end
+  class UnsupportedRubyVersion < Exception;
+  end
   # Base class for a column family in a keyspace
   # Used to access data persisted in Cassandra
   # Provides wrappers for Cassandra client methods
@@ -144,12 +146,12 @@ module RightSupport::DB
     DEFAULT_TIMEOUT = 20
 
     # Default maximum number of rows to retrieve in one chunk
-    DEFAULT_COUNT = 100
+    DEFAULT_COUNT   = 100
 
-    # Wrappers for Cassandra client
+        # Wrappers for Cassandra client
     class << self
 
-      attr_reader   :default_keyspace
+      attr_reader :default_keyspace
       attr_accessor :column_family
 
       @@current_keyspace = nil
@@ -242,8 +244,8 @@ module RightSupport::DB
       # keyspace(String):: Set the default keyspace
 
       def keyspace=(kyspc)
-        env = ENV['RACK_ENV'] || 'development'
-        nspace = namespace(env)
+        env                = ENV['RACK_ENV'] || 'development'
+        nspace             = namespace(env)
         @@default_keyspace = "#{kyspc}_#{env}"
         @@default_keyspace += "_#{nspace}" if nspace
       end
@@ -258,8 +260,8 @@ module RightSupport::DB
       # block(Proc):: Code that will be called in keyspace context
       def with_keyspace(keyspace, append_env=true, &block)
         @@current_keyspace = keyspace
-        env = ENV['RACK_ENV'] || 'development'
-        nspace = namespace(env)
+        env                = ENV['RACK_ENV'] || 'development'
+        nspace             = namespace(env)
         if append_env
           if nspace
             tail = "_#{env}_#{nspace}"
@@ -269,14 +271,14 @@ module RightSupport::DB
           @@current_keyspace += tail unless @@current_keyspace.end_with?(tail)
         end
         block.call
-        ensure
-          @@current_keyspace = nil
+      ensure
+        @@current_keyspace = nil
       end
 
       def get_connection(current=nil)
-        config = env_config
+        config                = env_config
         thrift_client_options = {
-          :timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT,
+          :timeout             => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT,
           :server_retry_period => nil,
         }
 
@@ -289,14 +291,17 @@ module RightSupport::DB
         current
       end
 
-      # Client connected to Cassandra server
-      # Create connection if does not already exist
-      # Use BinaryProtocolAccelerated if it available
+      # Return a Cassandra client object connected to a server and authorized to a suitable keyspace.
+      # Create connection if does not already exist; use BinaryProtocolAccelerated if available.
       #
-      # === Return
-      # (Cassandra):: Client connected to server
+      # This method determines the current keyspace based on the return value of self.keyspace
+      # which looks at the value of @@current_keyspace or @@default_keyspace to determine the keyspace it is operating
+      # under. If a connection already exists for the keyspace it will re-use it.  If a connection does not exist,
+      # it will create a new persistent connection for that keyspace that can be re-used with future requests
+      #
+      # @return [Cassandra] a client object that can be used to send requests to the ring
       def conn()
-        @@connections ||= {}
+        @@connections                ||= {}
         @@connections[self.keyspace] = get_connection(@@connections[self.keyspace])
         @@connections[self.keyspace]
       end
@@ -351,9 +356,9 @@ module RightSupport::DB
         elsif opt[:count]
           do_op(:get, column_family, k, opt)
         else
-          opt = opt.clone
+          opt         = opt.clone
           opt[:count] = DEFAULT_COUNT
-          columns = Cassandra::OrderedHash.new
+          columns     = Cassandra::OrderedHash.new
           loop do
             chunk = do_op(:get, column_family, k, opt)
             columns.merge!(chunk)
@@ -375,7 +380,7 @@ module RightSupport::DB
       # index(String):: Name of secondary index
       # key(String):: Index value that each selected row is required to match
       # columns(Array|nil):: Names of columns to be retrieved, defaults to all
-      # opt(Hash):: Request options with only :consistency used
+      # opt(Hash):: Request options with only :consistency and :count used
       #
       # === Block
       # Optional block that is yielded each chunk as it is retrieved as an array
@@ -384,20 +389,20 @@ module RightSupport::DB
       # === Return
       # (OrderedHash):: Rows retrieved with each key, value is columns
       def get_all_indexed_slices(index, key, columns = nil, opt = {})
-        rows = Cassandra::OrderedHash.new
+        rows  = Cassandra::OrderedHash.new
         start = ""
         count = opt.delete(:count) || DEFAULT_COUNT
-        expr = do_op(:create_idx_expr, index, key, "EQ")
-        opt = opt[:consistency] ? {:consistency => opt[:consistency]} : {}
+        expr  = do_op(:create_idx_expr, index, key, "EQ")
+        opt   = opt[:consistency] ? {:consistency => opt[:consistency]} : {}
         while true
           clause = do_op(:create_idx_clause, [expr], start, count)
-          chunk = self.conn.get_indexed_slices(column_family, clause, columns, opt)
+          chunk  = self.conn.get_indexed_slices(column_family, clause, columns, opt)
           rows.merge!(chunk)
           if chunk.size == count
             # Assume there are more chunks, use last key as start of next get
             start = chunk.keys.last
           else
-          # This must be the last chunk
+            # This must be the last chunk
             break
           end
         end
@@ -407,88 +412,97 @@ module RightSupport::DB
       # This method is an attempt to circumvent the Cassandra gem limitation of returning only 100 columns for wide rows,
       # and also to help reliably iterate through a column family when the node is busy and experiencing many timeouts.
       #
-      # Internally, it uses Cassandra#get_indexed_slices to find rows that match your index constraint; when it finds
-      # a wide row (with more than 1,000 columns), it continues to iterate through the columns of that row
+      # Internally, it uses Cassandra#get_indexed_slices to find rows that match your index constraint; for each matching
+      # row key, it iterates through all columns of that row, in chunks, using Cassandra#get_range. This approach is less
+      # efficient than grabbing some column values in the initial #get_indexed_slices, but it allows us to preserve the
+      # natural ordering of the columns we yield, and prevents us from yielding any column twice.
+      #
+      # A row key may be yielded more than once as each "chunk" of columns from that row is
+      # read from the ring, but each column will be yielded exactly once.
       #
       # == Parameters:
       # @param [String] index column name
       # @param [String] index column value
       #
       # == Yields:
-      # @yield [Array<String, Array<CassandraThrift::ColumnOrSuperColumn>>] array containing index column value passed in and an array of columns matching the index query
+      # @yield [row_key, columns] yields one or more times for every row that contains a matching index column, ultimately yielding EVERY column in that row
+      # @yieldparam [String] row_key the row key currently being processes
+      # @yieldparam [Array] columns an array of Cassandra CassandraThrift::ColumnOrSuperColumn objects
       def stream_all_indexed_slices(index, key)
-        expr = do_op(:create_idx_expr, index, key, "EQ")
-        start_row		    = ''
+        expr      = do_op(:create_idx_expr, index, key, "EQ")
+        start_row = ''
 
         # Loop over all CF rows, with batches of X
         while (start_row != nil)
-          # Reset these to their initieral values on every iteration thru the loop, in case
+          # Reset these to their initial values on every iteration thru the loop, in case
           # we backed off due to timeouts (see rescue clauses below)
-          max_row_count               = 100  # how many rows to grab at once
-          max_initial_column_count    = 1000 # how much to grab at first for each row
-          max_additional_column_count = 1000 # how much to grab in each chunk of a long row
+          row_count    = 100  # how many rows to grab at once
+          column_count = 1000 # how much to grab in each chunk of a long row
 
-          clause = do_op(:create_idx_clause, [expr], start_row, max_row_count)
+          clause = do_op(:create_idx_clause, [expr], start_row, row_count)
 
-          # Now, for each batch of rows, make sure don't ask for "ALL" columns of each row, to avoid hitting rows with a huge amount of columns, 
-          # which would cause large memory pressure here in the client, but more specially might cause long wait times and possible timeouts.
+          # Ask for a single column from each row, because we don't care about the column values
+          # in this step; we just want the row keys that contain a matching index column.
           begin
-            rows = self.conn.get_indexed_slices(column_family, clause, :count => max_initial_column_count)
+            row_keys = self.conn.get_indexed_slices(column_family, clause, :count => 1).keys
           rescue Exception => e
             if retryable_read_timeout?(e)
-              logger.error "CassandraModel#stream_all_indexed_slices retrying get_indexed_slices with fewer rows/cols due to a %s: %s @ %s (cf='%s' start_row='%s' count=%d)" %
-              [e.class.name, e.message, e.backtrace.first, column_family, start_row, max_row_count]
-              max_row_count /= 10 if max_row_count > 1
-              max_initial_column_count /= 10 if max_initial_column_count > 1
+              logger.error "CassandraModel#stream_all_indexed_slices retrying get_indexed_slices with fewer rows due to a %s: %s @ %s (cf='%s' start_row='%s' row_count=%d)" %
+                             [e.class.name, e.message, e.backtrace.first, column_family, start_row, row_count]
+              row_count /= 10 if row_count > 1
               retry
             else
               raise
             end
           end
 
-          rows.each_pair do |row_key, columns|
-            # We already processed this row the previous iteration
+          row_keys.each do |row_key|
+            # We already processed this row the previous iteration; skip it
             next if row_key == start_row
 
-            yield(row_key, columns)
-
-            if columns.size >= max_initial_column_count
-              # Loop over all columns of the row (1000 at a time) starting at the last column name
-              last_column_name = columns.last.column.name
-              while( last_column_name != nil )
-                begin
-                  # Retrieve a slice of this row excluding the first column
-                  # as it's already been processed.
-                  more_cols = self.conn.get_range(
-                    column_family,
-                    :start_key => row_key,
-                    :finish_key => row_key,
-                    :count => max_additional_column_count,
-                    :start => last_column_name,
-                    :slices_not_hash => true ).first.columns[1..-1]
-                rescue Exception => e
-                  if retryable_read_timeout?(e)
-                    logger.error "CassandraModel#stream_all_indexed_slices retrying get_range with fewer rows/cols due to a %s: %s @ %s (cf='%s' row='%s' start='%s' count=%d)" %
-                                   [e.class.name, e.message, e.backtrace.first, column_family, row_key, last_column_name, max_additional_column_count]
-                    max_additional_column_count /= 10 if max_additional_column_count > 1
-                    retry
-                  else
-                    raise
-                  end
+            start_column = ''
+
+            while start_column != nil
+              begin
+                options = {
+                  :start_key       => row_key,
+                  :finish_key      => row_key,
+                  :start           => start_column,
+                  :count           => column_count,
+                  :slices_not_hash => true
+                }
+
+                columns = self.conn.get_range(column_family, options).first.columns
+
+                if columns[0].column.name == start_column
+                  yield(row_key, columns[1..-1])
+                else
+                  yield(row_key, columns)
                 end
 
-                yield(row_key, more_cols)
-                if more_cols.size < max_additional_column_count
-                    last_column_name = nil
+                if columns.size >= column_count
+                  start_column = columns.last.column.name
+                else
+                  start_column = nil
+                end
+              rescue Exception => e
+                if retryable_read_timeout?(e)
+                  logger.error "CassandraModel#stream_all_indexed_slices retrying get_range with fewer cols due to a %s: %s @ %s (cf='%s' row='%s' start='%s' count=%d)" %
+                                 [e.class.name, e.message, e.backtrace.first, column_family, row_key, last_column_name, column_count]
+                  column_count /= 10 if column_count > 1
+                  retry
                 else
-                    last_column_name = more_cols.last.column.name
+                  raise
                 end
               end
             end
           end
 
-          break if rows.size < max_row_count
-          start_row = rows.keys.last
+          if row_keys.size >= row_count
+            start_row = row_keys.last
+          else
+            start_row = nil
+          end
         end
       end
 
@@ -505,14 +519,14 @@ module RightSupport::DB
       #   given class as value, but object only contains values for the columns retrieved;
       #   array is always empty if a block is given
       def get_indexed(index, key, columns = nil, opt = {})
-        rows = []
+        rows  = []
         start = ""
         count = DEFAULT_COUNT
-        expr = do_op(:create_idx_expr, index, key, "EQ")
-        opt = opt[:consistency] ? {:consistency => opt[:consistency]} : {}
+        expr  = do_op(:create_idx_expr, index, key, "EQ")
+        opt   = opt[:consistency] ? {:consistency => opt[:consistency]} : {}
         loop do
-          clause = do_op(:create_idx_clause, [expr], start, count)
-          chunk = do_op(:get_indexed_slices, column_family, clause, columns, opt)
+          clause     = do_op(:create_idx_clause, [expr], start, count)
+          chunk      = do_op(:get_indexed_slices, column_family, clause, columns, opt)
           chunk_rows = []
           chunk.each do |row_key, row_columns|
             if row_columns && row_key != start
@@ -610,10 +624,10 @@ module RightSupport::DB
       def do_op(meth, *args, &block)
         first_started_at ||= Time.now
         retries          ||= 0
-        started_at         = Time.now
+        started_at       = Time.now
 
         # cassandra functionality
-        result = conn.send(meth, *args, &block)
+        result           = conn.send(meth, *args, &block)
 
         # log functionality
         do_op_log(first_started_at, started_at, retries, meth, args[0], args[1])
@@ -635,7 +649,7 @@ module RightSupport::DB
           log_string = sprintf("CassandraModel %s, cf=%s, keys=%d, time=%.1fms", meth, cf, key_count, attempt_time*1000)
 
           if retries && retries > 0
-            total_time  = now - first_started_at
+            total_time = now - first_started_at
             log_string += sprintf(", retries=%d, total_time=%.1fms", retries, total_time*1000)
           end
 
@@ -724,7 +738,7 @@ module RightSupport::DB
     # attrs(Hash):: Attributes for object which form Cassandra row
     #   with column name as key and column value as value
     def initialize(key, attrs = {})
-      self.key = key
+      self.key        = key
       self.attributes = attrs
     end