mmh3 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f75743b47a08fe6ab088a1176cad6746e95dc740715fcd1249d63ab66d9b5a9
-  data.tar.gz: 53b77cea35c4b49828e338af56ed37bfa714c467643408208d9cd9fbd7d7a104
+  metadata.gz: 9b3781157663073fc2ddf9f5af0f58f28e4ef31af58cbc5ac081327b9aba327e
+  data.tar.gz: bb4cdba03cab5d309509947f917f884392a23d386a1f072a7322d2ee250dc91f
 SHA512:
-  metadata.gz: 26e434a6c91c6d84136c7aba6afb729beb2423ebc5e1db647569680c96ca78ab2a8f825fd639bafa8cc2a06f717e958a924ec8d459f58c41b5eb0cf70d4f3259
-  data.tar.gz: 1d627f4d5f6aceb7f38db402a1fe339e6c06f8b46a5714ffb8deb565ae40773896de3d2946f4fbf8805807fc1d003a1c070d9156531c3778b86eed55d0124cd9
+  metadata.gz: c7fa5acfc24334d26726ac8c32f3ebbeb710012056d71ab35fa73a72ef9067e1bdc76c02e1ec7afb8f3d2f7d522fc0289231fe88cc7f622bd12149aad6ce7a42
+  data.tar.gz: c2be744d61934671e2c0ad18b842f178daab06f411f3164d77989fa9b9f347db707aff66dc186ff4bd93374b125d8968979429dc91ac7f5c39e704e14222cd96

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+# 0.3.0
+- Add option to hash128 method for generating a 128-bit hash value in x86 architecture.
+
 # 0.2.0
-- Add hash128 method for generating a 128-bit hash value in x86 architecture.
+- Add hash128 method for generating a 128-bit hash value in x64 architecture.
 
 # 0.1.0
 - First release.

data/lib/mmh3.rb

@@ -45,13 +45,22 @@ module Mmh3
     end
   end
 
-  # Generate a 128-bit hash value for x64 architecture.
+  # Generate a 128-bit hash value.
   #
   # @param key [String] Key for hash value.
   # @param seed [Integer] Seed for hash value.
+  # @param x64arch [Boolean] Flag indicating whether to generate hash value for x64 architecture.
   #
   # @return [Integer] Returns hash value.
-  def hash128(key, seed = 0)
+  def hash128(key, seed = 0, x64arch = true)
+    return hash128_x86(key, seed) if x64arch == false
+
+    hash128_x64(key, seed)
+  end
+
+  # private
+
+  def hash128_x64(key, seed = 0)
     keyb = key.to_s.bytes
     key_len = keyb.size
     n_blocks = key_len / 16
@@ -135,7 +144,150 @@ module Mmh3
     h2 << 64 | h1
   end
 
