xunch 0.0.10.3 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a823df55ee04eec6dd9cb198b9219d633228e58
-  data.tar.gz: 8ef44351fd2de4129f2060918fdef8754d31bb41
+  metadata.gz: 9a0afe0ef5426b25109b7d7b53635235ca52eccc
+  data.tar.gz: 62a5467a1f9ee1b4dc03e98db8ac522ea0b8d11f
 SHA512:
-  metadata.gz: 36e5ac51f6ca81bb02baece72e0bf7e6720723d843df6d7d0d748bf9bfcf12846f19a9053fe70a483d5a9cbae236cbb2f2917a4cf7e045dd8f633738451d7a6e
-  data.tar.gz: e05efd775ea4e6b4811b0e37f48197184812dcd098350a543c16279014d4643ea6203226cd3f7f455c8f6deaea354c18032cbd535e6540515dfb25db2dd1eaf7
+  metadata.gz: 0698d73d427538458e290f381dc378de21ebd5500e662ddeaa43a18f4d88266feefa3bdb210d2ffdef7b0480f06e64cc940e341769bfc443c175325c83cb10af
+  data.tar.gz: 00fd358f5349aef1756ca282cb5359bc3506af2b547f86ef236c3faa3f673f0cf349150d3f99792f74582cb4682654a6fe17b53fa82017b315ccc5f971d55805

data/lib/xunch/cache/cache.rb

@@ -35,8 +35,18 @@ module Xunch
 
     protected
     def getCacheObjectKey(value)
-      key = value.send(@options[:key_field_name])
-      raise ArgumentError("value #{value} key field can not be nil.") unless key != nil
+      key = nil
+      @options[:key_field_name].each do |field|
+        v = value.send(field)
+        if v == nil
+          raise ArgumentError("value #{value} key field #{field} can not be nil.")
+        end
+        if key
+          key = key.concat("-").concat(v.to_s)
+        else
+          key = v.to_s
+        end
+      end
       key
     end
 
@@ -77,7 +87,7 @@ module Xunch
       end
 
       if(options["key_field_name"] != nil)
-        key_field_name = options["key_field_name"]
+        key_field_name = options["key_field_name"].split(",")
         use_options.store(:key_field_name, key_field_name)
       end
 

data/lib/xunch/shard/sharded.rb

@@ -1,5 +1,5 @@
 module Xunch
-  # maintain a consistency hash ring 
+  # maintain a consistency hash ring
   # this ring must be same as other language xunch sharded
   class Sharded
     include Murmurhash
@@ -47,4 +47,4 @@ module Xunch
       return key
     end
   end
-end
+end

data/lib/xunch/utils/utils.rb

@@ -4,7 +4,7 @@ module Xunch
       array = field.split("_")
       field_mod = array[0]
       for i in 1 .. array.length-1 do
-        field_mod << array[i].capitalize  
+        field_mod << array[i].capitalize
       end
       field_mod.freeze
     end
@@ -20,5 +20,24 @@ module Xunch
       }
       formatted_fields
     end
+
+    #
+    # 在multi key field的场景下,提供的辅助方法来拼接出key
+    # @params fields an array of key filed value
+    #
+    def self.concat_key_field(fields)
+      key = nil
+      fields.each do |field|
+        if field == nil
+          raise ArgumentError("key field #{field} can not be nil.")
+        end
+        if key
+          key = key.concat("-").concat(field.to_s)
+        else
+          key = field.to_s
+        end
+      end
+      key
+    end
   end
 end

data/test/multi_key_test.rb

@@ -0,0 +1,259 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../../test", __FILE__)
+require "test/unit"
+require "xunch"
+require 'yaml'
+require 'test_helper'
+
+class MultiKeyCacheTest < Test::Unit::TestCase
+  include Test::Unit::Assertions
+  def setup
+    super
+    root = File.expand_path("../..", __FILE__)
+    file = File.join(root, 'test/xunch2.yaml')
+    caches = Xunch::CacheBuilder.build(file)
+    @object_cache = caches["track"]
+    hash = TestHelper.build_objects
+    @cache_object = hash["object"]
+    @cache_objects = hash["objects"]
+    @keys = []
+    @cache_objects.each do |obj|
+      @keys.push("#{obj.id}-#{obj.track_id}")
+    end
+    puts "setup"
+  end
+
+  def test_get_set
+    puts "ObjectCacheTest test_get_set method start"
+    puts @cache_object.track_id.class.name
+    assert_equal('OK',@object_cache.put(@cache_object))
+    object = @object_cache.get("#{@cache_object.id}-#{@cache_object.track_id}")
+
+    # type assert
+    assert_equal(Time.name,object.created_at.class.name)
+    assert_equal(Time.name,object.updated_at.class.name)
+    assert_equal(Time.name,object.approved_at.class.name)
+    assert_equal(FalseClass.name,object.is_crawler.class.name)
+    assert_equal(TrueClass.name,object.is_public.class.name)
+    assert_equal(Fixnum.name,object.mp3size.class.name)
+    assert_equal(BigDecimal.name,object.longitude.class.name)
+    assert_equal(Fixnum.name,object.track_id.class.name)
+    assert_equal(String.name,object.play_path.class.name)
+
+    #value assert
+    assert_equal(@cache_object.track_id,object.track_id)
+    assert_equal(@cache_object.track_uid,object.track_uid)
+    assert_equal(@cache_object.track_upload_source,object.track_upload_source)
+    assert_equal(@cache_object.op_type,object.op_type)
+    assert_equal(@cache_object.is_publish,object.is_publish)
+    assert_equal(@cache_object.upload_source,object.upload_source)
+    assert_equal(@cache_object.uid,object.uid)
+    assert_equal(@cache_object.nickname,object.nickname)
+    assert_equal(@cache_object.avatar_path,object.avatar_path)
+    assert_equal(@cache_object.is_v,object.is_v)
+    assert_equal(@cache_object.human_category_id,object.human_category_id)
+    assert_equal(@cache_object.title,object.title)
+    assert_equal(@cache_object.intro,object.intro)
+    assert_equal(@cache_object.user_source,object.user_source)
+    assert_equal(@cache_object.category_id,object.category_id)
+    assert_equal(@cache_object.duration,object.duration)
+    assert_equal(@cache_object.play_path,object.play_path)
+    assert_equal(@cache_object.play_path_32,object.play_path_32)
+    assert_equal(@cache_object.play_path_64,object.play_path_64)
+    assert_equal(@cache_object.play_path_128,object.play_path_128)
+    assert_equal(@cache_object.transcode_state,object.transcode_state)
+    assert_equal(@cache_object.download_path,object.download_path)
+    assert_equal(@cache_object.cover_path,object.cover_path)
+    assert_equal(@cache_object.album_id,object.album_id)
+    assert_equal(@cache_object.album_title,object.album_title)
+    assert_equal(@cache_object.album_cover_path,object.album_cover_path)
+    assert_equal(@cache_object.tags,object.tags)
+    assert_equal(@cache_object.ignore_tags,object.ignore_tags)
+    assert_equal(@cache_object.extra_tags,object.extra_tags)
+    assert_equal(@cache_object.singer,object.singer)
+    assert_equal(@cache_object.singer_category,object.singer_category)
+    assert_equal(@cache_object.author,object.author)
+    assert_equal(@cache_object.composer,object.composer)
+    assert_equal(@cache_object.arrangement,object.arrangement)
+    assert_equal(@cache_object.post_production,object.post_production)
+    assert_equal(@cache_object.lyric_path,object.lyric_path)
+    assert_equal(@cache_object.language,object.language)
+    assert_equal(@cache_object.lyric,object.lyric)
+    assert_equal(@cache_object.resinger,object.resinger)
+    assert_equal(@cache_object.announcer,object.announcer)
+    assert_equal(@cache_object.is_public,object.is_public)
+    assert_equal(@cache_object.access_password,object.access_password)
+    assert_equal(@cache_object.allow_download,object.allow_download)
+    assert_equal(@cache_object.allow_comment,object.allow_comment)
+    assert_equal(@cache_object.is_crawler,object.is_crawler)
+    assert_equal(@cache_object.inet_aton_ip,object.inet_aton_ip)
+    assert_equal(@cache_object.longitude,object.longitude)
+    assert_equal(@cache_object.latitude,object.latitude)
+    assert_equal(@cache_object.music_category,object.music_category)
+    assert_equal(@cache_object.order_num,object.order_num)
+    assert_equal(@cache_object.is_pick,object.is_pick)
+    assert_equal(@cache_object.rich_intro,object.rich_intro)
+    assert_equal(@cache_object.short_intro,object.short_intro)
+    assert_equal(@cache_object.comment_content,object.comment_content)
+    assert_equal(@cache_object.comment_id,object.comment_id)
+    assert_equal(@cache_object.dig_status,object.dig_status)
+    assert_equal(@cache_object.approved_at,object.approved_at)
+    assert_equal(@cache_object.is_deleted,object.is_deleted)
+    assert_equal(@cache_object.mp3size,object.mp3size)
+    assert_equal(@cache_object.mp3size_32,object.mp3size_32)
+    assert_equal(@cache_object.mp3size_64,object.mp3size_64)
+    assert_equal(@cache_object.waveform,object.waveform)
+    assert_equal(@cache_object.upload_id,object.upload_id)
+    assert_equal(@cache_object.updated_at,object.updated_at)
+    assert_equal(@cache_object.created_at,object.created_at)
+    assert_equal(@cache_object.source_url,object.source_url)
+    assert_equal(@cache_object.status,object.status)
+    assert_equal(@cache_object.explore_height,object.explore_height)
+    assert_equal(@cache_object.id,object.id)
+    puts "ObjectCacheTest test_get_set method stop"
+  end
+
+  def test_get_set_benchmark
+    puts "ObjectCacheTest test_get_set_benchmark method start"
+    @object_cache.evict(1)
+    times = TestHelper::TIMES
+    start = Time.now
+    for i in 1 .. times do
+      @object_cache.put(@cache_object)
+    end
+    stop = Time.now
+    puts "#{times} times put operation total use #{stop-start} seconds"
+
+    start = Time.now
+    for i in 1 .. times do
+      @object_cache.get(1)
+    end
+    stop = Time.now
+    puts "#{times} times get operation total use #{stop-start} seconds"
+    puts "ObjectCacheTest test_get_set_benchmark method stop"
+  end
+
+  def test_mget_mset
+    puts "ObjectCacheTest test_mget_mset method start"
+    result = @object_cache.multi_put(@cache_objects)
+    for i in 0 .. result.length - 1 do
+      success = false
+      if result[i] == "OK" or result[i] == true
+        success = true
+      end
+      assert_equal(true,success)
+    end
+    objects = @object_cache.multi_get(@keys)
+    assert_equal(@cache_objects.length, objects.length)
+    for i in 0 .. @cache_objects.length - 1 do
+      assert_equal(Time.name,objects[i].created_at.class.name)
+      assert_equal(Time.name,objects[i].updated_at.class.name)
+      assert_equal(Time.name,objects[i].approved_at.class.name)
+      assert_equal(FalseClass.name,objects[i].is_crawler.class.name)
+      assert_equal(TrueClass.name,objects[i].is_public.class.name)
+      assert_equal(Fixnum.name,objects[i].mp3size.class.name)
+      assert_equal(BigDecimal.name,objects[i].longitude.class.name)
+      assert_equal(Fixnum.name,objects[i].track_id.class.name)
+      assert_equal(String.name,objects[i].play_path.class.name)
+
+      #VALUE assert
+      assert_equal(@cache_objects[i].track_id,objects[i].track_id)
+      assert_equal(@cache_objects[i].track_uid,objects[i].track_uid)
+      assert_equal(@cache_objects[i].track_upload_source,objects[i].track_upload_source)
+      assert_equal(@cache_objects[i].op_type,objects[i].op_type)
+      assert_equal(@cache_objects[i].is_publish,objects[i].is_publish)
+      assert_equal(@cache_objects[i].upload_source,objects[i].upload_source)
+      assert_equal(@cache_objects[i].uid,objects[i].uid)
+      assert_equal(@cache_objects[i].nickname,objects[i].nickname)
+      assert_equal(@cache_objects[i].avatar_path,objects[i].avatar_path)
+      assert_equal(@cache_objects[i].is_v,objects[i].is_v)
+      assert_equal(@cache_objects[i].human_category_id,objects[i].human_category_id)
+      assert_equal(@cache_objects[i].title,objects[i].title)
+      assert_equal(@cache_objects[i].intro,objects[i].intro)
+      assert_equal(@cache_objects[i].user_source,objects[i].user_source)
+      assert_equal(@cache_objects[i].category_id,objects[i].category_id)
+      assert_equal(@cache_objects[i].duration,objects[i].duration)
+      assert_equal(@cache_objects[i].play_path,objects[i].play_path)
+      assert_equal(@cache_objects[i].play_path_32,objects[i].play_path_32)
+      assert_equal(@cache_objects[i].play_path_64,objects[i].play_path_64)
+      assert_equal(@cache_objects[i].play_path_128,objects[i].play_path_128)
+      assert_equal(@cache_objects[i].transcode_state,objects[i].transcode_state)
+      assert_equal(@cache_objects[i].download_path,objects[i].download_path)
+      assert_equal(@cache_objects[i].cover_path,objects[i].cover_path)
+      assert_equal(@cache_objects[i].album_id,objects[i].album_id)
+      assert_equal(@cache_objects[i].album_title,objects[i].album_title)
+      assert_equal(@cache_objects[i].album_cover_path,objects[i].album_cover_path)
+      assert_equal(@cache_objects[i].tags,objects[i].tags)
+      assert_equal(@cache_objects[i].ignore_tags,objects[i].ignore_tags)
+      assert_equal(@cache_objects[i].extra_tags,objects[i].extra_tags)
+      assert_equal(@cache_objects[i].singer,objects[i].singer)
+      assert_equal(@cache_objects[i].singer_category,objects[i].singer_category)
+      assert_equal(@cache_objects[i].author,objects[i].author)
+      assert_equal(@cache_objects[i].composer,objects[i].composer)
+      assert_equal(@cache_objects[i].arrangement,objects[i].arrangement)
+      assert_equal(@cache_objects[i].post_production,objects[i].post_production)
+      assert_equal(@cache_objects[i].lyric_path,objects[i].lyric_path)
+      assert_equal(@cache_objects[i].language,objects[i].language)
+      assert_equal(@cache_objects[i].lyric,objects[i].lyric)
+      assert_equal(@cache_objects[i].resinger,objects[i].resinger)
+      assert_equal(@cache_objects[i].announcer,objects[i].announcer)
+      assert_equal(@cache_objects[i].is_public,objects[i].is_public)
+      assert_equal(@cache_objects[i].access_password,objects[i].access_password)
+      assert_equal(@cache_objects[i].allow_download,objects[i].allow_download)
+      assert_equal(@cache_objects[i].allow_comment,objects[i].allow_comment)
+      assert_equal(@cache_objects[i].is_crawler,objects[i].is_crawler)
+      assert_equal(@cache_objects[i].inet_aton_ip,objects[i].inet_aton_ip)
+      assert_equal(@cache_objects[i].longitude,objects[i].longitude)
+      assert_equal(@cache_objects[i].latitude,objects[i].latitude)
+      assert_equal(@cache_objects[i].music_category,objects[i].music_category)
+      assert_equal(@cache_objects[i].order_num,objects[i].order_num)
+      assert_equal(@cache_objects[i].is_pick,objects[i].is_pick)
+      assert_equal(@cache_objects[i].rich_intro,objects[i].rich_intro)
+      assert_equal(@cache_objects[i].short_intro,objects[i].short_intro)
+      assert_equal(@cache_objects[i].comment_content,objects[i].comment_content)
+      assert_equal(@cache_objects[i].comment_id,objects[i].comment_id)
+      assert_equal(@cache_objects[i].dig_status,objects[i].dig_status)
+      assert_equal(@cache_objects[i].approved_at,objects[i].approved_at)
+      assert_equal(@cache_objects[i].is_deleted,objects[i].is_deleted)
+      assert_equal(@cache_objects[i].mp3size,objects[i].mp3size)
+      assert_equal(@cache_objects[i].mp3size_32,objects[i].mp3size_32)
+      assert_equal(@cache_objects[i].mp3size_64,objects[i].mp3size_64)
+      assert_equal(@cache_objects[i].waveform,objects[i].waveform)
+      assert_equal(@cache_objects[i].upload_id,objects[i].upload_id)
+      assert_equal(@cache_objects[i].updated_at,objects[i].updated_at)
+      assert_equal(@cache_objects[i].created_at,objects[i].created_at)
+      assert_equal(@cache_objects[i].source_url,objects[i].source_url)
+      assert_equal(@cache_objects[i].status,objects[i].status)
+      assert_equal(@cache_objects[i].explore_height,objects[i].explore_height)
+      assert_equal(@cache_objects[i].id,objects[i].id)
+    end
+    puts "ObjectCacheTest test_mget_mset method stop"
+  end
+
+  def test_mget_mset_benchmark
+    puts "ObjectCacheTest test_mget_mset_benchmark method start"
+    @object_cache.batch_evict @keys
+
+    times = TestHelper::TIMES
+    start = Time.now
+    for i in 1 .. times do
+      @object_cache.multi_put(@cache_objects)
+    end
+    stop = Time.now
+    puts "#{times} times multi_put operation total use #{stop-start} seconds"
+
+    start = Time.now
+    for i in 1 .. times do
+      @object_cache.multi_get(@keys)
+    end
+    stop = Time.now
+    puts "#{times} times multi_get operation total use #{stop-start} seconds"
+    puts "ObjectCacheTest test_mget_mset_benchmark method stop"
+  end
+
+  def teardown
+    super
+    puts "teardown"
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xunch
 version: !ruby/object:Gem::Version
-  version: 0.0.10.3
+  version: 0.0.11
 platform: ruby
 authors:
 - Ted Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -79,10 +79,12 @@ files:
 - test/list_field_object_cache_test.rb
 - test/list_id_cache_test.rb
 - test/list_object_cache_test.rb
+- test/multi_key_test.rb
 - test/nginx_cache_helper_test.rb
 - test/object_cache_test.rb
 - test/rb_tree_test.rb
 - test/redis_client_test.rb
+- test/shard_test.rb
 homepage: http://www.ximalaya.com
 licenses:
 - Apache License Version 2.0
@@ -119,7 +121,9 @@ test_files:
 - test/list_field_object_cache_test.rb
 - test/list_id_cache_test.rb
 - test/list_object_cache_test.rb
+- test/multi_key_test.rb
 - test/nginx_cache_helper_test.rb
 - test/object_cache_test.rb
 - test/rb_tree_test.rb
 - test/redis_client_test.rb
+- test/shard_test.rb