diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/common/tupdesc.c | 4 | ||||
| -rw-r--r-- | src/backend/access/hash/hashfunc.c | 75 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtcompare.c | 26 | ||||
| -rw-r--r-- | src/backend/access/transam/xid.c | 6 |
4 files changed, 10 insertions, 101 deletions
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index 62d27d8cd7..719fe3528f 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.36 1998/02/26 04:29:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.37 1998/03/30 17:22:05 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -317,7 +317,7 @@ TupleDescInitEntry(TupleDesc desc, * * Note: in the special case of * - * create EMP (name = char16, manager = EMP) + * create EMP (name = text, manager = EMP) * * RelationNameCreateHeapRelation() calls BuildDesc() which * calls this routine and since EMP does not exist yet, the diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c index 8da88101dd..37b7722b8c 100644 --- a/src/backend/access/hash/hashfunc.c +++ b/src/backend/access/hash/hashfunc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.6 1997/09/08 21:40:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.7 1998/03/30 17:22:08 momjian Exp $ * * NOTES * These functions are stored in pg_amproc. For each operator class @@ -133,6 +133,8 @@ hashoid(Oid key) return ((uint32) ~key); } +#define PRIME1 37 +#define PRIME2 1048583 uint32 hashchar(char key) @@ -140,12 +142,8 @@ hashchar(char key) int len; uint32 h; - len = sizeof(char); - -#define PRIME1 37 -#define PRIME2 1048583 - h = 0; + len = sizeof(char); /* Convert char to integer */ h = h * PRIME1 ^ (key - ' '); h %= PRIME2; @@ -153,55 +151,6 @@ hashchar(char key) return (h); } -uint32 -hashchar2(uint16 intkey) -{ - uint32 h; - int len; - char *key = (char *) &intkey; - - h = 0; - len = sizeof(uint16); - /* Convert string to integer */ - while (len--) - h = h * PRIME1 ^ (*key++ - ' '); - h %= PRIME2; - - return (h); -} - -uint32 -hashchar4(uint32 intkey) -{ - uint32 h; - int len; - char *key = (char *) &intkey; - - h = 0; - len = sizeof(uint32); - /* Convert string to integer */ - while (len--) - h = h * PRIME1 ^ (*key++ - ' '); - h %= PRIME2; - - return (h); -} - -uint32 -hashchar8(char *key) -{ - uint32 h; - int len; - - h = 0; - len = sizeof(char8); - /* Convert string to integer */ - while (len--) - h = h * PRIME1 ^ (*key++ - ' '); - h %= PRIME2; - - return (h); -} uint32 hashname(NameData *n) @@ -223,22 +172,6 @@ hashname(NameData *n) } -uint32 -hashchar16(char *key) -{ - uint32 h; - int len; - - h = 0; - len = sizeof(char16); - /* Convert string to integer */ - while (len--) - h = h * PRIME1 ^ (*key++ - ' '); - h %= PRIME2; - - return (h); -} - /* * (Comment from the original db3 hashing code: ) diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index 55942379dc..85b673ebba 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.13 1997/09/08 21:41:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.14 1998/03/30 17:22:17 momjian Exp $ * * NOTES * These functions are stored in pg_amproc. For each operator class @@ -102,30 +102,6 @@ btcharcmp(char a, char b) } int32 -btchar2cmp(uint16 a, uint16 b) -{ - return (strncmp((char *) &a, (char *) &b, 2)); -} - -int32 -btchar4cmp(uint32 a, uint32 b) -{ - return (strncmp((char *) &a, (char *) &b, 4)); -} - -int32 -btchar8cmp(char *a, char *b) -{ - return (strncmp(a, b, 8)); -} - -int32 -btchar16cmp(char *a, char *b) -{ - return (strncmp(a, b, 16)); -} - -int32 btnamecmp(NameData *a, NameData *b) { return (strncmp(a->data, b->data, NAMEDATALEN)); diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c index 64ae130dd3..960d98b9e3 100644 --- a/src/backend/access/transam/xid.c +++ b/src/backend/access/transam/xid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.12 1998/02/26 04:30:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.13 1998/03/30 17:22:28 momjian Exp $ * * OLD COMMENTS * XXX WARNING @@ -30,14 +30,14 @@ extern TransactionId DisabledTransactionId; extern TransactionId AmiTransactionId; extern TransactionId FirstTransactionId; -/* XXX char16 name for catalogs */ +/* XXX name for catalogs */ TransactionId xidin(char *representation) { return (atol(representation)); } -/* XXX char16 name for catalogs */ +/* XXX name for catalogs */ char * xidout(TransactionId transactionId) { |