Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a2226ad

Browse files
bmomjianbmomjian
committed
contrib-array.patch
 this is an old patch which I have already submitted and never seen in the sources. It corrects the datatype oids used in some iterator functions. This bug has been reported to me by many other people. contrib-datetime.patch some code contributed by Reiner Dassing <dassing@wettzell.ifag.de> contrib-makefiles.patch fixes all my contrib makefiles which don't work with some compilers, as reported to me by another user. contrib-miscutil.patch an old patch for one of my old contribs. contrib-string.patch a small change to the c-like text output functions. Now the '{' is escaped only at the beginning of the string to distinguish it from arrays, and the '}' is no more escaped. elog-lineno.patch adds the current lineno of CopyFrom to elog messages. This is very useful when you load a 1 million tuples table from an external file and there is a bad value somehere. Currently you get an error message but you can't know where is the bad data. The patch uses a variable which was declared static in copy.c. The variable is now exported and initialized to 0. It is always cleared at the end of the copy or at the first elog message or when the copy is canceled. I know this is very ugly but I can't find any better way of knowing where the copy fails and I have this problem quite often. plperl-makefile.patch fixes a typo in a makefile, but the error must be elsewhere because it is a file generated automatically. Please have a look. tprintf-timestamp.patch restores the original 2-digit year format, assuming that the two century digits don't carry much information and that '000202' is easier to read than 20000202. Being only a log file it shouldn't break anything. Please apply the patches before the next scheduled code freeze. I also noticed that some of the contribs don't compile correcly. Should we ask people to fix their code or rename their makefiles so that they are ignored by the top makefile? -- Massimo Dal Zotto
1 parent 77d31cf commit a2226ad

File tree

17 files changed

+102
-67
lines changed

17 files changed

+102
-67
lines changed

‎contrib/array/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I ./ \
15-
-I $(SRCDIR)/ \
16-
-I $(SRCDIR)/include \
17-
-I $(SRCDIR)/port/$(PORTNAME)
14+
INCLUDE_OPT = -I./ \
15+
-I$(SRCDIR)/ \
16+
-I$(SRCDIR)/include \
17+
-I$(SRCDIR)/port/$(PORTNAME)
1818

1919
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
2020

‎contrib/array/array_iterator.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
6666
}
6767

6868
/* Lookup element type information */
69-
typ_tuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(elemtype), 0, 0, 0);
69+
typ_tuple = SearchSysCacheTuple(TYPEOID, ObjectIdGetDatum(elemtype), 0, 0, 0);
7070
if (!HeapTupleIsValid(typ_tuple))
7171
{
7272
elog(ERROR, "array_iterator: cache lookup failed for type %d", elemtype);
@@ -183,7 +183,7 @@ array_all_textregexeq(ArrayType *array, char *value)
183183
int32
184184
array_varchareq(ArrayType *array, char *value)
185185
{
186-
return array_iterator((Oid) 20, /* varchar */
186+
return array_iterator((Oid) 1043, /* varchar */
187187
(Oid) 1070, /* varchareq */
188188
0, /* logical or */
189189
array, (Datum) value);
@@ -192,7 +192,7 @@ array_varchareq(ArrayType *array, char *value)
192192
int32
193193
array_all_varchareq(ArrayType *array, char *value)
194194
{
195-
return array_iterator((Oid) 20, /* varchar */
195+
return array_iterator((Oid) 1043, /* varchar */
196196
(Oid) 1070, /* varchareq */
197197
1, /* logical and */
198198
array, (Datum) value);
@@ -201,7 +201,7 @@ array_all_varchareq(ArrayType *array, char *value)
201201
int32
202202
array_varcharregexeq(ArrayType *array, char *value)
203203
{
204-
return array_iterator((Oid) 20, /* varchar */
204+
return array_iterator((Oid) 1043, /* varchar */
205205
(Oid) 1254, /* textregexeq */
206206
0, /* logical or */
207207
array, (Datum) value);
@@ -210,7 +210,7 @@ array_varcharregexeq(ArrayType *array, char *value)
210210
int32
211211
array_all_varcharregexeq(ArrayType *array, char *value)
212212
{
213-
return array_iterator((Oid) 20, /* varchar */
213+
return array_iterator((Oid) 1043, /* varchar */
214214
(Oid) 1254, /* textregexeq */
215215
1, /* logical and */
216216
array, (Datum) value);
@@ -224,7 +224,7 @@ array_all_varcharregexeq(ArrayType *array, char *value)
224224
int32
225225
array_bpchareq(ArrayType *array, char *value)
226226
{
227-
return array_iterator((Oid) 20, /* bpchar */
227+
return array_iterator((Oid) 1042, /* bpchar */
228228
(Oid) 1048, /* bpchareq */
229229
0, /* logical or */
230230
array, (Datum) value);
@@ -233,7 +233,7 @@ array_bpchareq(ArrayType *array, char *value)
233233
int32
234234
array_all_bpchareq(ArrayType *array, char *value)
235235
{
236-
return array_iterator((Oid) 20, /* bpchar */
236+
return array_iterator((Oid) 1042, /* bpchar */
237237
(Oid) 1048, /* bpchareq */
238238
1, /* logical and */
239239
array, (Datum) value);
@@ -242,7 +242,7 @@ array_all_bpchareq(ArrayType *array, char *value)
242242
int32
243243
array_bpcharregexeq(ArrayType *array, char *value)
244244
{
245-
return array_iterator((Oid) 20, /* bpchar */
245+
return array_iterator((Oid) 1042, /* bpchar */
246246
(Oid) 1254, /* textregexeq */
247247
0, /* logical or */
248248
array, (Datum) value);
@@ -251,7 +251,7 @@ array_bpcharregexeq(ArrayType *array, char *value)
251251
int32
252252
array_all_bpcharregexeq(ArrayType *array, char *value)
253253
{
254-
return array_iterator((Oid) 20, /* bpchar */
254+
return array_iterator((Oid) 1042, /* bpchar */
255255
(Oid) 1254, /* textregexeq */
256256
1, /* logical and */
257257
array, (Datum) value);

‎contrib/datetime/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I ./ \
15-
-I $(SRCDIR)/ \
16-
-I $(SRCDIR)/include \
17-
-I $(SRCDIR)/port/$(PORTNAME)
14+
INCLUDE_OPT = -I./ \
15+
-I$(SRCDIR)/ \
16+
-I$(SRCDIR)/include \
17+
-I$(SRCDIR)/port/$(PORTNAME)
1818

1919
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
2020

‎contrib/datetime/datetime_functions.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*
66
* Copyright (C) 1999, Massimo Dal Zotto <dz@cs.unitn.it>
77
*
8+
* Date2mjd code contributed by Reiner Dassing <dassing@wettzell.ifag.de>
9+
*
810
* This software is distributed under the GNU General Public License
911
* either version 2, or (at your option) any later version.
1012
*/
@@ -73,7 +75,7 @@ decode_24h_time(char *str, struct tm *tm, double *fsec)
7375
if ( (tm->tm_hour < 0) || (tm->tm_hour > 24)
7476
|| (tm->tm_min < 0) || (tm->tm_min > 59)
7577
|| (tm->tm_sec < 0) || (tm->tm_sec > 59)
76-
|| (fsec < 0) )
78+
|| (*fsec < 0) )
7779
return -1;
7880

7981
return 0;
@@ -260,6 +262,16 @@ currentdate()
260262
return (date);
261263
}
262264

265+
int4
266+
date2mjd(DateADT val)
267+
{
268+
int result;
269+
270+
result = val + JDATE_2000 - 2400000.5;
271+
272+
return result;
273+
}
274+
263275
/* end of file */
264276

265277
/*

‎contrib/miscutil/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I ./ \
15-
-I $(SRCDIR)/ \
16-
-I $(SRCDIR)/include \
17-
-I $(SRCDIR)/port/$(PORTNAME)
14+
INCLUDE_OPT = -I./ \
15+
-I$(SRCDIR)/ \
16+
-I$(SRCDIR)/include \
17+
-I$(SRCDIR)/port/$(PORTNAME)
1818

1919
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
2020

‎contrib/miscutil/misc_utils.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ active_listeners(text *relname)
121121
return count;
122122
}
123123

124+
#ifdef USE_ASSERT_CHECKING
124125
int
125126
assert_enable(int val)
126127
{
@@ -134,6 +135,7 @@ assert_test(int val)
134135
return assertTest(val);
135136
}
136137
#endif
138+
#endif
137139

138140
/* end of file */
139141

‎contrib/miscutil/misc_utils.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ int backend_pid(void);
66
int unlisten(char *relname);
77
int max(int x, int y);
88
int min(int x, int y);
9-
int assert_enable(int val);
9+
int active_listeners(text *relname);
1010

11+
#ifdef USE_ASSERT_CHECKING
12+
int assert_enable(int val);
1113
#ifdef ASSERT_CHECKING_TEST
1214
int assert_test(int val);
1315
#endif
16+
#endif
1417

15-
int active_listeners(text *relname);
1618
#endif
1719

1820
/*

‎contrib/string/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I ./ \
15-
-I $(SRCDIR)/ \
16-
-I $(SRCDIR)/include \
17-
-I $(SRCDIR)/port/$(PORTNAME)
14+
INCLUDE_OPT = -I./ \
15+
-I$(SRCDIR)/ \
16+
-I$(SRCDIR)/include \
17+
-I$(SRCDIR)/port/$(PORTNAME)
1818

1919
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
2020

‎contrib/string/string_io.c

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
* representation of data.
5151
*/
5252

53-
char *
54-
string_output(char *data, int size)
53+
unsigned char *
54+
string_output(unsigned char *data, int size)
5555
{
5656
register unsigned char c,
5757
*p,
@@ -79,8 +79,6 @@ string_output(char *data, int size)
7979
{
8080
case '\\':
8181
case '"':
82-
case '{':
83-
case '}':
8482
case '\b':
8583
case '\f':
8684
case '\n':
@@ -89,6 +87,12 @@ string_output(char *data, int size)
8987
case '\v':
9088
len++;
9189
break;
90+
case '{':
91+
/* Escape beginning of string, to distinguish from arrays */
92+
if (p == data) {
93+
len++;
94+
}
95+
break;
9296
default:
9397
if (NOTPRINTABLE(*p))
9498
len += 3;
@@ -104,8 +108,6 @@ string_output(char *data, int size)
104108
{
105109
case '\\':
106110
case '"':
107-
case '{':
108-
case '}':
109111
*r++ = '\\';
110112
*r++ = c;
111113
break;
@@ -133,6 +135,13 @@ string_output(char *data, int size)
133135
*r++ = '\\';
134136
*r++ = 'v';
135137
break;
138+
case '{':
139+
/* Escape beginning of string, to distinguish from arrays */
140+
if (p == data) {
141+
*r++ = '\\';
142+
}
143+
*r++ = c;
144+
break;
136145
default:
137146
if (NOTPRINTABLE(c))
138147
{
@@ -180,8 +189,8 @@ string_output(char *data, int size)
180189
* a pointer to the new string or the header.
181190
*/
182191

183-
char *
184-
string_input(char *str, int size, int hdrsize, int *rtn_size)
192+
unsigned char *
193+
string_input(unsigned char *str, int size, int hdrsize, int *rtn_size)
185194
{
186195
register unsigned char *p,
187196
*r;
@@ -285,7 +294,7 @@ string_input(char *str, int size, int hdrsize, int *rtn_size)
285294
return ((char *) result);
286295
}
287296

288-
char *
297+
unsigned char *
289298
c_charout(int32 c)
290299
{
291300
char str[2];
@@ -300,7 +309,7 @@ c_charout(int32 c)
300309
* This can be used for SET, bytea, text and unknown data types
301310
*/
302311

303-
char *
312+
unsigned char *
304313
c_textout(struct varlena * vlena)
305314
{
306315
int len = 0;
@@ -318,8 +327,8 @@ c_textout(struct varlena * vlena)
318327
* This can be used for varchar and bpchar strings
319328
*/
320329

321-
char *
322-
c_varcharout(char *s)
330+
unsigned char *
331+
c_varcharout(unsigned char *s)
323332
{
324333
int len = 0;
325334

@@ -333,7 +342,7 @@ c_varcharout(char *s)
333342

334343
#if 0
335344
struct varlena *
336-
c_textin(char *str)
345+
c_textin(unsigned char *str)
337346
{
338347
struct varlena *result;
339348
int len;
@@ -348,7 +357,7 @@ c_textin(char *str)
348357
}
349358

350359
int32 *
351-
c_charin(char *str)
360+
c_charin(unsigned char *str)
352361
{
353362
return (string_input(str, 1, 0, NULL));
354363
}

‎contrib/string/string_io.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
#ifndef STRING_IO_H
22
#define STRING_IO_H
33

4-
char *string_output(char *data, int size);
5-
char *string_input(char *str, int size, int hdrsize, int *rtn_size);
6-
char *c_charout(int32 c);
7-
char *c_char2out(uint16 s);
8-
char *c_char4out(uint32 s);
9-
char *c_char8out(char *s);
10-
char *c_char16out(char *s);
11-
char *c_textout(struct varlena * vlena);
12-
char *c_varcharout(char *s);
4+
unsigned char* string_output(unsigned char *data, int size);
5+
unsigned char* string_input(unsigned char *str, int size, int hdrsize,
6+
int *rtn_size);
7+
unsigned char* c_charout(int32 c);
8+
unsigned char* c_textout(struct varlena * vlena);
9+
unsigned char* c_varcharout(unsigned char *s);
1310

1411
#if 0
15-
struct varlena *c_textin(char *str);
16-
char *c_char16in(char *str);
12+
struct varlena* c_textin(unsigned char *str);
13+
int32* c_charin(unsigned char *str)
1714
#endif
1815

1916
#endif

‎contrib/userlock/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ SRCDIR = $(PGDIR)/src
1111

1212
include $(SRCDIR)/Makefile.global
1313

14-
INCLUDE_OPT = -I ./ \
15-
-I $(SRCDIR)/ \
16-
-I $(SRCDIR)/include \
17-
-I $(SRCDIR)/port/$(PORTNAME)
14+
INCLUDE_OPT = -I./ \
15+
-I$(SRCDIR)/ \
16+
-I$(SRCDIR)/include \
17+
-I$(SRCDIR)/port/$(PORTNAME)
1818

1919
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
2020

0 commit comments

Comments
 (0)