rhosync 2.1.10 → 2.1.11

data/CHANGELOG

@@ -1,3 +1,12 @@
+## 2.1.11 (not released)
+* #17526603 - implement clientreset support for specified sources
+* #18356697 - store lock is never released (support request #1466)
+* use redis 2.2.12 by default
+* #18672811 - edge case produces race condition which leads to corruption of Store data
+* #18508155 - on failed syncs allow the user to retry it up to pre-defined number of times
+* #18888077 - implement Redis transactions optimization for push_objects and push_deletes
+* #19254217 - hard dependency on sinatra 1.2.7 (to be fixed in 2.1.12)
+
 ## 2.1.10
 * #16001227 - raise exceptions on c2dm errors
 * #1018 - delete read state for user as well

data/Rakefile

@@ -1,4 +1,6 @@
 require 'yaml'
+load 'tasks/redis.rake'
+
 $:.unshift File.join(File.dirname(__FILE__),'lib')
 require 'rhosync'
 
@@ -64,6 +66,7 @@ begin
     gemspec.files =  FileList["[A-Z]*", "{bench,bin,generators,lib,spec,tasks}/**/*"]
 
     # TODO: Due to https://www.pivotaltracker.com/story/show/3417862, we can't use JSON 1.4.3
+    gemspec.add_dependency "sinatra", "= 1.2.7"
     gemspec.add_dependency "json", "~>1.4.2"
     gemspec.add_dependency "sqlite3-ruby", "~>1.2.5"
     gemspec.add_dependency "rubyzip", "~>0.9.4"
@@ -71,7 +74,6 @@ begin
     gemspec.add_dependency "redis", "~>2.1.1"
     gemspec.add_dependency "resque", "~>1.14.0"
     gemspec.add_dependency "rest-client", "~>1.6.1"
-    gemspec.add_dependency "sinatra", "~>1.2"
     gemspec.add_dependency "templater", "~>1.0.0"
     gemspec.add_dependency "rake", "~>0.9.2"
     gemspec.add_development_dependency "log4r", "~>1.1.7"
@@ -108,6 +110,4 @@ end
 def ask(msg)
   print msg
   STDIN.gets.chomp
-end
-
-load 'tasks/redis.rake'
+end

data/lib/rhosync/api/push_deletes.rb

@@ -1,6 +1,9 @@
 Server.api :push_deletes do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   source_sync = SourceSync.new(source)
-  source_sync.push_deletes(params[:objects])
+  timeout = params[:timeout] || 10
+  raise_on_expire = params[:raise_on_expire] || false
+  rebuild_md = params[:rebuild_md].nil? ? true : params[:rebuild_md]
+  source_sync.push_deletes(params[:objects],timeout,raise_on_expire,rebuild_md)
   'done'
 end

data/lib/rhosync/api/push_objects.rb

@@ -1,6 +1,9 @@
 Server.api :push_objects do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   source_sync = SourceSync.new(source)
-  source_sync.push_objects(params[:objects])
+  timeout = params[:timeout] || 10
+  raise_on_expire = params[:raise_on_expire] || false
+  rebuild_md = params[:rebuild_md].nil? ? true : params[:rebuild_md]
+  source_sync.push_objects(params[:objects],timeout,raise_on_expire,rebuild_md)
   'done'
 end

data/lib/rhosync/client.rb

@@ -8,6 +8,7 @@ module Rhosync
     field :phone_id,:string
     field :user_id,:string
     field :app_id,:string
+    field :last_sync,:datetime
     attr_accessor :source_name
     validates_presence_of :app_id, :user_id
     
@@ -29,6 +30,7 @@ module Rhosync
     end
     
     def self.load(id,params)
+      params.merge!(:last_sync => Time.now)
       validate_attributes(params)
       super(id,params)
     end

data/lib/rhosync/client_sync.rb

@@ -204,8 +204,16 @@ module Rhosync
         
     class << self
       # Resets the store for a given app,client
-      def reset(client)
-        client.flash_data('*') if client
+      # Resets the store for a given app,client
+      def reset(client, params=nil)
+        return unless client
+        if params == nil or params[:sources] == nil
+          client.flash_data('*')
+        else
+          params[:sources].each do |source|
+            client.flash_source_data('*', source['name'])
+          end
+        end
       end
     
       def search_all(client,params=nil)

data/lib/rhosync/document.rb

@@ -21,10 +21,24 @@ module Document
     Store.delete_data(docname(doctype),data)
   end
   
+  def update_objects(doctype,updates)
+    Store.update_objects(docname(doctype),updates)
+  end
+  
+  def remove_objects(doctype,deletes)
+    Store.delete_objects(docname(doctype),deletes)
+  end
+  
   def flash_data(doctype)
     Store.flash_data(docname(doctype))
   end
   
+  def flash_source_data(doctype, from_source)
+    self.source_name=from_source
+    docnamestr = docname('') + doctype
+    Store.flash_data(docnamestr)
+  end
+  
   def rename(srcdoctype,dstdoctype)
     Store.rename(docname(srcdoctype),docname(dstdoctype))
   end

data/lib/rhosync/model.rb

@@ -33,14 +33,14 @@ module Rhosync
     # specified amount.
     def increment!(name,amount=1)
       raise ArgumentError, "Only integer fields can be incremented." unless self.class.fields.include?({:name => name.to_s, :type => :integer})
-      redis.incr(field_key(name), amount)
+      redis.incrby(field_key(name), amount)
     end
   
     # Decrement the specified integer field by 1 or the
     # specified amount.
     def decrement!(name,amount=1)
       raise ArgumentError, "Only integer fields can be decremented." unless self.class.fields.include?({:name => name.to_s, :type => :integer})
-      redis.decr(field_key(name), amount)
+      redis.decrby(field_key(name), amount)
     end
     
     def next_id #:nodoc:

data/lib/rhosync/read_state.rb

@@ -1,6 +1,7 @@
 module Rhosync  
   class ReadState < Model
     field :refresh_time, :integer
+    field :retry_counter, :integer
   
     def self.create(fields)
       fields[:id] = get_id(fields)
@@ -8,6 +9,7 @@ module Rhosync
       fields.delete(:user_id)
       fields.delete(:source_name)
       fields[:refresh_time] ||= Time.now.to_i
+      fields[:retry_counter] ||= 0
       super(fields,{})
     end
   

data/lib/rhosync/server.rb

@@ -236,7 +236,7 @@ module Rhosync
 
     get '/application/clientreset' do
       catch_all do 
-        ClientSync.reset(current_client)
+        ClientSync.reset(current_client, params)
         source_config.to_json
       end
     end

data/lib/rhosync/source.rb

@@ -90,7 +90,7 @@ module Rhosync
     
     # source fields
     define_fields([:id, :rho__id, :name, :url, :login, :password, :callback_url, :partition_type, :sync_type, 
-      :queue, :query_queue, :cud_queue, :belongs_to, :has_many], [:source_id, :priority])
+      :queue, :query_queue, :cud_queue, :belongs_to, :has_many], [:source_id, :priority, :retry_limit])
     
     def initialize(fields)
       self.name = fields['name'] || fields[:name]
@@ -112,6 +112,7 @@ module Rhosync
       fields[:rho__id] = fields[:name]
       fields[:belongs_to] = fields[:belongs_to].to_json if fields[:belongs_to]
       fields[:schema] = fields[:schema].to_json if fields[:schema]
+      fields[:retry_limit] = fields[:retry_limit] ? fields[:retry_limit] : 0
     end
         
     def self.create(fields,params)
@@ -262,15 +263,41 @@ module Rhosync
       self.poll_interval == 0 or 
       (self.poll_interval != -1 and self.read_state.refresh_time <= Time.now.to_i)
     end
-        
+         
     def if_need_refresh(client_id=nil,params=nil)
-      need_refresh = lock(:md) do |s|
-        check = check_refresh_time
-        s.read_state.refresh_time = Time.now.to_i + s.poll_interval if check
-        check
-      end
+      need_refresh = check_refresh_time
       yield client_id,params if need_refresh
     end
+    
+    def update_refresh_time(query_failure = false)
+      if self.poll_interval == 0
+        self.read_state.refresh_time = Time.now.to_i + self.poll_interval
+        return
+      end
+      
+      allowed_update = true
+      # reset number of retries on succesfull query
+      # or if last refresh was more than 'poll_interval' time ago
+      if not query_failure or (Time.now.to_i - self.read_state.refresh_time >= self.poll_interval)
+        self.read_state.retry_counter = 0 
+      end
+      
+      # do not reset the refresh time on failure
+      # if retry limit is not reached
+      if query_failure
+        if self.read_state.retry_counter < self.retry_limit
+          allowed_update = false
+          self.read_state.increment!(:retry_counter)
+        # we have reached the limit - update the refresh time
+        # and reset the counter
+        else
+          self.read_state.retry_counter = 0 
+        end
+      end
+      if allowed_update
+        self.read_state.refresh_time = Time.now.to_i + self.poll_interval
+      end
+    end
           
     private
     def poll_interval_key