-  # private
+  def hash128_x86(key, seed = 0)
+    keyb = key.to_s.bytes
+    key_len = keyb.size
+    n_blocks = key_len / 16
+
+    h1 = seed
+    h2 = seed
+    h3 = seed
+    h4 = seed
+    c1 = 0x239b961b
+    c2 = 0xab0e9789
+    c3 = 0x38b34ae5
+    c4 = 0xa1e38b93
+
+    (0...n_blocks * 16).step(16) do |bstart|
+      k1 = block32(keyb, bstart,  0)
+      k2 = block32(keyb, bstart,  4)
+      k3 = block32(keyb, bstart,  8)
+      k4 = block32(keyb, bstart, 12)
+
+      k1 = (k1 * c1) & 0xFFFFFFFF
+      k1 = rotl32(k1, 15)
+      k1 = (k1 * c2) & 0xFFFFFFFF
+      h1 ^= k1
+
+      h1 = rotl32(h1, 19)
+      h1 = (h1 + h2) & 0xFFFFFFFF
+      h1 = (h1 * 5 + 0x561ccd1b) & 0xFFFFFFFF
+
+      k2 = (k2 * c2) & 0xFFFFFFFF
+      k2 = rotl32(k2, 16)
+      k2 = (k2 * c3) & 0xFFFFFFFF
+      h2 ^= k2
+
+      h2 = rotl32(h2, 17)
+      h2 = (h2 + h3) & 0xFFFFFFFF
+      h2 = (h2 * 5 + 0x0bcaa747) & 0xFFFFFFFF
+
+      k3 = (k3 * c3) & 0xFFFFFFFF
+      k3 = rotl32(k3, 17)
+      k3 = (k3 * c4) & 0xFFFFFFFF
+      h3 ^= k3
+
+      h3 = rotl32(h3, 15)
+      h3 = (h3 + h4) & 0xFFFFFFFF
+      h3 = (h3 * 5 + 0x96cd1c35) & 0xFFFFFFFF
+
+      k4 = (k4 * c4) & 0xFFFFFFFF
+      k4 = rotl32(k4, 18)
+      k4 = (k4 * c1) & 0xFFFFFFFF
+      h4 ^= k4
+
+      h4 = rotl32(h4, 13)
+      h4 = (h4 + h1) & 0xFFFFFFFF
+      h4 = (h4 * 5 + 0x32ac3b17) & 0xFFFFFFFF
+    end
+
+    tail_id = n_blocks * 16
+    tail_sz = key_len & 15
+
+    k4 = 0
+    k4 ^= keyb[tail_id + 14] << 16 if tail_sz >= 15
+    k4 ^= keyb[tail_id + 13] <<  8 if tail_sz >= 14
+    k4 ^= keyb[tail_id + 12]       if tail_sz >= 13
+
+    if tail_sz > 12
+      k4 = (k4 * c4) & 0xFFFFFFFF
+      k4 = rotl32(k4, 18)
+      k4 = (k4 * c1) & 0xFFFFFFFF
+      h4 ^= k4
+    end
+
+    k3 = 0
+    k3 ^= keyb[tail_id + 11] << 24 if tail_sz >= 12
+    k3 ^= keyb[tail_id + 10] << 16 if tail_sz >= 11
+    k3 ^= keyb[tail_id +  9] <<  8 if tail_sz >= 10
+    k3 ^= keyb[tail_id +  8]       if tail_sz >=  9
+
+    if tail_sz > 8
+      k3 = (k3 * c3) & 0xFFFFFFFF
+      k3 = rotl32(k3, 17)
+      k3 = (k3 * c4) & 0xFFFFFFFF
+      h3 ^= k3
+    end
+
+    k2 = 0
+    k2 ^= keyb[tail_id +  7] << 24 if tail_sz >=  8
+    k2 ^= keyb[tail_id +  6] << 16 if tail_sz >=  7
+    k2 ^= keyb[tail_id +  5] <<  8 if tail_sz >=  6
+    k2 ^= keyb[tail_id +  4]       if tail_sz >=  5
+
+    if tail_sz > 4
+      k2 = (k2 * c2) & 0xFFFFFFFF
+      k2 = rotl32(k2, 16)
+      k2 = (k2 * c3) & 0xFFFFFFFF
+      h2 ^= k2
+    end
+
+    k1 = 0
+    k1 ^= keyb[tail_id +  3] << 24 if tail_sz >=  4
+    k1 ^= keyb[tail_id +  2] << 16 if tail_sz >=  3
+    k1 ^= keyb[tail_id +  1] <<  8 if tail_sz >=  2
+    k1 ^= keyb[tail_id]            if tail_sz >=  1
+
+    if tail_sz > 0
+      k1 = (k1 * c1) & 0xFFFFFFFF
+      k1 = rotl32(k1, 15)
+      k1 = (k1 * c2) & 0xFFFFFFFF
+      h1 ^= k1
+    end
+
+    h1 ^= key_len
+    h2 ^= key_len
+    h3 ^= key_len
+    h4 ^= key_len
+
+    h1 = (h1 + h2) & 0xFFFFFFFF
+    h1 = (h1 + h3) & 0xFFFFFFFF
+    h1 = (h1 + h4) & 0xFFFFFFFF
+    h2 = (h1 + h2) & 0xFFFFFFFF
+    h3 = (h1 + h3) & 0xFFFFFFFF
+    h4 = (h1 + h4) & 0xFFFFFFFF
+
+    h1 = fmix32(h1)
+    h2 = fmix32(h2)
+    h3 = fmix32(h3)
+    h4 = fmix32(h4)
+
+    h1 = (h1 + h2) & 0xFFFFFFFF
+    h1 = (h1 + h3) & 0xFFFFFFFF
+    h1 = (h1 + h4) & 0xFFFFFFFF
+    h2 = (h1 + h2) & 0xFFFFFFFF
+    h3 = (h1 + h3) & 0xFFFFFFFF
+    h4 = (h1 + h4) & 0xFFFFFFFF
+
+    h4 << 96 | h3 << 64 | h2 << 32 | h1
+  end
+
+  def block32(kb, bstart, offset)
+    kb[bstart + offset + 3] << 24 |
+    kb[bstart + offset + 2] << 16 |
+    kb[bstart + offset + 1] <<  8 |
+    kb[bstart + offset]
+  end
 
   def block64(kb, bstart, offset)
     kb[2 * bstart + (7 + offset)] << 56 |
@@ -178,5 +330,5 @@ module Mmh3
     h ^ (h >> 33)
   end
 
-  private_class_method :block64, :rotl32, :rotl64, :scramble32, :fmix32, :fmix64
+  private_class_method :hash128_x64, :hash128_x86, :block32, :block64, :rotl32, :rotl64, :scramble32, :fmix32, :fmix64
 end

data/lib/mmh3/version.rb

@@ -2,5 +2,5 @@
 
 module Mmh3
   # Version number of Mmh3 you are using.
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/mmh3.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/yoshoku/mmh3'
   spec.metadata['changelog_uri'] = 'https://github.com/yoshoku/mmh3/blob/master/CHANGELOG.md'
-  spec.metadata['documentation_url'] = 'https://rubydoc.info/gems/mmh3'
+  spec.metadata['documentation_uri'] = 'https://rubydoc.info/gems/mmh3'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmh3
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby implementation of MurmurHash3
 email:
@@ -37,7 +37,7 @@ metadata:
   homepage_uri: https://github.com/yoshoku/mmh3
   source_code_uri: https://github.com/yoshoku/mmh3
   changelog_uri: https://github.com/yoshoku/mmh3/blob/master/CHANGELOG.md
-  documentation_url: https://rubydoc.info/gems/mmh3
+  documentation_uri: https://rubydoc.info/gems/mmh3
 post_install_message: 
 rdoc_options: []
 require_paths: