cityhash 0.7.0 → 0.8.0

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.8.0 (May 5, 2013) ##
+
+### enhancements
+  * add crc methods
+
 ## 0.7.0 (October 25, 2012) ##
 
 ### enhancements

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 
 gem 'rake'
 gem 'rake-compiler'
-gem 'minitest', '~> 2.11.0'
+gem 'minitest', '~> 4.7.3'

data/README.md

@@ -21,6 +21,9 @@ CityHash.hash64(text, seed1)        # => 9154302171269876511
 CityHash.hash64(text, seed1, seed2) # => 4854399283587686019
 CityHash.hash128(text)              # => 124124989950401219618153994964897029896
 CityHash.hash128(text, seed1)       # => 101668641288246442316643001405184598611
+CityHash.hash128crc(text)           # => 124124989950401219618153994964897029896
+CityHash.hash128crc(text, seed1)    # => 101668641288246442316643001405184598611
+CityHash.hash256crc(text)           # => 11964743055457135893972873789222488394617411264226841264756
 ```
 
 ### Contributing to cityhash

data/ext/cityhash/citycrc.h

@@ -0,0 +1,43 @@
+// Copyright (c) 2011 Google, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// CityHash, by Geoff Pike and Jyrki Alakuijala
+//
+// This file declares the subset of the CityHash functions that require
+// _mm_crc32_u64().  See the CityHash README for details.
+//
+// Functions in the CityHash family are not suitable for cryptography.
+
+#ifndef CITY_HASH_CRC_H_
+#define CITY_HASH_CRC_H_
+
+#include <city.h>
+
+// Hash function for a byte array.
+uint128 CityHashCrc128(const char *s, size_t len);
+
+// Hash function for a byte array.  For convenience, a 128-bit seed is also
+// hashed into the result.
+uint128 CityHashCrc128WithSeed(const char *s, size_t len, uint128 seed);
+
+// Hash function for a byte array.  Sets result[0] ... result[3].
+void CityHashCrc256(const char *s, size_t len, uint64 *result);
+
+#endif  // CITY_HASH_CRC_H_

data/ext/cityhash/cityhash.cc

@@ -1,6 +1,10 @@
 #include <ruby.h>
 #include "city.h"
 
+#ifdef __SSE4_2__
+#include "citycrc.h"
+#endif
+
 // Use this typedef to make the compiler happy when
 // calling rb_define_method()
 typedef VALUE (ruby_method)(...);
@@ -38,6 +42,28 @@ extern "C" VALUE cityhash_hash128_with_seed(VALUE mod, VALUE input, VALUE seed_s
   return rb_str_new((char *)&hash, sizeof(hash));
 }
 
+#ifdef __SSE4_2__
+extern "C" VALUE cityhash_hashcrc128(VALUE mod, VALUE input)
+{
+  uint128 hash = CityHashCrc128(StringValuePtr(input), RSTRING_LEN(input));
+  return rb_str_new((char *)&hash, sizeof(hash));
+}
+
+extern "C" VALUE cityhash_hashcrc128_with_seed(VALUE mod, VALUE input, VALUE seed_string)
+{
+  uint128 seed = *(uint128 *)StringValuePtr(seed_string);
+  uint128 hash = CityHashCrc128WithSeed(StringValuePtr(input), RSTRING_LEN(input), seed);
+  return rb_str_new((char *)&hash, sizeof(hash));
+}
+
+extern "C" VALUE cityhash_hashcrc256(VALUE mod, VALUE input)
+{
+  uint64 hash[3] = {};
+  CityHashCrc256(StringValuePtr(input), RSTRING_LEN(input), hash);
+  return rb_str_new((char *)&hash, sizeof(hash));
+}
+#endif
+
 extern "C" void Init_cityhash()
 {
   VALUE mCityHash = rb_define_module("CityHash");
@@ -51,4 +77,11 @@ extern "C" void Init_cityhash()
 
   rb_define_singleton_method(mInternal, "hash128", (ruby_method*) &cityhash_hash128, 1);
   rb_define_singleton_method(mInternal, "hash128_with_seed", (ruby_method*) &cityhash_hash128_with_seed, 2);
+
+#ifdef __SSE4_2__
+  rb_define_singleton_method(mInternal, "hash128crc", (ruby_method*) &cityhash_hashcrc128, 1);
+  rb_define_singleton_method(mInternal, "hash128crc_with_seed", (ruby_method*) &cityhash_hashcrc128_with_seed, 2);
+
+  rb_define_singleton_method(mInternal, "hash256crc", (ruby_method*) &cityhash_hashcrc256, 1);
+#endif
 }

data/ext/cityhash/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-%w{g O3 Wall}.each do |flag|
+%w{g O3 Wall msse4.2}.each do |flag|
   flag = "-#{flag}"
   $CPPFLAGS += " #{flag}" unless $CPPFLAGS.split.include? flag
 end

data/lib/cityhash.rb

@@ -16,12 +16,38 @@ module CityHash
   end
 
   def self.hash128(input, seed=nil)
-    if seed
-      seed = [seed & LOW64_MASK, seed & HIGH64_MASK >> 64].pack('QQ')
-      digest = Internal.hash128_with_seed(input, seed)
+    digest = if seed
+      Internal.hash128_with_seed(input, packed_seed(seed))
     else
-      digest = Internal.hash128(input)
+      Internal.hash128(input)
     end
+
+    unpacked_digest(digest)
+  end
+
+  def self.hash128crc(input, seed=nil)
+    digest = if seed
+      Internal.hash128crc_with_seed(input, packed_seed(seed))
+    else
+      Internal.hash128crc(input)
+    end
+
+    unpacked_digest(digest)
+  end
+
+  def self.hash256crc(input)
+    digest = Internal.hash256crc(input)
+
+    [0..7, 8..15, 16..23].map { |r| digest[r].unpack('Q').first.to_s }.join.to_i
+  end
+
+  private
+
+  def self.packed_seed(seed)
+    [seed & LOW64_MASK, seed & HIGH64_MASK >> 64].pack('QQ')
+  end
+
+  def self.unpacked_digest(digest)
     [0..7, 8..15].map { |r| digest[r].unpack('Q').first.to_s }.join.to_i
   end
 end

data/lib/cityhash/version.rb

@@ -1,3 +1,3 @@
 module CityHash
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/test/cityhash_test.rb

@@ -25,4 +25,17 @@ describe CityHash do
     seed = (123 << 64) | 123
     assert_equal 1834994000056895780313918994795281207519, CityHash.hash128("test", seed)
   end
+
+  it "returns 128bit crc hash" do
+    assert_equal 124124989950401219618153994964897029896, CityHash.hash128crc("test")
+  end
+
+  it "returns 128bit crc hash with seed" do
+    seed = (123 << 64) | 123
+    assert_equal 1834994000056895780313918994795281207519, CityHash.hash128crc("test", seed)
+  end
+
+  it "returns 256bit crc hash" do
+    assert_equal 11964743055457135893972873789222488394617411264226841264756, CityHash.hash256crc("test")
+  end
 end

metadata

@@ -1,24 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cityhash
-version: !ruby/object:Gem::Version
-  version: 0.7.0
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Vasiliy Ermolovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+
+date: 2013-05-05 00:00:00 Z
 dependencies: []
+
 description: ruby bindings for google's cityhash
-email:
+email: 
 - younash@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/cityhash/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -29,6 +38,7 @@ files:
 - cityhash.gemspec
 - ext/cityhash/city.cc
 - ext/cityhash/city.h
+- ext/cityhash/citycrc.h
 - ext/cityhash/cityhash.cc
 - ext/cityhash/extconf.rb
 - lib/cityhash.rb
@@ -37,34 +47,37 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/nashby/cityhash
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4171946996269433700
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4171946996269433700
+      version: "0"
 requirements: []
+
 rubyforge_project: cityhash
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ruby bindings for google's cityhash
-test_files:
+test_files: 
 - test/cityhash_test.rb
 - test/test_helper.rb