xunch 0.0.10.2 → 0.0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2745b0a105ccb0dfa6461af733d0a544719ce442
-  data.tar.gz: da52e284ba4cc556b1f8addfbdccf0f5f2be21ff
+  metadata.gz: 7a823df55ee04eec6dd9cb198b9219d633228e58
+  data.tar.gz: 8ef44351fd2de4129f2060918fdef8754d31bb41
 SHA512:
-  metadata.gz: 93c52651755a238ffb43edd2b6c3c8fab1ac0b6d5e857dcb3f58544d6689d104c2d7980c93ee88a7a34989cbcd20488d35d2532b929458ca61a37c77340f4d7f
-  data.tar.gz: bde5eaabfb9b5c9bf7c92591fd74093dee2f7fcf99af9a6297b6ee48d0edfc9499a63a23a1f8a2d6e330a74281c63d1cc525a207babf838fe6907db89846e0aa
+  metadata.gz: 36e5ac51f6ca81bb02baece72e0bf7e6720723d843df6d7d0d748bf9bfcf12846f19a9053fe70a483d5a9cbae236cbb2f2917a4cf7e045dd8f633738451d7a6e
+  data.tar.gz: e05efd775ea4e6b4811b0e37f48197184812dcd098350a543c16279014d4643ea6203226cd3f7f455c8f6deaea354c18032cbd535e6540515dfb25db2dd1eaf7

data/lib/xunch/cache/cache.rb

@@ -1,16 +1,19 @@
+require 'socket'
 module Xunch
   class Cache
 
     def initialize(options, shard_infos)
       @options = initialize_options(options)
       @shard_redis = ShardRedis.new(@options[:regex],shard_infos)
+      @host = Socket.gethostname
+      @pid = Process.pid
     end
 
     # 从缓存中删除指定的key
     def evict(key)
       @shard_redis.del(assembleKey(key))
     end
-    
+
     # 从缓存中删除指定的一组key
     def batch_evict(keys)
       new_keys = []
@@ -30,7 +33,7 @@ module Xunch
       @shard_redis.destroy
     end
 
-    protected 
+    protected
     def getCacheObjectKey(value)
       key = value.send(@options[:key_field_name])
       raise ArgumentError("value #{value} key field can not be nil.") unless key != nil
@@ -44,7 +47,7 @@ module Xunch
 
     def assembleTempKey(key)
       name = @options[:name]
-      name + "_".concat(key.to_s).concat("_").concat(@options[:version].to_s).concat("_temp")
+      name + "_".concat(key.to_s).concat("_").concat(@options[:version].to_s).concat("_temp").concat(@host).concat(@pid)
     end
 
     def initialize_options(options)
@@ -65,7 +68,7 @@ module Xunch
       version = 1
       if(options["version"] != nil)
         version = options["version"]
-        use_options.store(:version, version) 
+        use_options.store(:version, version)
       end
 
       if(options["name"] != nil)

data/lib/xunch/cache/cache_builder.rb

@@ -26,6 +26,9 @@ module Xunch
       caches = {}
       lazy_caches = {}
       cache_configs.each_value  { |cache_config|
+        if cache_config["type"] == nil
+          raise ArgumentError.new("cache type can't be nil.")
+        end
         shard_names = cache_config["shards"].split(",")
         driver = cache_config["driver"].downcase.to_sym if cache_config["driver"]
         shard_infos = []
@@ -37,6 +40,9 @@ module Xunch
           shard_options = {}
           if driver
             shard_options[:driver] = driver
+            if shard_options[:driver] == :synchrony and cache_config["type"].start_with?("list")
+              raise ArgumentError.new("list cache can't use synchrony driver.")
+            end
           end
           if cache_config["timeout"]
             shard_options[:timeout] = cache_config["timeout"]

data/lib/xunch/codec/hash_codec.rb

@@ -20,9 +20,9 @@ module Xunch
     end
 
     def encode(value)
-      unless value.class.name == @klass.name
-        raise XunchCodecError.new("Codec error. Codec class is #{@klass}," << 
-          "object_id is #{@klass.object_id}, but value class is #{value.class}," << 
+      unless value.class.name.start_with? @klass.name
+        raise XunchCodecError.new("Codec error. Codec class is #{@klass}," <<
+          "object_id is #{@klass.object_id}, but value class is #{value.class}," <<
           "object_id is #{value.class.object_id}.
           value class = #{value.class.inspect} vs config class = #{@klass.inspect} ")
       end

data/lib/xunch/codec/json_codec.rb

@@ -8,7 +8,7 @@ module Xunch
     end
 
     def encode(value)
-      unless value.class.name == @klass.name
+      unless value.class.name.start_with? @klass.name
         raise XunchCodecError.new("Codec error. Codec class is #{@klass}," <<
           "object_id is #{@klass.object_id}, but value class is #{value.class}," <<
           "object_id is #{value.class.object_id}.

data/test/cache_builder_test.rb

@@ -29,6 +29,24 @@ class CacheBuilderTest < Test::Unit::TestCase
       end
     }
     puts "CacheBuilderTest test_build_type stop."
+    require 'socket'
+    i = 0
+    start = Time.now
+    while i < 1000000 do
+      Socket.gethostname
+      i += 1
+    end
+    stop = Time.now
+    puts stop - start
+
+    i = 0
+    start = Time.now
+    while i < 1000000 do
+      Process.pid
+      i += 1
+    end
+    stop = Time.now
+    puts stop - start
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xunch
 version: !ruby/object:Gem::Version
-  version: 0.0.10.2
+  version: 0.0.10.3
 platform: ruby
 authors:
 - Ted Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -44,6 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/xunch.rb
 - lib/xunch/cache/cache.rb
 - lib/xunch/cache/cache_builder.rb
 - lib/xunch/cache/field_object_cache.rb
@@ -56,18 +57,17 @@ files:
 - lib/xunch/codec/json_codec.rb
 - lib/xunch/connection/fiber_redis_pool.rb
 - lib/xunch/connection/threaded_redis_pool.rb
+- lib/xunch/shard/ThreadedRedisPool.rb
 - lib/xunch/shard/redis.rb
 - lib/xunch/shard/shard_info.rb
 - lib/xunch/shard/shard_redis.rb
 - lib/xunch/shard/sharded.rb
-- lib/xunch/shard/ThreadedRedisPool.rb
 - lib/xunch/utils/exceptions.rb
 - lib/xunch/utils/nginx_cache_helper.rb
 - lib/xunch/utils/rb_tree.rb
 - lib/xunch/utils/rb_tree_node.rb
 - lib/xunch/utils/types.rb
 - lib/xunch/utils/utils.rb
-- lib/xunch.rb
 - test/cache_builder_test.rb
 - test/cache_test.rb
 - test/em_cache_test.rb
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A distribute cache client library based on redis.