Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb2096a5

Browse files
author
Thomas G. Lockhart
committed
Clean up directory to compile and run on my Linux box at least.
Note that there is some trouble with inconsistant input/output formats.
1 parent71b4790 commitb2096a5

File tree

5 files changed

+83
-137
lines changed

5 files changed

+83
-137
lines changed

‎contrib/bit/Makefile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
ifndefPGDIR
2-
PGDIR= ../..
3-
PGDIR=/data/build/postgresql-7.0beta3
4-
endif
1+
# Makefile
2+
# For the bit/varbit data types
53

6-
SRCDIR=$(PGDIR)/src
4+
SRCDIR=../../src
75

86
include$(SRCDIR)/Makefile.global
97

8+
INSTALLDIR=$(LIBDIR)
9+
MODDIR=$(INSTALLDIR)/modules
10+
SQLDIR=$(INSTALLDIR)/sql
11+
1012
TARGETS= varbit.sql varbit$(DLSUFFIX)
1113
# vartest
1214
SOURCE= varbit.c varbit_glue.c
@@ -15,27 +17,24 @@ CFLAGS += -g
1517

1618
all:$(TARGETS)
1719

18-
varbit$(DLSUFFIX):$(OBJ)
19-
$(CC)$(CFLAGS) -shared -o varbit$(DLSUFFIX)$(SOURCE)$(CLIBS)
20-
2120
vartest: varbit.o vartest.o
2221
$(CC) -o$@ varbit.o vartest.o
2322

2423
install:
2524
$(MAKE) all
26-
cp -p varbit$(DLSUFFIX)$(LIBDIR)/contrib
27-
chmod 555$(LIBDIR)/contrib/varbit$(DLSUFFIX)
25+
-test -d$(INSTALLDIR)||$(INSTALL) -d$(INSTALLDIR)
26+
-test -d${MODDIR}||$(INSTALL) -d${MODDIR}
27+
-test -d${SQLDIR}||$(INSTALL) -d${SQLDIR}
28+
$(INSTALL) -m 555$(filter%$(DLSUFFIX),$(TARGETS))$(MODDIR)
29+
$(INSTALL) -m 664$(filter%.sql,$(TARGETS))$(SQLDIR)
2830

2931
%.sql:%.source
30-
echo$(SRCDIR)
3132
if [-z"$$USER" ];then USER=$$LOGNAME;fi;\
3233
if [-z"$$USER" ];then USER=`whoami`;fi;\
3334
if [-z"$$USER" ];thenecho'Cannot deduce $$USER.';exit 1;fi;\
3435
rm -f$@;\
3536
C=`pwd`;\
36-
O=$C;\
37-
if [-d${LIBDIR}/contrib ];then O=${LIBDIR}/contrib;else \
38-
echo"contrib directory does not exist.";fi;\
37+
O=${MODDIR};\
3938
sed -e"s:_CWD_:$$C:g"\
4039
-e"s:_OBJWD_:$$O:g"\
4140
-e"s:_DLSUFFIX_:$(DLSUFFIX):g"\

‎contrib/bit/postgres.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎contrib/bit/varbit.demo.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
createtablebit_example (abits, bbits);
1+
createtablebit_example (abit, bbit);
22
copy bit_examplefrom stdin;
33
X0FX10
44
X1FX11

‎contrib/bit/varbit.h

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
1-
#include"c.h"
1+
#include<stdlib.h>
2+
#include<ctype.h>
3+
#include<errno.h>
4+
5+
#include<float.h>/* faked on sunos4 */
6+
7+
#include<math.h>
8+
29
#include"postgres.h"
10+
#ifdefHAVE_LIMITS_H
11+
#include<limits.h>
12+
#ifndefMAXINT
13+
#defineMAXINT INT_MAX
14+
#endif
15+
#else
16+
#ifdefHAVE_VALUES_H
17+
#include<values.h>
18+
#endif
19+
#endif
20+
#include"fmgr.h"
21+
#include"utils/timestamp.h"
22+
#include"utils/builtins.h"
23+
324

425
#defineHEXDIG(z) (z)<10 ? ((z)+'0') : ((z)-10+'A')
526

‎contrib/bit/varbit.source

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,171 @@
11
LOAD '_OBJWD_/varbit.so';
22

3-
CREATE FUNCTIONvarbit_in(opaque)
3+
CREATE FUNCTIONvarbitin(opaque)
44
RETURNS bit
55
AS '_OBJWD_/varbit.so'
66
LANGUAGE 'c';
77

8-
CREATE FUNCTIONvarbit_out(opaque)
8+
CREATE FUNCTIONzpbitout(opaque)
99
RETURNS opaque
1010
AS '_OBJWD_/varbit.so'
1111
LANGUAGE 'c';
1212

13-
CREATE TYPEbits (
13+
CREATE TYPEbit (
1414
internallength = -1,
15-
input =varbit_in,
16-
output =varbit_out
15+
input =varbitin,
16+
output =zpbitout
1717
);
1818

19-
CREATE FUNCTION bitcat(bits,bits) RETURNSbits
19+
CREATE FUNCTION bitcat(bit,bit) RETURNSbit
2020
AS '_OBJWD_/varbit.so'
2121
LANGUAGE 'C';
2222

2323
CREATE OPERATOR || (
24-
leftarg =bits,
25-
rightarg =bits,
24+
leftarg =bit,
25+
rightarg =bit,
2626
procedure = bitcat
2727
);
2828

29-
CREATE FUNCTION bitsubstr(bits,integer,integer) RETURNSbits
29+
CREATE FUNCTION bitsubstr(bit,integer,integer) RETURNSbit
3030
AS '_OBJWD_/varbit.so'
3131
LANGUAGE 'C';
3232

33-
CREATE FUNCTION biteq(bits,bits) RETURNS bool
33+
CREATE FUNCTION biteq(bit,bit) RETURNS bool
3434
AS '_OBJWD_/varbit.so'
3535
LANGUAGE 'C';
3636

3737
CREATE OPERATOR = (
38-
leftarg =bits,
39-
rightarg =bits,
38+
leftarg =bit,
39+
rightarg =bit,
4040
procedure = biteq,
4141
negator = <>,
4242
commutator = =
4343
);
4444

45-
CREATE FUNCTION bitne(bits,bits) RETURNS bool
45+
CREATE FUNCTION bitne(bit,bit) RETURNS bool
4646
AS '_OBJWD_/varbit.so'
4747
LANGUAGE 'C';
4848

4949
CREATE OPERATOR <> (
50-
leftarg =bits,
51-
rightarg =bits,
50+
leftarg =bit,
51+
rightarg =bit,
5252
procedure = bitne,
5353
negator = =,
5454
commutator = <>
5555
);
5656

57-
CREATE FUNCTION bitlt(bits,bits) RETURNS bool
57+
CREATE FUNCTION bitlt(bit,bit) RETURNS bool
5858
AS '_OBJWD_/varbit.so'
5959
LANGUAGE 'C';
6060

6161
CREATE OPERATOR < (
62-
leftarg =bits,
63-
rightarg =bits,
62+
leftarg =bit,
63+
rightarg =bit,
6464
procedure = bitlt
6565
);
6666

67-
CREATE FUNCTION bitle(bits,bits) RETURNS bool
67+
CREATE FUNCTION bitle(bit,bit) RETURNS bool
6868
AS '_OBJWD_/varbit.so'
6969
LANGUAGE 'C';
7070

7171
CREATE OPERATOR <= (
72-
leftarg =bits,
73-
rightarg =bits,
72+
leftarg =bit,
73+
rightarg =bit,
7474
procedure = bitle
7575
);
7676

77-
CREATE FUNCTION bitgt(bits,bits) RETURNS bool
77+
CREATE FUNCTION bitgt(bit,bit) RETURNS bool
7878
AS '_OBJWD_/varbit.so'
7979
LANGUAGE 'C';
8080

8181
CREATE OPERATOR > (
82-
leftarg =bits,
83-
rightarg =bits,
82+
leftarg =bit,
83+
rightarg =bit,
8484
procedure = bitgt,
8585
negator = <=,
8686
commutator = <
8787
);
8888

89-
CREATE FUNCTION bitge(bits,bits) RETURNS bool
89+
CREATE FUNCTION bitge(bit,bit) RETURNS bool
9090
as '_OBJWD_/varbit.so'
9191
language 'C';
9292

9393
CREATE OPERATOR >= (
94-
leftarg =bits,
95-
rightarg =bits,
94+
leftarg =bit,
95+
rightarg =bit,
9696
procedure = bitge,
9797
negator = <,
9898
commutator = <=
9999
);
100100

101-
CREATE FUNCTION bitcmp(bits,bits) RETURNSint4
101+
CREATE FUNCTION bitcmp(bit,bit) RETURNSinteger
102102
AS '_OBJWD_/varbit.so'
103103
LANGUAGE 'C';
104104

105105
CREATE OPERATOR <=> (
106-
leftarg =bits,
107-
rightarg =bits,
106+
leftarg =bit,
107+
rightarg =bit,
108108
procedure = bitcmp
109109
);
110110

111-
CREATE FUNCTION bitor(bits,bits) RETURNSbits
111+
CREATE FUNCTION bitor(bit,bit) RETURNSbit
112112
AS '_OBJWD_/varbit.so'
113113
LANGUAGE 'C';
114114

115115
CREATE OPERATOR | (
116-
leftarg =bits,
117-
rightarg =bits,
116+
leftarg =bit,
117+
rightarg =bit,
118118
procedure = bitor,
119119
commutator = |
120120
);
121121

122-
CREATE FUNCTION bitand(bits,bits) RETURNSbits
122+
CREATE FUNCTION bitand(bit,bit) RETURNSbit
123123
AS '_OBJWD_/varbit.so'
124124
LANGUAGE 'C';
125125

126126
CREATE OPERATOR & (
127-
leftarg =bits,
128-
rightarg =bits,
127+
leftarg =bit,
128+
rightarg =bit,
129129
procedure = bitand,
130130
commutator = &
131131
);
132132

133133

134-
CREATE FUNCTION bitxor(bits,bits) RETURNSbits
134+
CREATE FUNCTION bitxor(bit,bit) RETURNSbit
135135
AS '_OBJWD_/varbit.so'
136136
LANGUAGE 'C';
137137

138138
CREATE OPERATOR ^ (
139-
leftarg =bits,
140-
rightarg =bits,
139+
leftarg =bit,
140+
rightarg =bit,
141141
procedure = bitxor
142142
);
143143

144-
CREATE FUNCTION bitnot(bits) RETURNSbits
144+
CREATE FUNCTION bitnot(bit) RETURNSbit
145145
AS '_OBJWD_/varbit.so'
146146
LANGUAGE 'C';
147147

148148
CREATE OPERATOR ~ (
149-
rightarg =bits,
149+
rightarg =bit,
150150
procedure = bitnot
151151
);
152152

153-
CREATE FUNCTION bitshiftleft(bits,int4) RETURNSbits
153+
CREATE FUNCTION bitshiftleft(bit,integer) RETURNSbit
154154
AS '_OBJWD_/varbit.so'
155155
LANGUAGE 'C';
156156

157157
CREATE OPERATOR << (
158-
leftarg =bits,
159-
rightarg =int4,
158+
leftarg =bit,
159+
rightarg =integer,
160160
procedure = bitshiftleft
161161
);
162162

163-
CREATE FUNCTION bitshiftright(bits,int4) RETURNSbits
163+
CREATE FUNCTION bitshiftright(bit,integer) RETURNSbit
164164
AS '_OBJWD_/varbit.so'
165165
LANGUAGE 'C';
166166

167167
CREATE OPERATOR >> (
168-
leftarg =bits,
169-
rightarg =int4,
168+
leftarg =bit,
169+
rightarg =integer,
170170
procedure = bitshiftright
171171
);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp