Add zpbit and varbit data types from Adrian Joubert

 <a.joubert@albourne.com>.

2 files changed, 89 insertions, 1 deletions

diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 4e6cbaaace0..270187e9173 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.108 2000/04/07 13:40:12 thomas Exp $
+ * $Id: builtins.h,v 1.109 2000/04/08 02:13:10 thomas Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -36,6 +36,7 @@
 #include "utils/nabstime.h"
 #include "utils/date.h"
 #include "utils/lztext.h"
+#include "utils/varbit.h"
 
 /*
  *		Defined in adt/
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h
new file mode 100644
index 00000000000..9ee0724b01d
--- /dev/null
+++ b/src/include/utils/varbit.h
@@ -0,0 +1,87 @@
+#ifndef VARBIT_H
+#define VARBIT_H
+
+#include <math.h>
+
+#include "postgres.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#ifndef MAXINT
+#define MAXINT INT_MAX
+#endif
+#else
+#ifdef HAVE_VALUES_H
+#include <values.h>
+#endif
+#endif
+#include "utils/builtins.h"
+
+
+#define HEXDIG(z)    (z)<10 ? ((z)+'0') : ((z)-10+'A')
+
+/* Modeled on struct varlena from postgres.h, bu data type is bits8 */
+struct varbita
+{
+	int32		vl_len;
+	bits8		vl_dat[1];
+};
+
+#define BITSPERBYTE		8
+#define VARBITHDRSZ		sizeof(int32)
+/* Number of bits in this bit string */
+#define VARBITLEN(PTR)		(((struct varbita *)VARDATA(PTR))->vl_len)
+/* Pointer tp the first byte containing bit string data */
+#define VARBITS(PTR)		(((struct varbita *)VARDATA(PTR))->vl_dat)
+/* Number of bytes in the data section of a bit string */
+#define VARBITBYTES(PTR)	(VARSIZE(PTR) - VARHDRSZ - VARBITHDRSZ)
+/* Padding of the bit string at the end */
+#define VARBITPAD(PTR)		(VARBITBYTES(PTR)*BITSPERBYTE - VARBITLEN(PTR))
+/* Number of bytes needed to store a bit string of a given length */
+#define VARBITDATALEN(BITLEN)	((BITLEN)/BITSPERBYTE + \
+				  ((BITLEN)%BITSPERBYTE > 0 ? 1 : 0) + \
+					VARHDRSZ + VARBITHDRSZ)
+/* pointer beyond the end of the bit string (like end() in STL containers) */
+#define VARBITEND(PTR)		((bits8 *) (PTR + VARSIZE(PTR)))
+/* Mask that will cover exactly one byte, i.e. BITSPERBYTE bits */
+#define BITMASK 0xFF
+#define BITHIGH 0x80
+
+
+bits8 * zpbit_in(char *s, int dummy,  int32 atttypmod);
+char * zpbit_out(bits8 *s);
+char * zpbits_out(bits8 *s);
+bits8 * varbit_in(char *s, int dummy,  int32 atttypmod);
+char * varbit_out (bits8 *s);
+bool biteq (bits8 *arg1, bits8 *arg2);
+bool bitne (bits8 *arg1, bits8 *arg2);
+bool bitge (bits8 *arg1, bits8 *arg2);
+bool bitgt (bits8 *arg1, bits8 *arg2);
+bool bitle (bits8 *arg1, bits8 *arg2);
+bool bitlt (bits8 *arg1, bits8 *arg2);
+int bitcmp (bits8 *arg1, bits8 *arg2);
+bits8 * bitand (bits8 * arg1, bits8 * arg2);
+bits8 * bitor (bits8 * arg1, bits8 * arg2);
+bits8 * bitxor (bits8 * arg1, bits8 * arg2);
+bits8 * bitnot (bits8 * arg);
+bits8 * bitshiftright (bits8 * arg, int shft);
+bits8 * bitshiftleft (bits8 * arg, int shft);
+bits8 * bitcat (bits8 *arg1, bits8 *arg2);
+bits8 * bitsubstr (bits8 *arg, int32 s, int32 l);
+
+bool varbiteq (bits8 *arg1, bits8 *arg2);
+bool varbitne (bits8 *arg1, bits8 *arg2);
+bool varbitge (bits8 *arg1, bits8 *arg2);
+bool varbitgt (bits8 *arg1, bits8 *arg2);
+bool varbitle (bits8 *arg1, bits8 *arg2);
+bool varbitlt (bits8 *arg1, bits8 *arg2);
+int varbitcmp (bits8 *arg1, bits8 *arg2);
+bits8 * varbitand (bits8 * arg1, bits8 * arg2);
+bits8 * varbitor (bits8 * arg1, bits8 * arg2);
+bits8 * varbitxor (bits8 * arg1, bits8 * arg2);
+bits8 * varbitnot (bits8 * arg);
+bits8 * varbitshiftright (bits8 * arg, int shft);
+bits8 * varbitshiftleft (bits8 * arg, int shft);
+bits8 * varbitcat (bits8 *arg1, bits8 *arg2);
+bits8 * varbitsubstr (bits8 *arg, int32 s, int32 l);
+
+#endif