mmh3 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a69bb53a4e9f7a3a63711f27669f2172ee3e61000961b453bd428fb0dd5147f
-  data.tar.gz: 5ec35b7d7b436d01c798cf5478e652066477dbf28f1f5be2e6947ac8535d695c
+  metadata.gz: 8f75743b47a08fe6ab088a1176cad6746e95dc740715fcd1249d63ab66d9b5a9
+  data.tar.gz: 53b77cea35c4b49828e338af56ed37bfa714c467643408208d9cd9fbd7d7a104
 SHA512:
-  metadata.gz: 69bf8ef42fe0e46d7954df35d3fe3f43693fe0f7bfe1ab38ea16f81be69c7a08ebe183fb6d51a7c6b133afeb0b757ea44f5d36bcfb36bd95a6e55492e56cb452
-  data.tar.gz: d19e0b3fe2f766569a166234d16f2940fa3e15ff28d2609c34cf18acf29387a1d58afa20376ead005e828f70c551fd96e9aee75d65286ecaa4bb7b3bfbcf125a
+  metadata.gz: 26e434a6c91c6d84136c7aba6afb729beb2423ebc5e1db647569680c96ca78ab2a8f825fd639bafa8cc2a06f717e958a924ec8d459f58c41b5eb0cf70d4f3259
+  data.tar.gz: 1d627f4d5f6aceb7f38db402a1fe339e6c06f8b46a5714ffb8deb565ae40773896de3d2946f4fbf8805807fc1d003a1c070d9156531c3778b86eed55d0124cd9

data/CHANGELOG.md

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

data/lib/mmh3.rb

@@ -45,10 +45,117 @@ module Mmh3
     end
   end
 
+  # Generate a 128-bit hash value for x64 architecture.
+  #
+  # @param key [String] Key for hash value.
+  # @param seed [Integer] Seed for hash value.
+  #
+  # @return [Integer] Returns hash value.
+  def hash128(key, seed = 0)
+    keyb = key.to_s.bytes
+    key_len = keyb.size
+    n_blocks = key_len / 16
+
+    h1 = seed
+    h2 = seed
+    c1 = 0x87c37b91114253d5
+    c2 = 0x4cf5ad432745937f
+
+    (0...n_blocks * 8).step(8) do |bstart|
+      k1 = block64(keyb, bstart, 0)
+      k2 = block64(keyb, bstart, 8)
+
+      k1 = (k1 * c1) & 0xFFFFFFFFFFFFFFFF
+      k1 = rotl64(k1, 31)
+      k1 = (k1 * c2) & 0xFFFFFFFFFFFFFFFF
+      h1 ^= k1
+
+      h1 = rotl64(h1, 27)
+      h1 = (h1 + h2) & 0xFFFFFFFFFFFFFFFF
+      h1 = (h1 * 5 + 0x52dce729) & 0xFFFFFFFFFFFFFFFF
+
+      k2 = (k2 * c2) & 0xFFFFFFFFFFFFFFFF
+      k2 = rotl64(k2, 33)
+      k2 = (k2 * c1) & 0xFFFFFFFFFFFFFFFF
+      h2 ^= k2
+
+      h2 = rotl64(h2, 31)
+      h2 = (h2 + h1) & 0xFFFFFFFFFFFFFFFF
+      h2 = (h2 * 5 + 0x38495ab5) & 0xFFFFFFFFFFFFFFFF
+    end
+
+    tail_id = n_blocks * 16
+    tail_sz = key_len & 15
+
+    k2 = 0
+    k2 ^= keyb[tail_id + 14] << 48 if tail_sz >= 15
+    k2 ^= keyb[tail_id + 13] << 40 if tail_sz >= 14
+    k2 ^= keyb[tail_id + 12] << 32 if tail_sz >= 13
+    k2 ^= keyb[tail_id + 11] << 24 if tail_sz >= 12
+    k2 ^= keyb[tail_id + 10] << 16 if tail_sz >= 11
+    k2 ^= keyb[tail_id +  9] <<  8 if tail_sz >= 10
+    k2 ^= keyb[tail_id +  8]       if tail_sz >=  9
+
+    if tail_sz > 8
+      k2 = (k2 * c2) & 0xFFFFFFFFFFFFFFFF
+      k2 = rotl64(k2, 33)
+      k2 = (k2 * c1) & 0xFFFFFFFFFFFFFFFF
+      h2 ^= k2
+    end
+
+    k1 = 0
+    k1 ^= keyb[tail_id + 7] << 56 if tail_sz >= 8
+    k1 ^= keyb[tail_id + 6] << 48 if tail_sz >= 7
+    k1 ^= keyb[tail_id + 5] << 40 if tail_sz >= 6
+    k1 ^= keyb[tail_id + 4] << 32 if tail_sz >= 5
+    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) & 0xFFFFFFFFFFFFFFFF
+      k1 = rotl64(k1, 31)
+      k1 = (k1 * c2) & 0xFFFFFFFFFFFFFFFF
+      h1 ^= k1
+    end
+
+    h1 ^= key_len
+    h2 ^= key_len
+
+    h1 = (h1 + h2) & 0xFFFFFFFFFFFFFFFF
+    h2 = (h1 + h2) & 0xFFFFFFFFFFFFFFFF
+
+    h1 = fmix64(h1)
+    h2 = fmix64(h2)
+
+    h1 = (h1 + h2) & 0xFFFFFFFFFFFFFFFF
+    h2 = (h1 + h2) & 0xFFFFFFFFFFFFFFFF
+
+    h2 << 64 | h1
+  end
+
+  # private
+
+  def block64(kb, bstart, offset)
+    kb[2 * bstart + (7 + offset)] << 56 |
+    kb[2 * bstart + (6 + offset)] << 48 |
+    kb[2 * bstart + (5 + offset)] << 40 |
+    kb[2 * bstart + (4 + offset)] << 32 |
+    kb[2 * bstart + (3 + offset)] << 24 |
+    kb[2 * bstart + (2 + offset)] << 16 |
+    kb[2 * bstart + (1 + offset)] <<  8 |
+    kb[2 * bstart + offset]
+  end
+
   def rotl32(x, r)
     (x << r | x >> (32 - r)) & 0xFFFFFFFF
   end
 
+  def rotl64(x, r)
+    (x << r | x >> (64 - r)) & 0xFFFFFFFFFFFFFFFF
+  end
+
   def scramble32(k)
     k = (k * 0xcc9e2d51) & 0xFFFFFFFF
     k = rotl32(k, 15)
@@ -63,5 +170,13 @@ module Mmh3
     h ^ (h >> 16)
   end
 
-  private_class_method :rotl32, :scramble32, :fmix32
+  def fmix64(h)
+    h ^= h >> 33
+    h = (h * 0xff51afd7ed558ccd) & 0xFFFFFFFFFFFFFFFF
+    h ^= h >> 33
+    h = (h * 0xc4ceb9fe1a85ec53) & 0xFFFFFFFFFFFFFFFF
+    h ^ (h >> 33)
+  end
+
+  private_class_method :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.1.0'
+  VERSION = '0.2.0'
 end

data/mmh3.gemspec

@@ -14,6 +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'
 
   # 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.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby implementation of MurmurHash3
 email:
@@ -20,6 +20,7 @@ files:
 - ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -36,6 +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
 post_install_message: 
 rdoc_options: []
 require_paths: