Skip to content

Commit eec4c73

Browse files
scrappyscrappy
committed
From: Massimo Dal Zotto <dz@cs.unitn.it> Here is a tar file the new directories, which substitute the old ones in contrib. Please remove the old directories array, datetime, miscutil, string and userlock before unpacking the tar file in contrib. Note that as the modules are now installed in lib/modules I install all my sql code in lib/sql. In my opinion also the other contributors should follow these rules.
1 parent 3067ac8 commit eec4c73

25 files changed

+435
-424
lines changed

‎contrib/README

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ array -
1212

1313
datetime -
1414
Date & time functions
15-
by Sergio Lenzi <lenzi@bsi.com.br>
15+
by Massimo Dal Zotto <dz@cs.unitn.it>
1616

1717
earthdistance -
1818
Operator for computing earth distance for two points
@@ -66,18 +66,14 @@ pginterface -
6666
A crude C/4GL
6767
by Bruce Momjian <root@candle.pha.pa.us>
6868

69-
sequence -
70-
Set a new sequence value
71-
by Massimo Dal Zotto <dz@cs.unitn.it>
72-
7369
soundex -
7470
Prototype for soundex function
7571

7672
spi -
7773
A general trigger function autoinc() and so on.
7874

7975
string -
80-
New input/output conversion routines for strings
76+
C-like input/output conversion routines for strings
8177
by Massimo Dal Zotto <dz@cs.unitn.it>
8278

8379
unixdate -

‎contrib/array/Makefile

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,35 @@ INCLUDE_OPT = -I ./ \
1515
-I $(SRCDIR)/include \
1616
-I $(SRCDIR)/port/$(PORTNAME)
1717

18-
CFLAGS += $(INCLUDE_OPT)
19-
20-
ifeq ($(PORTNAME), linux)
21-
ifdef LINUX_ELF
22-
ifeq ($(CC), gcc)
23-
CFLAGS += -fPIC
24-
endif
25-
endif
26-
endif
27-
28-
ifeq ($(PORTNAME), i386_solaris)
29-
CFLAGS+= -fPIC
30-
endif
18+
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
3119

3220
MODNAME = array_iterator
3321

3422
MODULE = $(MODNAME)$(DLSUFFIX)
3523

24+
MODDIR = $(LIBDIR)/modules
25+
26+
SQLDIR = $(LIBDIR)/sql
27+
3628
all: module sql
3729

3830
module: $(MODULE)
3931

4032
sql: $(MODNAME).sql
4133

42-
install: $(MODULE)
43-
cp -p $(MODULE) $(LIBDIR)/modules
44-
cd $(LIBDIR)/modules; strip $(MODULE)
34+
install: $(MODULE) $(MODDIR) $(SQLDIR)
35+
cp -p $(MODULE) $(MODDIR)/
36+
strip $(MODDIR)/$(MODULE)
37+
cp -p $(MODNAME).sql $(SQLDIR)/
38+
39+
$(MODDIR):
40+
mkdir -p $@
41+
42+
$(SQLDIR):
43+
mkdir -p $@
4544

4645
%.sql: %.sql.in
47-
sed "s|MODULE_PATHNAME|$(LIBDIR)/modules/$(MODULE)|" < $< > $@
46+
sed "s|MODULE_PATHNAME|$(MODDIR)/$(MODULE)|" < $< > $@
4847

4948
.SUFFIXES: $(DLSUFFIX)
5049

@@ -55,7 +54,7 @@ depend dep:
5554
$(CC) -MM $(INCLUDE_OPT) *.c >depend
5655

5756
clean:
58-
rm -f $(MODULE) $(MODNAME).sql
57+
rm -f *~ $(MODULE) $(MODNAME).sql
5958

6059
ifeq (depend,$(wildcard depend))
6160
include depend

‎contrib/array/array_iterator.c

Lines changed: 19 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
* elements of the array and the value and compute a result as
77
* the logical OR or AND of the iteration results.
88
*
9-
* Copyright (c) 1997, Massimo Dal Zotto <dz@cs.unitn.it>
9+
* Copyright (c) 1998, Massimo Dal Zotto <dz@cs.unitn.it>
10+
*
11+
* This file is distributed under the GNU General Public License
12+
* either version 2, or (at your option) any later version.
1013
*/
1114

1215
#include <ctype.h>
@@ -33,8 +36,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
3336
TypeTupleForm typ_struct;
3437
bool typbyval;
3538
int typlen;
36-
func_ptr proc_fn;
37-
int pronargs;
39+
FmgrInfo finfo;
3840
int nitems,
3941
i,
4042
result;
@@ -70,9 +72,8 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
7072
typbyval = typ_struct->typbyval;
7173

7274
/* Lookup the function entry point */
73-
proc_fn = (func_ptr) NULL;
74-
fmgr_info(proc, &pronargs); /* (proc, &proc_fn, &pronargs); */
75-
if ((proc_fn == NULL) || (pronargs != 2))
75+
fmgr_info(proc, &finfo);
76+
if ((finfo.fn_oid == 0) || (finfo.fn_nargs != 2))
7677
{
7778
elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %d", proc);
7879
return (0);
@@ -88,21 +89,21 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
8889
switch (typlen)
8990
{
9091
case 1:
91-
result = (int) (*proc_fn) (*p, value);
92+
result = (int) (*(finfo.fn_addr)) (*p, value);
9293
break;
9394
case 2:
94-
result = (int) (*proc_fn) (*(int16 *) p, value);
95+
result = (int) (*(finfo.fn_addr)) (*(int16 *) p, value);
9596
break;
9697
case 3:
9798
case 4:
98-
result = (int) (*proc_fn) (*(int32 *) p, value);
99+
result = (int) (*(finfo.fn_addr)) (*(int32 *) p, value);
99100
break;
100101
}
101102
p += typlen;
102103
}
103104
else
104105
{
105-
result = (int) (*proc_fn) (p, value);
106+
result = (int) (*(finfo.fn_addr)) (p, value);
106107
if (typlen > 0)
107108
p += typlen;
108109
else
@@ -166,47 +167,6 @@ array_all_textregexeq(ArrayType *array, char *value)
166167
array, (Datum) value);
167168
}
168169

169-
/*
170-
* Iterator functions for type _char16. Note that the regexp
171-
* operators take the second argument of type text.
172-
*/
173-
174-
int32
175-
array_char16eq(ArrayType *array, char *value)
176-
{
177-
return array_iterator((Oid) 20, /* char16 */
178-
(Oid) 1275, /* char16eq */
179-
0, /* logical or */
180-
array, (Datum) value);
181-
}
182-
183-
int32
184-
array_all_char16eq(ArrayType *array, char *value)
185-
{
186-
return array_iterator((Oid) 20, /* char16 */
187-
(Oid) 1275, /* char16eq */
188-
1, /* logical and */
189-
array, (Datum) value);
190-
}
191-
192-
int32
193-
array_char16regexeq(ArrayType *array, char *value)
194-
{
195-
return array_iterator((Oid) 20, /* char16 */
196-
(Oid) 1288, /* char16regexeq */
197-
0, /* logical or */
198-
array, (Datum) value);
199-
}
200-
201-
int32
202-
array_all_char16regexeq(ArrayType *array, char *value)
203-
{
204-
return array_iterator((Oid) 20, /* char16 */
205-
(Oid) 1288, /* char16regexeq */
206-
1, /* logical and */
207-
array, (Datum) value);
208-
}
209-
210170
/*
211171
* Iterator functions for type _int4
212172
*/
@@ -320,3 +280,11 @@ array_all_int4le(ArrayType *array, int4 value)
320280
}
321281

322282
/* end of file */
283+
284+
/*
285+
* Local variables:
286+
* tab-width: 4
287+
* c-indent-level: 4
288+
* c-basic-offset: 4
289+
* End:
290+
*/

‎contrib/array/array_iterator.sql.in

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
-- SQL code to define the new array iterator functions and operators
1+
-- array_iterator.sql --
2+
--
3+
-- SQL code to define the array iterator functions and operators.
4+
--
5+
-- Copyright (c) 1998, Massimo Dal Zotto <dz@cs.unitn.it>
6+
--
7+
-- This file is distributed under the GNU General Public License
8+
-- either version 2, or (at your option) any later version.
29

3-
-- define the array operators *=, **=, *~ and **~ for type _text
10+
-- Define the array functions *=, **=, *~ and **~ for type _text
411
--
512
create function array_texteq(_text, text) returns bool
613
as 'MODULE_PATHNAME'
@@ -38,47 +45,7 @@ create operator **~ (
3845
rightarg=text,
3946
procedure=array_all_textregexeq);
4047

41-
42-
-- define the array operators *=, **=, *~ and **~ for type _char16
43-
--
44-
create function array_char16eq(_char16, char16) returns bool
45-
as 'MODULE_PATHNAME'
46-
language 'c';
47-
48-
create function array_all_char16eq(_char16, char16) returns bool
49-
as 'MODULE_PATHNAME'
50-
language 'c';
51-
52-
create function array_char16regexeq(_char16, text) returns bool
53-
as 'MODULE_PATHNAME'
54-
language 'c';
55-
56-
create function array_all_char16regexeq(_char16, text) returns bool
57-
as 'MODULE_PATHNAME'
58-
language 'c';
59-
60-
create operator *= (
61-
leftarg=_char16,
62-
rightarg=char16,
63-
procedure=array_char16eq);
64-
65-
create operator **= (
66-
leftarg=_char16,
67-
rightarg=char16,
68-
procedure=array_all_char16eq);
69-
70-
create operator *~ (
71-
leftarg=_char16,
72-
rightarg=text,
73-
procedure=array_char16regexeq);
74-
75-
create operator **~ (
76-
leftarg=_char16,
77-
rightarg=text,
78-
procedure=array_all_char16regexeq);
79-
80-
81-
-- define the array operators *=, **=, *> and **> for type _int4
48+
-- Define the array functions *=, **=, *> and **> for type _int4
8249
--
8350
create function array_int4eq(_int4, int4) returns bool
8451
as 'MODULE_PATHNAME'
@@ -128,6 +95,8 @@ create function array_all_int4le(_int4, int4) returns bool
12895
as 'MODULE_PATHNAME'
12996
language 'c';
13097

98+
-- Define the operators corresponding to the above functions
99+
--
131100
create operator *= (
132101
leftarg=_int4,
133102
rightarg=int4,

‎contrib/datetime/Makefile

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,35 @@ INCLUDE_OPT = -I ./ \
1515
-I $(SRCDIR)/include \
1616
-I $(SRCDIR)/port/$(PORTNAME)
1717

18-
CFLAGS += $(INCLUDE_OPT)
19-
20-
ifeq ($(PORTNAME), linux)
21-
ifdef LINUX_ELF
22-
ifeq ($(CC), gcc)
23-
CFLAGS += -fPIC
24-
endif
25-
endif
26-
endif
27-
28-
ifeq ($(PORTNAME), i386_solaris)
29-
CFLAGS+= -fPIC
30-
endif
18+
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
3119

3220
MODNAME = datetime_functions
3321

3422
MODULE = $(MODNAME)$(DLSUFFIX)
3523

24+
MODDIR = $(LIBDIR)/modules
25+
26+
SQLDIR = $(LIBDIR)/sql
27+
3628
all: module sql
3729

3830
module: $(MODULE)
3931

4032
sql: $(MODNAME).sql
4133

42-
install: $(MODULE)
43-
cp -p $(MODULE) $(LIBDIR)/modules
44-
cd $(LIBDIR)/modules; strip $(MODULE)
34+
install: $(MODULE) $(MODDIR) $(SQLDIR)
35+
cp -p $(MODULE) $(MODDIR)/
36+
strip $(MODDIR)/$(MODULE)
37+
cp -p $(MODNAME).sql $(SQLDIR)/
38+
39+
$(MODDIR):
40+
mkdir -p $@
41+
42+
$(SQLDIR):
43+
mkdir -p $@
4544

4645
%.sql: %.sql.in
47-
sed "s|MODULE_PATHNAME|$(LIBDIR)/modules/$(MODULE)|" < $< > $@
46+
sed "s|MODULE_PATHNAME|$(MODDIR)/$(MODULE)|" < $< > $@
4847

4948
.SUFFIXES: $(DLSUFFIX)
5049

@@ -55,7 +54,7 @@ depend dep:
5554
$(CC) -MM $(INCLUDE_OPT) *.c >depend
5655

5756
clean:
58-
rm -f $(MODULE) $(MODNAME).sql
57+
rm -f *~ $(MODULE) $(MODNAME).sql
5958

6059
ifeq (depend,$(wildcard depend))
6160
include depend

‎contrib/datetime/datetime_functions.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
*
44
* This file defines new functions for the time and date data types.
55
*
6-
* Copyright (c) 1996, Massimo Dal Zotto <dz@cs.unitn.it>
6+
* Copyright (c) 1998, Massimo Dal Zotto <dz@cs.unitn.it>
7+
*
8+
* This file is distributed under the GNU General Public License
9+
* either version 2, or (at your option) any later version.
710
*/
811

9-
#include <stdio.h> /* for sprintf() */
12+
#include <stdio.h>
1013
#include <string.h>
1114
#include <limits.h>
1215
#ifdef HAVE_FLOAT_H
@@ -102,7 +105,6 @@ hhmm_out(TimeADT *time)
102105
sprintf(buf, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
103106

104107
result = palloc(strlen(buf) + 1);
105-
106108
strcpy(result, buf);
107109

108110
return (result);
@@ -220,3 +222,11 @@ currentdate()
220222
}
221223

222224
/* end of file */
225+
226+
/*
227+
* Local variables:
228+
* tab-width: 4
229+
* c-indent-level: 4
230+
* c-basic-offset: 4
231+
* End:
232+
*/

0 commit comments

Comments
 (0)