data/lib/rhosync/source_adapter.rb

@@ -41,20 +41,16 @@ module Rhosync
     
     def sync
       if @result and @result.empty?
-        @source.lock(:md) do |s|
-          s.flash_data(:md)
-          s.put_value(:md_size,0)
-        end
+        @source.flash_data(:md)
+        @source.put_value(:md_size,0)
       else
         if @result
           Store.put_data(@tmp_docname,@result) 
           @stash_size += @result.size
         end  
-        @source.lock(:md) do |s|
-          s.flash_data(:md)
-          Store.rename(@tmp_docname,s.docname(:md))
-          s.put_value(:md_size,@stash_size)
-        end
+        @source.flash_data(:md)
+        Store.rename(@tmp_docname,@source.docname(:md))
+        @source.put_value(:md_size,@stash_size)
       end
     end
     

data/lib/rhosync/source_sync.rb

@@ -59,12 +59,18 @@ module Rhosync
     end
     
     def do_query(params=nil)
-      @source.if_need_refresh do
-        Stats::Record.update("source:query:#{@source.name}") do
-          return if _auth_op('login') == false
-          self.read(nil,params)
-          _auth_op('logoff')
-        end  
+      @source.lock(:md) do
+        @source.if_need_refresh do
+          Stats::Record.update("source:query:#{@source.name}") do
+            if _auth_op('login')
+              result = self.read(nil,params)
+              _auth_op('logoff')
+            end
+            # update refresh time
+            query_failure = Store.get_keys(@source.docname(:errors)).size > 0
+            @source.update_refresh_time(query_failure)
+          end
+        end
       end
     end
     
@@ -75,31 +81,57 @@ module Rhosync
         @source.app_id,@source.user_id,client_id,params)
     end
     
-    def push_objects(objects,timeout=10,raise_on_expire=false)
+    def push_objects(objects,timeout=10,raise_on_expire=false,rebuild_md=true)
       @source.lock(:md,timeout,raise_on_expire) do |s|
-        doc = @source.get_data(:md)
-        orig_doc_size = doc.size
-        objects.each do |id,obj|
-          doc[id] ||= {}
-          doc[id].merge!(obj)
-        end  
-        diff_count = doc.size - orig_doc_size
-        @source.put_data(:md,doc)
+        diff_count = 0
+        # in case of rebuild_md
+        # we clean-up and rebuild the whole :md doc
+        # on every request
+        if(rebuild_md)
+          doc = @source.get_data(:md)
+          orig_doc_size = doc.size
+          objects.each do |id,obj|
+            doc[id] ||= {}
+            doc[id].merge!(obj)
+          end  
+          diff_count = doc.size - orig_doc_size
+          @source.put_data(:md,doc)
+        else
+          # if rebuild_md == false
+          # we only operate on specific set values
+          # which brings a big optimization
+          # in case of small transactions
+          diff_count = @source.update_objects(:md, objects)
+        end
+        
         @source.update_count(:md_size,diff_count)
       end      
     end    
 
-    def push_deletes(objects,timeout=10,raise_on_expire=false)
+    def push_deletes(objects,timeout=10,raise_on_expire=false,rebuild_md=true)
       @source.lock(:md,timeout,raise_on_expire) do |s|
-        doc = @source.get_data(:md)
-        orig_doc_size = doc.size
-        objects.each do |id|
-          doc.delete(id)
-        end  
-        diff_count = doc.size - orig_doc_size
-        @source.put_data(:md,doc)
+        diff_count = 0
+        if(rebuild_md)
+          # in case of rebuild_md
+          # we clean-up and rebuild the whole :md doc
+          # on every request
+          doc = @source.get_data(:md)
+          orig_doc_size = doc.size
+          objects.each do |id|
+            doc.delete(id)
+          end  
+          diff_count = doc.size - orig_doc_size
+          @source.put_data(:md,doc)
+        else
+          # if rebuild_md == false
+          # we only operate on specific set values
+          # which brings a big optimization
+          # in case of small transactions
+          diff_count = -@source.remove_objects(:md, objects)
+        end
+        
         @source.update_count(:md_size,diff_count)
-      end      
+      end    
     end
     
     private

data/lib/rhosync/store.rb

@@ -46,12 +46,66 @@ module Rhosync
         end
         true
       end
-    
+      
+      # updates objects for a given doctype, source, user
+      # create new objects if necessary
+      def update_objects(dockey, data={})
+        return 0 unless dockey and data
+        
+        new_object_count = 0
+        doc = get_data(dockey)
+        @@db.pipelined do
+          data.each do |key,value|
+            is_create = doc[key].nil?
+            new_object_count += 1 if is_create
+            value.each do |attrib,value|
+              next if _is_reserved?(attrib, value)
+              
+              new_element = setelement(key,attrib,value)
+              element_exists = is_create ? false : doc[key].has_key?(attrib)
+              if element_exists
+                existing_element = setelement(key,attrib,doc[key][attrib])
+                if existing_element != new_element
+                  @@db.srem(dockey, existing_element)
+                  @@db.sadd(dockey, new_element)
+                end
+              else
+                @@db.sadd(dockey, new_element)
+              end
+            end
+          end
+        end
+        new_object_count
+      end
+      
+      # Removes objects from a given doctype,source,user
+      def delete_objects(dockey,data=[])
+        return 0 unless dockey and data
+        
+        deleted_object_count = 0
+        doc = get_data(dockey)
+        @@db.pipelined do
+          data.each do |id|
+            if doc[id]
+              doc[id].each do |name,value|
+                @@db.srem(dockey, setelement(id,name,value))
+              end
+              deleted_object_count += 1
+            end
+            doc.delete(id)
+          end
+        end
+        deleted_object_count
+      end
+      
       # Adds a simple key/value pair
       def put_value(dockey,value)
         if dockey
-          @@db.del(dockey)
-          @@db.set(dockey,value.to_s) if value
+          if value
+            @@db.set(dockey,value.to_s)
+          else
+            @@db.del(dockey)
+          end
         end
       end
     
@@ -145,7 +199,7 @@ module Rhosync
       def lock(dockey,timeout=0,raise_on_expire=false)
         m_lock = get_lock(dockey,timeout,raise_on_expire)
         res = yield
-        release_lock(dockey,m_lock)
+        release_lock(dockey,m_lock,raise_on_expire)
         res
       end
       
@@ -187,8 +241,8 @@ module Rhosync
       #   Time.now.to_i+timeout+1
       # end
       
-      def release_lock(dockey,lock)
-        @@db.del(_lock_key(dockey)) if (lock >= Time.now.to_i)
+      def release_lock(dockey,lock,raise_on_expire=false)
+        @@db.del(_lock_key(dockey)) if raise_on_expire or Rhosync.raise_on_expired_lock or (lock >= Time.now.to_i)
       end
       
       # Create a copy of srckey in dstkey

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.10'
+  VERSION = '2.1.11'
 end

data/spec/api/get_client_params_spec.rb

@@ -6,7 +6,7 @@ describe "RhosyncApiGetClientParams" do
   it "should list client attributes" do
     post "/api/get_client_params", {:api_token => @api_token, :client_id =>@c.id}
     res = JSON.parse(last_response.body)
-    res.delete_if { |attrib| attrib['name'] == 'rho__id' }
+    res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
     res.sort{|x,y| x['name']<=>y['name']}.should == [
       {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
       {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 

data/spec/api/get_source_params_spec.rb

@@ -15,7 +15,8 @@ describe "RhosyncApiGetSourceParams" do
       {"name"=>"password", "value"=>"testpass", "type"=>"string"}, 
       {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
       {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
-      {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
+      {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
+      {"name"=>"retry_limit", "value"=>0, "type"=>"integer"},
       {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
       {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
       {"name"=>"belongs_to", "type"=>"string", "value"=>nil},

data/spec/api/rhosync_api_spec.rb

@@ -121,7 +121,7 @@ describe "RhosyncApi" do
   
   it "should list client attributes using direct api call" do
     res = RhosyncApi::get_client_params('',@api_token,@c.id)
-    res.delete_if { |attrib| attrib['name'] == 'rho__id' }
+    res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
     res.sort{|x,y| x['name']<=>y['name']}.should == [
       {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
       {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
@@ -164,7 +164,8 @@ describe "RhosyncApi" do
       {"name"=>"password", "value"=>"testpass", "type"=>"string"}, 
       {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
       {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
-      {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
+      {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
+      {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
       {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
       {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
       {"name"=>"belongs_to", "type"=>"string", "value"=>nil},

data/spec/client_sync_spec.rb

@@ -150,6 +150,24 @@ describe "ClientSync" do
       verify_result(@c.docname(:cd) => {})
       Client.load(@c.id,{:source_name => @s.name}).should_not be_nil
     end
+    
+    it "should handle reset on individual source adapters" do
+      @c.source_name = 'SampleAdapter'
+      set_state(@c.docname(:cd) => @data)
+      verify_result(@c.docname(:cd) => @data)
+      
+      @c.source_name = 'SimpleAdapter'
+      set_state(@c.docname(:cd) => @data)
+      verify_result(@c.docname(:cd) => @data)
+      
+      sources = [{'name'=>'SimpleAdapter'}]
+      ClientSync.reset(@c, {:sources => sources})
+      
+      @c.source_name = 'SampleAdapter'
+      verify_result(@c.docname(:cd) => @data)
+      @c.source_name = 'SimpleAdapter'
+      verify_result(@c.docname(:cd) => {})
+    end
   end
   
   describe "search" do

data/spec/model_spec.rb

@@ -207,12 +207,12 @@ describe Rhosync::Model do
     end
     
     it "should send INCR when #increment! is called on an integer" do
-      @redisMock.should_receive(:incr).with("test_increments:1:foo", 1)
+      @redisMock.should_receive(:incrby).with("test_increments:1:foo", 1)
       @x.increment!(:foo)
     end
     
     it "should send DECR when #decrement! is called on an integer" do
-      @redisMock.should_receive(:decr).with("test_increments:1:foo", 1)
+      @redisMock.should_receive(:decrby).with("test_increments:1:foo", 1)
       @x.decrement!(:foo)
     end
     

data/spec/server/server_spec.rb

@@ -177,6 +177,20 @@ describe "Server" do
       verify_result(@c.docname(:cd) => {})
     end
     
+    it "should respond to clientreset with individual adapters" do
+      @c.source_name = 'SimpleAdapter'
+      set_state(@c.docname(:cd) => @data)
+      @c.source_name = 'SampleAdapter'
+      set_state(@c.docname(:cd) => @data)
+      sources = [{'name' => 'SimpleAdapter'}]
+      get "/application/clientreset", :client_id => @c.id,:version => ClientSync::VERSION, :sources => sources
+      JSON.parse(last_response.body).should == @source_config
+      @c.source_name = 'SampleAdapter'
+      verify_result(@c.docname(:cd) => @data)
+      @c.source_name = 'SimpleAdapter'
+      verify_result(@c.docname(:cd) => {})
+    end
+    
     it "should switch client user if client user_id doesn't match session user" do
       set_test_data('test_db_storage',@data)
       get "/application",:client_id => @c.id,:source_name => @s.name,:version => ClientSync::VERSION

data/spec/source_sync_spec.rb

@@ -208,6 +208,77 @@ describe "SourceSync" do
       it "should do search with exception raised" do
         verify_read_operation_with_error('search')
       end
+      
+      it "should do query with exception raised and update refresh time only after retries limit is exceeded" do
+        @s.retry_limit = 1
+        msg = "Error during query"
+        set_test_data('test_db_storage',{},msg,"query error")
+        res = @ss.do_query
+        verify_result(@s.docname(:md) => {},
+          @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+        # 1) if retry_limit is set to N - then, first N retries should not update refresh_time
+        @s.read_state.retry_counter.should == 1
+        @s.read_state.refresh_time.should <= Time.now.to_i
+        
+        # try once more and fail again
+        set_test_data('test_db_storage',{},msg,"query error")
+        res = @ss.do_query
+        verify_result(@s.docname(:md) => {},
+          @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+        
+        # 2) if retry_limit is set to N and number of retries exceeded it - update refresh_time
+        @s.read_state.retry_counter.should == 0
+        @s.read_state.refresh_time.should > Time.now.to_i
+      end
+      
+      it "should do query with exception raised and restore state with succesfull retry" do
+        @s.retry_limit = 1
+        msg = "Error during query"
+        set_test_data('test_db_storage',{},msg,"query error")
+        res = @ss.do_query
+        verify_result(@s.docname(:md) => {},
+          @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+        # 1) if retry_limit is set to N - then, first N retries should not update refresh_time
+        @s.read_state.retry_counter.should == 1
+        @s.read_state.refresh_time.should <= Time.now.to_i
+        
+        # try once more (with success)
+        expected = {'1'=>@product1,'2'=>@product2}
+        set_test_data('test_db_storage',expected)
+        @ss.do_query 
+        verify_result(@s.docname(:md) => expected, 
+          @s.docname(:errors) => {})
+        @s.read_state.retry_counter.should == 0
+        @s.read_state.refresh_time.should > Time.now.to_i
+      end
+      
+      it "should do query with exception raised and update refresh time if retry_limit is 0" do
+        @s.retry_limit = 0
+        msg = "Error during query"
+        set_test_data('test_db_storage',{},msg,"query error")
+        res = @ss.do_query
+        verify_result(@s.docname(:md) => {},
+          @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+        #  if poll_interval is set to 0 - refresh time should be updated
+        @s.read_state.retry_counter.should == 0
+        @s.read_state.refresh_time.should > Time.now.to_i
+      end
+      
+      it "should do query with exception raised and update refresh time if poll_interval == 0" do
+        @s.retry_limit = 1
+        @s.poll_interval = 0
+        msg = "Error during query"
+        set_test_data('test_db_storage',{},msg,"query error")
+        prev_refresh_time = @s.read_state.refresh_time
+        # make sure refresh time is expired
+        sleep(1)
+        res = @ss.do_query
+        verify_result(@s.docname(:md) => {},
+          @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+        #  if poll_interval is set to 0 - refresh time should be updated
+        @s.read_state.retry_counter.should == 0
+        @s.read_state.refresh_time.should > prev_refresh_time
+      end
     end
     
     describe "app-level partitioning" do
@@ -221,7 +292,8 @@ describe "SourceSync" do
         verify_result("source:#{@test_app_name}:__shared__:#{@s_fields[:name]}:md" => expected)
         Store.db.keys("read_state:#{@test_app_name}:__shared__*").sort.should ==
           [ "read_state:#{@test_app_name}:__shared__:SampleAdapter:refresh_time",
-            "read_state:#{@test_app_name}:__shared__:SampleAdapter:rho__id"]
+            "read_state:#{@test_app_name}:__shared__:SampleAdapter:retry_counter",
+            "read_state:#{@test_app_name}:__shared__:SampleAdapter:rho__id"].sort
       end
     end
     

data/spec/store_spec.rb

@@ -51,6 +51,41 @@ describe "Store" do
       Store.get_data('mydata').should == data
     end
     
+    it "should update_objects with simple data and one changed attribute" do
+      data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+      update_data = { '1' => {'attr1' => 'value2'}}
+      Store.put_data('mydata', data)
+      Store.get_data('mydata').should == data
+      Store.update_objects('mydata', update_data)        
+      data['1'].merge!(update_data['1'])
+      Store.get_data('mydata').should == data
+    end
+    
+    it "should update_objects with simple data and verify that srem and sadd is called only on affected fields" do
+      data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+      update_data = { '1' => {'attr1' => 'value2', 'new_attr' => 'new_val', 'hello' => 'world'},
+                      '2' => {'whole_new_object' => 'new_value' } }
+      Store.put_data('mydata', data)
+      Store.db.should_receive(:srem).exactly(1).times
+      Store.db.should_receive(:sadd).exactly(3).times
+      Store.update_objects('mydata', update_data)        
+    end
+    
+    it "should delete_objects with simple data" do
+      data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+      Store.put_data('mydata', data)
+      Store.delete_objects('mydata', ['1'])
+      Store.get_data('mydata').should == {}
+    end
+    
+    it "should delete_objects with simple data and verify that srem is called only on affected fields" do
+      data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+      Store.put_data('mydata', data)
+      Store.db.should_receive(:srem).exactly(2).times
+      Store.db.should_receive(:sadd).exactly(0).times
+      Store.delete_objects('mydata', ['1'])        
+    end
+    
     it "should add simple array data to new set" do
       @data = ['1','2','3']
       Store.put_data(@s.docname(:md),@data).should == true

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-2.2.2"
+	$redis_ver = "redis-2.2.12"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
@@ -161,7 +161,7 @@ namespace :redis do
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.2"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.12"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 1
-  - 10
-  version: 2.1.10
+  - 11
+  version: 2.1.11
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,12 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
+        version: 1.2.7
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,11 +48,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +64,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +80,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,11 +96,11 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +112,11 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: resque
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +128,11 @@ dependencies:
         - 0
         version: 1.14.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,21 +144,6 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -569,7 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework