cityhash 0.2.1 → 0.3.0

data/README.md

@@ -13,6 +13,8 @@ Ruby wrapper for google's cityhash.
     CityHash.hash64("test")               # => 17703940110308125106
     CityHash.hash64("test", 12345)        # => 14900027982776226655
     CityHash.hash64("test", 12345, 54321) # => 11136353178704814373
+    CityHash.hash128("test") # => 130554790001792308794529643941127319555
+    CityHash.hash128("test", [123,123]) # => 183946415266487905135364192266033899899 
 	
 ### Contributing to cityhash
  

data/cityhash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cityhash}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nashby"]
-  s.date = %q{2011-04-22}
+  s.date = %q{2011-04-23}
   s.description = %q{ffi wrapper for google's cityhash}
   s.email = %q{younash@gmail.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
     "lib/cityhash/ext/src/Makefile",
     "lib/cityhash/ext/src/city.cc",
     "lib/cityhash/ext/src/city.h",
+    "lib/cityhash/ext/src/city_ruby_bridge.cpp",
+    "lib/cityhash/ext/src/city_ruby_bridge.h",
     "lib/cityhash/version.rb",
     "test/helper.rb",
     "test/test_cityhash.rb"

data/lib/cityhash.rb

@@ -8,8 +8,8 @@ module CityHash
     attach_function :city_hash64, :CityHash64, [:string, :size_t], :uint64
     attach_function :city_hash64_with_seed, :CityHash64WithSeed, [:string, :size_t, :uint64], :uint64
     attach_function :city_hash64_with_seeds, :CityHash64WithSeeds, [:string, :size_t, :uint64, :uint64], :uint64
-    attach_function :city_hash128, :CityHash128, [:string, :size_t], :ulong
-    attach_function :city_hash128_with_seed, :CityHash128WithSeed, [:string, :size_t, :ulong], :ulong
+    attach_function :city_hash128, :CityHash128String, [:string, :size_t], :string
+    attach_function :city_hash128_with_seed, :CityHash128WithSeedString, [:string, :size_t, :uint64, :uint64], :string
   end
 
   def self.hash64(input, seed1 = nil, seed2 = nil)
@@ -34,7 +34,7 @@ module CityHash
     return CityHash::Internal.city_hash64_with_seeds(input_str, len, seed1.to_i, seed2.to_i)
   end
 
-  def self.hash128(input, seed = nil)
+  def self.hash128(input, seed = [])
     input_str = input.to_s
 
     # Ruby 1.8 compatibility
@@ -45,11 +45,11 @@ module CityHash
       len = input_str.size
     end
 
-    if seed.nil?
-      return CityHash::Internal.city_hash128(input_str, len)
+    if seed.empty?
+      return CityHash::Internal.city_hash128(input_str, len).to_i
     end
 
-    return CityHash::Internal.city_hash128_with_seed(input_str, len, seed.to_i)
+    return CityHash::Internal.city_hash128_with_seed(input_str, len, seed[0].to_i, seed[1].to_i).to_i
   end
 
 end

data/lib/cityhash/ext/src/Makefile

@@ -1,2 +1,2 @@
 all:
-	g++ -shared -fPIC city.cc -o ../libcity.so
+	g++ -shared -fPIC city.cc city_ruby_bridge.cpp -o ../libcity.so

data/lib/cityhash/ext/src/city_ruby_bridge.cpp

@@ -0,0 +1,19 @@
+#include "city_ruby_bridge.h"
+#include <sstream>
+
+const char* CityHash128String(const char *s, size_t len)
+{
+  std::ostringstream str;
+  str << Uint128Low64(CityHash128(s, len)) << Uint128High64(CityHash128(s, len));
+
+  return str.str().c_str();
+}
+
+const char* CityHash128WithSeedString(const char *s, size_t len, uint64 seed1, uint64 seed2)
+{
+  uint128 seed(seed1, seed2);
+  std::ostringstream str;
+  str << Uint128Low64(CityHash128WithSeed(s, len, seed)) << Uint128High64(CityHash128WithSeed(s, len, seed));
+
+  return str.str().c_str();
+}

data/lib/cityhash/ext/src/city_ruby_bridge.h

@@ -0,0 +1,8 @@
+#include "city.h"
+
+typedef uint64_t uint64;
+typedef std::pair<uint64, uint64> uint128;
+
+extern "C" const char* CityHash128String(const char *s, size_t len);
+
+extern "C" const char* CityHash128WithSeedString(const char *s, size_t len, uint64 seed1, uint64 seed2);

data/lib/cityhash/version.rb

@@ -2,8 +2,8 @@ module CityHash
  
   module Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/test_cityhash.rb

@@ -14,4 +14,12 @@ class TestCityhash < Test::Unit::TestCase
     assert_equal 11136353178704814373, CityHash.hash64("test", 12345, 54321)
   end
 
+  should "return 128bit hash" do
+    assert_equal 130554790001792308794529643941127319555, CityHash.hash128("test")
+  end
+
+  should "return 128bit hash with seed" do
+    assert_equal 183946415266487905135364192266033899899, CityHash.hash128("test", [123,123])
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: cityhash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - nashby
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 +03:00
+date: 2011-04-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,8 @@ files:
 - lib/cityhash/ext/src/Makefile
 - lib/cityhash/ext/src/city.cc
 - lib/cityhash/ext/src/city.h
+- lib/cityhash/ext/src/city_ruby_bridge.cpp
+- lib/cityhash/ext/src/city_ruby_bridge.h
 - lib/cityhash/version.rb
 - test/helper.rb
 - test/test_cityhash.rb
@@ -118,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -574838995
+      hash: -308570463
       segments: 
       - 0
       version: "0"