tair 0.1.0 → 0.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca3c650db4a3d3ddc1edba2923b19f4b3ca60561
-  data.tar.gz: 4f99c738c965cbaafc79f1073ec0b80565a03a6d
+  metadata.gz: b3439ef24484e932537cc2403abd84819519f4db
+  data.tar.gz: 6aa58d81edc3c133ff3fe67895db30defa11af2f
 SHA512:
-  metadata.gz: 90e030599e1304ff2e1cc3b14ef438be60d5d7ecb19c5f55ff673081cd1e4dfb39f0bb9b22b725dec2ffa25c93069d690f2f03de4e8c3c43515b19336fd8a240
-  data.tar.gz: 897949bdbeb6a8a16df0a942179a57376e355acf4beb23d3c96896c2bbb34380a771dcbcbab234e069f9c9983e01308881766ca9230bf72aee4cd8f9917d5ffd
+  metadata.gz: 072924488e5b1d03c90ebe3b3ad64e6927ab5afa4d2c10fb5a9116453a8257d3304292db08c4e5eb7c8ecb8689610c245e84608a9947ad20e019eab7357d439a
+  data.tar.gz: 4a2ed0fd8939f9281ba20083cf95b0fbdc4d1f7df2a846a026c38da47fb0bd886172f81813f7f250de60ed8aeb54159563e741e78b2c6760a2282bf9ed35247c

data/lib/tair/protocol/murmurhash.rb

@@ -3,8 +3,49 @@ require 'tair_murmurhash'
 module Tair
   module Protocol
     module Murmurhash
+
+      MURMURHASH_M = 0x5bd1e995
+      MAX_OF_32B   = (1 << 32) - 1
+
       def self.digest(key, seed=97)
-        ::Tair::TairMurmurhash.new(key, seed).digest
+        key   = key.each_codepoint.to_a
+        len   = key.size
+        h     = seed ^ len
+        index = 0
+
+        while len >= 4
+          k = (key[index] & 0xff) |
+            ((key[index + 1] << 8) & 0xff00) |
+            ((key[index + 2] << 16) & 0xff0000) |
+            (key[index + 3] << 24)
+
+
+          k = (k * MURMURHASH_M) & MAX_OF_32B
+          k ^= (k >> 24)
+          k = (k * MURMURHASH_M) & MAX_OF_32B
+          h = (h * MURMURHASH_M) & MAX_OF_32B
+          h ^= k
+          index += 4
+          len   -= 4
+        end
+
+        if len == 3
+          h ^= (key[index + 2] << 16)
+        end
+
+        if len == 3 or len == 2
+          h ^= (key[index + 1] << 8)
+        end
+
+        if len == 3 or len == 2 or len == 1
+          h ^= key[index]
+          h = (h* MURMURHASH_M) & MAX_OF_32B
+        end
+
+        h ^= (h >> 13)
+        h = (h * MURMURHASH_M) & MAX_OF_32B
+        h ^= (h >> 15)
+        h
       end
     end
   end

data/lib/tair/version.rb

@@ -2,8 +2,8 @@ module Tair
   module Version
     MAJOR   = 0
     MINOR   = 1
-    PATCH   = 0
-    RELEASE = nil
+    PATCH   = 1
+    RELEASE = 'pre'
 
     def self.to_s
       [MAJOR, MINOR, PATCH, RELEASE].compact.join('.')

data/tair.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.extensions    = spec.files.grep(%r{extconf})
 
   spec.add_dependency "bindata", "~> 2.1.0"
-  spec.add_dependency "rice", "~> 1.6.2"
   spec.add_dependency "colored", "~> 1.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tair
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1.pre
 platform: ruby
 authors:
 - "如彼"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: rice
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -126,8 +112,7 @@ description: Tair client for ruby.
 email:
 - hua.qiuh@alibaba-inc.com
 executables: []
-extensions:
-- ext/tair/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -135,8 +120,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - Rakefile
-- ext/tair/extconf.rb
-- ext/tair/tair_murmurhash.cpp
 - lib/tair.rb
 - lib/tair/client.rb
 - lib/tair/cluster.rb
@@ -177,12 +160,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: tair client for ruby.

data/ext/tair/extconf.rb

@@ -1,3 +0,0 @@
-require 'mkmf-rice'
-
-create_makefile "tair_murmurhash"

data/ext/tair/tair_murmurhash.cpp

@@ -1,72 +0,0 @@
-#include "rice/Module.hpp"
-#include "rice/Class.hpp"
-#include "rice/String.hpp"
-
-using namespace Rice;
-using namespace std;
-
-#define MURMURHASH_M 0x5bd1e995
-
-uint64_t digest(string str, uint32_t seed)
-{
-  const char *key = str.c_str();
-  int len         = str.length();
-  uint32_t h      = seed ^ len;
-  int index       = 0;
-
-  while (len >= 4) {
-    uint32_t k = (key[index] & 0xff) | ((key[index + 1] << 8) & 0xff00)
-      | ((key[index + 2] << 16) & 0xff0000)
-      | (key[index + 3] << 24);
-
-    k *= MURMURHASH_M;
-    k ^= (k >> 24);
-    k *= MURMURHASH_M;
-    h *= MURMURHASH_M;
-    h ^= k;
-    index += 4;
-    len -= 4;
-  }
-
-  switch (len) {
-    case 3:
-      h ^= (key[index + 2] << 16);
-
-    case 2:
-      h ^= (key[index + 1] << 8);
-
-    case 1:
-      h ^= key[index];
-      h *= MURMURHASH_M;
-  }
-
-  h ^= (h >> 13);
-  h *= MURMURHASH_M;
-  h ^= (h >> 15);
-  return h;
-}
-
-
-Object tmh_initialize(Object self, String str, uint32_t seed)
-{
-  self.iv_set("@string", str);
-  self.iv_set("@seed", seed);
-}
-
-Object tmh_digest(Object self)
-{
-  string str    = self.iv_get("@string").to_s().str();
-  uint32_t seed = from_ruby<uint32_t>(self.iv_get("@seed"));
-  uint32_t hash = digest(str, seed);
-  return to_ruby<uint32_t>(hash);
-}
-
-extern "C"
-void Init_tair_murmurhash()
-{
-  Module rb_mTair = define_module("Tair");
-  Class rb_cTairMurmurhash = 
-    define_class_under(rb_mTair, "TairMurmurhash")
-    .define_method( "initialize", &tmh_initialize )
-    .define_method( "digest",     &tmh_digest );
-}