Skip to content

Commit

Permalink
Merge pull request #18 from cybozu/siphash
Browse files Browse the repository at this point in the history
Use SipHash instead of MurmurHash.
  • Loading branch information
toshipp committed Dec 4, 2013
2 parents c7d5fec + 39016f3 commit cdfc268
Show file tree
Hide file tree
Showing 8 changed files with 173 additions and 383 deletions.
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ shared between yrmcds and memcached. yrmcds is developed for
[cybozu.com][cybozu], a B2B cloud service widely adopted by companies in
Japan.

License
-------

yrmcds is licensed under [the BSD 2-clause license][bsd2].

The source code contains a [SipHash][] implementation borrowed from
[csiphash][] which is licensed under [the MIT license][mit].

Features
--------

Expand Down Expand Up @@ -77,6 +85,10 @@ An upstart script and a logrotate configuration file are installed too.
[memcached]: http://memcached.org/
[bench]: https://github.com/cybozu/yrmcds/blob/master/docs/bench.md#results
[repcached]: http://repcached.lab.klab.org/
[bsd2]: http://opensource.org/licenses/BSD-2-Clause
[SipHash]: https://131002.net/siphash/
[csiphash]: https://github.com/majek/csiphash
[mit]: http://opensource.org/licenses/MIT
[libyrmcds]: /libyrmcds/
[php-yrmcds]: /php-yrmcds/
[slab1]: http://nosql.mypopescu.com/post/13506116892/memcached-internals-memory-allocation-eviction
Expand Down
335 changes: 0 additions & 335 deletions cybozu/MurmurHash3.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions cybozu/MurmurHash3.h

This file was deleted.

Loading

0 comments on commit cdfc268

Please sign in to comment.