sohm 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859ccb91894c9f987316960595b6fe50084b5755
-  data.tar.gz: 4fddfad5a05999a99dc46fc65df4e36405ef582e
+  metadata.gz: 39fb619f570ad3f62832bbcdd996cdc69415be89
+  data.tar.gz: f41f415ad11975dac2524514ad4cbc37cefe850f
 SHA512:
-  metadata.gz: 219278de40db8ec365bc2fbfe553bcda87dd08407c200e6ad200f0d3b66ed94d24a67ca4baf8f5a04e4a3c25ea473c23eda6530b4d9ad048ff36bc15ec7a8993
-  data.tar.gz: dfbd6ab50d8e91b0eb77ccff049d93fdb063a16b71e76477366ae5754789040d8fe94f7bf672024d6feb725087e574b92577e456b3bc53d1d1e5804e6fadc219
+  metadata.gz: 9d9ed24c9db23f038e4df3f68a2f674668b08f29358266891e4d925799be03efee441910de76a9e61a05213e516287ec9bd07ba26f4dfb9766914ef639c2d5de
+  data.tar.gz: a2a0b78bb3e19a8af9a798059b0bdd80a183482358d997790c77331bf8b303d7fe1961204a578b4659102d0cced8d26b0a6b033faeb9985004ffb1b7eb250425

data/lib/sohm/lua/save.lua

@@ -6,7 +6,8 @@ if (not ctoken) or ctoken == ARGV[2] then
    else
       ntoken = tonumber(ctoken) + 1
    end
-   redis.call('HMSET', KEYS[1], '_sdata', ARGV[1], '_cas', ntoken)
+   redis.call('HMSET', KEYS[1], '_sdata', ARGV[1],
+              '_cas', ntoken, '_ndata', ARGV[3])
    return ntoken
 else
    error('cas_error')

data/lib/sohm.rb

@@ -108,6 +108,19 @@ module Sohm
     @mutex
   end
 
+  # If this is true, Sohm::Model#save would refresh all indices inline
+  # when called, this might hurt performance in certain cases. You can
+  # use this flag here to disable this inline refreshing, then use external
+  # background workers to refresh indices by calling Sohm::Model#refresh_indices
+  @refresh_indices_inline = true
+  def self.refresh_indices_inline=(flag)
+    @refresh_indices_inline = flag
+  end
+
+  def self.refresh_indices_inline
+    @refresh_indices_inline
+  end
+
   # By default, EVALSHA is used
   def self.enable_evalsha
     defined?(@enable_evalsha) ? @enable_evalsha : true
@@ -1060,7 +1073,8 @@ module Sohm
       if serial_attributes_changed
         response = script(LUA_SAVE, 1, key,
           sanitize_attributes(serial_attributes).to_msgpack,
-          cas_token)
+          cas_token,
+          sanitize_attributes(attributes).to_msgpack)
 
         if response.is_a?(RuntimeError)
           if response.message =~ /cas_error/
@@ -1072,16 +1086,62 @@ module Sohm
 
         @cas_token = response
         @serial_attributes_changed = false
+      else
+        redis.call("HSET", key, "_ndata",
+                   sanitize_attributes(attributes).to_msgpack)
       end
 
-      redis.call("HSET", key, "_ndata",
-                 sanitize_attributes(attributes).to_msgpack)
-
-      refresh_indices
+      if Sohm.refresh_indices_inline
+        refresh_indices
+      end
 
       return self
     end
 
+    # Refresh model indices
+    def refresh_indices
+      memo_key = key["_indices"]
+      # Add new indices first
+      commands = fetch_indices.each_pair.map do |field, vals|
+        vals.map do |val|
+          index_key = model.key["_indices"][field][val]
+          [["SADD", memo_key, index_key], ["SADD", index_key, id]]
+        end
+      end.flatten(2)
+
+      model.synchronize do
+        commands.each do |command|
+          redis.queue(*command)
+        end
+        redis.commit
+      end
+
+      # Remove old indices
+      index_set = ::Set.new(redis.call("SMEMBERS", memo_key))
+      # Here we are fetching the latest model to avoid concurrency issue
+      valid_list = model[id].send(:fetch_indices).each_pair.map do |field, vals|
+        vals.map do |val|
+          model.key["_indices"][field][val]
+        end
+      end.flatten(1)
+      valid_set = ::Set.new(valid_list)
+      diff_set = index_set - valid_set
+      if diff_set.size > 0
+        diff_list = diff_set.to_a
+        commands = diff_list.map do |key|
+          ["SREM", key, id]
+        end + [["SREM", memo_key] + diff_list]
+
+        model.synchronize do
+          commands.each do |command|
+            redis.queue(*command)
+          end
+          redis.commit
+        end
+      end
+      true
+    end
+
     # Delete the model, including all the following keys:
     #
     # - <Model>:<id>
@@ -1215,48 +1275,6 @@ module Sohm
       indices
     end
 
-    # This is performed asynchronously
-    def refresh_indices
-      memo_key = key["_indices"]
-      # Add new indices first
-      commands = fetch_indices.each_pair.map do |field, vals|
-        vals.map do |val|
-          index_key = model.key["_indices"][field][val]
-          [["SADD", memo_key, index_key], ["SADD", index_key, id]]
-        end
-      end.flatten(2)
-
-      # TODO: Think about switching to a redis pool later
-      model.synchronize do
-        commands.each do |command|
-          redis.queue(*command)
-        end
-        redis.commit
-      end
-
-      # Remove old indices
-      # TODO: we can do this asynchronously, or maybe in a background queue
-      index_set = ::Set.new(redis.call("SMEMBERS", memo_key))
-      valid_list = model[id].send(:fetch_indices).each_pair.map do |field, vals|
-        vals.map do |val|
-          model.key["_indices"][field][val]
-        end
-      end.flatten(1)
-      valid_set = ::Set.new(valid_list)
-      diff_set = index_set - valid_set
-      diff_list = diff_set.to_a
-      commands = diff_list.map do |key|
-        ["SREM", key, id]
-      end + [["SREM", memo_key] + diff_list]
-
-      model.synchronize do
-        commands.each do |command|
-          redis.queue(*command)
-        end
-        redis.commit
-      end
-    end
-
     # Unpack hash returned by redis, which contains _cas, _sdata, _ndata
     # columns
     def unpack_attrs(attrs)

data/sohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "sohm"
-  s.version = "0.10.1"
+  s.version = "0.10.2"
   s.summary = %{Slim ohm for twemproxy-like system}
   s.description = %Q{Slim ohm is a forked ohm that works with twemproxy-like redis system, only a limited set of features in ohm is supported}
   s.authors = ["Xuejie Xiao"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sohm
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Xuejie Xiao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic