Update README, copyright, etc.

Author: Yury Frolov

COPYRIGHT

@@ -1,27 +1,12 @@
 
 Files under public domain:
 
-- inthash.c
-- lookup2.c
-- lookup3.c
 - murmur3.c
-- spooky.c
 
 Files under PostgreSQL License:
 
-- crc32.c
-- pgsql84.c
-- pgspqrhash.c
-- pgspqrhash.h
-
-Files under MIT license:
-
-- city.c
-
-Files under ISC license:
-
-- md5.c
-
+- spqrhash.c
+- spqrhash.h
 
 PostgreSQL license
 ------------------

README.rst

@@ -1,15 +1,7 @@
-pgspqrhash
+spqrhash
 =========
 
-The goal of pgspqrhash is to provide stable hashes for PostgeSQL,
-"stable" in the sense that their implementation does not change,
-they are independent from PostgeSQL version.
-
-Some string hashes may be dependent on CPU architecture,
-so that they return different return on big-endian
-architecture from little-endian architecture.
-It you want to be architectures-independent, then
-use algorithms that don't depend on endianess.
+The extension provides hash funcitons for SPQR to work with PG.
 
 
 Installation
@@ -25,17 +17,6 @@ You need PostgreSQL developent environment.  Then simply::
 Functions
 ---------
 
-hash_string
-~~~~~~~~~~~
-
-::
-
-  hash_string(data text,  algo text [, initval int4]) returns int4
-  hash_string(data bytea, algo text [, initval int4]) returns int4
-
-This hashes the data with specified algorithm, returns 32-bit result.
-
-
 hash64_string
 ~~~~~~~~~~~~~
 
@@ -46,27 +27,6 @@ hash64_string
 
 Uses same algorithms as `hash_string()` but returns 64-bit result.
 
-hash128_string
-~~~~~~~~~~~~~~
-
-::
-
-  hash64_string(data text, algo text, [, initval int4]) returns int8
-  hash64_string(data byte, algo text, [, initval int4]) returns int8
-
-Uses same algorithms as `hash_string()` but returns 128-bit result.
-
-
-hash_int4
-~~~~~~~~~
-
-::
-
-  hash_int4(val int4) returns int4
-
-Hash 32-bit integer.
-
-
 hash_int8
 ~~~~~~~~~
 
@@ -78,26 +38,15 @@ Hash 64-bit integer.
 
 
 
-String hashing algorithms
+Hashing algorithms
 -------------------------
 
 List of currently provided algorithms.
 
 ==============  =========  ======  =======  =======  ==============================
  Algorithm      CPU-indep   Bits   IV bits  Partial   Description
 ==============  =========  ======  =======  =======  ==============================
- city64          no          64       64       no     CityHash64
- city128         no         128      128       no     CityHash128
- crc32           yes         32       32      yes     CRC32
- lookup2         no          64       32       no      Jenkins lookup2
- lookup3be       yes         64       32       no      Jenkins lookup3 big-endian
- lookup3le       yes         64       32       no      Jenkins lookup3 little-endian
- lookup3         no          64       32       no      Jenkins lookup3 CPU-native
  murmur3         no          32       32       no      MurmurHash v3, 32-bit variant
- md5             yes        128      128       no      MD5
- pgsql84         no          64        0       no      Hacked lookup3 in Postgres 8.4+
- siphash24       yes         64      128       no      SipHash-2-4
- spooky          no         128      128       no      SpookyHash
 ==============  =========  ======  =======  =======  ==============================
 
 CPU-independence
@@ -117,54 +66,9 @@ Partial hashing
   Whether long string can be hashed in smaller parts, by giving last
   value as initval to next hash call.
 
-Integer hashing algorithms
---------------------------
-
-==============  ======  ================================  ============================
- Algorithm       Bits    Description                       Notes
-==============  ======  ================================  ============================
- wang32           32     Thomas Wang hash32shift
- wang32mult       32     Thomas Wang hash32shiftmult
- jenkins          32     Bob Jenkins hash with 6 shifts
- wang64           64     Thomas Wang hash64shift
- wang64to32       64     Thomas Wang hash6432shift         Result can be cast to int4
-==============  ======  ================================  ============================
-
-All algorithms here have the property that they are "reversible",
-that means there is 1:1 mapping between input and output.
-
-This propery is useful for creating well-defined "random" sort order over
-unique integer id's.  Or picking up random row from table
-with unique id's.
-
-
 Links
 -----
 
-* `Lookup2/3 hashes`__ by Bob Jenkins.
-
-.. __: http://burtleburtle.net/bob/hash/doobs.html
-
 * `MurmurHash`__ by Austin Appleby.
 
 .. __: http://code.google.com/p/smhasher/
-
-* `Integer hashes`__ by Bob Jenkins.
-
-.. __: http://burtleburtle.net/bob/hash/integer.html
-
-* `Integer hashes`__ by Thomas Wang.
-
-.. __: http://www.cris.com/~Ttwang/tech/inthash.htm
-
-* Google's `CityHash`__.  64/128/256-bit output.
-
-.. __: http://code.google.com/p/cityhash/
-
-* `SpookyHash`__ by Bob Jenkins.  128-bit output.
-
-.. __: http://www.burtleburtle.net/bob/hash/spooky.html
-
-* `SipHash-2-4`__ by Jean-Philippe Aumasson and Daniel J. Bernstein.
-
-.. __: https://131002.net/siphash/

debian/copyright

@@ -0,0 +1,33 @@
+
+Files under public domain:
+
+- murmur3.c
+
+Files under PostgreSQL License:
+
+- spqrhash.c
+- spqrhash.h
+
+PostgreSQL license
+------------------
+
+Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+Portions Copyright (c) 1994, The Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement
+is hereby granted, provided that the above copyright notice and this
+paragraph and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+

debian/rules

@@ -32,7 +32,7 @@ override_dh_auto_install:
 
 .PHONY: orig realclean
 PKGVERS = $(shell dpkg-parsechangelog | awk -F '[:-]' '/^Version:/ { print substr($$2, 2) }')
-srcpkg = pgspqrhash_$(PKGVERS)
+srcpkg = spqrhash_$(PKGVERS)
 srctar = $(srcpkg).orig.tar.gz
 dst = ext/$(srcpkg)
 orig:

spqrhash.control

@@ -1,5 +1,5 @@
 # spqrhash extension
-comment = 'Stable hash functions'
+comment = 'SPQR hash functions'
 default_version = '1.0'
 module_pathname = '$libdir/spqrhash'
 relocatable = true

src/spqrhash.h

@@ -1,5 +1,5 @@
-#ifndef _PGspqrhash_H_
-#define _PGspqrhash_H_
+#ifndef _SPQRHash_H_
+#define _SPQRHash_H_
 
 #include <postgres.h>
 #include <fmgr.h>