diff options
| author | Bruce Momjian | 1998-02-26 04:46:47 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-02-26 04:46:47 +0000 |
| commit | a32450a5855eed4bfd756ef292ee45d3c754665b (patch) | |
| tree | 26735c3406d9f46d0f39accbe6ff1fb5cc5beedc | |
| parent | 757bf69a2e259c76baed94fa06e792664ab5ed67 (diff) | |
pgindent run before 6.3 release, with Thomas' requested changes.
430 files changed, 12555 insertions, 10457 deletions
diff --git a/contrib/array/array_iterator.c b/contrib/array/array_iterator.c index 53130bf7a9..7c301c8e23 100644 --- a/contrib/array/array_iterator.c +++ b/contrib/array/array_iterator.c @@ -29,90 +29,113 @@ static int32 array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value) { - HeapTuple typ_tuple; - TypeTupleForm typ_struct; - bool typbyval; - int typlen; - func_ptr proc_fn; - int pronargs; - int nitems, i, result; - int ndim, *dim; - char *p; - - /* Sanity checks */ - if ((array == (ArrayType *) NULL) - || (ARR_IS_LO(array) == true)) { - /* elog(NOTICE, "array_iterator: array is null"); */ - return (0); - } - ndim = ARR_NDIM(array); - dim = ARR_DIMS(array); - nitems = getNitems(ndim, dim); - if (nitems == 0) { - /* elog(NOTICE, "array_iterator: nitems = 0"); */ - return (0); - } - - /* Lookup element type information */ - typ_tuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(elemtype),0,0,0); - if (!HeapTupleIsValid(typ_tuple)) { - elog(ERROR,"array_iterator: cache lookup failed for type %d", elemtype); - return 0; - } - typ_struct = (TypeTupleForm) GETSTRUCT(typ_tuple); - typlen = typ_struct->typlen; - typbyval = typ_struct->typbyval; - - /* Lookup the function entry point */ - proc_fn = (func_ptr) NULL; - fmgr_info(proc, &proc_fn, &pronargs); - if ((proc_fn == NULL) || (pronargs != 2)) { - elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %d", proc); - return (0); - } - - /* Scan the array and apply the operator to each element */ - result = 0; - p = ARR_DATA_PTR(array); - for (i = 0; i < nitems; i++) { - if (typbyval) { - switch(typlen) { - case 1: - result = (int) (*proc_fn)(*p, value); - break; - case 2: - result = (int) (*proc_fn)(* (int16 *) p, value); - break; - case 3: - case 4: - result = (int) (*proc_fn)(* (int32 *) p, value); - break; - } - p += typlen; - } else { - result = (int) (*proc_fn)(p, value); - if (typlen > 0) { - p += typlen; - } else { - p += INTALIGN(* (int32 *) p); - } - } - if (result) { - if (!and) { - return (1); - } - } else { - if (and) { + HeapTuple typ_tuple; + TypeTupleForm typ_struct; + bool typbyval; + int typlen; + func_ptr proc_fn; + int pronargs; + int nitems, + i, + result; + int ndim, + *dim; + char *p; + + /* Sanity checks */ + if ((array == (ArrayType *) NULL) + || (ARR_IS_LO(array) == true)) + { + /* elog(NOTICE, "array_iterator: array is null"); */ + return (0); + } + ndim = ARR_NDIM(array); + dim = ARR_DIMS(array); + nitems = getNitems(ndim, dim); + if (nitems == 0) + { + /* elog(NOTICE, "array_iterator: nitems = 0"); */ + return (0); + } + + /* Lookup element type information */ + typ_tuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(elemtype), 0, 0, 0); + if (!HeapTupleIsValid(typ_tuple)) + { + elog(ERROR, "array_iterator: cache lookup failed for type %d", elemtype); + return 0; + } + typ_struct = (TypeTupleForm) GETSTRUCT(typ_tuple); + typlen = typ_struct->typlen; + typbyval = typ_struct->typbyval; + + /* Lookup the function entry point */ + proc_fn = (func_ptr) NULL; + fmgr_info(proc, &proc_fn, &pronargs); + if ((proc_fn == NULL) || (pronargs != 2)) + { + elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %d", proc); return (0); - } } - } - if (and && result) { - return (1); - } else { - return (0); - } + /* Scan the array and apply the operator to each element */ + result = 0; + p = ARR_DATA_PTR(array); + for (i = 0; i < nitems; i++) + { + if (typbyval) + { + switch (typlen) + { + case 1: + result = (int) (*proc_fn) (*p, value); + break; + case 2: + result = (int) (*proc_fn) (*(int16 *) p, value); + break; + case 3: + case 4: + result = (int) (*proc_fn) (*(int32 *) p, value); + break; + } + p += typlen; + } + else + { + result = (int) (*proc_fn) (p, value); + if (typlen > 0) + { + p += typlen; + } + else + { + p += INTALIGN(*(int32 *) p); + } + } + if (result) + { + if (!and) + { + return (1); + } + } + else + { + if (and) + { + return (0); + } + } + } + + if (and && result) + { + return (1); + } + else + { + return (0); + } } /* @@ -120,39 +143,39 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value) */ int32 -array_texteq(ArrayType *array, char* value) +array_texteq(ArrayType *array, char *value) { - return array_iterator((Oid) 25, /* text */ - (Oid) 67, /* texteq */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 25, /* text */ + (Oid) 67, /* texteq */ + 0, /* logical or */ + array, (Datum) value); } int32 -array_all_texteq(ArrayType *array, char* value) +array_all_texteq(ArrayType *array, char *value) { - return array_iterator((Oid) 25, /* text */ - (Oid) 67, /* texteq */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 25, /* text */ + (Oid) 67, /* texteq */ + 1, /* logical and */ + array, (Datum) value); } int32 -array_textregexeq(ArrayType *array, char* value) +array_textregexeq(ArrayType *array, char *value) { - return array_iterator((Oid) 25, /* text */ - (Oid) 1254, /* textregexeq */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 25, /* text */ + (Oid) 1254, /* textregexeq */ + 0, /* logical or */ + array, (Datum) value); } int32 -array_all_textregexeq(ArrayType *array, char* value) +array_all_textregexeq(ArrayType *array, char *value) { - return array_iterator((Oid) 25, /* text */ - (Oid) 1254, /* textregexeq */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 25, /* text */ + (Oid) 1254, /* textregexeq */ + 1, /* logical and */ + array, (Datum) value); } /* @@ -161,39 +184,39 @@ array_all_textregexeq(ArrayType *array, char* value) */ int32 -array_char16eq(ArrayType *array, char* value) +array_char16eq(ArrayType *array, char *value) { - return array_iterator((Oid) 20, /* char16 */ - (Oid) 1275, /* char16eq */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 20, /* char16 */ + (Oid) 1275, /* char16eq */ + 0, /* logical or */ + array, (Datum) value); } int32 -array_all_char16eq(ArrayType *array, char* value) +array_all_char16eq(ArrayType *array, char *value) { - return array_iterator((Oid) 20, /* char16 */ - (Oid) 1275, /* char16eq */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 20, /* char16 */ + (Oid) 1275, /* char16eq */ + 1, /* logical and */ + array, (Datum) value); } int32 -array_char16regexeq(ArrayType *array, char* value) +array_char16regexeq(ArrayType *array, char *value) { - return array_iterator((Oid) 20, /* char16 */ - (Oid) 1288, /* char16regexeq */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 20, /* char16 */ + (Oid) 1288, /* char16regexeq */ + 0, /* logical or */ + array, (Datum) value); } int32 -array_all_char16regexeq(ArrayType *array, char* value) +array_all_char16regexeq(ArrayType *array, char *value) { - return array_iterator((Oid) 20, /* char16 */ - (Oid) 1288, /* char16regexeq */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 20, /* char16 */ + (Oid) 1288, /* char16regexeq */ + 1, /* logical and */ + array, (Datum) value); } /* @@ -203,109 +226,109 @@ array_all_char16regexeq(ArrayType *array, char* value) int32 array_int4eq(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 65, /* int4eq */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 65, /* int4eq */ + 0, /* logical or */ + array, (Datum) value); } int32 array_all_int4eq(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 65, /* int4eq */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 65, /* int4eq */ + 1, /* logical and */ + array, (Datum) value); } int32 array_int4ne(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 144, /* int4ne */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 144, /* int4ne */ + 0, /* logical or */ + array, (Datum) value); } int32 array_all_int4ne(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 144, /* int4ne */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 144, /* int4ne */ + 1, /* logical and */ + array, (Datum) value); } int32 array_int4gt(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 147, /* int4gt */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 147, /* int4gt */ + 0, /* logical or */ + array, (Datum) value); } int32 array_all_int4gt(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 147, /* int4gt */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 147, /* int4gt */ + 1, /* logical and */ + array, (Datum) value); } int32 array_int4ge(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 150, /* int4ge */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 150, /* int4ge */ + 0, /* logical or */ + array, (Datum) value); } int32 array_all_int4ge(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 150, /* int4ge */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 150, /* int4ge */ + 1, /* logical and */ + array, (Datum) value); } int32 array_int4lt(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 66, /* int4lt */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 66, /* int4lt */ + 0, /* logical or */ + array, (Datum) value); } int32 array_all_int4lt(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 66, /* int4lt */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 66, /* int4lt */ + 1, /* logical and */ + array, (Datum) value); } int32 array_int4le(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 149, /* int4le */ - 0, /* logical or */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 149, /* int4le */ + 0, /* logical or */ + array, (Datum) value); } int32 array_all_int4le(ArrayType *array, int4 value) { - return array_iterator((Oid) 23, /* int4 */ - (Oid) 149, /* int4le */ - 1, /* logical and */ - array, (Datum)value); + return array_iterator((Oid) 23, /* int4 */ + (Oid) 149, /* int4le */ + 1, /* logical and */ + array, (Datum) value); } /* end of file */ diff --git a/contrib/array/array_iterator.h b/contrib/array/array_iterator.h index 0d9c58ed00..458ec5916d 100644 --- a/contrib/array/array_iterator.h +++ b/contrib/array/array_iterator.h @@ -1,27 +1,28 @@ #ifndef ARRAY_ITERATOR_H #define ARRAY_ITERATOR_H -static int32 array_iterator(Oid elemtype, Oid proc, int and, - ArrayType *array, Datum value); -int32 array_texteq(ArrayType *array, char* value); -int32 array_all_texteq(ArrayType *array, char* value); -int32 array_textregexeq(ArrayType *array, char* value); -int32 array_all_textregexeq(ArrayType *array, char* value); -int32 array_char16eq(ArrayType *array, char* value); -int32 array_all_char16eq(ArrayType *array, char* value); -int32 array_char16regexeq(ArrayType *array, char* value); -int32 array_all_char16regexeq(ArrayType *array, char* value); -int32 array_int4eq(ArrayType *array, int4 value); -int32 array_all_int4eq(ArrayType *array, int4 value); -int32 array_int4ne(ArrayType *array, int4 value); -int32 array_all_int4ne(ArrayType *array, int4 value); -int32 array_int4gt(ArrayType *array, int4 value); -int32 array_all_int4gt(ArrayType *array, int4 value); -int32 array_int4ge(ArrayType *array, int4 value); -int32 array_all_int4ge(ArrayType *array, int4 value); -int32 array_int4lt(ArrayType *array, int4 value); -int32 array_all_int4lt(ArrayType *array, int4 value); -int32 array_int4le(ArrayType *array, int4 value); -int32 array_all_int4le(ArrayType *array, int4 value); +static int32 +array_iterator(Oid elemtype, Oid proc, int and, + ArrayType *array, Datum value); +int32 array_texteq(ArrayType *array, char *value); +int32 array_all_texteq(ArrayType *array, char *value); +int32 array_textregexeq(ArrayType *array, char *value); +int32 array_all_textregexeq(ArrayType *array, char *value); +int32 array_char16eq(ArrayType *array, char *value); +int32 array_all_char16eq(ArrayType *array, char *value); +int32 array_char16regexeq(ArrayType *array, char *value); +int32 array_all_char16regexeq(ArrayType *array, char *value); +int32 array_int4eq(ArrayType *array, int4 value); +int32 array_all_int4eq(ArrayType *array, int4 value); +int32 array_int4ne(ArrayType *array, int4 value); +int32 array_all_int4ne(ArrayType *array, int4 value); +int32 array_int4gt(ArrayType *array, int4 value); +int32 array_all_int4gt(ArrayType *array, int4 value); +int32 array_int4ge(ArrayType *array, int4 value); +int32 array_all_int4ge(ArrayType *array, int4 value); +int32 array_int4lt(ArrayType *array, int4 value); +int32 array_all_int4lt(ArrayType *array, int4 value); +int32 array_int4le(ArrayType *array, int4 value); +int32 array_all_int4le(ArrayType *array, int4 value); #endif diff --git a/contrib/datetime/datetime_functions.c b/contrib/datetime/datetime_functions.c index 4c8d11794c..29a2a55400 100644 --- a/contrib/datetime/datetime_functions.c +++ b/contrib/datetime/datetime_functions.c @@ -6,7 +6,7 @@ * Copyright (c) 1996, Massimo Dal Zotto <[email protected]> */ -#include <stdio.h> /* for sprintf() */ +#include <stdio.h> /* for sprintf() */ #include <string.h> #include <limits.h> #ifdef HAVE_FLOAT_H @@ -32,45 +32,47 @@ * to hh:mm like in timetables. */ -TimeADT * +TimeADT * hhmm_in(char *str) { - TimeADT *time; - - double fsec; - struct tm tt, *tm = &tt; - - int nf; - char lowstr[MAXDATELEN+1]; - char *field[MAXDATEFIELDS]; - int dtype; - int ftype[MAXDATEFIELDS]; - - if (!PointerIsValid(str)) - elog(ERROR,"Bad (null) time external representation",NULL); - - if ((ParseDateTime( str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0) - || (DecodeTimeOnly( field, ftype, nf, &dtype, tm, &fsec) != 0)) - elog(ERROR,"Bad time external representation '%s'",str); - - if (tm->tm_hour<0 || tm->tm_hour>24 || - (tm->tm_hour==24 && (tm->tm_min!=0 || tm->tm_sec!=0 || fsec!= 0))) { - elog(ERROR, - "time_in: hour must be limited to values 0 through 24:00 " - "in \"%s\"", - str); - } - if ((tm->tm_min < 0) || (tm->tm_min > 59)) - elog(ERROR,"Minute must be limited to values 0 through 59 in '%s'",str); - if ((tm->tm_sec < 0) || ((tm->tm_sec + fsec) >= 60)) - elog(ERROR,"Second must be limited to values 0 through < 60 in '%s'", - str); - - time = palloc(sizeof(TimeADT)); - - *time = ((((tm->tm_hour*60)+tm->tm_min)*60)); - - return(time); + TimeADT *time; + + double fsec; + struct tm tt, + *tm = &tt; + + int nf; + char lowstr[MAXDATELEN + 1]; + char *field[MAXDATEFIELDS]; + int dtype; + int ftype[MAXDATEFIELDS]; + + if (!PointerIsValid(str)) + elog(ERROR, "Bad (null) time external representation", NULL); + + if ((ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0) + || (DecodeTimeOnly(field, ftype, nf, &dtype, tm, &fsec) != 0)) + elog(ERROR, "Bad time external representation '%s'", str); + + if (tm->tm_hour < 0 || tm->tm_hour > 24 || + (tm->tm_hour == 24 && (tm->tm_min != 0 || tm->tm_sec != 0 || fsec != 0))) + { + elog(ERROR, + "time_in: hour must be limited to values 0 through 24:00 " + "in \"%s\"", + str); + } + if ((tm->tm_min < 0) || (tm->tm_min > 59)) + elog(ERROR, "Minute must be limited to values 0 through 59 in '%s'", str); + if ((tm->tm_sec < 0) || ((tm->tm_sec + fsec) >= 60)) + elog(ERROR, "Second must be limited to values 0 through < 60 in '%s'", + str); + + time = palloc(sizeof(TimeADT)); + + *time = ((((tm->tm_hour * 60) + tm->tm_min) * 60)); + + return (time); } /* @@ -82,132 +84,143 @@ hhmm_in(char *str) char * hhmm_out(TimeADT *time) { - char *result; - struct tm tt, *tm = &tt; - char buf[MAXDATELEN+1]; + char *result; + struct tm tt, + *tm = &tt; + char buf[MAXDATELEN + 1]; - if (!PointerIsValid(time)) - return NULL; + if (!PointerIsValid(time)) + return NULL; - tm->tm_hour = (*time / (60*60)); - tm->tm_min = (((int) (*time / 60)) % 60); - tm->tm_sec = (((int) *time) % 60); + tm->tm_hour = (*time / (60 * 60)); + tm->tm_min = (((int) (*time / 60)) % 60); + tm->tm_sec = (((int) *time) % 60); - if (tm->tm_sec == 0) { - sprintf(buf, "%02d:%02d", tm->tm_hour, tm->tm_min); - } else { - sprintf(buf, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec); - } + if (tm->tm_sec == 0) + { + sprintf(buf, "%02d:%02d", tm->tm_hour, tm->tm_min); + } + else + { + sprintf(buf, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec); + } - result = palloc(strlen(buf)+1); + result = palloc(strlen(buf) + 1); - strcpy( result, buf); + strcpy(result, buf); - return(result); + return (result); } -TimeADT * +TimeADT * hhmm(TimeADT *time) { - TimeADT *result = palloc(sizeof(TimeADT)); + TimeADT *result = palloc(sizeof(TimeADT)); - *result = (((int) *time) / 60 * 60); + *result = (((int) *time) / 60 * 60); - return(result); + return (result); } -TimeADT * +TimeADT * time_difference(TimeADT *time1, TimeADT *time2) { - TimeADT *time = palloc(sizeof(TimeADT)); + TimeADT *time = palloc(sizeof(TimeADT)); - *time = (*time1 - *time2); - return(time); + *time = (*time1 - *time2); + return (time); } int4 time_hours(TimeADT *time) { - return (((int) *time) / 3600); + return (((int) *time) / 3600); } int4 time_minutes(TimeADT *time) { - return ((((int) *time) / 60) % 60); + return ((((int) *time) / 60) % 60); } int4 time_seconds(TimeADT *time) { - return (((int) *time) % 60); + return (((int) *time) % 60); } int4 as_minutes(TimeADT *time) { - return (((int) *time) / 60); + return (((int) *time) / 60); } int4 as_seconds(TimeADT *time) { - return ((int) *time); + return ((int) *time); } int4 date_day(DateADT val) { - int year, month, day; + int year, + month, + day; - j2date(val + JDATE_2000, &year, &month, &day); + j2date(val + JDATE_2000, &year, &month, &day); - return (day); + return (day); } int4 date_month(DateADT val) { - int year, month, day; + int year, + month, + day; - j2date(val + JDATE_2000, &year, &month, &day); + j2date(val + JDATE_2000, &year, &month, &day); - return (month); + return (month); } int4 date_year(DateADT val) { - int year, month, day; + int year, + month, + day; - j2date(val + JDATE_2000, &year, &month, &day); + j2date(val + JDATE_2000, &year, &month, &day); - return (year); + return (year); } -TimeADT * +TimeADT * currenttime() { - TimeADT *result = palloc(sizeof(TimeADT)); - struct tm *tm; - time_t current_time; + TimeADT *result = palloc(sizeof(TimeADT)); + struct tm *tm; + time_t current_time; - current_time = time(NULL); - tm = localtime(¤t_time); - *result = ((((tm->tm_hour*60)+tm->tm_min)*60)+tm->tm_sec); + current_time = time(NULL); + tm = localtime(¤t_time); + *result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec); - return (result); + return (result); } DateADT currentdate() { - DateADT date; - struct tm tt, *tm = &tt; + DateADT date; + struct tm tt, + *tm = &tt; - GetCurrentTime(tm); - date = (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday) - JDATE_2000); - return (date); + GetCurrentTime(tm); + date = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - JDATE_2000); + return (date); } /* end of file */ diff --git a/contrib/datetime/datetime_functions.h b/contrib/datetime/datetime_functions.h index 6847498405..3a3de8ec52 100644 --- a/contrib/datetime/datetime_functions.h +++ b/contrib/datetime/datetime_functions.h @@ -1,19 +1,19 @@ #ifndef DATETIME_FUNCTIONS_H #define DATETIME_FUNCTIONS_H -TimeADT *hhmm_in(char *str); -char *hhmm_out(TimeADT *time); -TimeADT *hhmm(TimeADT *time); -TimeADT *time_difference(TimeADT *time1, TimeADT *time2); -int4 time_hours(TimeADT *time); -int4 time_minutes(TimeADT *time); -int4 time_seconds(TimeADT *time); -int4 as_minutes(TimeADT *time); -int4 as_seconds(TimeADT *time); -int4 date_day(DateADT val); -int4 date_month(DateADT val); -int4 date_year(DateADT val); -TimeADT *currenttime(void); -DateADT currentdate(void); +TimeADT *hhmm_in(char *str); +char *hhmm_out(TimeADT *time); +TimeADT *hhmm(TimeADT *time); +TimeADT *time_difference(TimeADT *time1, TimeADT *time2); +int4 time_hours(TimeADT *time); +int4 time_minutes(TimeADT *time); +int4 time_seconds(TimeADT *time); +int4 as_minutes(TimeADT *time); +int4 as_seconds(TimeADT *time); +int4 date_day(DateADT val); +int4 date_month(DateADT val); +int4 date_year(DateADT val); +TimeADT *currenttime(void); +DateADT currentdate(void); #endif diff --git a/contrib/int8/int8.c b/contrib/int8/int8.c index f8945ccd5d..4e04c99352 100644 --- a/contrib/int8/int8.c +++ b/contrib/int8/int8.c @@ -89,7 +89,7 @@ int64 *dtoi8(float64 val); /* int8in() */ -int64 * +int64 * int8in(char *str) { int64 *result = palloc(sizeof(int64)); @@ -107,12 +107,12 @@ int8in(char *str) #endif return (result); -} /* int8in() */ +} /* int8in() */ /* int8out() */ -char * +char * int8out(int64 * val) { char *result; @@ -137,7 +137,7 @@ int8out(int64 * val) #endif return (result); -} /* int8out() */ +} /* int8out() */ /*---------------------------------------------------------- @@ -151,37 +151,37 @@ bool int8eq(int64 * val1, int64 * val2) { return (*val1 == *val2); -} /* int8eq() */ +} /* int8eq() */ bool int8ne(int64 * val1, int64 * val2) { return (*val1 != *val2); -} /* int8ne() */ +} /* int8ne() */ bool int8lt(int64 * val1, int64 * val2) { return (*val1 < *val2); -} /* int8lt() */ +} /* int8lt() */ bool int8gt(int64 * val1, int64 * val2) { return (*val1 > *val2); -} /* int8gt() */ +} /* int8gt() */ bool int8le(int64 * val1, int64 * val2) { return (*val1 <= *val2); -} /* int8le() */ +} /* int8le() */ bool int8ge(int64 * val1, int64 * val2) { return (*val1 >= *val2); -} /* int8ge() */ +} /* int8ge() */ /* int84relop() @@ -191,44 +191,44 @@ bool int84eq(int64 * val1, int32 val2) { return (*val1 == val2); -} /* int84eq() */ +} /* int84eq() */ bool int84ne(int64 * val1, int32 val2) { return (*val1 != val2); -} /* int84ne() */ +} /* int84ne() */ bool int84lt(int64 * val1, int32 val2) { return (*val1 < val2); -} /* int84lt() */ +} /* int84lt() */ bool int84gt(int64 * val1, int32 val2) { return (*val1 > val2); -} /* int84gt() */ +} /* int84gt() */ bool int84le(int64 * val1, int32 val2) { return (*val1 <= val2); -} /* int84le() */ +} /* int84le() */ bool int84ge(int64 * val1, int32 val2) { return (*val1 >= val2); -} /* int84ge() */ +} /* int84ge() */ /*---------------------------------------------------------- * Arithmetic operators on 64-bit integers. *---------------------------------------------------------*/ -int64 * +int64 * int8um(int64 * val) { int64 *result = palloc(sizeof(int64)); @@ -239,9 +239,9 @@ int8um(int64 * val) *result = (-*val); return (result); -} /* int8um() */ +} /* int8um() */ -int64 * +int64 * int8pl(int64 * val1, int64 * val2) { int64 *result = palloc(sizeof(int64)); @@ -252,9 +252,9 @@ int8pl(int64 * val1, int64 * val2) *result = *val1 + *val2; return (result); -} /* int8pl() */ +} /* int8pl() */ -int64 * +int64 * int8mi(int64 * val1, int64 * val2) { int64 *result = palloc(sizeof(int64)); @@ -265,9 +265,9 @@ int8mi(int64 * val1, int64 * val2) *result = *val1 - *val2; return (result); -} /* int8mi() */ +} /* int8mi() */ -int64 * +int64 * int8mul(int64 * val1, int64 * val2) { int64 *result = palloc(sizeof(int64)); @@ -278,9 +278,9 @@ int8mul(int64 * val1, int64 * val2) *result = *val1 * *val2; return (result); -} /* int8mul() */ +} /* int8mul() */ -int64 * +int64 * int8div(int64 * val1, int64 * val2) { int64 *result = palloc(sizeof(int64)); @@ -291,14 +291,14 @@ int8div(int64 * val1, int64 * val2) *result = *val1 / *val2; return (result); -} /* int8div() */ +} /* int8div() */ /*---------------------------------------------------------- * Conversion operators. *---------------------------------------------------------*/ -int64 * +int64 * int48(int32 val) { int64 *result = palloc(sizeof(int64)); @@ -306,7 +306,7 @@ int48(int32 val) *result = val; return (result); -} /* int48() */ +} /* int48() */ int32 int84(int64 * val) @@ -322,10 +322,10 @@ int84(int64 * val) result = *val; return (result); -} /* int84() */ +} /* int84() */ #if FALSE -int64 * +int64 * int28 (int16 val) { int64 *result; @@ -336,7 +336,7 @@ int28 (int16 val) *result = val; return (result); -} /* int28() */ +} /* int28() */ int16 int82(int64 * val) @@ -349,7 +349,7 @@ int82(int64 * val) result = *val; return (result); -} /* int82() */ +} /* int82() */ #endif @@ -361,9 +361,9 @@ i8tod(int64 * val) *result = *val; return (result); -} /* i8tod() */ +} /* i8tod() */ -int64 * +int64 * dtoi8(float64 val) { int64 *result = palloc(sizeof(int64)); @@ -374,4 +374,4 @@ dtoi8(float64 val) *result = *val; return (result); -} /* dtoi8() */ +} /* dtoi8() */ diff --git a/contrib/ip_and_mac/ip.c b/contrib/ip_and_mac/ip.c index d941c26742..b0320bae38 100644 --- a/contrib/ip_and_mac/ip.c +++ b/contrib/ip_and_mac/ip.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for IP addresses. * - * $Id: ip.c,v 1.2 1998/02/14 17:58:03 scrappy Exp $ + * $Id: ip.c,v 1.3 1998/02/26 04:27:37 momjian Exp $ */ #include <stdio.h> @@ -13,83 +13,98 @@ * This is the internal storage format for IP addresses: */ -typedef struct ipaddr { - uint32 address; - int16 width; -} ipaddr; +typedef struct ipaddr +{ + uint32 address; + int16 width; +} ipaddr; /* * Various forward declarations: */ -ipaddr *ipaddr_in(char *str); -char *ipaddr_out(ipaddr *addr); +ipaddr *ipaddr_in(char *str); +char *ipaddr_out(ipaddr * addr); -bool ipaddr_lt(ipaddr *a1, ipaddr *a2); -bool ipaddr_le(ipaddr *a1, ipaddr *a2); -bool ipaddr_eq(ipaddr *a1, ipaddr *a2); -bool ipaddr_ge(ipaddr *a1, ipaddr *a2); -bool ipaddr_gt(ipaddr *a1, ipaddr *a2); +bool ipaddr_lt(ipaddr * a1, ipaddr * a2); +bool ipaddr_le(ipaddr * a1, ipaddr * a2); +bool ipaddr_eq(ipaddr * a1, ipaddr * a2); +bool ipaddr_ge(ipaddr * a1, ipaddr * a2); +bool ipaddr_gt(ipaddr * a1, ipaddr * a2); -bool ipaddr_ne(ipaddr *a1, ipaddr *a2); +bool ipaddr_ne(ipaddr * a1, ipaddr * a2); -int4 ipaddr_cmp(ipaddr *a1, ipaddr *a2); +int4 ipaddr_cmp(ipaddr * a1, ipaddr * a2); -bool ipaddr_in_net(ipaddr *a1, ipaddr *a2); -ipaddr *ipaddr_mask(ipaddr *a); -ipaddr *ipaddr_bcast(ipaddr *a); +bool ipaddr_in_net(ipaddr * a1, ipaddr * a2); +ipaddr *ipaddr_mask(ipaddr * a); +ipaddr *ipaddr_bcast(ipaddr * a); /* * Build a mask of a given width: */ -unsigned long build_mask(unsigned char bits) { - unsigned long mask = 0; - int i; - for (i = 0; i < bits; i++) - mask = (mask >> 1) | 0x80000000; - return mask; +unsigned long +build_mask(unsigned char bits) +{ + unsigned long mask = 0; + int i; + + for (i = 0; i < bits; i++) + mask = (mask >> 1) | 0x80000000; + return mask; } /* - * IP address reader. Note how the count returned by sscanf() + * IP address reader. Note how the count returned by sscanf() * is used to determine whether the mask size was specified. */ -ipaddr *ipaddr_in(char *str) { - int a, b, c, d, w; - ipaddr *result; - int count; - - if (strlen(str) > 0) { - - count = sscanf(str, "%d.%d.%d.%d/%d", &a, &b, &c, &d, &w); - - if (count < 4) { - elog(ERROR, "ipaddr_in: error in parsing \"%s\"", str); - return(NULL); - } - - if (count == 4) - w = 32; - - if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || - (c < 0) || (c > 255) || (d < 0) || (d > 255) || - (w < 0) || (w > 32)) { - elog(ERROR, "ipaddr_in: illegal address \"%s\"", str); - return(NULL); - } - } else { - a = b = c = d = w = 0; /* special case for missing address */ - } - - result = (ipaddr *)palloc(sizeof(ipaddr)); - - result->address = (uint32) ((a<<24)|(b<<16)|(c<<8)|d); - result->address &= build_mask(w); - result->width = w; - - return(result); +ipaddr * +ipaddr_in(char *str) +{ + int a, + b, + c, + d, + w; + ipaddr *result; + int count; + + if (strlen(str) > 0) + { + + count = sscanf(str, "%d.%d.%d.%d/%d", &a, &b, &c, &d, &w); + + if (count < 4) + { + elog(ERROR, "ipaddr_in: error in parsing \"%s\"", str); + return (NULL); + } + + if (count == 4) + w = 32; + + if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || + (c < 0) || (c > 255) || (d < 0) || (d > 255) || + (w < 0) || (w > 32)) + { + elog(ERROR, "ipaddr_in: illegal address \"%s\"", str); + return (NULL); + } + } + else + { + a = b = c = d = w = 0; /* special case for missing address */ + } + + result = (ipaddr *) palloc(sizeof(ipaddr)); + + result->address = (uint32) ((a << 24) | (b << 16) | (c << 8) | d); + result->address &= build_mask(w); + result->width = w; + + return (result); } /* @@ -97,118 +112,144 @@ ipaddr *ipaddr_in(char *str) { * generated only for subnets, not for plain host addresses. */ -char *ipaddr_out(ipaddr *addr) { - char *result; - - if (addr == NULL) - return(NULL); - - result = (char *)palloc(32); - - if (addr->address > 0) { - if (addr->width == 32) - sprintf(result, "%d.%d.%d.%d", - (addr->address >> 24) & 0xff, - (addr->address >> 16) & 0xff, - (addr->address >> 8) & 0xff, - addr->address & 0xff); - else - sprintf(result, "%d.%d.%d.%d/%d", - (addr->address >> 24) & 0xff, - (addr->address >> 16) & 0xff, - (addr->address >> 8) & 0xff, - addr->address & 0xff, - addr->width); - } else { - result[0] = 0; /* special case for missing address */ - } - return(result); +char * +ipaddr_out(ipaddr * addr) +{ + char *result; + + if (addr == NULL) + return (NULL); + + result = (char *) palloc(32); + + if (addr->address > 0) + { + if (addr->width == 32) + sprintf(result, "%d.%d.%d.%d", + (addr->address >> 24) & 0xff, + (addr->address >> 16) & 0xff, + (addr->address >> 8) & 0xff, + addr->address & 0xff); + else + sprintf(result, "%d.%d.%d.%d/%d", + (addr->address >> 24) & 0xff, + (addr->address >> 16) & 0xff, + (addr->address >> 8) & 0xff, + addr->address & 0xff, + addr->width); + } + else + { + result[0] = 0; /* special case for missing address */ + } + return (result); } /* * Boolean tests for magnitude. */ -bool ipaddr_lt(ipaddr *a1, ipaddr *a2) { - return (a1->address < a2->address); +bool +ipaddr_lt(ipaddr * a1, ipaddr * a2) +{ + return (a1->address < a2->address); }; -bool ipaddr_le(ipaddr *a1, ipaddr *a2) { - return (a1->address <= a2->address); +bool +ipaddr_le(ipaddr * a1, ipaddr * a2) +{ + return (a1->address <= a2->address); }; -bool ipaddr_eq(ipaddr *a1, ipaddr *a2) { - return (a1->address == a2->address); +bool +ipaddr_eq(ipaddr * a1, ipaddr * a2) +{ + return (a1->address == a2->address); }; -bool ipaddr_ge(ipaddr *a1, ipaddr *a2) { - return (a1->address >= a2->address); +bool +ipaddr_ge(ipaddr * a1, ipaddr * a2) +{ + return (a1->address >= a2->address); }; -bool ipaddr_gt(ipaddr *a1, ipaddr *a2) { - return (a1->address > a2->address); +bool +ipaddr_gt(ipaddr * a1, ipaddr * a2) +{ + return (a1->address > a2->address); }; -bool ipaddr_ne(ipaddr *a1, ipaddr *a2) { - return (a1->address != a2->address); +bool +ipaddr_ne(ipaddr * a1, ipaddr * a2) +{ + return (a1->address != a2->address); }; /* * Comparison function for sorting: */ -int4 ipaddr_cmp(ipaddr *a1, ipaddr *a2) { - if (a1->address < a2->address) - return -1; - else if (a1->address > a2->address) - return 1; - else - return 0; +int4 +ipaddr_cmp(ipaddr * a1, ipaddr * a2) +{ + if (a1->address < a2->address) + return -1; + else if (a1->address > a2->address) + return 1; + else + return 0; } /* * Test whether an address is within a given subnet: */ -bool ipaddr_in_net(ipaddr *a1, ipaddr *a2) { - uint32 maskbits; - if (a1->width < a2->width) - return FALSE; - if ((a1->width == 32) && (a2->width == 32)) - return ipaddr_eq(a1, a2); - maskbits = build_mask(a2->width); - if ((a1->address & maskbits) == (a2->address & maskbits)) - return TRUE; - return FALSE; +bool +ipaddr_in_net(ipaddr * a1, ipaddr * a2) +{ + uint32 maskbits; + + if (a1->width < a2->width) + return FALSE; + if ((a1->width == 32) && (a2->width == 32)) + return ipaddr_eq(a1, a2); + maskbits = build_mask(a2->width); + if ((a1->address & maskbits) == (a2->address & maskbits)) + return TRUE; + return FALSE; } /* * Pick out just the mask of a network: */ -ipaddr *ipaddr_mask(ipaddr *a) { - ipaddr *result; +ipaddr * +ipaddr_mask(ipaddr * a) +{ + ipaddr *result; - result = (ipaddr *)palloc(sizeof(ipaddr)); - result->address = build_mask(a->width); - result->width = 32; + result = (ipaddr *) palloc(sizeof(ipaddr)); + result->address = build_mask(a->width); + result->width = 32; - return result; + return result; } /* * Return the broadcast address of a network: */ -ipaddr *ipaddr_bcast(ipaddr *a) { - ipaddr *result; +ipaddr * +ipaddr_bcast(ipaddr * a) +{ + ipaddr *result; - result = (ipaddr *)palloc(sizeof(ipaddr)); - result->address = a->address; - result->address |= (build_mask(32 - a->width) >> a->width); - result->width = 32; + result = (ipaddr *) palloc(sizeof(ipaddr)); + result->address = a->address; + result->address |= (build_mask(32 - a->width) >> a->width); + result->width = 32; - return result; + return result; } /* diff --git a/contrib/ip_and_mac/mac.c b/contrib/ip_and_mac/mac.c index 34aed59267..f4f5fff7df 100644 --- a/contrib/ip_and_mac/mac.c +++ b/contrib/ip_and_mac/mac.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.c,v 1.2 1998/02/14 17:58:05 scrappy Exp $ + * $Id: mac.c,v 1.3 1998/02/26 04:27:44 momjian Exp $ */ #include <stdio.h> @@ -15,33 +15,34 @@ * This is the internal storage format for MAC addresses: */ -typedef struct macaddr { - unsigned char a; - unsigned char b; - unsigned char c; - unsigned char d; - unsigned char e; - unsigned char f; -} macaddr; +typedef struct macaddr +{ + unsigned char a; + unsigned char b; + unsigned char c; + unsigned char d; + unsigned char e; + unsigned char f; +} macaddr; /* * Various forward declarations: */ -macaddr *macaddr_in(char *str); -char *macaddr_out(macaddr *addr); +macaddr *macaddr_in(char *str); +char *macaddr_out(macaddr * addr); -bool macaddr_lt(macaddr *a1, macaddr *a2); -bool macaddr_le(macaddr *a1, macaddr *a2); -bool macaddr_eq(macaddr *a1, macaddr *a2); -bool macaddr_ge(macaddr *a1, macaddr *a2); -bool macaddr_gt(macaddr *a1, macaddr *a2); +bool macaddr_lt(macaddr * a1, macaddr * a2); +bool macaddr_le(macaddr * a1, macaddr * a2); +bool macaddr_eq(macaddr * a1, macaddr * a2); +bool macaddr_ge(macaddr * a1, macaddr * a2); +bool macaddr_gt(macaddr * a1, macaddr * a2); -bool macaddr_ne(macaddr *a1, macaddr *a2); +bool macaddr_ne(macaddr * a1, macaddr * a2); -int4 macaddr_cmp(macaddr *a1, macaddr *a2); +int4 macaddr_cmp(macaddr * a1, macaddr * a2); -text *macaddr_manuf(macaddr *addr); +text *macaddr_manuf(macaddr * addr); /* * Utility macros used for sorting and comparing: @@ -57,147 +58,185 @@ text *macaddr_manuf(macaddr *addr); * MAC address reader. Accepts several common notations. */ -macaddr *macaddr_in(char *str) { - int a, b, c, d, e, f; - macaddr *result; - int count; - - if (strlen(str) > 0) { - - count = sscanf(str, "%x:%x:%x:%x:%x:%x", &a, &b, &c, &d, &e, &f); - if (count != 6) - count = sscanf(str, "%x-%x-%x-%x-%x-%x", &a, &b, &c, &d, &e, &f); - if (count != 6) - count = sscanf(str, "%2x%2x%2x:%2x%2x%2x", &a, &b, &c, &d, &e, &f); - if (count != 6) - count = sscanf(str, "%2x%2x%2x-%2x%2x%2x", &a, &b, &c, &d, &e, &f); - if (count != 6) - count = sscanf(str, "%2x%2x.%2x%2x.%2x%2x", &a, &b, &c, &d, &e, &f); - - if (count != 6) { - elog(ERROR, "macaddr_in: error in parsing \"%s\"", str); - return(NULL); - } - - if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || - (c < 0) || (c > 255) || (d < 0) || (d > 255) || - (e < 0) || (e > 255) || (f < 0) || (f > 255)) { - elog(ERROR, "macaddr_in: illegal address \"%s\"", str); - return(NULL); - } - } else { - a = b = c = d = e = f = 0; /* special case for missing address */ - } - - result = (macaddr *)palloc(sizeof(macaddr)); - - result->a = a; - result->b = b; - result->c = c; - result->d = d; - result->e = e; - result->f = f; - - return(result); +macaddr * +macaddr_in(char *str) +{ + int a, + b, + c, + d, + e, + f; + macaddr *result; + int count; + + if (strlen(str) > 0) + { + + count = sscanf(str, "%x:%x:%x:%x:%x:%x", &a, &b, &c, &d, &e, &f); + if (count != 6) + count = sscanf(str, "%x-%x-%x-%x-%x-%x", &a, &b, &c, &d, &e, &f); + if (count != 6) + count = sscanf(str, "%2x%2x%2x:%2x%2x%2x", &a, &b, &c, &d, &e, &f); + if (count != 6) + count = sscanf(str, "%2x%2x%2x-%2x%2x%2x", &a, &b, &c, &d, &e, &f); + if (count != 6) + count = sscanf(str, "%2x%2x.%2x%2x.%2x%2x", &a, &b, &c, &d, &e, &f); + + if (count != 6) + { + elog(ERROR, "macaddr_in: error in parsing \"%s\"", str); + return (NULL); + } + + if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || + (c < 0) || (c > 255) || (d < 0) || (d > 255) || + (e < 0) || (e > 255) || (f < 0) || (f > 255)) + { + elog(ERROR, "macaddr_in: illegal address \"%s\"", str); + return (NULL); + } + } + else + { + a = b = c = d = e = f = 0; /* special case for missing + * address */ + } + + result = (macaddr *) palloc(sizeof(macaddr)); + + result->a = a; + result->b = b; + result->c = c; + result->d = d; + result->e = e; + result->f = f; + + return (result); } /* * MAC address output function. Fixed format. */ -char *macaddr_out(macaddr *addr) { - char *result; - - if (addr == NULL) - return(NULL); - - result = (char *)palloc(32); - - if ((hibits(addr) > 0) || (lobits(addr) > 0)) { - sprintf(result, "%02x:%02x:%02x:%02x:%02x:%02x", - addr->a, addr->b, addr->c, addr->d, addr->e, addr->f); - } else { - result[0] = 0; /* special case for missing address */ - } - return(result); +char * +macaddr_out(macaddr * addr) +{ + char *result; + + if (addr == NULL) + return (NULL); + + result = (char *) palloc(32); + + if ((hibits(addr) > 0) || (lobits(addr) > 0)) + { + sprintf(result, "%02x:%02x:%02x:%02x:%02x:%02x", + addr->a, addr->b, addr->c, addr->d, addr->e, addr->f); + } + else + { + result[0] = 0; /* special case for missing address */ + } + return (result); } /* * Boolean tests. */ -bool macaddr_lt(macaddr *a1, macaddr *a2) { - return((hibits(a1) < hibits(a2)) || - ((hibits(a1) == hibits(a2)) && lobits(a1) < lobits(a2))); +bool +macaddr_lt(macaddr * a1, macaddr * a2) +{ + return ((hibits(a1) < hibits(a2)) || + ((hibits(a1) == hibits(a2)) && lobits(a1) < lobits(a2))); }; -bool macaddr_le(macaddr *a1, macaddr *a2) { - return((hibits(a1) < hibits(a2)) || - ((hibits(a1) == hibits(a2)) && lobits(a1) <= lobits(a2))); +bool +macaddr_le(macaddr * a1, macaddr * a2) +{ + return ((hibits(a1) < hibits(a2)) || + ((hibits(a1) == hibits(a2)) && lobits(a1) <= lobits(a2))); }; -bool macaddr_eq(macaddr *a1, macaddr *a2) { - return ((hibits(a1) == hibits(a2)) && (lobits(a1) == lobits(a2))); +bool +macaddr_eq(macaddr * a1, macaddr * a2) +{ + return ((hibits(a1) == hibits(a2)) && (lobits(a1) == lobits(a2))); }; -bool macaddr_ge(macaddr *a1, macaddr *a2) { - return((hibits(a1) > hibits(a2)) || - ((hibits(a1) == hibits(a2)) && lobits(a1) >= lobits(a2))); +bool +macaddr_ge(macaddr * a1, macaddr * a2) +{ + return ((hibits(a1) > hibits(a2)) || + ((hibits(a1) == hibits(a2)) && lobits(a1) >= lobits(a2))); }; -bool macaddr_gt(macaddr *a1, macaddr *a2) { - return((hibits(a1) > hibits(a2)) || - ((hibits(a1) == hibits(a2)) && lobits(a1) > lobits(a2))); +bool +macaddr_gt(macaddr * a1, macaddr * a2) +{ + return ((hibits(a1) > hibits(a2)) || + ((hibits(a1) == hibits(a2)) && lobits(a1) > lobits(a2))); }; -bool macaddr_ne(macaddr *a1, macaddr *a2) { - return ((hibits(a1) != hibits(a2)) || (lobits(a1) != lobits(a2))); +bool +macaddr_ne(macaddr * a1, macaddr * a2) +{ + return ((hibits(a1) != hibits(a2)) || (lobits(a1) != lobits(a2))); }; /* * Comparison function for sorting: */ -int4 macaddr_cmp(macaddr *a1, macaddr *a2) { - if (hibits(a1) < hibits(a2)) - return -1; - else if (hibits(a1) > hibits(a2)) - return 1; - else if (lobits(a1) < lobits(a2)) - return -1; - else if (lobits(a1) > lobits(a2)) - return 1; - else - return 0; +int4 +macaddr_cmp(macaddr * a1, macaddr * a2) +{ + if (hibits(a1) < hibits(a2)) + return -1; + else if (hibits(a1) > hibits(a2)) + return 1; + else if (lobits(a1) < lobits(a2)) + return -1; + else if (lobits(a1) > lobits(a2)) + return 1; + else + return 0; } /* * The special manufacturer fetching function. See "mac.h". */ -text *macaddr_manuf(macaddr *addr) { - manufacturer *manuf; - int length; - text *result; - - for (manuf = manufacturers; manuf->name != NULL; manuf++) { - if ((manuf->a == addr->a) && - (manuf->b == addr->b) && - (manuf->c == addr->c)) - break; - } - if (manuf->name == NULL) { - result = palloc(VARHDRSZ + 1); - memset(result, 0, VARHDRSZ + 1); - VARSIZE(result) = VARHDRSZ + 1; - } else { - length = strlen(manuf->name) + 1; - result = palloc(length + VARHDRSZ); - memset(result, 0, length + VARHDRSZ); - VARSIZE(result) = length + VARHDRSZ; - memcpy(VARDATA(result), manuf->name, length); - } - return result; +text * +macaddr_manuf(macaddr * addr) +{ + manufacturer *manuf; + int length; + text *result; + + for (manuf = manufacturers; manuf->name != NULL; manuf++) + { + if ((manuf->a == addr->a) && + (manuf->b == addr->b) && + (manuf->c == addr->c)) + break; + } + if (manuf->name == NULL) + { + result = palloc(VARHDRSZ + 1); + memset(result, 0, VARHDRSZ + 1); + VARSIZE(result) = VARHDRSZ + 1; + } + else + { + length = strlen(manuf->name) + 1; + result = palloc(length + VARHDRSZ); + memset(result, 0, length + VARHDRSZ); + VARSIZE(result) = length + VARHDRSZ; + memcpy(VARDATA(result), manuf->name, length); + } + return result; } /* diff --git a/contrib/ip_and_mac/mac.h b/contrib/ip_and_mac/mac.h index 27c4c1ec27..954dc05925 100644 --- a/contrib/ip_and_mac/mac.h +++ b/contrib/ip_and_mac/mac.h @@ -1,130 +1,131 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.h,v 1.2 1998/02/14 17:58:07 scrappy Exp $ + * $Id: mac.h,v 1.3 1998/02/26 04:27:50 momjian Exp $ */ -typedef struct manufacturer { - unsigned char a; - unsigned char b; - unsigned char c; - char *name; -} manufacturer; +typedef struct manufacturer +{ + unsigned char a; + unsigned char b; + unsigned char c; + char *name; +} manufacturer; manufacturer manufacturers[] = { - {0x00, 0x00, 0x0C, "Cisco"}, - {0x00, 0x00, 0x0E, "Fujitsu"}, - {0x00, 0x00, 0x0F, "NeXT"}, - {0x00, 0x00, 0x10, "Sytek"}, - {0x00, 0x00, 0x1D, "Cabletron"}, - {0x00, 0x00, 0x20, "DIAB"}, - {0x00, 0x00, 0x22, "Visual Technology"}, - {0x00, 0x00, 0x2A, "TRW"}, - {0x00, 0x00, 0x32, "GPT Limited"}, - {0x00, 0x00, 0x5A, "S & Koch"}, - {0x00, 0x00, 0x5E, "IANA"}, - {0x00, 0x00, 0x65, "Network General"}, - {0x00, 0x00, 0x6B, "MIPS"}, - {0x00, 0x00, 0x77, "MIPS"}, - {0x00, 0x00, 0x7A, "Ardent"}, - {0x00, 0x00, 0x89, "Cayman Systems"}, - {0x00, 0x00, 0x93, "Proteon"}, - {0x00, 0x00, 0x9F, "Ameristar Technology"}, - {0x00, 0x00, 0xA2, "Wellfleet"}, - {0x00, 0x00, 0xA3, "Network Application Technology"}, - {0x00, 0x00, 0xA6, "Network General"}, - {0x00, 0x00, 0xA7, "NCD"}, - {0x00, 0x00, 0xA9, "Network Systems"}, - {0x00, 0x00, 0xAA, "Xerox"}, - {0x00, 0x00, 0xB3, "CIMLinc"}, - {0x00, 0x00, 0xB7, "Dove Fastnet"}, - {0x00, 0x00, 0xBC, "Allen-Bradley"}, - {0x00, 0x00, 0xC0, "Western Digital"}, - {0x00, 0x00, 0xC5, "Farallon"}, - {0x00, 0x00, 0xC6, "Hewlett-Packard"}, - {0x00, 0x00, 0xC8, "Altos"}, - {0x00, 0x00, 0xC9, "Emulex"}, - {0x00, 0x00, 0xD7, "Dartmouth College"}, - {0x00, 0x00, 0xD8, "3Com (?)"}, - {0x00, 0x00, 0xDD, "Gould"}, - {0x00, 0x00, 0xDE, "Unigraph"}, - {0x00, 0x00, 0xE2, "Acer Counterpoint"}, - {0x00, 0x00, 0xEF, "Alantec"}, - {0x00, 0x00, 0xFD, "High Level Hardware"}, - {0x00, 0x01, 0x02, "BBN internal usage"}, - {0x00, 0x20, 0xAF, "3Com"}, - {0x00, 0x17, 0x00, "Kabel"}, - {0x00, 0x80, 0x64, "Wyse Technology"}, - {0x00, 0x80, 0x2B, "IMAC (?)"}, - {0x00, 0x80, 0x2D, "Xylogics, Inc."}, - {0x00, 0x80, 0x8C, "Frontier Software Development"}, - {0x00, 0x80, 0xC2, "IEEE 802.1 Committee"}, - {0x00, 0x80, 0xD3, "Shiva"}, - {0x00, 0xAA, 0x00, "Intel"}, - {0x00, 0xDD, 0x00, "Ungermann-Bass"}, - {0x00, 0xDD, 0x01, "Ungermann-Bass"}, - {0x02, 0x07, 0x01, "Racal InterLan"}, - {0x02, 0x04, 0x06, "BBN internal usage"}, - {0x02, 0x60, 0x86, "Satelcom MegaPac"}, - {0x02, 0x60, 0x8C, "3Com"}, - {0x02, 0xCF, 0x1F, "CMC"}, - {0x08, 0x00, 0x02, "3Com"}, - {0x08, 0x00, 0x03, "ACC"}, - {0x08, 0x00, 0x05, "Symbolics"}, - {0x08, 0x00, 0x08, "BBN"}, - {0x08, 0x00, 0x09, "Hewlett-Packard"}, - {0x08, 0x00, 0x0A, "Nestar Systems"}, - {0x08, 0x00, 0x0B, "Unisys"}, - {0x08, 0x00, 0x11, "Tektronix"}, - {0x08, 0x00, 0x14, "Excelan"}, - {0x08, 0x00, 0x17, "NSC"}, - {0x08, 0x00, 0x1A, "Data General"}, - {0x08, 0x00, 0x1B, "Data General"}, - {0x08, 0x00, 0x1E, "Apollo"}, - {0x08, 0x00, 0x20, "Sun"}, - {0x08, 0x00, 0x22, "NBI"}, - {0x08, 0x00, 0x25, "CDC"}, - {0x08, 0x00, 0x26, "Norsk Data"}, - {0x08, 0x00, 0x27, "PCS Computer Systems GmbH"}, - {0x08, 0x00, 0x28, "Texas Instruments"}, - {0x08, 0x00, 0x2B, "DEC"}, - {0x08, 0x00, 0x2E, "Metaphor"}, - {0x08, 0x00, 0x2F, "Prime Computer"}, - {0x08, 0x00, 0x36, "Intergraph"}, - {0x08, 0x00, 0x37, "Fujitsu-Xerox"}, - {0x08, 0x00, 0x38, "Bull"}, - {0x08, 0x00, 0x39, "Spider Systems"}, - {0x08, 0x00, 0x41, "DCA Digital Comm. Assoc."}, - {0x08, 0x00, 0x45, "Xylogics (?)"}, - {0x08, 0x00, 0x46, "Sony"}, - {0x08, 0x00, 0x47, "Sequent"}, - {0x08, 0x00, 0x49, "Univation"}, - {0x08, 0x00, 0x4C, "Encore"}, - {0x08, 0x00, 0x4E, "BICC"}, - {0x08, 0x00, 0x56, "Stanford University"}, - {0x08, 0x00, 0x58, "DECsystem 20 (?)"}, - {0x08, 0x00, 0x5A, "IBM"}, - {0x08, 0x00, 0x67, "Comdesign"}, - {0x08, 0x00, 0x68, "Ridge"}, - {0x08, 0x00, 0x69, "Silicon Graphics"}, - {0x08, 0x00, 0x6E, "Concurrent"}, - {0x08, 0x00, 0x75, "DDE"}, - {0x08, 0x00, 0x7C, "Vitalink"}, - {0x08, 0x00, 0x80, "XIOS"}, - {0x08, 0x00, 0x86, "Imagen/QMS"}, - {0x08, 0x00, 0x87, "Xyplex"}, - {0x08, 0x00, 0x89, "Kinetics"}, - {0x08, 0x00, 0x8B, "Pyramid"}, - {0x08, 0x00, 0x8D, "XyVision"}, - {0x08, 0x00, 0x90, "Retix Inc"}, - {0x48, 0x44, 0x53, "HDS (?)"}, - {0x80, 0x00, 0x10, "AT&T"}, - {0xAA, 0x00, 0x00, "DEC"}, - {0xAA, 0x00, 0x01, "DEC"}, - {0xAA, 0x00, 0x02, "DEC"}, - {0xAA, 0x00, 0x03, "DEC"}, - {0xAA, 0x00, 0x04, "DEC"}, - {0x00, 0x00, 0x00, NULL} + {0x00, 0x00, 0x0C, "Cisco"}, + {0x00, 0x00, 0x0E, "Fujitsu"}, + {0x00, 0x00, 0x0F, "NeXT"}, + {0x00, 0x00, 0x10, "Sytek"}, + {0x00, 0x00, 0x1D, "Cabletron"}, + {0x00, 0x00, 0x20, "DIAB"}, + {0x00, 0x00, 0x22, "Visual Technology"}, + {0x00, 0x00, 0x2A, "TRW"}, + {0x00, 0x00, 0x32, "GPT Limited"}, + {0x00, 0x00, 0x5A, "S & Koch"}, + {0x00, 0x00, 0x5E, "IANA"}, + {0x00, 0x00, 0x65, "Network General"}, + {0x00, 0x00, 0x6B, "MIPS"}, + {0x00, 0x00, 0x77, "MIPS"}, + {0x00, 0x00, 0x7A, "Ardent"}, + {0x00, 0x00, 0x89, "Cayman Systems"}, + {0x00, 0x00, 0x93, "Proteon"}, + {0x00, 0x00, 0x9F, "Ameristar Technology"}, + {0x00, 0x00, 0xA2, "Wellfleet"}, + {0x00, 0x00, 0xA3, "Network Application Technology"}, + {0x00, 0x00, 0xA6, "Network General"}, + {0x00, 0x00, 0xA7, "NCD"}, + {0x00, 0x00, 0xA9, "Network Systems"}, + {0x00, 0x00, 0xAA, "Xerox"}, + {0x00, 0x00, 0xB3, "CIMLinc"}, + {0x00, 0x00, 0xB7, "Dove Fastnet"}, + {0x00, 0x00, 0xBC, "Allen-Bradley"}, + {0x00, 0x00, 0xC0, "Western Digital"}, + {0x00, 0x00, 0xC5, "Farallon"}, + {0x00, 0x00, 0xC6, "Hewlett-Packard"}, + {0x00, 0x00, 0xC8, "Altos"}, + {0x00, 0x00, 0xC9, "Emulex"}, + {0x00, 0x00, 0xD7, "Dartmouth College"}, + {0x00, 0x00, 0xD8, "3Com (?)"}, + {0x00, 0x00, 0xDD, "Gould"}, + {0x00, 0x00, 0xDE, "Unigraph"}, + {0x00, 0x00, 0xE2, "Acer Counterpoint"}, + {0x00, 0x00, 0xEF, "Alantec"}, + {0x00, 0x00, 0xFD, "High Level Hardware"}, + {0x00, 0x01, 0x02, "BBN internal usage"}, + {0x00, 0x20, 0xAF, "3Com"}, + {0x00, 0x17, 0x00, "Kabel"}, + {0x00, 0x80, 0x64, "Wyse Technology"}, + {0x00, 0x80, 0x2B, "IMAC (?)"}, + {0x00, 0x80, 0x2D, "Xylogics, Inc."}, + {0x00, 0x80, 0x8C, "Frontier Software Development"}, + {0x00, 0x80, 0xC2, "IEEE 802.1 Committee"}, + {0x00, 0x80, 0xD3, "Shiva"}, + {0x00, 0xAA, 0x00, "Intel"}, + {0x00, 0xDD, 0x00, "Ungermann-Bass"}, + {0x00, 0xDD, 0x01, "Ungermann-Bass"}, + {0x02, 0x07, 0x01, "Racal InterLan"}, + {0x02, 0x04, 0x06, "BBN internal usage"}, + {0x02, 0x60, 0x86, "Satelcom MegaPac"}, + {0x02, 0x60, 0x8C, "3Com"}, + {0x02, 0xCF, 0x1F, "CMC"}, + {0x08, 0x00, 0x02, "3Com"}, + {0x08, 0x00, 0x03, "ACC"}, + {0x08, 0x00, 0x05, "Symbolics"}, + {0x08, 0x00, 0x08, "BBN"}, + {0x08, 0x00, 0x09, "Hewlett-Packard"}, + {0x08, 0x00, 0x0A, "Nestar Systems"}, + {0x08, 0x00, 0x0B, "Unisys"}, + {0x08, 0x00, 0x11, "Tektronix"}, + {0x08, 0x00, 0x14, "Excelan"}, + {0x08, 0x00, 0x17, "NSC"}, + {0x08, 0x00, 0x1A, "Data General"}, + {0x08, 0x00, 0x1B, "Data General"}, + {0x08, 0x00, 0x1E, "Apollo"}, + {0x08, 0x00, 0x20, "Sun"}, + {0x08, 0x00, 0x22, "NBI"}, + {0x08, 0x00, 0x25, "CDC"}, + {0x08, 0x00, 0x26, "Norsk Data"}, + {0x08, 0x00, 0x27, "PCS Computer Systems GmbH"}, + {0x08, 0x00, 0x28, "Texas Instruments"}, + {0x08, 0x00, 0x2B, "DEC"}, + {0x08, 0x00, 0x2E, "Metaphor"}, + {0x08, 0x00, 0x2F, "Prime Computer"}, + {0x08, 0x00, 0x36, "Intergraph"}, + {0x08, 0x00, 0x37, "Fujitsu-Xerox"}, + {0x08, 0x00, 0x38, "Bull"}, + {0x08, 0x00, 0x39, "Spider Systems"}, + {0x08, 0x00, 0x41, "DCA Digital Comm. Assoc."}, + {0x08, 0x00, 0x45, "Xylogics (?)"}, + {0x08, 0x00, 0x46, "Sony"}, + {0x08, 0x00, 0x47, "Sequent"}, + {0x08, 0x00, 0x49, "Univation"}, + {0x08, 0x00, 0x4C, "Encore"}, + {0x08, 0x00, 0x4E, "BICC"}, + {0x08, 0x00, 0x56, "Stanford University"}, + {0x08, 0x00, 0x58, "DECsystem 20 (?)"}, + {0x08, 0x00, 0x5A, "IBM"}, + {0x08, 0x00, 0x67, "Comdesign"}, + {0x08, 0x00, 0x68, "Ridge"}, + {0x08, 0x00, 0x69, "Silicon Graphics"}, + {0x08, 0x00, 0x6E, "Concurrent"}, + {0x08, 0x00, 0x75, "DDE"}, + {0x08, 0x00, 0x7C, "Vitalink"}, + {0x08, 0x00, 0x80, "XIOS"}, + {0x08, 0x00, 0x86, "Imagen/QMS"}, + {0x08, 0x00, 0x87, "Xyplex"}, + {0x08, 0x00, 0x89, "Kinetics"}, + {0x08, 0x00, 0x8B, "Pyramid"}, + {0x08, 0x00, 0x8D, "XyVision"}, + {0x08, 0x00, 0x90, "Retix Inc"}, + {0x48, 0x44, 0x53, "HDS (?)"}, + {0x80, 0x00, 0x10, "AT&T"}, + {0xAA, 0x00, 0x00, "DEC"}, + {0xAA, 0x00, 0x01, "DEC"}, + {0xAA, 0x00, 0x02, "DEC"}, + {0xAA, 0x00, 0x03, "DEC"}, + {0xAA, 0x00, 0x04, "DEC"}, + {0x00, 0x00, 0x00, NULL} }; /* diff --git a/contrib/miscutil/assert_test.c b/contrib/miscutil/assert_test.c index fa2ec1fcaa..793f585e51 100644 --- a/contrib/miscutil/assert_test.c +++ b/contrib/miscutil/assert_test.c @@ -9,19 +9,19 @@ #include "postgres.h" #include "assert_test.h" -extern int assertTest(int val); -extern int assertEnable(int val); +extern int assertTest(int val); +extern int assertEnable(int val); int assert_enable(int val) { - return assertEnable(val); + return assertEnable(val); } int assert_test(int val) { - return assertTest(val); + return assertTest(val); } /* @@ -29,14 +29,14 @@ assert_test(int val) -- Enable/disable Postgres assert checking. -- create function assert_enable(int4) returns int4 - as '/usr/local/pgsql/lib/assert_test.so' - language 'C'; + as '/usr/local/pgsql/lib/assert_test.so' + language 'C'; -- Test Postgres assert checking. -- create function assert_test(int4) returns int4 - as '/usr/local/pgsql/lib/assert_test.so' - language 'C'; + as '/usr/local/pgsql/lib/assert_test.so' + language 'C'; */ diff --git a/contrib/miscutil/assert_test.h b/contrib/miscutil/assert_test.h index 2af288729a..73b3938e06 100644 --- a/contrib/miscutil/assert_test.h +++ b/contrib/miscutil/assert_test.h @@ -1,7 +1,7 @@ #ifndef ASSERT_TEST_H #define ASSERT_TEST_H -int assert_enable(int val); -int assert_test(int val); +int assert_enable(int val); +int assert_test(int val); #endif diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c index 3b8f379d21..b787457e3f 100644 --- a/contrib/miscutil/misc_utils.c +++ b/contrib/miscutil/misc_utils.c @@ -13,38 +13,38 @@ #include "misc_utils.h" -extern int ExecutorLimit(int limit); +extern int ExecutorLimit(int limit); extern void Async_Unlisten(char *relname, int pid); int query_limit(int limit) { - return ExecutorLimit(limit); + return ExecutorLimit(limit); } int backend_pid() { - return getpid(); + return getpid(); } int unlisten(char *relname) { - Async_Unlisten(relname, getpid()); - return 0; + Async_Unlisten(relname, getpid()); + return 0; } int max(int x, int y) { - return ((x > y) ? x : y); + return ((x > y) ? x : y); } int min(int x, int y) { - return ((x < y) ? x : y); + return ((x < y) ? x : y); } /* end of file */ diff --git a/contrib/miscutil/misc_utils.h b/contrib/miscutil/misc_utils.h index 7dd583c264..a87c71b244 100644 --- a/contrib/miscutil/misc_utils.h +++ b/contrib/miscutil/misc_utils.h @@ -1,10 +1,10 @@ #ifndef MISC_UTILS_H #define MISC_UTILS_H -int query_limit(int limit); -int backend_pid(void); -int unlisten(char *relname); -int max(int x, int y); -int min(int x, int y); +int query_limit(int limit); +int backend_pid(void); +int unlisten(char *relname); +int max(int x, int y); +int min(int x, int y); #endif diff --git a/contrib/pginterface/pginterface.c b/contrib/pginterface/pginterface.c index 1335baa192..3c19943c26 100644 --- a/contrib/pginterface/pginterface.c +++ b/contrib/pginterface/pginterface.c @@ -30,7 +30,7 @@ static int tuple; ** connectdb - returns PGconn structure ** */ -PGconn * +PGconn * connectdb(char *dbName, char *pghost, char *pgport, diff --git a/contrib/sequence/set_sequence.c b/contrib/sequence/set_sequence.c index 7468efb5fd..713421f822 100644 --- a/contrib/sequence/set_sequence.c +++ b/contrib/sequence/set_sequence.c @@ -12,30 +12,30 @@ #include "set_sequence.h" -extern int setval(struct varlena *seqin, int4 val); +extern int setval(struct varlena * seqin, int4 val); int -set_currval(struct varlena *sequence, int4 nextval) +set_currval(struct varlena * sequence, int4 nextval) { - return setval(sequence, nextval); + return setval(sequence, nextval); } int -next_id(struct varlena *sequence) +next_id(struct varlena * sequence) { - return nextval(sequence); + return nextval(sequence); } int -last_id(struct varlena *sequence) +last_id(struct varlena * sequence) { - return currval(sequence); + return currval(sequence); } int -set_last_id(struct varlena *sequence, int4 nextval) +set_last_id(struct varlena * sequence, int4 nextval) { - return setval(sequence, nextval); + return setval(sequence, nextval); } /* end of file */ diff --git a/contrib/sequence/set_sequence.h b/contrib/sequence/set_sequence.h index f5c6294966..992adcc02b 100644 --- a/contrib/sequence/set_sequence.h +++ b/contrib/sequence/set_sequence.h @@ -1,9 +1,9 @@ #ifndef SET_SEQUENCE_H #define SET_SEQUENCE_H -int set_currval(struct varlena *sequence, int4 nextval); -int next_id(struct varlena *sequence); -int last_id(struct varlena *sequence); -int set_last_id(struct varlena *sequence, int4 nextval); +int set_currval(struct varlena * sequence, int4 nextval); +int next_id(struct varlena * sequence); +int last_id(struct varlena * sequence); +int set_last_id(struct varlena * sequence, int4 nextval); #endif diff --git a/contrib/soundex/soundex.c b/contrib/soundex/soundex.c index 20b99759a1..df0c8366b9 100644 --- a/contrib/soundex/soundex.c +++ b/contrib/soundex/soundex.c @@ -13,7 +13,7 @@ /* prototype for soundex function */ char *soundex(char *instr, char *outstr); -text * +text * text_soundex(text *t) { /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ @@ -47,7 +47,7 @@ text_soundex(text *t) return (new_t); } -char * +char * soundex(char *instr, char *outstr) { /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ char *table = "01230120022455012623010202"; diff --git a/contrib/spi/autoinc.c b/contrib/spi/autoinc.c index 57ad37dbf4..c7caf3c842 100644 --- a/contrib/spi/autoinc.c +++ b/contrib/spi/autoinc.c @@ -2,9 +2,9 @@ #include "executor/spi.h" /* this is what you need to work with SPI */ #include "commands/trigger.h" /* -"- and triggers */ -HeapTuple autoinc(void); +HeapTuple autoinc(void); -extern int4 nextval(struct varlena * seqin); +extern int4 nextval(struct varlena * seqin); HeapTuple autoinc() @@ -28,73 +28,73 @@ autoinc() elog(ERROR, "autoinc: can't process STATEMENT events"); if (TRIGGER_FIRED_AFTER(CurrentTriggerData->tg_event)) elog(ERROR, "autoinc: must be fired before event"); - + if (TRIGGER_FIRED_BY_INSERT(CurrentTriggerData->tg_event)) rettuple = CurrentTriggerData->tg_trigtuple; else if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event)) rettuple = CurrentTriggerData->tg_newtuple; else elog(ERROR, "autoinc: can't process DELETE events"); - + rel = CurrentTriggerData->tg_relation; relname = SPI_getrelname(rel); - + trigger = CurrentTriggerData->tg_trigger; nargs = trigger->tgnargs; if (nargs <= 0 || nargs % 2 != 0) elog(ERROR, "autoinc (%s): even number gt 0 of arguments was expected", relname); - + args = trigger->tgargs; tupdesc = rel->rd_att; - + CurrentTriggerData = NULL; - - chattrs = (int *) palloc (nargs/2 * sizeof (int)); - newvals = (Datum *) palloc (nargs/2 * sizeof (Datum)); - - for (i = 0; i < nargs; ) + + chattrs = (int *) palloc(nargs / 2 * sizeof(int)); + newvals = (Datum *) palloc(nargs / 2 * sizeof(Datum)); + + for (i = 0; i < nargs;) { - struct varlena *seqname; - int attnum = SPI_fnumber (tupdesc, args[i]); - int32 val; - - if ( attnum < 0 ) + struct varlena *seqname; + int attnum = SPI_fnumber(tupdesc, args[i]); + int32 val; + + if (attnum < 0) elog(ERROR, "autoinc (%s): there is no attribute %s", relname, args[i]); - if (SPI_gettypeid (tupdesc, attnum) != INT4OID) - elog(ERROR, "autoinc (%s): attribute %s must be of INT4 type", - relname, args[i]); - - val = DatumGetInt32 (SPI_getbinval (rettuple, tupdesc, attnum, &isnull)); - + if (SPI_gettypeid(tupdesc, attnum) != INT4OID) + elog(ERROR, "autoinc (%s): attribute %s must be of INT4 type", + relname, args[i]); + + val = DatumGetInt32(SPI_getbinval(rettuple, tupdesc, attnum, &isnull)); + if (!isnull && val != 0) { i += 2; continue; } - + i++; chattrs[chnattrs] = attnum; - seqname = textin (args[i]); - newvals[chnattrs] = Int32GetDatum (nextval (seqname)); - if ( DatumGetInt32 (newvals[chnattrs]) == 0 ) - newvals[chnattrs] = Int32GetDatum (nextval (seqname)); - pfree (seqname); + seqname = textin(args[i]); + newvals[chnattrs] = Int32GetDatum(nextval(seqname)); + if (DatumGetInt32(newvals[chnattrs]) == 0) + newvals[chnattrs] = Int32GetDatum(nextval(seqname)); + pfree(seqname); chnattrs++; i++; } - + if (chnattrs > 0) { - rettuple = SPI_modifytuple (rel, rettuple, chnattrs, chattrs, newvals, NULL); - if ( rettuple == NULL ) - elog (ERROR, "autoinc (%s): %d returned by SPI_modifytuple", - relname, SPI_result); + rettuple = SPI_modifytuple(rel, rettuple, chnattrs, chattrs, newvals, NULL); + if (rettuple == NULL) + elog(ERROR, "autoinc (%s): %d returned by SPI_modifytuple", + relname, SPI_result); } - - pfree (relname); - pfree (chattrs); - pfree (newvals); + + pfree(relname); + pfree(chattrs); + pfree(newvals); return (rettuple); } diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c index cd0fdfc0bb..b53d5e4088 100644 --- a/contrib/spi/insert_username.c +++ b/contrib/spi/insert_username.c @@ -7,71 +7,71 @@ */ #include "executor/spi.h" /* this is what you need to work with SPI */ -#include "commands/trigger.h" /* -"- and triggers */ +#include "commands/trigger.h" /* -"- and triggers */ #include "miscadmin.h" /* for GetPgUserName() */ -HeapTuple insert_username (void); +HeapTuple insert_username(void); HeapTuple -insert_username () +insert_username() { - Trigger *trigger; /* to get trigger name */ + Trigger *trigger; /* to get trigger name */ int nargs; /* # of arguments */ Datum newval; /* new value of column */ - char **args; /* arguments */ - char *relname; /* triggered relation name */ + char **args; /* arguments */ + char *relname; /* triggered relation name */ Relation rel; /* triggered relation */ HeapTuple rettuple = NULL; TupleDesc tupdesc; /* tuple description */ int attnum; - /* sanity checks from autoinc.c */ + /* sanity checks from autoinc.c */ if (!CurrentTriggerData) elog(ERROR, "insert_username: triggers are not initialized"); if (TRIGGER_FIRED_FOR_STATEMENT(CurrentTriggerData->tg_event)) elog(ERROR, "insert_username: can't process STATEMENT events"); if (TRIGGER_FIRED_AFTER(CurrentTriggerData->tg_event)) elog(ERROR, "insert_username: must be fired before event"); - + if (TRIGGER_FIRED_BY_INSERT(CurrentTriggerData->tg_event)) rettuple = CurrentTriggerData->tg_trigtuple; else if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event)) rettuple = CurrentTriggerData->tg_newtuple; else elog(ERROR, "insert_username: can't process DELETE events"); - + rel = CurrentTriggerData->tg_relation; relname = SPI_getrelname(rel); - + trigger = CurrentTriggerData->tg_trigger; nargs = trigger->tgnargs; if (nargs != 1) elog(ERROR, "insert_username (%s): one argument was expected", relname); - + args = trigger->tgargs; tupdesc = rel->rd_att; - + CurrentTriggerData = NULL; - - attnum = SPI_fnumber (tupdesc, args[0]); - - if ( attnum < 0 ) + + attnum = SPI_fnumber(tupdesc, args[0]); + + if (attnum < 0) elog(ERROR, "insert_username (%s): there is no attribute %s", relname, args[0]); - if (SPI_gettypeid (tupdesc, attnum) != TEXTOID) - elog(ERROR, "insert_username (%s): attribute %s must be of TEXT type", - relname, args[0]); - - /* create fields containing name */ - newval = PointerGetDatum (textin (GetPgUserName ())); - - /* construct new tuple */ - rettuple = SPI_modifytuple (rel, rettuple, 1, &attnum, &newval, NULL); - if ( rettuple == NULL ) - elog (ERROR, "insert_username (%s): %d returned by SPI_modifytuple", - relname, SPI_result); - - pfree (relname); + if (SPI_gettypeid(tupdesc, attnum) != TEXTOID) + elog(ERROR, "insert_username (%s): attribute %s must be of TEXT type", + relname, args[0]); + + /* create fields containing name */ + newval = PointerGetDatum(textin(GetPgUserName())); + + /* construct new tuple */ + rettuple = SPI_modifytuple(rel, rettuple, 1, &attnum, &newval, NULL); + if (rettuple == NULL) + elog(ERROR, "insert_username (%s): %d returned by SPI_modifytuple", + relname, SPI_result); + + pfree(relname); return (rettuple); } diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index 5fc9bfa4ce..954e12c590 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -190,7 +190,7 @@ check_primary_key() * Ok, execute prepared plan. */ ret = SPI_execp(*(plan->splan), kvals, NULL, 1); - /* we have no NULLs - so we pass ^^^^ here */ + /* we have no NULLs - so we pass ^^^^ here */ if (ret < 0) elog(ERROR, "check_primary_key: SPI_execp returned %d", ret); @@ -481,7 +481,7 @@ check_foreign_key() relname = args[0]; ret = SPI_execp(plan->splan[r], kvals, NULL, tcount); - /* we have no NULLs - so we pass ^^^^ here */ + /* we have no NULLs - so we pass ^^^^ here */ if (ret < 0) elog(ERROR, "check_foreign_key: SPI_execp returned %d", ret); diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c index 270095acbf..89d3f13e41 100644 --- a/contrib/spi/timetravel.c +++ b/contrib/spi/timetravel.c @@ -9,38 +9,38 @@ #define ABSTIMEOID 702 /* it should be in pg_type.h */ -AbsoluteTime currabstime(void); -HeapTuple timetravel(void); -int32 set_timetravel(Name relname, int32 on); +AbsoluteTime currabstime(void); +HeapTuple timetravel(void); +int32 set_timetravel(Name relname, int32 on); typedef struct { - char *ident; - void *splan; -} EPlan; + char *ident; + void *splan; +} EPlan; static EPlan *Plans = NULL; /* for UPDATE/DELETE */ static int nPlans = 0; -static char **TTOff = NULL; -static int nTTOff = 0; +static char **TTOff = NULL; +static int nTTOff = 0; static EPlan *find_plan(char *ident, EPlan ** eplan, int *nplans); /* - * timetravel () -- - * 1. IF an update affects tuple with stop_date eq INFINITY - * then form (and return) new tuple with stop_date eq current date - * and all other column values as in old tuple, and insert tuple - * with new data and start_date eq current date and - * stop_date eq INFINITY - * ELSE - skip updation of tuple. - * 2. IF an delete affects tuple with stop_date eq INFINITY - * then insert the same tuple with stop_date eq current date - * ELSE - skip deletion of tuple. - * 3. On INSERT, if start_date is NULL then current date will be - * inserted, if stop_date is NULL then INFINITY will be inserted. - * + * timetravel () -- + * 1. IF an update affects tuple with stop_date eq INFINITY + * then form (and return) new tuple with stop_date eq current date + * and all other column values as in old tuple, and insert tuple + * with new data and start_date eq current date and + * stop_date eq INFINITY + * ELSE - skip updation of tuple. + * 2. IF an delete affects tuple with stop_date eq INFINITY + * then insert the same tuple with stop_date eq current date + * ELSE - skip deletion of tuple. + * 3. On INSERT, if start_date is NULL then current date will be + * inserted, if stop_date is NULL then INFINITY will be inserted. + * * In CREATE TRIGGER you are to specify start_date and stop_date column * names: * EXECUTE PROCEDURE @@ -53,8 +53,10 @@ timetravel() Trigger *trigger; /* to get trigger name */ char **args; /* arguments */ int attnum[2]; /* fnumbers of start/stop columns */ - Datum oldon, oldoff; - Datum newon, newoff; + Datum oldon, + oldoff; + Datum newon, + newoff; Datum *cvals; /* column values */ char *cnulls; /* column nulls */ char *relname; /* triggered relation name */ @@ -78,11 +80,11 @@ timetravel() /* Called by trigger manager ? */ if (!CurrentTriggerData) elog(ERROR, "timetravel: triggers are not initialized"); - + /* Should be called for ROW trigger */ if (TRIGGER_FIRED_FOR_STATEMENT(CurrentTriggerData->tg_event)) elog(ERROR, "timetravel: can't process STATEMENT events"); - + /* Should be called BEFORE */ if (TRIGGER_FIRED_AFTER(CurrentTriggerData->tg_event)) elog(ERROR, "timetravel: must be fired before event"); @@ -90,196 +92,197 @@ timetravel() /* INSERT ? */ if (TRIGGER_FIRED_BY_INSERT(CurrentTriggerData->tg_event)) isinsert = true; - + if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event)) newtuple = CurrentTriggerData->tg_newtuple; - + trigtuple = CurrentTriggerData->tg_trigtuple; - + rel = CurrentTriggerData->tg_relation; relname = SPI_getrelname(rel); - + /* check if TT is OFF for this relation */ for (i = 0; i < nTTOff; i++) - if (strcasecmp (TTOff[i], relname) == 0) + if (strcasecmp(TTOff[i], relname) == 0) break; if (i < nTTOff) /* OFF - nothing to do */ { - pfree (relname); + pfree(relname); return ((newtuple != NULL) ? newtuple : trigtuple); } - + trigger = CurrentTriggerData->tg_trigger; if (trigger->tgnargs != 2) - elog(ERROR, "timetravel (%s): invalid (!= 2) number of arguments %d", - relname, trigger->tgnargs); - + elog(ERROR, "timetravel (%s): invalid (!= 2) number of arguments %d", + relname, trigger->tgnargs); + args = trigger->tgargs; tupdesc = rel->rd_att; natts = tupdesc->natts; - + /* * Setting CurrentTriggerData to NULL prevents direct calls to trigger * functions in queries. Normally, trigger functions have to be called * by trigger manager code only. */ CurrentTriggerData = NULL; - - for (i = 0; i < 2; i++ ) + + for (i = 0; i < 2; i++) { - attnum[i] = SPI_fnumber (tupdesc, args[i]); - if ( attnum[i] < 0 ) + attnum[i] = SPI_fnumber(tupdesc, args[i]); + if (attnum[i] < 0) elog(ERROR, "timetravel (%s): there is no attribute %s", relname, args[i]); - if (SPI_gettypeid (tupdesc, attnum[i]) != ABSTIMEOID) - elog(ERROR, "timetravel (%s): attributes %s and %s must be of abstime type", - relname, args[0], args[1]); + if (SPI_gettypeid(tupdesc, attnum[i]) != ABSTIMEOID) + elog(ERROR, "timetravel (%s): attributes %s and %s must be of abstime type", + relname, args[0], args[1]); } - - if (isinsert) /* INSERT */ + + if (isinsert) /* INSERT */ { - int chnattrs = 0; - int chattrs[2]; - Datum newvals[2]; - - oldon = SPI_getbinval (trigtuple, tupdesc, attnum[0], &isnull); + int chnattrs = 0; + int chattrs[2]; + Datum newvals[2]; + + oldon = SPI_getbinval(trigtuple, tupdesc, attnum[0], &isnull); if (isnull) { - newvals[chnattrs] = GetCurrentAbsoluteTime (); + newvals[chnattrs] = GetCurrentAbsoluteTime(); chattrs[chnattrs] = attnum[0]; chnattrs++; } - - oldoff = SPI_getbinval (trigtuple, tupdesc, attnum[1], &isnull); + + oldoff = SPI_getbinval(trigtuple, tupdesc, attnum[1], &isnull); if (isnull) { - if ((chnattrs == 0 && DatumGetInt32 (oldon) >= NOEND_ABSTIME) || - (chnattrs > 0 && DatumGetInt32 (newvals[0]) >= NOEND_ABSTIME)) - elog (ERROR, "timetravel (%s): %s ge %s", - relname, args[0], args[1]); + if ((chnattrs == 0 && DatumGetInt32(oldon) >= NOEND_ABSTIME) || + (chnattrs > 0 && DatumGetInt32(newvals[0]) >= NOEND_ABSTIME)) + elog(ERROR, "timetravel (%s): %s ge %s", + relname, args[0], args[1]); newvals[chnattrs] = NOEND_ABSTIME; chattrs[chnattrs] = attnum[1]; chnattrs++; } else { - if ((chnattrs == 0 && DatumGetInt32 (oldon) >= - DatumGetInt32 (oldoff)) || - (chnattrs > 0 && DatumGetInt32 (newvals[0]) >= - DatumGetInt32 (oldoff))) - elog (ERROR, "timetravel (%s): %s ge %s", - relname, args[0], args[1]); + if ((chnattrs == 0 && DatumGetInt32(oldon) >= + DatumGetInt32(oldoff)) || + (chnattrs > 0 && DatumGetInt32(newvals[0]) >= + DatumGetInt32(oldoff))) + elog(ERROR, "timetravel (%s): %s ge %s", + relname, args[0], args[1]); } - - pfree (relname); - if ( chnattrs <= 0 ) + + pfree(relname); + if (chnattrs <= 0) return (trigtuple); - - rettuple = SPI_modifytuple (rel, trigtuple, chnattrs, - chattrs, newvals, NULL); + + rettuple = SPI_modifytuple(rel, trigtuple, chnattrs, + chattrs, newvals, NULL); return (rettuple); } - - oldon = SPI_getbinval (trigtuple, tupdesc, attnum[0], &isnull); + + oldon = SPI_getbinval(trigtuple, tupdesc, attnum[0], &isnull); if (isnull) elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[0]); - - oldoff = SPI_getbinval (trigtuple, tupdesc, attnum[1], &isnull); + + oldoff = SPI_getbinval(trigtuple, tupdesc, attnum[1], &isnull); if (isnull) elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[1]); + /* - * If DELETE/UPDATE of tuple with stop_date neq INFINITY - * then say upper Executor to skip operation for this tuple + * If DELETE/UPDATE of tuple with stop_date neq INFINITY then say + * upper Executor to skip operation for this tuple */ - if (newtuple != NULL) /* UPDATE */ + if (newtuple != NULL) /* UPDATE */ { - newon = SPI_getbinval (newtuple, tupdesc, attnum[0], &isnull); + newon = SPI_getbinval(newtuple, tupdesc, attnum[0], &isnull); if (isnull) elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[0]); - newoff = SPI_getbinval (newtuple, tupdesc, attnum[1], &isnull); + newoff = SPI_getbinval(newtuple, tupdesc, attnum[1], &isnull); if (isnull) elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[1]); - - if ( oldon != newon || oldoff != newoff ) - elog (ERROR, "timetravel (%s): you can't change %s and/or %s columns (use set_timetravel)", - relname, args[0], args[1]); - - if ( newoff != NOEND_ABSTIME ) + + if (oldon != newon || oldoff != newoff) + elog(ERROR, "timetravel (%s): you can't change %s and/or %s columns (use set_timetravel)", + relname, args[0], args[1]); + + if (newoff != NOEND_ABSTIME) { - pfree (relname); /* allocated in upper executor context */ + pfree(relname); /* allocated in upper executor context */ return (NULL); } } - else if (oldoff != NOEND_ABSTIME) /* DELETE */ + else if (oldoff != NOEND_ABSTIME) /* DELETE */ { - pfree (relname); + pfree(relname); return (NULL); } - - newoff = GetCurrentAbsoluteTime (); - + + newoff = GetCurrentAbsoluteTime(); + /* Connect to SPI manager */ if ((ret = SPI_connect()) < 0) elog(ERROR, "timetravel (%s): SPI_connect returned %d", relname, ret); - + /* Fetch tuple values and nulls */ - cvals = (Datum *) palloc (natts * sizeof (Datum)); - cnulls = (char *) palloc (natts * sizeof (char)); + cvals = (Datum *) palloc(natts * sizeof(Datum)); + cnulls = (char *) palloc(natts * sizeof(char)); for (i = 0; i < natts; i++) { - cvals[i] = SPI_getbinval ((newtuple != NULL) ? newtuple : trigtuple, - tupdesc, i + 1, &isnull); + cvals[i] = SPI_getbinval((newtuple != NULL) ? newtuple : trigtuple, + tupdesc, i + 1, &isnull); cnulls[i] = (isnull) ? 'n' : ' '; } - + /* change date column(s) */ - if (newtuple) /* UPDATE */ + if (newtuple) /* UPDATE */ { - cvals[attnum[0] - 1] = newoff; /* start_date eq current date */ + cvals[attnum[0] - 1] = newoff; /* start_date eq current date */ cnulls[attnum[0] - 1] = ' '; cvals[attnum[1] - 1] = NOEND_ABSTIME; /* stop_date eq INFINITY */ cnulls[attnum[1] - 1] = ' '; } - else /* DELETE */ + else +/* DELETE */ { - cvals[attnum[1] - 1] = newoff; /* stop_date eq current date */ + cvals[attnum[1] - 1] = newoff; /* stop_date eq current date */ cnulls[attnum[1] - 1] = ' '; } - + /* - * Construct ident string as TriggerName $ TriggeredRelationId - * and try to find prepared execution plan. + * Construct ident string as TriggerName $ TriggeredRelationId and try + * to find prepared execution plan. */ sprintf(ident, "%s$%u", trigger->tgname, rel->rd_id); plan = find_plan(ident, &Plans, &nPlans); - + /* if there is no plan ... */ if (plan->splan == NULL) { void *pplan; Oid *ctypes; char sql[8192]; - + /* allocate ctypes for preparation */ ctypes = (Oid *) palloc(natts * sizeof(Oid)); - + /* - * Construct query: - * INSERT INTO _relation_ VALUES ($1, ...) + * Construct query: INSERT INTO _relation_ VALUES ($1, ...) */ sprintf(sql, "INSERT INTO %s VALUES (", relname); for (i = 1; i <= natts; i++) { sprintf(sql + strlen(sql), "$%d%s", - i, (i < natts) ? ", " : ")"); + i, (i < natts) ? ", " : ")"); ctypes[i - 1] = SPI_gettypeid(tupdesc, i); } - + /* Prepare plan for query */ pplan = SPI_prepare(sql, natts, ctypes); if (pplan == NULL) elog(ERROR, "timetravel (%s): SPI_prepare returned %d", relname, SPI_result); - + /* * Remember that SPI_prepare places plan in current memory context * - so, we have to save plan in Top memory context for latter @@ -288,101 +291,103 @@ timetravel() pplan = SPI_saveplan(pplan); if (pplan == NULL) elog(ERROR, "timetravel (%s): SPI_saveplan returned %d", relname, SPI_result); - + plan->splan = pplan; } - + /* * Ok, execute prepared plan. */ ret = SPI_execp(plan->splan, cvals, cnulls, 0); - + if (ret < 0) elog(ERROR, "timetravel (%s): SPI_execp returned %d", relname, ret); - + /* Tuple to return to upper Executor ... */ - if (newtuple) /* UPDATE */ + if (newtuple) /* UPDATE */ { HeapTuple tmptuple; - - tmptuple = SPI_copytuple (trigtuple); - rettuple = SPI_modifytuple (rel, tmptuple, 1, &(attnum[1]), &newoff, NULL); + + tmptuple = SPI_copytuple(trigtuple); + rettuple = SPI_modifytuple(rel, tmptuple, 1, &(attnum[1]), &newoff, NULL); + /* * SPI_copytuple allocates tmptuple in upper executor context - * have to free allocation using SPI_pfree */ - SPI_pfree (tmptuple); + SPI_pfree(tmptuple); } - else /* DELETE */ + else +/* DELETE */ rettuple = trigtuple; - - SPI_finish(); /* don't forget say Bye to SPI mgr */ - - pfree (relname); + + SPI_finish(); /* don't forget say Bye to SPI mgr */ + + pfree(relname); return (rettuple); } /* * set_timetravel () -- - * turn timetravel for specified relation ON/OFF + * turn timetravel for specified relation ON/OFF */ int32 set_timetravel(Name relname, int32 on) { - char *rname; - char *d; - char *s; - int i; - + char *rname; + char *d; + char *s; + int i; + for (i = 0; i < nTTOff; i++) - if (namestrcmp (relname, TTOff[i]) == 0) + if (namestrcmp(relname, TTOff[i]) == 0) break; - + if (i < nTTOff) /* OFF currently */ { if (on == 0) return (0); - + /* turn ON */ - free (TTOff[i]); + free(TTOff[i]); if (nTTOff == 1) - free (TTOff); + free(TTOff); else { if (i < nTTOff - 1) - memcpy (&(TTOff[i]), &(TTOff[i + 1]), (nTTOff - i) * sizeof (char*)); - TTOff = realloc (TTOff, (nTTOff - 1) * sizeof (char*)); + memcpy(&(TTOff[i]), &(TTOff[i + 1]), (nTTOff - i) * sizeof(char *)); + TTOff = realloc(TTOff, (nTTOff - 1) * sizeof(char *)); } nTTOff--; return (0); } - + /* ON currently */ if (on != 0) return (1); - + /* turn OFF */ if (nTTOff == 0) - TTOff = malloc (sizeof (char*)); + TTOff = malloc(sizeof(char *)); else - TTOff = realloc (TTOff, (nTTOff + 1) * sizeof (char*)); - s = rname = nameout (relname); - d = TTOff[nTTOff] = malloc (strlen (rname) + 1); + TTOff = realloc(TTOff, (nTTOff + 1) * sizeof(char *)); + s = rname = nameout(relname); + d = TTOff[nTTOff] = malloc(strlen(rname) + 1); while (*s) - *d++ = tolower (*s++); + *d++ = tolower(*s++); *d = 0; - pfree (rname); + pfree(rname); nTTOff++; - + return (1); } AbsoluteTime -currabstime () +currabstime() { - return (GetCurrentAbsoluteTime ()); + return (GetCurrentAbsoluteTime()); } static EPlan * diff --git a/contrib/string/string_io.c b/contrib/string/string_io.c index 5dd6346b56..48deefd653 100644 --- a/contrib/string/string_io.c +++ b/contrib/string/string_io.c @@ -20,13 +20,13 @@ #define ISO8859 #define MIN(x, y) ((x) < (y) ? (x) : (y)) -#define VALUE(char) ((char) - '0') -#define DIGIT(val) ((val) + '0') -#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) +#define VALUE(char) ((char) - '0') +#define DIGIT(val) ((val) + '0') +#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) #ifndef ISO8859 -#define NOTPRINTABLE(c) (!isprint(c)) +#define NOTPRINTABLE(c) (!isprint(c)) #else -#define NOTPRINTABLE(c) (!isprint(c) && ((c) < 0xa0)) +#define NOTPRINTABLE(c) (!isprint(c) && ((c) < 0xa0)) #endif /* @@ -50,103 +50,117 @@ char * string_output(char *data, int size) { - register unsigned char c, *p, *r, *result; - register int l, len; + register unsigned char c, + *p, + *r, + *result; + register int l, + len; + + if (data == NULL) + { + result = (char *) palloc(2); + result[0] = '-'; + result[1] = '\0'; + return (result); + } - if (data == NULL) { - result = (char *) palloc(2); - result[0] = '-'; - result[1] = '\0'; - return (result); - } - - if (size < 0) { - size = strlen(data); - } - - /* adjust string length for escapes */ - len = size; - for (p=data,l=size; l>0; p++,l--) { - switch (*p) { - case '\\': - case '"' : - case '{': - case '}': - case '\b': - case '\f': - case '\n': - case '\r': - case '\t': - case '\v': - len++; - break; - default: - if (NOTPRINTABLE(*p)) { - len += 3; - } + if (size < 0) + { + size = strlen(data); + } + + /* adjust string length for escapes */ + len = size; + for (p = data, l = size; l > 0; p++, l--) + { + switch (*p) + { + case '\\': + case '"': + case '{': + case '}': + case '\b': + case '\f': + case '\n': + case '\r': + case '\t': + case '\v': + len++; + break; + default: + if (NOTPRINTABLE(*p)) + { + len += 3; + } + } } - } - len++; - - result = (char *) palloc(len); - - for (p=data,r=result,l=size; (l > 0) && (c = *p); p++,l--) { - switch (c) { - case '\\': - case '"' : - case '{': - case '}': - *r++ = '\\'; - *r++ = c; - break; - case '\b': - *r++ = '\\'; - *r++ = 'b'; - break; - case '\f': - *r++ = '\\'; - *r++ = 'f'; - break; - case '\n': - *r++ = '\\'; - *r++ = 'n'; - break; - case '\r': - *r++ = '\\'; - *r++ = 'r'; - break; - case '\t': - *r++ = '\\'; - *r++ = 't'; - break; - case '\v': - *r++ = '\\'; - *r++ = 'v'; - break; - default: - if (NOTPRINTABLE(c)) { - *r = '\\'; - r += 3; - *r-- = DIGIT(c & 07); - c >>= 3; - *r-- = DIGIT(c & 07); - c >>= 3; - *r = DIGIT(c & 03); - r += 3; - } else { - *r++ = c; - } + len++; + + result = (char *) palloc(len); + + for (p = data, r = result, l = size; (l > 0) && (c = *p); p++, l--) + { + switch (c) + { + case '\\': + case '"': + case '{': + case '}': + *r++ = '\\'; + *r++ = c; + break; + case '\b': + *r++ = '\\'; + *r++ = 'b'; + break; + case '\f': + *r++ = '\\'; + *r++ = 'f'; + break; + case '\n': + *r++ = '\\'; + *r++ = 'n'; + break; + case '\r': + *r++ = '\\'; + *r++ = 'r'; + break; + case '\t': + *r++ = '\\'; + *r++ = 't'; + break; + case '\v': + *r++ = '\\'; + *r++ = 'v'; + break; + default: + if (NOTPRINTABLE(c)) + { + *r = '\\'; + r += 3; + *r-- = DIGIT(c & 07); + c >>= 3; + *r-- = DIGIT(c & 07); + c >>= 3; + *r = DIGIT(c & 03); + r += 3; + } + else + { + *r++ = c; + } + } } - } - *r = '\0'; + *r = '\0'; - return((char *) result); + return ((char *) result); } /* * string_input() -- * - * This function accepts a C string in input and copies it into a new + * This function accepts a C string in input and copies it into a new * object allocated with palloc() translating all escape sequences. * An optional header can be allocatd before the string, for example * to hold the length of a varlena object. @@ -172,136 +186,155 @@ string_output(char *data, int size) char * string_input(char *str, int size, int hdrsize, int *rtn_size) { - register unsigned char *p, *r; - unsigned char *result; - int len; - - if ((str == NULL) || (hdrsize < 0)) { - return (char *) NULL; - } - - /* Compute result size */ - len = strlen(str); - for (p=str; *p; ) { - if (*p++ == '\\') { - if (ISOCTAL(*p)) { - if (ISOCTAL(*(p+1))) { - p++; - len--; - } - if (ISOCTAL(*(p+1))) { - p++; - len--; + register unsigned char *p, + *r; + unsigned char *result; + int len; + + if ((str == NULL) || (hdrsize < 0)) + { + return (char *) NULL; + } + + /* Compute result size */ + len = strlen(str); + for (p = str; *p;) + { + if (*p++ == '\\') + { + if (ISOCTAL(*p)) + { + if (ISOCTAL(*(p + 1))) + { + p++; + len--; + } + if (ISOCTAL(*(p + 1))) + { + p++; + len--; + } + } + if (*p) + p++; + len--; } - } - if (*p) p++; - len--; } - } - - /* result has variable length */ - if (size == 0) { - size = len+1; - } else - - /* result has variable length with maximum size */ - if (size < 0) { - size = MIN(len, - size)+1; - } - - result = (char *) palloc(hdrsize+size); - memset(result, 0, hdrsize+size); - if (rtn_size) { - *rtn_size = size; - } - - r = result + hdrsize; - for (p=str; *p; ) { - register unsigned char c; - if ((c = *p++) == '\\') { - switch (c = *p++) { - case '\0': - p--; - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - c = VALUE(c); - if (isdigit(*p)) { - c = (c<<3) + VALUE(*p++); + + /* result has variable length */ + if (size == 0) + { + size = len + 1; + } + else + /* result has variable length with maximum size */ + if (size < 0) + { + size = MIN(len, -size) + 1; + } + + result = (char *) palloc(hdrsize + size); + memset(result, 0, hdrsize + size); + if (rtn_size) + { + *rtn_size = size; + } + + r = result + hdrsize; + for (p = str; *p;) + { + register unsigned char c; + + if ((c = *p++) == '\\') + { + switch (c = *p++) + { + case '\0': + p--; + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + c = VALUE(c); + if (isdigit(*p)) + { + c = (c << 3) + VALUE(*p++); + } + if (isdigit(*p)) + { + c = (c << 3) + VALUE(*p++); + } + *r++ = c; + break; + case 'b': + *r++ = '\b'; + break; + case 'f': + *r++ = '\f'; + break; + case 'n': + *r++ = '\n'; + break; + case 'r': + *r++ = '\r'; + break; + case 't': + *r++ = '\t'; + break; + case 'v': + *r++ = '\v'; + break; + default: + *r++ = c; + } } - if (isdigit(*p)) { - c = (c<<3) + VALUE(*p++); + else + { + *r++ = c; } - *r++ = c; - break; - case 'b': - *r++ = '\b'; - break; - case 'f': - *r++ = '\f'; - break; - case 'n': - *r++ = '\n'; - break; - case 'r': - *r++ = '\r'; - break; - case 't': - *r++ = '\t'; - break; - case 'v': - *r++ = '\v'; - break; - default: - *r++ = c; - } - } else { - *r++ = c; } - } - return((char *) result); + return ((char *) result); } char * c_charout(int32 c) { - char str[2]; + char str[2]; - str[0] = (char) c; - str[1] = '\0'; + str[0] = (char) c; + str[1] = '\0'; - return (string_output(str, 1)); + return (string_output(str, 1)); } char * c_char2out(uint16 s) { - return (string_output((char *) &s, 2)); + return (string_output((char *) &s, 2)); } char * c_char4out(uint32 s) { - return (string_output((char *) &s, 4)); + return (string_output((char *) &s, 4)); } char * c_char8out(char *s) { - return (string_output(s, 8)); + return (string_output(s, 8)); } char * c_char16out(char *s) { - return (string_output(s, 16)); + return (string_output(s, 16)); } /* @@ -309,16 +342,17 @@ c_char16out(char *s) */ char * -c_textout(struct varlena *vlena) +c_textout(struct varlena * vlena) { - int len = 0; - char *s = NULL; - - if (vlena) { - len = VARSIZE(vlena) - VARHDRSZ; - s = VARDATA(vlena); - } - return (string_output(s, len)); + int len = 0; + char *s = NULL; + + if (vlena) + { + len = VARSIZE(vlena) - VARHDRSZ; + s = VARDATA(vlena); + } + return (string_output(s, len)); } /* @@ -328,37 +362,40 @@ c_textout(struct varlena *vlena) char * c_varcharout(char *s) { - int len = 0; + int len = 0; - if (s) { - len = *(int32*)s - 4; - s += 4; - } - return (string_output(s, len)); + if (s) + { + len = *(int32 *) s - 4; + s += 4; + } + return (string_output(s, len)); } #if 0 struct varlena * c_textin(char *str) { - struct varlena *result; - int len; + struct varlena *result; + int len; - if (str == NULL) { - return ((struct varlena *) NULL); - } + if (str == NULL) + { + return ((struct varlena *) NULL); + } - result = (struct varlena *) string_input(str, 0, VARHDRSZ, &len); - VARSIZE(result) = len; + result = (struct varlena *) string_input(str, 0, VARHDRSZ, &len); + VARSIZE(result) = len; - return (result); + return (result); } char * c_char16in(char *str) { - return (string_input(str, 16, 0, NULL)); + return (string_input(str, 16, 0, NULL)); } + #endif diff --git a/contrib/string/string_io.h b/contrib/string/string_io.h index 974f1f4262..b2af60f62c 100644 --- a/contrib/string/string_io.h +++ b/contrib/string/string_io.h @@ -1,19 +1,20 @@ #ifndef STRING_IO_H #define STRING_IO_H -char *string_output(char *data, int size); -char *string_input(char *str, int size, int hdrsize, int *rtn_size); -char *c_charout(int32 c); -char *c_char2out(uint16 s); -char *c_char4out(uint32 s); -char *c_char8out(char *s); -char *c_char16out(char *s); -char *c_textout(struct varlena *vlena); -char *c_varcharout(char *s); +char *string_output(char *data, int size); +char *string_input(char *str, int size, int hdrsize, int *rtn_size); +char *c_charout(int32 c); +char *c_char2out(uint16 s); +char *c_char4out(uint32 s); +char *c_char8out(char *s); +char *c_char16out(char *s); +char *c_textout(struct varlena * vlena); +char *c_varcharout(char *s); #if 0 struct varlena *c_textin(char *str); -char *c_char16in(char *str); +char *c_char16in(char *str); + #endif #endif diff --git a/contrib/userlock/user_locks.c b/contrib/userlock/user_locks.c index efc9b0a464..fe8abcac0c 100644 --- a/contrib/userlock/user_locks.c +++ b/contrib/userlock/user_locks.c @@ -22,79 +22,80 @@ #include "user_locks.h" -#define USER_LOCKS_TABLE_ID 0 +#define USER_LOCKS_TABLE_ID 0 -extern Oid MyDatabaseId; +extern Oid MyDatabaseId; int user_lock(unsigned int id1, unsigned int id2, LOCKT lockt) { - LOCKTAG tag; + LOCKTAG tag; - memset(&tag,0,sizeof(LOCKTAG)); - tag.relId = 0; - tag.dbId = MyDatabaseId; - tag.tupleId.ip_blkid.bi_hi = id2 >> 16; - tag.tupleId.ip_blkid.bi_lo = id2 & 0xffff; - tag.tupleId.ip_posid = (unsigned short) (id1 & 0xffff); + memset(&tag, 0, sizeof(LOCKTAG)); + tag.relId = 0; + tag.dbId = MyDatabaseId; + tag.tupleId.ip_blkid.bi_hi = id2 >> 16; + tag.tupleId.ip_blkid.bi_lo = id2 & 0xffff; + tag.tupleId.ip_posid = (unsigned short) (id1 & 0xffff); - return LockAcquire(USER_LOCKS_TABLE_ID, &tag, lockt); + return LockAcquire(USER_LOCKS_TABLE_ID, &tag, lockt); } int user_unlock(unsigned int id1, unsigned int id2, LOCKT lockt) { - LOCKTAG tag; - - memset(&tag, 0,sizeof(LOCKTAG)); - tag.relId = 0; - tag.dbId = MyDatabaseId; - tag.tupleId.ip_blkid.bi_hi = id2 >> 16; - tag.tupleId.ip_blkid.bi_lo = id2 & 0xffff; - tag.tupleId.ip_posid = (unsigned short) (id1 & 0xffff); - - return LockRelease(USER_LOCKS_TABLE_ID, &tag, lockt); + LOCKTAG tag; + + memset(&tag, 0, sizeof(LOCKTAG)); + tag.relId = 0; + tag.dbId = MyDatabaseId; + tag.tupleId.ip_blkid.bi_hi = id2 >> 16; + tag.tupleId.ip_blkid.bi_lo = id2 & 0xffff; + tag.tupleId.ip_posid = (unsigned short) (id1 & 0xffff); + + return LockRelease(USER_LOCKS_TABLE_ID, &tag, lockt); } int user_write_lock(unsigned int id1, unsigned int id2) { - return user_lock(id1, id2, WRITE_LOCK); + return user_lock(id1, id2, WRITE_LOCK); } int user_write_unlock(unsigned int id1, unsigned int id2) { - return user_unlock(id1, id2, WRITE_LOCK); + return user_unlock(id1, id2, WRITE_LOCK); } int user_write_lock_oid(Oid oid) { - return user_lock(0, oid, WRITE_LOCK); + return user_lock(0, oid, WRITE_LOCK); } int user_write_unlock_oid(Oid oid) { - return user_unlock(0, oid, WRITE_LOCK); + return user_unlock(0, oid, WRITE_LOCK); } int user_unlock_all() { - PROC *proc; - SHMEM_OFFSET location; - - ShmemPIDLookup(getpid(),&location); - if (location == INVALID_OFFSET) { - elog(NOTICE, "UserUnlockAll: unable to get proc ptr"); - return -1; - } - - proc = (PROC *) MAKE_PTR(location); - return LockReleaseAll(USER_LOCKS_TABLE_ID, &proc->lockQueue); + PROC *proc; + SHMEM_OFFSET location; + + ShmemPIDLookup(getpid(), &location); + if (location == INVALID_OFFSET) + { + elog(NOTICE, "UserUnlockAll: unable to get proc ptr"); + return -1; + } + + proc = (PROC *) MAKE_PTR(location); + return LockReleaseAll(USER_LOCKS_TABLE_ID, &proc->lockQueue); } /* end of file */ diff --git a/contrib/userlock/user_locks.h b/contrib/userlock/user_locks.h index ab890483fa..7f31556403 100644 --- a/contrib/userlock/user_locks.h +++ b/contrib/userlock/user_locks.h @@ -1,12 +1,12 @@ #ifndef USER_LOCKS_H #define USER_LOCKS_H -int user_lock(unsigned int id1, unsigned int id2, LOCKT lockt); -int user_unlock(unsigned int id1, unsigned int id2, LOCKT lockt); -int user_write_lock(unsigned int id1, unsigned int id2); -int user_write_unlock(unsigned int id1, unsigned int id2); -int user_write_lock_oid(Oid oid); -int user_write_unlock_oid(Oid oid); -int user_unlock_all(void); +int user_lock(unsigned int id1, unsigned int id2, LOCKT lockt); +int user_unlock(unsigned int id1, unsigned int id2, LOCKT lockt); +int user_write_lock(unsigned int id1, unsigned int id2); +int user_write_unlock(unsigned int id1, unsigned int id2); +int user_write_lock_oid(Oid oid); +int user_write_unlock_oid(Oid oid); +int user_unlock_all(void); #endif diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 37c9b62874..ded94d0d8a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.36 1998/02/11 19:09:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.37 1998/02/26 04:29:15 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -34,14 +34,14 @@ #endif /* Used by heap_getattr() macro, for speed */ -long heap_sysoffset[] = { +long heap_sysoffset[] = { /* Only the first one is pass-by-ref, and is handled specially in the macro */ - offsetof(HeapTupleData, t_ctid), - offsetof(HeapTupleData, t_oid), - offsetof(HeapTupleData, t_xmin), - offsetof(HeapTupleData, t_cmin), - offsetof(HeapTupleData, t_xmax), - offsetof(HeapTupleData, t_cmax) + offsetof(HeapTupleData, t_ctid), + offsetof(HeapTupleData, t_oid), + offsetof(HeapTupleData, t_xmin), + offsetof(HeapTupleData, t_cmin), + offsetof(HeapTupleData, t_xmax), + offsetof(HeapTupleData, t_cmax) }; /* ---------------------------------------------------------------- @@ -350,7 +350,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum) { switch (attnum) { - case SelfItemPointerAttributeNumber: + case SelfItemPointerAttributeNumber: return ((Datum) &tup->t_ctid); case ObjectIdAttributeNumber: return ((Datum) (long) tup->t_oid); @@ -389,16 +389,16 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum) */ Datum nocachegetattr(HeapTuple tup, - int attnum, - TupleDesc tupleDesc, - bool *isnull) + int attnum, + TupleDesc tupleDesc, + bool *isnull) { char *tp; /* ptr to att in tuple */ - bits8 *bp = tup->t_bits; /* ptr to att in tuple */ + bits8 *bp = tup->t_bits; /* ptr to att in tuple */ int slow; /* do we have to walk nulls? */ AttributeTupleForm *att = tupleDesc->attrs; - + #if IN_MACRO /* This is handled in the macro */ Assert(attnum > 0); @@ -430,6 +430,7 @@ nocachegetattr(HeapTuple tup, } else if (attnum == 0) { + /* * first attribute is always at position zero */ @@ -470,11 +471,11 @@ nocachegetattr(HeapTuple tup, * ---------------- */ { - int i = 0; /* current offset in bp */ - int mask; /* bit in byte we're looking at */ - char n; /* current byte in bp */ - int byte, - finalbit; + int i = 0; /* current offset in bp */ + int mask; /* bit in byte we're looking at */ + char n; /* current byte in bp */ + int byte, + finalbit; byte = attnum >> 3; finalbit = attnum & 0x07; @@ -486,14 +487,14 @@ nocachegetattr(HeapTuple tup, { /* check for nulls in any "earlier" bytes */ if ((~n) != 0) - slow=1; + slow = 1; } else { /* check for nulls "before" final bit of last byte */ mask = (1 << finalbit) - 1; if ((~n) & mask) - slow=1; + slow = 1; } } } @@ -508,8 +509,8 @@ nocachegetattr(HeapTuple tup, { if (att[attnum]->attcacheoff != -1) { - return (Datum)fetchatt(&(att[attnum]), - tp + att[attnum]->attcacheoff); + return (Datum) fetchatt(&(att[attnum]), + tp + att[attnum]->attcacheoff); } else if (attnum == 0) { @@ -517,11 +518,11 @@ nocachegetattr(HeapTuple tup, } else if (!HeapTupleAllFixed(tup)) { - int j = 0; + int j = 0; /* - * In for(), we make this <= and not < because we want to - * test if we can go past it in initializing offsets. + * In for(), we make this <= and not < because we want to test + * if we can go past it in initializing offsets. */ for (j = 0; j <= attnum && !slow; j++) if (att[j]->attlen < 1 && !VARLENA_FIXED_SIZE(att[j])) @@ -536,8 +537,8 @@ nocachegetattr(HeapTuple tup, */ if (!slow) { - int j = 1; - long off; + int j = 1; + long off; /* * need to set cache for some atts @@ -554,13 +555,14 @@ nocachegetattr(HeapTuple tup, off = att[j - 1]->attcacheoff + att[j - 1]->atttypmod; for (; j <= attnum || - /* Can we compute more? We will probably need them */ - (j < tup->t_natts && - att[j]->attcacheoff == -1 && - (HeapTupleNoNulls(tup) || !att_isnull(j, bp)) && - (HeapTupleAllFixed(tup)|| - att[j]->attlen > 0 || VARLENA_FIXED_SIZE(att[j]))); j++) + /* Can we compute more? We will probably need them */ + (j < tup->t_natts && + att[j]->attcacheoff == -1 && + (HeapTupleNoNulls(tup) || !att_isnull(j, bp)) && + (HeapTupleAllFixed(tup) || + att[j]->attlen > 0 || VARLENA_FIXED_SIZE(att[j]))); j++) { + /* * Fix me when going to a machine with more than a four-byte * word! @@ -605,7 +607,7 @@ nocachegetattr(HeapTuple tup, break; case -1: Assert(!VARLENA_FIXED_SIZE(att[j]) || - att[j]->atttypmod == VARSIZE(tp + off)); + att[j]->atttypmod == VARSIZE(tp + off)); off += VARSIZE(tp + off); break; default: @@ -618,9 +620,9 @@ nocachegetattr(HeapTuple tup, } else { - bool usecache = true; - int off = 0; - int i; + bool usecache = true; + int off = 0; + int i; /* * Now we know that we have to walk the tuple CAREFULLY. @@ -665,7 +667,7 @@ nocachegetattr(HeapTuple tup, default: if (att[i]->attlen < sizeof(int32)) elog(ERROR, - "nocachegetattr2: attribute %d has len %d", + "nocachegetattr2: attribute %d has len %d", i, att[i]->attlen); if (att[i]->attalign == 'd') off = DOUBLEALIGN(off); @@ -690,7 +692,7 @@ nocachegetattr(HeapTuple tup, break; case -1: Assert(!VARLENA_FIXED_SIZE(att[i]) || - att[i]->atttypmod == VARSIZE(tp + off)); + att[i]->atttypmod == VARSIZE(tp + off)); off += VARSIZE(tp + off); if (!VARLENA_FIXED_SIZE(att[i])) usecache = false; @@ -965,9 +967,9 @@ heap_modifytuple(HeapTuple tuple, * ---------------- */ infomask = newTuple->t_infomask; - memmove((char *) &newTuple->t_oid, /* XXX */ + memmove((char *) &newTuple->t_oid, /* XXX */ (char *) &tuple->t_oid, - ((char *) &tuple->t_hoff - (char *) &tuple->t_oid)); /* XXX */ + ((char *) &tuple->t_hoff - (char *) &tuple->t_oid)); /* XXX */ newTuple->t_infomask = infomask; newTuple->t_natts = numberOfAttributes; /* fix t_natts just in * case */ @@ -993,7 +995,7 @@ heap_addheader(uint32 natts, /* max domain index */ int structlen, /* its length */ char *structure) /* pointer to the struct */ { - char *tp; /* tuple data pointer */ + char *tp; /* tuple data pointer */ HeapTuple tup; long len; int hoff; @@ -1018,4 +1020,3 @@ heap_addheader(uint32 natts, /* max domain index */ return (tup); } - diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 1ba64a251b..521dda8d81 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.27 1998/02/11 19:09:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.28 1998/02/26 04:29:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ index_formtuple(TupleDesc tupleDescriptor, Datum value[], char null[]) { - char *tp; /* tuple pointer */ + char *tp; /* tuple pointer */ IndexTuple tuple; /* return tuple */ Size size, hoff; @@ -133,14 +133,14 @@ index_formtuple(TupleDesc tupleDescriptor, */ Datum nocache_index_getattr(IndexTuple tup, - int attnum, - TupleDesc tupleDesc, - bool *isnull) + int attnum, + TupleDesc tupleDesc, + bool *isnull) { - char *tp; /* ptr to att in tuple */ - char *bp = NULL; /* ptr to att in tuple */ + char *tp; /* ptr to att in tuple */ + char *bp = NULL; /* ptr to att in tuple */ int slow; /* do we have to walk nulls? */ - int data_off; /* tuple data offset */ + int data_off; /* tuple data offset */ AttributeTupleForm *att = tupleDesc->attrs; /* ---------------- @@ -174,7 +174,7 @@ nocache_index_getattr(IndexTuple tup, #ifdef IN_MACRO /* This is handled in the macro */ - + /* first attribute is always at position zero */ if (attnum == 1) @@ -184,8 +184,8 @@ nocache_index_getattr(IndexTuple tup, if (att[attnum]->attcacheoff != -1) { return (Datum) fetchatt(&(att[attnum]), - (char *) tup + data_off + - att[attnum]->attcacheoff); + (char *) tup + data_off + + att[attnum]->attcacheoff); } #endif @@ -206,11 +206,11 @@ nocache_index_getattr(IndexTuple tup, * here! */ #ifdef IN_MACRO /* This is handled in the macro */ - + if (att_isnull(attnum, bp)) { *isnull = true; - return (Datum)NULL; + return (Datum) NULL; } #endif @@ -219,11 +219,11 @@ nocache_index_getattr(IndexTuple tup, * ---------------- */ { - int i = 0; /* current offset in bp */ - int mask; /* bit in byte we're looking at */ - char n; /* current byte in bp */ - int byte, - finalbit; + int i = 0; /* current offset in bp */ + int mask; /* bit in byte we're looking at */ + char n; /* current byte in bp */ + int byte, + finalbit; byte = attnum >> 3; finalbit = attnum & 0x07; @@ -235,14 +235,14 @@ nocache_index_getattr(IndexTuple tup, { /* check for nulls in any "earlier" bytes */ if ((~n) != 0) - slow=1; + slow = 1; } else { /* check for nulls "before" final bit of last byte */ mask = (1 << finalbit) - 1; if ((~n) & mask) - slow=1; + slow = 1; } } } @@ -257,7 +257,7 @@ nocache_index_getattr(IndexTuple tup, if (att[attnum]->attcacheoff != -1) { return (Datum) fetchatt(&(att[attnum]), - tp + att[attnum]->attcacheoff); + tp + att[attnum]->attcacheoff); } else if (attnum == 0) { @@ -265,7 +265,7 @@ nocache_index_getattr(IndexTuple tup, } else if (!IndexTupleAllFixed(tup)) { - int j = 0; + int j = 0; for (j = 0; j < attnum && !slow; j++) if (att[j]->attlen < 1 && !VARLENA_FIXED_SIZE(att[j])) @@ -281,8 +281,8 @@ nocache_index_getattr(IndexTuple tup, if (!slow) { - int j = 1; - long off; + int j = 1; + long off; /* * need to set cache for some atts @@ -293,13 +293,14 @@ nocache_index_getattr(IndexTuple tup, while (att[j]->attcacheoff != -1) j++; - if (!VARLENA_FIXED_SIZE(att[j-1])) + if (!VARLENA_FIXED_SIZE(att[j - 1])) off = att[j - 1]->attcacheoff + att[j - 1]->attlen; else off = att[j - 1]->attcacheoff + att[j - 1]->atttypmod; for (; j < attnum + 1; j++) { + /* * Fix me when going to a machine with more than a four-byte * word! @@ -346,9 +347,9 @@ nocache_index_getattr(IndexTuple tup, } else { - bool usecache = true; - int off = 0; - int i; + bool usecache = true; + int off = 0; + int i; /* * Now we know that we have to walk the tuple CAREFULLY. @@ -387,7 +388,7 @@ nocache_index_getattr(IndexTuple tup, default: if (att[i]->attlen < sizeof(int32)) elog(ERROR, - "nocachegetiattr2: attribute %d has len %d", + "nocachegetiattr2: attribute %d has len %d", i, att[i]->attlen); if (att[i]->attalign == 'd') off = DOUBLEALIGN(off); @@ -412,7 +413,7 @@ nocache_index_getattr(IndexTuple tup, break; case -1: Assert(!VARLENA_FIXED_SIZE(att[i]) || - att[i]->atttypmod == VARSIZE(tp + off)); + att[i]->atttypmod == VARSIZE(tp + off)); off += VARSIZE(tp + off); if (!VARLENA_FIXED_SIZE(att[i])) usecache = false; diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c index 35c812cd73..02e60c899a 100644 --- a/src/backend/access/common/printtup.c +++ b/src/backend/access/common/printtup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.26 1998/02/11 19:09:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.27 1998/02/26 04:29:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -124,7 +124,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo) { outputstr = fmgr(typoutput, attr, gettypelem(typeinfo->attrs[i]->atttypid), - typeinfo->attrs[i]->atttypmod); + typeinfo->attrs[i]->atttypmod); pq_putint(strlen(outputstr) + VARHDRSZ, VARHDRSZ); pq_putnchar(outputstr, strlen(outputstr)); pfree(outputstr); @@ -176,8 +176,8 @@ showatts(char *name, TupleDesc tupleDesc) void debugtup(HeapTuple tuple, TupleDesc typeinfo) { - int i; - Datum attr; + int i; + Datum attr; char *value; bool isnull; Oid typoutput; @@ -191,7 +191,7 @@ debugtup(HeapTuple tuple, TupleDesc typeinfo) { value = fmgr(typoutput, attr, gettypelem(typeinfo->attrs[i]->atttypid), - typeinfo->attrs[i]->atttypmod); + typeinfo->attrs[i]->atttypmod); printatt((unsigned) i + 1, typeinfo->attrs[i], value); pfree(value); } @@ -313,7 +313,7 @@ printtup_internal(HeapTuple tuple, TupleDesc typeinfo) pq_putnchar(DatumGetPointer(attr), len); #ifdef IPORTAL_DEBUG fprintf(stderr, "byref length %d data %x\n", len, - DatumGetPointer(attr)); + DatumGetPointer(attr)); #endif } } diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index be1418e701..62d27d8cd7 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.35 1998/02/10 16:02:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.36 1998/02/26 04:29:22 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -306,7 +306,7 @@ TupleDescInitEntry(TupleDesc desc, att->attnum = attributeNumber; att->attnelems = attdim; att->attisset = attisset; - + att->attnotnull = false; att->atthasdef = false; @@ -487,7 +487,7 @@ BuildDescForRelation(List *schema, char *relname) if (arry != NIL) { /* array of XXX is _XXX */ - sprintf(typename, "_%.*s", NAMEDATALEN-2,entry->typename->name); + sprintf(typename, "_%.*s", NAMEDATALEN - 2, entry->typename->name); attdim = length(arry); } else diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index bcfe5fdfc8..e443f393ba 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.17 1997/11/20 23:19:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.18 1998/02/26 04:29:28 momjian Exp $ * * NOTES * This file contains only the public interface routines. @@ -306,7 +306,7 @@ hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relatio /* * hashgettuple() -- Get the next tuple in the scan. */ -char * +char * hashgettuple(IndexScanDesc scan, ScanDirection dir) { RetrieveIndexResult res; @@ -329,7 +329,7 @@ hashgettuple(IndexScanDesc scan, ScanDirection dir) /* * hashbeginscan() -- start a scan on a hash index */ -char * +char * hashbeginscan(Relation rel, bool fromEnd, uint16 keysz, diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index eaded2cdb8..6bb6f38718 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.26 1998/02/11 19:09:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.27 1998/02/26 04:29:31 momjian Exp $ * * * INTERFACE ROUTINES @@ -654,6 +654,7 @@ heap_beginscan(Relation relation, sdesc->rs_rd = relation; if (nkeys) + /* * we do this here instead of in initsdesc() because heap_rescan * also calls initsdesc() and we don't want to allocate memory @@ -1303,7 +1304,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup) Page dp; Buffer buffer; HeapTuple tuple; - + /* ---------------- * increment access statistics * ---------------- @@ -1375,13 +1376,13 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup) * ---------------- */ HeapTupleSatisfies(lp, - relation, - buffer, - (PageHeader) dp, - false, - 0, - (ScanKey) NULL, - tuple); + relation, + buffer, + (PageHeader) dp, + false, + 0, + (ScanKey) NULL, + tuple); if (!tuple) { ReleaseBuffer(buffer); diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index 01825cc684..b46037e7e4 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.16 1998/01/15 19:42:02 pgsql Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.17 1998/02/26 04:29:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -242,17 +242,17 @@ StrategyTermEvaluate(StrategyTerm term, switch (operator->flags ^ entry->sk_flags) { case 0x0: - tmpres = (long) FMGR_PTR2(&entry->sk_func, + tmpres = (long) FMGR_PTR2(&entry->sk_func, left, right); break; case SK_NEGATE: - tmpres = (long) !FMGR_PTR2(&entry->sk_func, + tmpres = (long) !FMGR_PTR2(&entry->sk_func, left, right); break; case SK_COMMUTE: - tmpres = (long) FMGR_PTR2(&entry->sk_func, + tmpres = (long) FMGR_PTR2(&entry->sk_func, right, left); break; diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index bf4c1bfae9..72e0731edd 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.24 1997/11/20 23:20:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.25 1998/02/26 04:29:44 momjian Exp $ * * NOTES * This file contains only the public interface routines. @@ -389,7 +389,7 @@ btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation /* * btgettuple() -- Get the next tuple in the scan. */ -char * +char * btgettuple(IndexScanDesc scan, ScanDirection dir) { RetrieveIndexResult res; @@ -411,7 +411,7 @@ btgettuple(IndexScanDesc scan, ScanDirection dir) /* * btbeginscan() -- start a scan on a btree index */ -char * +char * btbeginscan(Relation rel, bool fromEnd, uint16 keysz, ScanKey scankey) { IndexScanDesc scan; diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 32bd77d857..5729cafe71 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.30 1998/01/15 19:42:13 pgsql Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.31 1998/02/26 04:29:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -197,12 +197,11 @@ _bt_moveright(Relation rel, * if number of attrs > keysize. Example: (2,0) - last items * on this page, (2,1) - first item on next page (hikey), our * scankey is x = 2. Scankey == (2,1) because of we compare - * first attrs only, but we shouldn't to move right of here. - * - vadim 04/15/97 - * + * first attrs only, but we shouldn't to move right of here. - + * vadim 04/15/97 + * * Also, if this page is not LEAF one (and # of attrs > keysize) - * then we can't move too. - * - vadim 10/22/97 + * then we can't move too. - vadim 10/22/97 */ if (_bt_skeycmp(rel, keysz, scankey, page, hikey, diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index d52d79ce52..b6f7b337a9 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -5,7 +5,7 @@ * * * IDENTIFICATION - * $Id: nbtsort.c,v 1.28 1998/02/21 19:23:14 scrappy Exp $ + * $Id: nbtsort.c,v 1.29 1998/02/26 04:29:54 momjian Exp $ * * NOTES * @@ -553,7 +553,7 @@ _bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz) * create and initialize a spool structure, including the underlying * files. */ -void * +void * _bt_spoolinit(Relation index, int ntapes, bool isunique) { BTSpool *btspool = (BTSpool *) palloc(sizeof(BTSpool)); diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c index af46780446..e9b52ead23 100644 --- a/src/backend/access/rtree/rtproc.c +++ b/src/backend/access/rtree/rtproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.15 1998/01/07 21:02:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.16 1998/02/26 04:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ rt_box_union(BOX *a, BOX *b) return (n); } -BOX * +BOX * rt_box_inter(BOX *a, BOX *b) { BOX *n; diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index af401accd6..4968162f76 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.22 1998/01/15 19:42:19 pgsql Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.23 1998/02/26 04:30:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -956,7 +956,7 @@ freestack(RTSTACK *s) } } -char * +char * rtdelete(Relation r, ItemPointer tid) { BlockNumber blkno; diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index e864a2ead3..5beaa125be 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.16 1998/01/07 21:02:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.17 1998/02/26 04:30:18 momjian Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -47,8 +47,8 @@ Relation VariableRelation = (Relation) NULL; * global variables holding cached transaction id's and statuses. * ---------------- */ -TransactionId cachedTestXid; -XidStatus cachedTestXidStatus; +TransactionId cachedTestXid; +XidStatus cachedTestXidStatus; /* ---------------- * transaction system constants @@ -416,14 +416,14 @@ InitializeTransactionLog(void) VariableRelation = heap_openr(VariableRelationName); /* ---------------- * XXX TransactionLogUpdate requires that LogRelation - * is valid so we temporarily set it so we can initialize + * is valid so we temporarily set it so we can initialize * things properly. This could be done cleaner. * ---------------- */ LogRelation = logRelation; /* ---------------- - * if we have a virgin database, we initialize the log + * if we have a virgin database, we initialize the log * relation by committing the AmiTransactionId (id 512) and we * initialize the variable relation by setting the next available * transaction id to FirstTransactionId (id 514). OID initialization diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c index 4a0799ac2c..64ae130dd3 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.11 1997/11/02 15:24:47 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.12 1998/02/26 04:30:19 momjian Exp $ * * OLD COMMENTS * XXX WARNING @@ -38,7 +38,7 @@ xidin(char *representation) } /* XXX char16 name for catalogs */ -char * +char * xidout(TransactionId transactionId) { /* return(TransactionIdFormString(transactionId)); */ diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 948248a0f3..b23eb3c4e9 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.36 1998/02/11 19:09:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.37 1998/02/26 04:30:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -200,19 +200,21 @@ int numattr; /* number of attributes for cur. rel */ extern int fsyncOff; /* do not fsync the database */ /* The test for HAVE_SIGSETJMP fails on Linux 2.0.x because the test - * explicitly disallows sigsetjmp being a #define, which is how it - * is declared in Linux. So, to avoid compiler warnings about - * sigsetjmp() being redefined, let's not redefine unless necessary. + * explicitly disallows sigsetjmp being a #define, which is how it + * is declared in Linux. So, to avoid compiler warnings about + * sigsetjmp() being redefined, let's not redefine unless necessary. * - thomas 1997-12-27 */ #if !defined(HAVE_SIGSETJMP) && !defined(sigsetjmp) static jmp_buf Warn_restart; + #define sigsetjmp(x,y) setjmp(x) #define siglongjmp longjmp #else static sigjmp_buf Warn_restart; + #endif int DebugMode; @@ -472,8 +474,8 @@ boot_openrel(char *relname) HeapScanDesc sdesc; HeapTuple tup; - if (strlen(relname) >= NAMEDATALEN-1) - relname[NAMEDATALEN-1] = '\0'; + if (strlen(relname) >= NAMEDATALEN - 1) + relname[NAMEDATALEN - 1] = '\0'; if (Typ == (struct typmap **) NULL) { @@ -907,7 +909,7 @@ AllocateAttribute() * be freed by the CALLER. * ---------------- */ -char * +char * MapArrayTypeName(char *s) { int i, @@ -960,7 +962,7 @@ EnterString(char *str) * associated with the idnum * ---------------- */ -char * +char * LexIDStr(int ident_num) { return (strtable[ident_num]); @@ -979,7 +981,7 @@ LexIDStr(int ident_num) static int CompHash(char *str, int len) { - int result; + int result; result = (NUM * str[0] + NUMSQR * str[len - 1] + NUMCUBE * str[(len - 1) / 2]); diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 17d87dd744..afbf47b29b 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.7 1998/02/25 13:05:57 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.8 1998/02/26 04:30:26 momjian Exp $ * * NOTES * See acl.h. @@ -74,7 +74,7 @@ char *aclcheck_error_strings[] = { static dumpacl(Acl *acl) { - unsigned i; + unsigned i; AclItem *aip; elog(DEBUG, "acl size = %d, # acls = %d", @@ -94,7 +94,7 @@ ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg) { - unsigned i; + unsigned i; Acl *old_acl = (Acl *) NULL, *new_acl; Relation relation; @@ -211,7 +211,7 @@ get_grosysid(char *groname) return (id); } -char * +char * get_groname(AclId grosysid) { HeapTuple htp; @@ -283,8 +283,8 @@ in_group(AclId uid, AclId gid) static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode) { - unsigned i; - AclItem *aip, + unsigned i; + AclItem *aip, *aidat; unsigned num, found_group; @@ -417,7 +417,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode) /* * Deny anyone permission to update a system catalog unless - * pg_shadow.usecatupd is set. (This is to let superusers protect + * pg_shadow.usecatupd is set. (This is to let superusers protect * themselves from themselves.) */ if (((mode & ACL_WR) || (mode & ACL_AP)) && diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index 95241e9dd6..844c1502f6 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.14 1998/02/11 19:09:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.15 1998/02/26 04:30:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ * relpath - path to the relation * Perhaps this should be in-line code in relopen(). */ -char * +char * relpath(char relname[]) { char *path; diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index c48779d700..7bab4d1842 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.46 1998/02/11 19:09:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.47 1998/02/26 04:30:35 momjian Exp $ * * INTERFACE ROUTINES * heap_create() - Create an uncataloged heap relation @@ -63,8 +63,9 @@ #include <string.h> #endif -static void AddPgRelationTuple(Relation pg_class_desc, - Relation new_rel_desc, Oid new_rel_oid, unsigned natts); +static void +AddPgRelationTuple(Relation pg_class_desc, + Relation new_rel_desc, Oid new_rel_oid, unsigned natts); static void AddToTempRelList(Relation r); static void DeletePgAttributeTuples(Relation rdesc); static void DeletePgRelationTuple(Relation rdesc); @@ -164,14 +165,14 @@ static TempRelList *tempRels = NULL; * * * if heap_create is called with "" as the name, then heap_create will create - * a temporary name "temp_$RELOID" for the relation + * a temporary name "temp_$RELOID" for the relation * ---------------------------------------------------------------- */ Relation heap_create(char *name, TupleDesc tupDesc) { - unsigned i; + unsigned i; Oid relid; Relation rdesc; int len; @@ -378,7 +379,7 @@ heap_create(char *name, * create new relation * insert new relation into attribute catalog * - * Should coordinate with heap_create_with_catalogr(). Either + * Should coordinate with heap_create_with_catalogr(). Either * it should not be called or there should be a way to prevent * the relation from being removed at the end of the * transaction if it is successful ('u'/'r' may be enough). @@ -726,14 +727,14 @@ addNewRelationType(char *typeName, Oid new_rel_oid) */ new_type_oid = TypeCreate(typeName, /* type name */ new_rel_oid, /* relation oid */ - typeLen(typeidType(OIDOID)), /* internal size */ - typeLen(typeidType(OIDOID)), /* external size */ + typeLen(typeidType(OIDOID)), /* internal size */ + typeLen(typeidType(OIDOID)), /* external size */ 'c', /* type-type (catalog) */ ',', /* default array delimiter */ "int4in", /* input procedure */ - "int4out",/* output procedure */ - "int4in", /* receive procedure */ - "int4out",/* send procedure */ + "int4out", /* output procedure */ + "int4in", /* receive procedure */ + "int4out", /* send procedure */ NULL, /* array element type - irrelevent */ "-", /* default type value */ (bool) 1, /* passed by value */ @@ -748,7 +749,7 @@ addNewRelationType(char *typeName, Oid new_rel_oid) */ Oid heap_create_with_catalog(char relname[], - TupleDesc tupdesc) + TupleDesc tupdesc) { Relation pg_class_desc; Relation new_rel_desc; diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 3f66216a4c..1f78612fc1 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.38 1998/02/07 21:41:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.39 1998/02/26 04:30:38 momjian Exp $ * * * INTERFACE ROUTINES @@ -119,7 +119,7 @@ DefaultBuild(Relation heapRelation, Relation indexRelation, */ static FormData_pg_attribute sysatts[] = { {0l, {"ctid"}, 27l, 0l, 6, -1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0'}, - {0l, {"oid"}, 26l, 0l, 4, -2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'}, + {0l, {"oid"}, 26l, 0l, 4, -2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'}, {0l, {"xmin"}, 28l, 0l, 4, -3, 0, -1, -1, '\0', '\0', 'i', '\0', '\0'}, {0l, {"cmin"}, 29l, 0l, 4, -4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'}, {0l, {"xmax"}, 28l, 0l, 4, -5, 0, -1, -1, '\0', '\0', 'i', '\0', '\0'}, @@ -460,7 +460,7 @@ ConstructTupleDescriptor(Oid heapoid, ((TypeTupleForm) ((char *) tup + tup->t_hoff))->typbyval; ((AttributeTupleForm) to)->attlen = - ((TypeTupleForm) ((char *) tup + tup->t_hoff))->typlen; + ((TypeTupleForm) ((char *) tup + tup->t_hoff))->typlen; ((AttributeTupleForm) to)->atttypmod = IndexKeyType->typmod; } @@ -1100,7 +1100,7 @@ index_create(char *heapRelationName, * write lock heap to guarantee exclusive access * ---------------- RelationSetLockForWrite(heapRelation); - * ^^^^^ + * ^^^^^ * Does it have any sense ? - vadim 10/27/97 */ @@ -1611,7 +1611,7 @@ DefaultBuild(Relation heapRelation, */ scan = heap_beginscan(heapRelation, /* relation */ 0, /* start at end */ - false, /* seeself */ + false,/* seeself */ 0, /* number of keys */ (ScanKey) NULL); /* scan key */ diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index c754345403..84515e70ed 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.12 1998/02/11 19:10:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.13 1998/02/26 04:30:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -267,7 +267,7 @@ AggregateCreate(char *aggName, } -char * +char * AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull) { HeapTuple tup; diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 235314e530..fc25127427 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.21 1998/02/11 19:10:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.22 1998/02/26 04:30:41 momjian Exp $ * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. @@ -224,7 +224,7 @@ OperatorShellMakeWithOpenRelation(Relation pg_operator_desc, Oid leftObjectId, Oid rightObjectId) { - int i; + int i; HeapTuple tup; Datum values[Natts_pg_operator]; char nulls[Natts_pg_operator]; @@ -782,7 +782,7 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId) }; fmgr_info(ObjectIdEqualRegProcedure, &opKey[0].sk_func); - opKey[0].sk_nargs = opKey[0].sk_func.fn_nargs; + opKey[0].sk_nargs = opKey[0].sk_func.fn_nargs; for (i = 0; i < Natts_pg_operator; ++i) { diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 855999935f..f300b97965 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.14 1998/02/11 19:10:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.15 1998/02/26 04:30:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -216,7 +216,7 @@ ProcedureCreate(char *procedureName, if (strcmp(languageName, "sql") == 0) { plan_list = pg_parse_and_plan(prosrc, typev, parameterCount, - &querytree_list, dest); + &querytree_list, dest); /* typecheck return value */ pg_checkretval(typeObjectId, querytree_list); diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index 7a137c254f..9fef898f2b 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.19 1998/02/11 19:10:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.20 1998/02/26 04:30:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -155,7 +155,7 @@ TypeGet(char *typeName, /* name of type to be fetched */ static Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName) { - int i; + int i; HeapTuple tup; Datum values[Natts_pg_type]; char nulls[Natts_pg_type]; @@ -605,7 +605,7 @@ TypeRename(char *oldTypeName, char *newTypeName) * the CALLER is responsible for pfreeing the */ -char * +char * makeArrayTypeName(char *typeName) { char *arr; diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index ea3058e9e0..58cc6b467c 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.28 1998/01/31 04:38:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.29 1998/02/26 04:30:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ #include <libpq/libpq.h> #ifndef HAVE_STRDUP -# include <port-protos.h> /* for strdup() */ +#include <port-protos.h> /* for strdup() */ #endif #include <storage/lmgr.h> @@ -97,7 +97,7 @@ static Dllist *pendingNotifies = NULL; static int AsyncExistsPendingNotify(char *); static void ClearPendingNotify(void); static void Async_NotifyFrontEnd(void); -void Async_Unlisten(char *relname, int pid); +void Async_Unlisten(char *relname, int pid); static void Async_UnlistenOnExit(int code, char *relname); /* @@ -617,7 +617,7 @@ Async_NotifyFrontEnd() if (whereToSendOutput == Remote) { pq_putnchar("A", 1); - pq_putint((int32)MyProcPid, sizeof(int32)); + pq_putint((int32) MyProcPid, sizeof(int32)); pq_putstr(DatumGetName(d)->data); pq_flush(); } diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 9b2df76761..377f8f166c 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.22 1998/01/10 05:19:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.23 1998/02/26 04:30:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -212,8 +212,8 @@ copy_heap(Oid OIDOldHeap) OldHeapDesc = RelationGetTupleDescriptor(OldHeap); /* - * Need to make a copy of the tuple descriptor, heap_create_with_catalog - * modifies it. + * Need to make a copy of the tuple descriptor, + * heap_create_with_catalog modifies it. */ tupdesc = CreateTupleDescCopy(OldHeapDesc); diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 4e66b1fe3e..0bf94de220 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.25 1998/02/07 21:41:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.26 1998/02/26 04:30:49 momjian Exp $ * * NOTES * The PortalExecutorHeapMemory crap needs to be eliminated @@ -97,10 +97,10 @@ PerformPortalFetch(char *name, char *tag, CommandDest dest) { - Portal portal; - int feature; - QueryDesc *queryDesc; - MemoryContext context; + Portal portal; + int feature; + QueryDesc *queryDesc; + MemoryContext context; /* ---------------- * sanity checks @@ -148,16 +148,16 @@ PerformPortalFetch(char *name, * ---------------- */ queryDesc = PortalGetQueryDesc(portal); - - if ( dest == None ) /* MOVE */ + + if (dest == None) /* MOVE */ { - QueryDesc *qdesc = (QueryDesc *) palloc (sizeof (QueryDesc)); - - memcpy (qdesc, queryDesc, sizeof (QueryDesc)); + QueryDesc *qdesc = (QueryDesc *) palloc(sizeof(QueryDesc)); + + memcpy(qdesc, queryDesc, sizeof(QueryDesc)); qdesc->dest = dest; queryDesc = qdesc; } - + BeginCommand(name, queryDesc->operation, portal->attinfo, /* QueryDescGetTypeInfo(queryDesc), @@ -178,9 +178,9 @@ PerformPortalFetch(char *name, ExecutorRun(queryDesc, PortalGetState(portal), feature, count); - if ( dest == None ) /* MOVE */ - pfree (queryDesc); - + if (dest == None) /* MOVE */ + pfree(queryDesc); + /* ---------------- * Note: the "end-of-command" tag is returned by higher-level * utility code diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 7807ddb91f..bf8a974401 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.43 1998/02/25 13:06:08 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.44 1998/02/26 04:30:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,8 @@ static Oid GetOutputFunction(Oid type); static Oid GetTypeElement(Oid type); static Oid GetInputFunction(Oid type); static Oid IsTypeByVal(Oid type); -static void GetIndexRelations(Oid main_relation_oid, +static void +GetIndexRelations(Oid main_relation_oid, int *n_indices, Relation **index_rels); @@ -64,7 +65,7 @@ static void CopyAttributeOut(FILE *fp, char *string, char *delim); static int CountTuples(Relation relation); extern FILE *Pfout, - *Pfin; + *Pfin; static int lineno; @@ -275,7 +276,7 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim) if (!isnull) { string = (char *) (*fmgr_faddr(&out_functions[i])) - (value, elements[i], typmod[i]); + (value, elements[i], typmod[i]); CopyAttributeOut(fp, string, delim); pfree(string); } @@ -582,8 +583,8 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim) { values[i] = (Datum) (*fmgr_faddr(&in_functions[i])) (string, - elements[i], - typmod[i]); + elements[i], + typmod[i]); /* * Sanity check - by reference attributes cannot @@ -592,7 +593,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim) if (!PointerIsValid(values[i]) && !(rel->rd_att->attrs[i]->attbyval)) { - elog(ERROR, "copy from line %d: Bad file format",lineno); + elog(ERROR, "copy from line %d: Bad file format", lineno); } } } diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index 13f43d7a75..4d57b56095 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.25 1998/02/10 04:00:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.26 1998/02/26 04:30:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ DefineRelation(CreateStmt *stmt) if (strlen(stmt->relname) >= NAMEDATALEN) elog(ERROR, "the relation name %s is >= %d characters long", stmt->relname, NAMEDATALEN); - StrNCpy(relname, stmt->relname, NAMEDATALEN); /* make full length for + StrNCpy(relname, stmt->relname, NAMEDATALEN); /* make full length for * copy */ /* ---------------- @@ -253,7 +253,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr) if (relation == NULL) { elog(ERROR, - "MergeAttr: Can't inherit from non-existent superclass '%s'", name); + "MergeAttr: Can't inherit from non-existent superclass '%s'", name); } if (relation->rd_rel->relkind == 'S') { @@ -334,7 +334,8 @@ MergeAttributes(List *schema, List *supers, List **supconstr) for (i = 0; i < constr->num_check; i++) { - Constraint *cdef = (Constraint *) makeNode(Constraint); /* palloc(sizeof(Constraint)); */ + Constraint *cdef = (Constraint *) makeNode(Constraint); /* palloc(sizeof(Constrai + * nt)); */ cdef->contype = CONSTR_CHECK; if (check[i].ccname[0] == '$') diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 9326b1a549..104091fb28 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.7 1998/02/25 13:06:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.8 1998/02/26 04:30:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,10 +61,10 @@ createdb(char *dbname, char *dbpath) closeAllVfds(); /* Now create directory for this new database */ - if ((dbpath != NULL) && (strcmp(dbpath,dbname) != 0)) + if ((dbpath != NULL) && (strcmp(dbpath, dbname) != 0)) { - if (*(dbpath+strlen(dbpath)-1) == SEP_CHAR) - *(dbpath+strlen(dbpath)-1) = '\0'; + if (*(dbpath + strlen(dbpath) - 1) == SEP_CHAR) + *(dbpath + strlen(dbpath) - 1) = '\0'; sprintf(loc, "%s%c%s", dbpath, SEP_CHAR, dbname); } else @@ -75,12 +75,12 @@ createdb(char *dbname, char *dbpath) lp = ExpandDatabasePath(loc); if (lp == NULL) - elog(ERROR,"Unable to locate path '%s'" - "\n\tThis may be due to a missing environment variable" - " in the server",loc); + elog(ERROR, "Unable to locate path '%s'" + "\n\tThis may be due to a missing environment variable" + " in the server", loc); - if (mkdir(lp,S_IRWXU) != 0) - elog(ERROR,"Unable to create database directory %s",lp); + if (mkdir(lp, S_IRWXU) != 0) + elog(ERROR, "Unable to create database directory %s", lp); sprintf(buf, "%s %s%cbase%ctemplate1%c* %s", COPY_CMD, DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR, lp); @@ -93,7 +93,7 @@ createdb(char *dbname, char *dbpath) #endif sprintf(buf, "insert into pg_database (datname, datdba, datpath)" - " values (\'%s\', \'%d\', \'%s\');", dbname, user_id, loc); + " values (\'%s\', \'%d\', \'%s\');", dbname, user_id, loc); pg_exec_query(buf, (char **) NULL, (Oid *) NULL, 0); } @@ -104,7 +104,7 @@ destroydb(char *dbname) Oid user_id, db_id; char *path; - char dbpath[MAXPGPATH+1]; + char dbpath[MAXPGPATH + 1]; char buf[512]; /* @@ -122,10 +122,10 @@ destroydb(char *dbname) stop_vacuum(dbpath, dbname); path = ExpandDatabasePath(dbpath); - if (path == NULL) - elog(ERROR,"Unable to locate path '%s'" - "\n\tThis may be due to a missing environment variable" - " in the server",dbpath); + if (path == NULL) + elog(ERROR, "Unable to locate path '%s'" + "\n\tThis may be due to a missing environment variable" + " in the server", dbpath); /* * remove the pg_database tuple FIRST, this may fail due to @@ -206,7 +206,7 @@ check_permissions(char *command, bool use_super; char *userName; text *dbtext; - char path[MAXPGPATH+1]; + char path[MAXPGPATH + 1]; userName = GetPgUserName(); utup = SearchSysCacheTuple(USENAME, PointerGetDatum(userName), @@ -264,12 +264,12 @@ check_permissions(char *command, (char *) NULL); *dbIdP = dbtup->t_oid; dbtext = (text *) heap_getattr(dbtup, - Anum_pg_database_datpath, - RelationGetTupleDescriptor(dbrel), - (char *) NULL); + Anum_pg_database_datpath, + RelationGetTupleDescriptor(dbrel), + (char *) NULL); - strncpy(path, VARDATA(dbtext), (VARSIZE(dbtext)-VARHDRSZ)); - *(path+VARSIZE(dbtext)-VARHDRSZ) = '\0'; + strncpy(path, VARDATA(dbtext), (VARSIZE(dbtext) - VARHDRSZ)); + *(path + VARSIZE(dbtext) - VARHDRSZ) = '\0'; } else { @@ -304,7 +304,7 @@ check_permissions(char *command, if (dbfound && !strcmp(command, "destroydb")) strcpy(dbpath, path); -} /* check_permissions() */ +} /* check_permissions() */ /* * stop_vacuum() -- stop the vacuum daemon on the database, if one is running. @@ -319,7 +319,7 @@ stop_vacuum(char *dbpath, char *dbname) if (strchr(dbpath, SEP_CHAR) != 0) { sprintf(filename, "%s%cbase%c%s%c%s.vacuum", DataDir, SEP_CHAR, SEP_CHAR, - dbname, SEP_CHAR, dbname); + dbname, SEP_CHAR, dbname); } else { diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index e5d524cd07..15ad37d76e 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.23 1998/02/25 13:06:12 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.24 1998/02/26 04:30:57 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -265,39 +265,42 @@ CreateFunction(ProcedureStmt *stmt, CommandDest dest) } else { - HeapTuple languageTuple; - Form_pg_language languageStruct; + HeapTuple languageTuple; + Form_pg_language languageStruct; - /* Lookup the language in the system cache */ + /* Lookup the language in the system cache */ languageTuple = SearchSysCacheTuple(LANNAME, - PointerGetDatum(languageName), - 0, 0, 0); - - if (!HeapTupleIsValid(languageTuple)) { - - elog(ERROR, - "Unrecognized language specified in a CREATE FUNCTION: " - "'%s'. Recognized languages are sql, C, internal " - "and the created procedural languages.", - languageName); + PointerGetDatum(languageName), + 0, 0, 0); + + if (!HeapTupleIsValid(languageTuple)) + { + + elog(ERROR, + "Unrecognized language specified in a CREATE FUNCTION: " + "'%s'. Recognized languages are sql, C, internal " + "and the created procedural languages.", + languageName); } /* Check that this language is a PL */ languageStruct = (Form_pg_language) GETSTRUCT(languageTuple); - if (!(languageStruct->lanispl)) { - elog(ERROR, - "Language '%s' isn't defined as PL", languageName); + if (!(languageStruct->lanispl)) + { + elog(ERROR, + "Language '%s' isn't defined as PL", languageName); } /* - * Functions in untrusted procedural languages are - * restricted to be defined by postgres superusers only + * Functions in untrusted procedural languages are restricted to + * be defined by postgres superusers only */ - if (languageStruct->lanpltrusted == false && !superuser()) { - elog(ERROR, "Only users with Postgres superuser privilege " - "are permitted to create a function in the '%s' " - "language.", - languageName); + if (languageStruct->lanpltrusted == false && !superuser()) + { + elog(ERROR, "Only users with Postgres superuser privilege " + "are permitted to create a function in the '%s' " + "language.", + languageName); } lanisPL = true; diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 879fdc82d0..a8b32e2e0a 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.17 1998/02/13 03:21:30 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.18 1998/02/26 04:30:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -204,23 +204,23 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) appendStringInfo(str, buf); } appendStringInfo(str, "\n"); - + /* initPlan-s */ if (plan->initPlan) { - List *saved_rtable = es->rtable; - List *lst; - + List *saved_rtable = es->rtable; + List *lst; + for (i = 0; i < indent; i++) appendStringInfo(str, " "); appendStringInfo(str, " InitPlan\n"); - foreach (lst, plan->initPlan) + foreach(lst, plan->initPlan) { - es->rtable = ((SubPlan*) lfirst(lst))->rtable; + es->rtable = ((SubPlan *) lfirst(lst))->rtable; for (i = 0; i < indent; i++) appendStringInfo(str, " "); appendStringInfo(str, " -> "); - explain_outNode(str, ((SubPlan*) lfirst(lst))->plan, indent + 4, es); + explain_outNode(str, ((SubPlan *) lfirst(lst))->plan, indent + 4, es); } es->rtable = saved_rtable; } @@ -242,23 +242,23 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) appendStringInfo(str, " -> "); explain_outNode(str, innerPlan(plan), indent + 3, es); } - + /* subPlan-s */ if (plan->subPlan) { - List *saved_rtable = es->rtable; - List *lst; - + List *saved_rtable = es->rtable; + List *lst; + for (i = 0; i < indent; i++) appendStringInfo(str, " "); appendStringInfo(str, " SubPlan\n"); - foreach (lst, plan->subPlan) + foreach(lst, plan->subPlan) { - es->rtable = ((SubPlan*) lfirst(lst))->rtable; + es->rtable = ((SubPlan *) lfirst(lst))->rtable; for (i = 0; i < indent; i++) appendStringInfo(str, " "); appendStringInfo(str, " -> "); - explain_outNode(str, ((SubPlan*) lfirst(lst))->plan, indent + 4, es); + explain_outNode(str, ((SubPlan *) lfirst(lst))->plan, indent + 4, es); } es->rtable = saved_rtable; } diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index 870a0fb65a..aac1297950 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -43,7 +43,7 @@ case_translate_language_name(const char *input, char *output) * --------------------------------------------------------------------- */ void -CreateProceduralLanguage(CreatePLangStmt * stmt) +CreateProceduralLanguage(CreatePLangStmt *stmt) { char languageName[NAMEDATALEN]; HeapTuple langTup; @@ -139,7 +139,7 @@ CreateProceduralLanguage(CreatePLangStmt * stmt) * --------------------------------------------------------------------- */ void -DropProceduralLanguage(DropPLangStmt * stmt) +DropProceduralLanguage(DropPLangStmt *stmt) { char languageName[NAMEDATALEN]; HeapTuple langTup; diff --git a/src/backend/commands/recipe.c b/src/backend/commands/recipe.c index a95913392c..8034a51531 100644 --- a/src/backend/commands/recipe.c +++ b/src/backend/commands/recipe.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.19 1998/02/10 04:00:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.20 1998/02/26 04:30:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -493,9 +493,9 @@ tg_replaceNumberedParam(Node *expression, { newVar = makeVar(rt_ind, 0, /* the whole tuple */ - TypeGet(teeRelName, &defined), + TypeGet(teeRelName, &defined), -1, - 0, + 0, rt_ind, 0); return (Node *) newVar; @@ -504,9 +504,9 @@ tg_replaceNumberedParam(Node *expression, newVar = makeVar(rt_ind, 1, /* just the first field, * which is 'result' */ - TypeGet(teeRelName, &defined), + TypeGet(teeRelName, &defined), -1, - 0, + 0, rt_ind, 0); return (Node *) newVar; @@ -1052,7 +1052,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) tupdesc = rel->rd_att; relid = heap_create_with_catalog( - child->nodeElem->outTypes->val[0], tupdesc); + child->nodeElem->outTypes->val[0], tupdesc); } else { @@ -1077,7 +1077,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) else { relid = heap_create_with_catalog( - child->nodeElem->outTypes->val[0], tupdesc); + child->nodeElem->outTypes->val[0], tupdesc); } } } diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 33062b911b..c0ab43da7c 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -38,7 +38,7 @@ TriggerData *CurrentTriggerData = NULL; void RelationBuildTriggers(Relation relation); void FreeTriggerDesc(Relation relation); -static void DescribeTrigger(TriggerDesc * trigdesc, Trigger * trigger); +static void DescribeTrigger(TriggerDesc *trigdesc, Trigger *trigger); static HeapTuple GetTupleForTrigger(Relation relation, ItemPointer tid, bool before); @@ -46,7 +46,7 @@ GetTupleForTrigger(Relation relation, ItemPointer tid, extern GlobalMemory CacheCxt; void -CreateTrigger(CreateTrigStmt * stmt) +CreateTrigger(CreateTrigStmt *stmt) { int16 tgtype; int16 tgattr[8] = {0}; @@ -249,7 +249,7 @@ CreateTrigger(CreateTrigStmt * stmt) } void -DropTrigger(DropTrigStmt * stmt) +DropTrigger(DropTrigStmt *stmt) { Relation rel; Relation tgrel; @@ -519,7 +519,7 @@ FreeTriggerDesc(Relation relation) } static void -DescribeTrigger(TriggerDesc * trigdesc, Trigger * trigger) +DescribeTrigger(TriggerDesc *trigdesc, Trigger *trigger) { uint16 *n; Trigger ***t, @@ -593,7 +593,7 @@ DescribeTrigger(TriggerDesc * trigdesc, Trigger * trigger) } static HeapTuple -ExecCallTriggerFunc(Trigger * trigger) +ExecCallTriggerFunc(Trigger *trigger) { if (trigger->tgfunc.fn_addr == NULL) @@ -601,9 +601,10 @@ ExecCallTriggerFunc(Trigger * trigger) fmgr_info(trigger->tgfoid, &trigger->tgfunc); } - if (trigger->tgfunc.fn_plhandler != NULL) { + if (trigger->tgfunc.fn_plhandler != NULL) + { return (HeapTuple) (*(trigger->tgfunc.fn_plhandler)) - (&trigger->tgfunc); + (&trigger->tgfunc); } return (HeapTuple) ((*fmgr_faddr(&trigger->tgfunc)) ()); diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 05506fd93f..9ef2613a4f 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -43,34 +43,39 @@ static void CheckPgUserAclNotNull(void); *--------------------------------------------------------------------- */ static -void UpdatePgPwdFile(char* sql) { - - char* filename; - char* tempname; - - /* Create a temporary filename to be renamed later. This prevents the - * backend from clobbering the pg_pwd file while the postmaster might be - * reading from it. - */ - filename = crypt_getpwdfilename(); - tempname = (char*)malloc(strlen(filename) + 12); - sprintf(tempname, "%s.%d", filename, MyProcPid); - - /* Copy the contents of pg_shadow to the pg_pwd ASCII file using a the SEPCHAR - * character as the delimiter between fields. Then rename the file to its - * final name. - */ - sprintf(sql, "copy %s to '%s' using delimiters %s", ShadowRelationName, tempname, CRYPT_PWD_FILE_SEPCHAR); - pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0); - rename(tempname, filename); - free((void*)tempname); - - /* Create a flag file the postmaster will detect the next time it tries to - * authenticate a user. The postmaster will know to reload the pg_pwd file - * contents. - */ - filename = crypt_getpwdreloadfilename(); - creat(filename, S_IRUSR | S_IWUSR); +void +UpdatePgPwdFile(char *sql) +{ + + char *filename; + char *tempname; + + /* + * Create a temporary filename to be renamed later. This prevents the + * backend from clobbering the pg_pwd file while the postmaster might + * be reading from it. + */ + filename = crypt_getpwdfilename(); + tempname = (char *) malloc(strlen(filename) + 12); + sprintf(tempname, "%s.%d", filename, MyProcPid); + + /* + * Copy the contents of pg_shadow to the pg_pwd ASCII file using a the + * SEPCHAR character as the delimiter between fields. Then rename the + * file to its final name. + */ + sprintf(sql, "copy %s to '%s' using delimiters %s", ShadowRelationName, tempname, CRYPT_PWD_FILE_SEPCHAR); + pg_exec_query(sql, (char **) NULL, (Oid *) NULL, 0); + rename(tempname, filename); + free((void *) tempname); + + /* + * Create a flag file the postmaster will detect the next time it + * tries to authenticate a user. The postmaster will know to reload + * the pg_pwd file contents. + */ + filename = crypt_getpwdreloadfilename(); + creat(filename, S_IRUSR | S_IWUSR); } /*--------------------------------------------------------------------- @@ -80,352 +85,407 @@ void UpdatePgPwdFile(char* sql) { * user is specified in the desired groups of defined in pg_group. *--------------------------------------------------------------------- */ -void DefineUser(CreateUserStmt *stmt) { - - char* pg_user; - Relation pg_shadow_rel; - TupleDesc pg_shadow_dsc; - HeapScanDesc scan; - HeapTuple tuple; - Datum datum; - Buffer buffer; - char sql[512]; - char* sql_end; - bool exists = false, - n, - inblock; - int max_id = -1; - - if (stmt->password) - CheckPgUserAclNotNull(); - if (!(inblock = IsTransactionBlock())) - BeginTransactionBlock(); - - /* Make sure the user attempting to create a user can insert into the pg_shadow - * relation. - */ - pg_user = GetPgUserName(); - if (pg_aclcheck(ShadowRelationName, pg_user, ACL_RD | ACL_WR | ACL_AP) != ACLCHECK_OK) { - UserAbortTransactionBlock(); - elog(ERROR, "defineUser: user \"%s\" does not have SELECT and INSERT privilege for \"%s\"", - pg_user, ShadowRelationName); - return; - } - - /* Scan the pg_shadow relation to be certain the user doesn't already exist. - */ - pg_shadow_rel = heap_openr(ShadowRelationName); - pg_shadow_dsc = RelationGetTupleDescriptor(pg_shadow_rel); - /* Secure a write lock on pg_shadow so we can be sure of what the next usesysid - * should be. - */ - RelationSetLockForWrite(pg_shadow_rel); - - scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL); - while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) { - datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_shadow_dsc, &n); - - if (!exists && !strncmp((char*)datum, stmt->user, strlen(stmt->user))) - exists = true; - - datum = heap_getattr(tuple, Anum_pg_shadow_usesysid, pg_shadow_dsc, &n); - if ((int)datum > max_id) - max_id = (int)datum; - - ReleaseBuffer(buffer); - } - heap_endscan(scan); - - if (exists) { - RelationUnsetLockForWrite(pg_shadow_rel); - heap_close(pg_shadow_rel); - UserAbortTransactionBlock(); - elog(ERROR, "defineUser: user \"%s\" has already been created", stmt->user); - return; - } - - /* Build the insert statment to be executed. - */ - sprintf(sql, "insert into %s(usename,usesysid,usecreatedb,usetrace,usesuper,usecatupd,passwd", ShadowRelationName); -/* if (stmt->password) - strcat(sql, ",passwd"); -- removed so that insert empty string when no password */ - if (stmt->validUntil) - strcat(sql, ",valuntil"); - - sql_end = sql + strlen(sql); - sprintf(sql_end, ") values('%s',%d", stmt->user, max_id + 1); - if (stmt->createdb && *stmt->createdb) - strcat(sql_end, ",'t','t'"); - else - strcat(sql_end, ",'f','t'"); - if (stmt->createuser && *stmt->createuser) - strcat(sql_end, ",'t','t'"); - else - strcat(sql_end, ",'f','t'"); - sql_end += strlen(sql_end); - if (stmt->password) { - sprintf(sql_end, ",'%s'", stmt->password); - sql_end += strlen(sql_end); - } else { - strcpy(sql_end, ",''"); - sql_end += strlen(sql_end); - } - if (stmt->validUntil) { - sprintf(sql_end, ",'%s'", stmt->validUntil); - sql_end += strlen(sql_end); - } - strcat(sql_end, ")"); - - pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0); - - /* Add the stuff here for groups. - */ - - UpdatePgPwdFile(sql); - - /* This goes after the UpdatePgPwdFile to be certain that two backends to not - * attempt to write to the pg_pwd file at the same time. - */ - RelationUnsetLockForWrite(pg_shadow_rel); - heap_close(pg_shadow_rel); - - if (IsTransactionBlock() && !inblock) - EndTransactionBlock(); +void +DefineUser(CreateUserStmt *stmt) +{ + + char *pg_user; + Relation pg_shadow_rel; + TupleDesc pg_shadow_dsc; + HeapScanDesc scan; + HeapTuple tuple; + Datum datum; + Buffer buffer; + char sql[512]; + char *sql_end; + bool exists = false, + n, + inblock; + int max_id = -1; + + if (stmt->password) + CheckPgUserAclNotNull(); + if (!(inblock = IsTransactionBlock())) + BeginTransactionBlock(); + + /* + * Make sure the user attempting to create a user can insert into the + * pg_shadow relation. + */ + pg_user = GetPgUserName(); + if (pg_aclcheck(ShadowRelationName, pg_user, ACL_RD | ACL_WR | ACL_AP) != ACLCHECK_OK) + { + UserAbortTransactionBlock(); + elog(ERROR, "defineUser: user \"%s\" does not have SELECT and INSERT privilege for \"%s\"", + pg_user, ShadowRelationName); + return; + } + + /* + * Scan the pg_shadow relation to be certain the user doesn't already + * exist. + */ + pg_shadow_rel = heap_openr(ShadowRelationName); + pg_shadow_dsc = RelationGetTupleDescriptor(pg_shadow_rel); + + /* + * Secure a write lock on pg_shadow so we can be sure of what the next + * usesysid should be. + */ + RelationSetLockForWrite(pg_shadow_rel); + + scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL); + while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) + { + datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_shadow_dsc, &n); + + if (!exists && !strncmp((char *) datum, stmt->user, strlen(stmt->user))) + exists = true; + + datum = heap_getattr(tuple, Anum_pg_shadow_usesysid, pg_shadow_dsc, &n); + if ((int) datum > max_id) + max_id = (int) datum; + + ReleaseBuffer(buffer); + } + heap_endscan(scan); + + if (exists) + { + RelationUnsetLockForWrite(pg_shadow_rel); + heap_close(pg_shadow_rel); + UserAbortTransactionBlock(); + elog(ERROR, "defineUser: user \"%s\" has already been created", stmt->user); + return; + } + + /* + * Build the insert statment to be executed. + */ + sprintf(sql, "insert into %s(usename,usesysid,usecreatedb,usetrace,usesuper,usecatupd,passwd", ShadowRelationName); +/* if (stmt->password) + strcat(sql, ",passwd"); -- removed so that insert empty string when no password */ + if (stmt->validUntil) + strcat(sql, ",valuntil"); + + sql_end = sql + strlen(sql); + sprintf(sql_end, ") values('%s',%d", stmt->user, max_id + 1); + if (stmt->createdb && *stmt->createdb) + strcat(sql_end, ",'t','t'"); + else + strcat(sql_end, ",'f','t'"); + if (stmt->createuser && *stmt->createuser) + strcat(sql_end, ",'t','t'"); + else + strcat(sql_end, ",'f','t'"); + sql_end += strlen(sql_end); + if (stmt->password) + { + sprintf(sql_end, ",'%s'", stmt->password); + sql_end += strlen(sql_end); + } + else + { + strcpy(sql_end, ",''"); + sql_end += strlen(sql_end); + } + if (stmt->validUntil) + { + sprintf(sql_end, ",'%s'", stmt->validUntil); + sql_end += strlen(sql_end); + } + strcat(sql_end, ")"); + + pg_exec_query(sql, (char **) NULL, (Oid *) NULL, 0); + + /* + * Add the stuff here for groups. + */ + + UpdatePgPwdFile(sql); + + /* + * This goes after the UpdatePgPwdFile to be certain that two backends + * to not attempt to write to the pg_pwd file at the same time. + */ + RelationUnsetLockForWrite(pg_shadow_rel); + heap_close(pg_shadow_rel); + + if (IsTransactionBlock() && !inblock) + EndTransactionBlock(); } -extern void AlterUser(AlterUserStmt *stmt) { - - char* pg_user; - Relation pg_shadow_rel; - TupleDesc pg_shadow_dsc; - HeapScanDesc scan; - HeapTuple tuple; - Datum datum; - Buffer buffer; - char sql[512]; - char* sql_end; - bool exists = false, - n, - inblock; - - if (stmt->password) - CheckPgUserAclNotNull(); - if (!(inblock = IsTransactionBlock())) - BeginTransactionBlock(); - - /* Make sure the user attempting to create a user can insert into the pg_shadow - * relation. - */ - pg_user = GetPgUserName(); - if (pg_aclcheck(ShadowRelationName, pg_user, ACL_RD | ACL_WR) != ACLCHECK_OK) { - UserAbortTransactionBlock(); - elog(ERROR, "alterUser: user \"%s\" does not have SELECT and UPDATE privilege for \"%s\"", - pg_user, ShadowRelationName); - return; - } - - /* Scan the pg_shadow relation to be certain the user exists. - */ - pg_shadow_rel = heap_openr(ShadowRelationName); - pg_shadow_dsc = RelationGetTupleDescriptor(pg_shadow_rel); - /* Secure a write lock on pg_shadow so we can be sure that when the dump of - * the pg_pwd file is done, there is not another backend doing the same. - */ - RelationSetLockForWrite(pg_shadow_rel); - - scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL); - while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) { - datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_shadow_dsc, &n); - - if (!strncmp((char*)datum, stmt->user, strlen(stmt->user))) { - exists = true; - ReleaseBuffer(buffer); - break; - } - } - heap_endscan(scan); - - if (!exists) { - RelationUnsetLockForWrite(pg_shadow_rel); - heap_close(pg_shadow_rel); - UserAbortTransactionBlock(); - elog(ERROR, "alterUser: user \"%s\" does not exist", stmt->user); - return; - } - - /* Create the update statement to modify the user. - */ - sprintf(sql, "update %s set", ShadowRelationName); - sql_end = sql; - if (stmt->password) { - sql_end += strlen(sql_end); - sprintf(sql_end, " passwd = '%s'", stmt->password); - } - if (stmt->createdb) { - if (sql_end != sql) - strcat(sql_end, ","); - sql_end += strlen(sql_end); - if (*stmt->createdb) - strcat(sql_end, " usecreatedb = 't'"); - else - strcat(sql_end, " usecreatedb = 'f'"); - } - if (stmt->createuser) { - if (sql_end != sql) - strcat(sql_end, ","); - sql_end += strlen(sql_end); - if (*stmt->createuser) - strcat(sql_end, " usesuper = 't'"); - else - strcat(sql_end, " usesuper = 'f'"); - } - if (stmt->validUntil) { - if (sql_end != sql) - strcat(sql_end, ","); - sql_end += strlen(sql_end); - sprintf(sql_end, " valuntil = '%s'", stmt->validUntil); - } - if (sql_end != sql) { - sql_end += strlen(sql_end); - sprintf(sql_end, " where usename = '%s'", stmt->user); - pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0); - } - - /* do the pg_group stuff here */ - - UpdatePgPwdFile(sql); - - RelationUnsetLockForWrite(pg_shadow_rel); - heap_close(pg_shadow_rel); - - if (IsTransactionBlock() && !inblock) - EndTransactionBlock(); +extern void +AlterUser(AlterUserStmt *stmt) +{ + + char *pg_user; + Relation pg_shadow_rel; + TupleDesc pg_shadow_dsc; + HeapScanDesc scan; + HeapTuple tuple; + Datum datum; + Buffer buffer; + char sql[512]; + char *sql_end; + bool exists = false, + n, + inblock; + + if (stmt->password) + CheckPgUserAclNotNull(); + if (!(inblock = IsTransactionBlock())) + BeginTransactionBlock(); + + /* + * Make sure the user attempting to create a user can insert into the + * pg_shadow relation. + */ + pg_user = GetPgUserName(); + if (pg_aclcheck(ShadowRelationName, pg_user, ACL_RD | ACL_WR) != ACLCHECK_OK) + { + UserAbortTransactionBlock(); + elog(ERROR, "alterUser: user \"%s\" does not have SELECT and UPDATE privilege for \"%s\"", + pg_user, ShadowRelationName); + return; + } + + /* + * Scan the pg_shadow relation to be certain the user exists. + */ + pg_shadow_rel = heap_openr(ShadowRelationName); + pg_shadow_dsc = RelationGetTupleDescriptor(pg_shadow_rel); + + /* + * Secure a write lock on pg_shadow so we can be sure that when the + * dump of the pg_pwd file is done, there is not another backend doing + * the same. + */ + RelationSetLockForWrite(pg_shadow_rel); + + scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL); + while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) + { + datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_shadow_dsc, &n); + + if (!strncmp((char *) datum, stmt->user, strlen(stmt->user))) + { + exists = true; + ReleaseBuffer(buffer); + break; + } + } + heap_endscan(scan); + + if (!exists) + { + RelationUnsetLockForWrite(pg_shadow_rel); + heap_close(pg_shadow_rel); + UserAbortTransactionBlock(); + elog(ERROR, "alterUser: user \"%s\" does not exist", stmt->user); + return; + } + + /* + * Create the update statement to modify the user. + */ + sprintf(sql, "update %s set", ShadowRelationName); + sql_end = sql; + if (stmt->password) + { + sql_end += strlen(sql_end); + sprintf(sql_end, " passwd = '%s'", stmt->password); + } + if (stmt->createdb) + { + if (sql_end != sql) + strcat(sql_end, ","); + sql_end += strlen(sql_end); + if (*stmt->createdb) + strcat(sql_end, " usecreatedb = 't'"); + else + strcat(sql_end, " usecreatedb = 'f'"); + } + if (stmt->createuser) + { + if (sql_end != sql) + strcat(sql_end, ","); + sql_end += strlen(sql_end); + if (*stmt->createuser) + strcat(sql_end, " usesuper = 't'"); + else + strcat(sql_end, " usesuper = 'f'"); + } + if (stmt->validUntil) + { + if (sql_end != sql) + strcat(sql_end, ","); + sql_end += strlen(sql_end); + sprintf(sql_end, " valuntil = '%s'", stmt->validUntil); + } + if (sql_end != sql) + { + sql_end += strlen(sql_end); + sprintf(sql_end, " where usename = '%s'", stmt->user); + pg_exec_query(sql, (char **) NULL, (Oid *) NULL, 0); + } + + /* do the pg_group stuff here */ + + UpdatePgPwdFile(sql); + + RelationUnsetLockForWrite(pg_shadow_rel); + heap_close(pg_shadow_rel); + + if (IsTransactionBlock() && !inblock) + EndTransactionBlock(); } -extern void RemoveUser(char* user) { - - char* pg_user; - Relation pg_shadow_rel, - pg_rel; - TupleDesc pg_dsc; - HeapScanDesc scan; - HeapTuple tuple; - Datum datum; - Buffer buffer; - char sql[512]; - bool n, - inblock; - int usesysid = -1, - ndbase = 0; - char** dbase = NULL; - - if (!(inblock = IsTransactionBlock())) - BeginTransactionBlock(); - - /* Make sure the user attempting to create a user can delete from the pg_shadow - * relation. - */ - pg_user = GetPgUserName(); - if (pg_aclcheck(ShadowRelationName, pg_user, ACL_RD | ACL_WR) != ACLCHECK_OK) { - UserAbortTransactionBlock(); - elog(ERROR, "removeUser: user \"%s\" does not have SELECT and DELETE privilege for \"%s\"", - pg_user, ShadowRelationName); - return; - } - - /* Perform a scan of the pg_shadow relation to find the usesysid of the user to - * be deleted. If it is not found, then return a warning message. - */ - pg_shadow_rel = heap_openr(ShadowRelationName); - pg_dsc = RelationGetTupleDescriptor(pg_shadow_rel); - /* Secure a write lock on pg_shadow so we can be sure that when the dump of - * the pg_pwd file is done, there is not another backend doing the same. - */ - RelationSetLockForWrite(pg_shadow_rel); - - scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL); - while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) { - datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_dsc, &n); - - if (!strncmp((char*)datum, user, strlen(user))) { - usesysid = (int)heap_getattr(tuple, Anum_pg_shadow_usesysid, pg_dsc, &n); - ReleaseBuffer(buffer); - break; - } - ReleaseBuffer(buffer); - } - heap_endscan(scan); - - if (usesysid == -1) { - RelationUnsetLockForWrite(pg_shadow_rel); - heap_close(pg_shadow_rel); - UserAbortTransactionBlock(); - elog(ERROR, "removeUser: user \"%s\" does not exist", user); - return; - } - - /* Perform a scan of the pg_database relation to find the databases owned by - * usesysid. Then drop them. - */ - pg_rel = heap_openr(DatabaseRelationName); - pg_dsc = RelationGetTupleDescriptor(pg_rel); - - scan = heap_beginscan(pg_rel, false, false, 0, NULL); - while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) { - datum = heap_getattr(tuple, Anum_pg_database_datdba, pg_dsc, &n); - - if ((int)datum == usesysid) { - datum = heap_getattr(tuple, Anum_pg_database_datname, pg_dsc, &n); - if (memcmp((void*)datum, "template1", 9)) { - dbase = (char**)realloc((void*)dbase, sizeof(char*) * (ndbase + 1)); - dbase[ndbase] = (char*)malloc(NAMEDATALEN + 1); - memcpy((void*)dbase[ndbase], (void*)datum, NAMEDATALEN); - dbase[ndbase++][NAMEDATALEN] = '\0'; - } - } - ReleaseBuffer(buffer); - } - heap_endscan(scan); - heap_close(pg_rel); - - while (ndbase--) { - elog(NOTICE, "Dropping database %s", dbase[ndbase]); - sprintf(sql, "drop database %s", dbase[ndbase]); - free((void*)dbase[ndbase]); - pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0); - } - if (dbase) - free((void*)dbase); - - /* Since pg_shadow is global over all databases, one of two things must be done - * to insure complete consistency. First, pg_shadow could be made non-global. - * This would elminate the code above for deleting database and would require - * the addition of code to delete tables, views, etc owned by the user. - * - * The second option would be to create a means of deleting tables, view, - * etc. owned by the user from other databases. Pg_user is global and so - * this must be done at some point. - * - * Let us not forget that the user should be removed from the pg_groups also. - * - * Todd A. Brandys 11/18/1997 - * - */ - - /* Remove the user from the pg_shadow table - */ - sprintf(sql, "delete from %s where usename = '%s'", ShadowRelationName, user); - pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0); - - UpdatePgPwdFile(sql); - - RelationUnsetLockForWrite(pg_shadow_rel); - heap_close(pg_shadow_rel); - - if (IsTransactionBlock() && !inblock) - EndTransactionBlock(); +extern void +RemoveUser(char *user) +{ + + char *pg_user; + Relation pg_shadow_rel, + pg_rel; + TupleDesc pg_dsc; + HeapScanDesc scan; + HeapTuple tuple; + Datum datum; + Buffer buffer; + char sql[512]; + bool n, + inblock; + int usesysid = -1, + ndbase = 0; + char **dbase = NULL; + + if (!(inblock = IsTransactionBlock())) + BeginTransactionBlock(); + + /* + * Make sure the user attempting to create a user can delete from the + * pg_shadow relation. + */ + pg_user = GetPgUserName(); + if (pg_aclcheck(ShadowRelationName, pg_user, ACL_RD | ACL_WR) != ACLCHECK_OK) + { + UserAbortTransactionBlock(); + elog(ERROR, "removeUser: user \"%s\" does not have SELECT and DELETE privilege for \"%s\"", + pg_user, ShadowRelationName); + return; + } + + /* + * Perform a scan of the pg_shadow relation to find the usesysid of + * the user to be deleted. If it is not found, then return a warning + * message. + */ + pg_shadow_rel = heap_openr(ShadowRelationName); + pg_dsc = RelationGetTupleDescriptor(pg_shadow_rel); + + /* + * Secure a write lock on pg_shadow so we can be sure that when the + * dump of the pg_pwd file is done, there is not another backend doing + * the same. + */ + RelationSetLockForWrite(pg_shadow_rel); + + scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL); + while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) + { + datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_dsc, &n); + + if (!strncmp((char *) datum, user, strlen(user))) + { + usesysid = (int) heap_getattr(tuple, Anum_pg_shadow_usesysid, pg_dsc, &n); + ReleaseBuffer(buffer); + break; + } + ReleaseBuffer(buffer); + } + heap_endscan(scan); + + if (usesysid == -1) + { + RelationUnsetLockForWrite(pg_shadow_rel); + heap_close(pg_shadow_rel); + UserAbortTransactionBlock(); + elog(ERROR, "removeUser: user \"%s\" does not exist", user); + return; + } + + /* + * Perform a scan of the pg_database relation to find the databases + * owned by usesysid. Then drop them. + */ + pg_rel = heap_openr(DatabaseRelationName); + pg_dsc = RelationGetTupleDescriptor(pg_rel); + + scan = heap_beginscan(pg_rel, false, false, 0, NULL); + while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer))) + { + datum = heap_getattr(tuple, Anum_pg_database_datdba, pg_dsc, &n); + + if ((int) datum == usesysid) + { + datum = heap_getattr(tuple, Anum_pg_database_datname, pg_dsc, &n); + if (memcmp((void *) datum, "template1", 9)) + { + dbase = (char **) realloc((void *) dbase, sizeof(char *) * (ndbase + 1)); + dbase[ndbase] = (char *) malloc(NAMEDATALEN + 1); + memcpy((void *) dbase[ndbase], (void *) datum, NAMEDATALEN); + dbase[ndbase++][NAMEDATALEN] = '\0'; + } + } + ReleaseBuffer(buffer); + } + heap_endscan(scan); + heap_close(pg_rel); + + while (ndbase--) + { + elog(NOTICE, "Dropping database %s", dbase[ndbase]); + sprintf(sql, "drop database %s", dbase[ndbase]); + free((void *) dbase[ndbase]); + pg_exec_query(sql, (char **) NULL, (Oid *) NULL, 0); + } + if (dbase) + free((void *) dbase); + + /* + * Since pg_shadow is global over all databases, one of two things + * must be done to insure complete consistency. First, pg_shadow + * could be made non-global. This would elminate the code above for + * deleting database and would require the addition of code to delete + * tables, views, etc owned by the user. + * + * The second option would be to create a means of deleting tables, view, + * etc. owned by the user from other databases. Pg_user is global and + * so this must be done at some point. + * + * Let us not forget that the user should be removed from the pg_groups + * also. + * + * Todd A. Brandys 11/18/1997 + * + */ + + /* + * Remove the user from the pg_shadow table + */ + sprintf(sql, "delete from %s where usename = '%s'", ShadowRelationName, user); + pg_exec_query(sql, (char **) NULL, (Oid *) NULL, 0); + + UpdatePgPwdFile(sql); + + RelationUnsetLockForWrite(pg_shadow_rel); + heap_close(pg_shadow_rel); + + if (IsTransactionBlock() && !inblock) + EndTransactionBlock(); } /* @@ -433,9 +493,10 @@ extern void RemoveUser(char* user) { * * check to see if there is an ACL on pg_shadow */ -static void CheckPgUserAclNotNull() +static void +CheckPgUserAclNotNull() { -HeapTuple htp; + HeapTuple htp; htp = SearchSysCacheTuple(RELNAME, PointerGetDatum(ShadowRelationName), 0, 0, 0); @@ -451,6 +512,6 @@ HeapTuple htp; elog(NOTICE, "so normal users can not read the passwords."); elog(ERROR, "Try 'REVOKE ALL ON pg_shadow FROM PUBLIC'"); } - + return; } diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 47d5d2fb47..882f5ca106 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.62 1998/02/25 23:40:32 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.63 1998/02/26 04:31:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,9 +54,9 @@ #include <sys/resource.h> #endif -/* #include <port-protos.h> */ /* Why? */ + /* #include <port-protos.h> *//* Why? */ -extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block); +extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block); bool VacuumRunning = false; @@ -136,7 +136,7 @@ vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec) old = MemoryContextSwitchTo((MemoryContext) pmem); if (va_spec != NIL && !analyze) - elog(ERROR,"Can't vacuum columns, only tables. You can 'vacuum analyze' columns."); + elog(ERROR, "Can't vacuum columns, only tables. You can 'vacuum analyze' columns."); foreach(le, va_spec) { @@ -725,8 +725,9 @@ vc_scanheap(VRelStats *vacrelstats, Relation onerel, } else if (!TransactionIdIsInProgress(htup->t_xmin)) { + /* - * Not Aborted, Not Committed, Not in Progress - + * Not Aborted, Not Committed, Not in Progress - * so it's from crashed process. - vadim 11/26/96 */ ncrash++; @@ -741,11 +742,11 @@ vc_scanheap(VRelStats *vacrelstats, Relation onerel, } } - /* - * here we are concerned about tuples with xmin committed - * and xmax unknown or committed + /* + * here we are concerned about tuples with xmin committed and + * xmax unknown or committed */ - if (htup->t_infomask & HEAP_XMIN_COMMITTED && + if (htup->t_infomask & HEAP_XMIN_COMMITTED && !(htup->t_infomask & HEAP_XMAX_INVALID)) { if (htup->t_infomask & HEAP_XMAX_COMMITTED) @@ -759,6 +760,7 @@ vc_scanheap(VRelStats *vacrelstats, Relation onerel, tupgone = true; else if (!TransactionIdIsInProgress(htup->t_xmax)) { + /* * Not Aborted, Not Committed, Not in Progress - so it * from crashed process. - vadim 06/02/97 @@ -916,7 +918,7 @@ Tup %u: Vac %u, Crash %u, UnUsed %u, MinLen %u, MaxLen %u; Re-using: Free/Avail. ru1.ru_stime.tv_sec - ru0.ru_stime.tv_sec, ru1.ru_utime.tv_sec - ru0.ru_utime.tv_sec); -} /* vc_scanheap */ +} /* vc_scanheap */ /* @@ -1087,15 +1089,15 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel, * But we can't remove last page - this is our * "show-stopper" !!! - vadim 02/25/98 */ - if (ToVpd != Fvplast && + if (ToVpd != Fvplast && !vc_enough_space(ToVpd, vacrelstats->min_tlen)) { Assert(Fnpages > ToVpI + 1); memmove(Fvpl->vpl_pgdesc + ToVpI, Fvpl->vpl_pgdesc + ToVpI + 1, - sizeof(VPageDescr *) * (Fnpages - ToVpI - 1)); + sizeof(VPageDescr *) * (Fnpages - ToVpI - 1)); Fnpages--; - Assert (Fvplast == Fvpl->vpl_pgdesc[Fnpages - 1]); + Assert(Fvplast == Fvpl->vpl_pgdesc[Fnpages - 1]); } } for (i = 0; i < Fnpages; i++) @@ -1333,7 +1335,7 @@ Elapsed %u/%u sec.", { i = BlowawayRelationBuffers(onerel, blkno); if (i < 0) - elog (FATAL, "VACUUM (vc_rpfheap): BlowawayRelationBuffers returned %d", i); + elog(FATAL, "VACUUM (vc_rpfheap): BlowawayRelationBuffers returned %d", i); blkno = smgrtruncate(DEFAULT_SMGR, onerel, blkno); Assert(blkno >= 0); vacrelstats->npages = blkno; /* set new number of blocks */ @@ -1349,7 +1351,7 @@ Elapsed %u/%u sec.", pfree(vpc); -} /* vc_rpfheap */ +} /* vc_rpfheap */ /* * vc_vacheap() -- free dead tuples @@ -1367,7 +1369,7 @@ vc_vacheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl) int i; nblocks = Vvpl->vpl_npages; - nblocks -= Vvpl->vpl_nemend; /* nothing to do with them */ + nblocks -= Vvpl->vpl_nemend;/* nothing to do with them */ for (i = 0, vpp = Vvpl->vpl_pgdesc; i < nblocks; i++, vpp++) { @@ -1394,17 +1396,17 @@ vc_vacheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl) * it) before truncation */ FlushBufferPool(!TransactionFlushEnabled()); - + i = BlowawayRelationBuffers(onerel, nblocks); if (i < 0) - elog (FATAL, "VACUUM (vc_vacheap): BlowawayRelationBuffers returned %d", i); + elog(FATAL, "VACUUM (vc_vacheap): BlowawayRelationBuffers returned %d", i); nblocks = smgrtruncate(DEFAULT_SMGR, onerel, nblocks); Assert(nblocks >= 0); vacrelstats->npages = nblocks; /* set new number of blocks */ } -} /* vc_vacheap */ +} /* vc_vacheap */ /* * vc_vacpage() -- free dead tuples on a page @@ -1424,7 +1426,7 @@ vc_vacpage(Page page, VPageDescr vpd) } PageRepairFragmentation(page); -} /* vc_vacpage */ +} /* vc_vacpage */ /* * _vc_scanoneind() -- scan one index relation to update statistic. @@ -1470,7 +1472,7 @@ vc_scanoneind(Relation indrel, int nhtups) elog(NOTICE, "Ind %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)", indrel->rd_rel->relname.data, nitups, nhtups); -} /* vc_scanoneind */ +} /* vc_scanoneind */ /* * vc_vaconeind() -- vacuum one index relation. @@ -1553,7 +1555,7 @@ vc_vaconeind(VPageList vpl, Relation indrel, int nhtups) elog(NOTICE, "Ind %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)", indrel->rd_rel->relname.data, nitups, nhtups); -} /* vc_vaconeind */ +} /* vc_vaconeind */ /* * vc_tidreapped() -- is a particular tid reapped? @@ -1597,7 +1599,7 @@ vc_tidreapped(ItemPointer itemptr, VPageList vpl) return (vp); -} /* vc_tidreapped */ +} /* vc_tidreapped */ /* * vc_attrstats() -- compute column statistics used by the optimzer @@ -2011,7 +2013,7 @@ vc_reappage(VPageList vpl, VPageDescr vpc) /* insert this page into vpl list */ vc_vpinsert(vpl, newvpd); -} /* vc_reappage */ +} /* vc_reappage */ static void vc_vpinsert(VPageList vpl, VPageDescr vpnew) @@ -2101,7 +2103,7 @@ vc_find_eq(char *bot, int nelem, int size, char *elm, int (*compar) (char *, cha first_move = true; } -} /* vc_find_eq */ +} /* vc_find_eq */ static int vc_cmp_blk(char *left, char *right) @@ -2118,7 +2120,7 @@ vc_cmp_blk(char *left, char *right) return (0); return (1); -} /* vc_cmp_blk */ +} /* vc_cmp_blk */ static int vc_cmp_offno(char *left, char *right) @@ -2130,7 +2132,7 @@ vc_cmp_offno(char *left, char *right) return (0); return (1); -} /* vc_cmp_offno */ +} /* vc_cmp_offno */ static void @@ -2207,7 +2209,7 @@ vc_getindices(Oid relid, int *nindices, Relation **Irel) *Irel = (Relation *) NULL; } -} /* vc_getindices */ +} /* vc_getindices */ static void @@ -2223,7 +2225,7 @@ vc_clsindices(int nindices, Relation *Irel) } pfree(Irel); -} /* vc_clsindices */ +} /* vc_clsindices */ static void @@ -2262,7 +2264,7 @@ vc_mkindesc(Relation onerel, int nindices, Relation *Irel, IndDesc **Idesc) idcur->natts = natts; } -} /* vc_mkindesc */ +} /* vc_mkindesc */ static bool @@ -2283,4 +2285,4 @@ vc_enough_space(VPageDescr vpd, Size len) return (false); -} /* vc_enough_space */ +} /* vc_enough_space */ diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 7ab04df99c..364eed343b 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -1,8 +1,8 @@ /* * Routines for handling of 'SET var TO', - * 'SHOW var' and 'RESET var' statements. + * 'SHOW var' and 'RESET var' statements. * - * $Id: variable.c,v 1.3 1998/02/03 16:06:49 thomas Exp $ + * $Id: variable.c,v 1.4 1998/02/26 04:31:05 momjian Exp $ * */ @@ -61,7 +61,7 @@ get_token(char **tok, char **val, const char *str) } *tok = (char *) palloc(len + 1); - StrNCpy(*tok, start, len+1); + StrNCpy(*tok, start, len + 1); /* skip white spaces */ while (isspace(*str)) @@ -107,7 +107,7 @@ get_token(char **tok, char **val, const char *str) } *val = (char *) palloc(len + 1); - StrNCpy(*val, start, len+1); + StrNCpy(*val, start, len + 1); /* skip white spaces */ while (isspace(*str)) @@ -342,18 +342,21 @@ parse_date(const char *value) DateStyle = USE_GERMAN_DATES; dcnt++; EuroDates = TRUE; - if ((ecnt > 0) && (! EuroDates)) ecnt++; + if ((ecnt > 0) && (!EuroDates)) + ecnt++; } else if (!strncasecmp(tok, "EURO", 4)) { EuroDates = TRUE; - if ((dcnt <= 0) || (DateStyle != USE_GERMAN_DATES)) ecnt++; + if ((dcnt <= 0) || (DateStyle != USE_GERMAN_DATES)) + ecnt++; } else if ((!strcasecmp(tok, "US")) || (!strncasecmp(tok, "NONEURO", 7))) { EuroDates = FALSE; - if ((dcnt <= 0) || (DateStyle == USE_GERMAN_DATES)) ecnt++; + if ((dcnt <= 0) || (DateStyle == USE_GERMAN_DATES)) + ecnt++; } else if (!strcasecmp(tok, "DEFAULT")) { @@ -445,7 +448,7 @@ parse_timezone(const char *value) if ((defaultTZ = getenv("TZ")) != NULL) strcpy(TZvalue, defaultTZ); - /* found nothing so mark with an invalid pointer */ + /* found nothing so mark with an invalid pointer */ else defaultTZ = (char *) -1; @@ -459,7 +462,7 @@ parse_timezone(const char *value) } return TRUE; -} /* parse_timezone() */ +} /* parse_timezone() */ bool show_timezone() @@ -468,10 +471,10 @@ show_timezone() tz = getenv("TZ"); - elog(NOTICE, "Time zone is %s", ((tz != NULL)? tz: "unknown")); + elog(NOTICE, "Time zone is %s", ((tz != NULL) ? tz : "unknown")); return TRUE; -} /* show_timezone() */ +} /* show_timezone() */ /* reset_timezone() * Set TZ environment variable to original value. @@ -501,7 +504,10 @@ reset_timezone() tzset(); } - /* otherwise, time zone was set but no original explicit time zone available */ + /* + * otherwise, time zone was set but no original explicit time zone + * available + */ else { strcpy(tzbuf, "="); @@ -511,7 +517,7 @@ reset_timezone() } return TRUE; -} /* reset_timezone() */ +} /* reset_timezone() */ /*-----------------------------------------------------------------------*/ struct VariableParsers @@ -523,13 +529,27 @@ struct VariableParsers } VariableParsers[] = { - { "datestyle", parse_date, show_date, reset_date }, - { "timezone", parse_timezone, show_timezone, reset_timezone }, - { "cost_heap", parse_cost_heap, show_cost_heap, reset_cost_heap }, - { "cost_index", parse_cost_index, show_cost_index, reset_cost_index }, - { "geqo", parse_geqo, show_geqo, reset_geqo }, - { "r_plans", parse_r_plans, show_r_plans, reset_r_plans }, - { NULL, NULL, NULL, NULL } + { + "datestyle", parse_date, show_date, reset_date + }, + { + "timezone", parse_timezone, show_timezone, reset_timezone + }, + { + "cost_heap", parse_cost_heap, show_cost_heap, reset_cost_heap + }, + { + "cost_index", parse_cost_index, show_cost_index, reset_cost_index + }, + { + "geqo", parse_geqo, show_geqo, reset_geqo + }, + { + "r_plans", parse_r_plans, show_r_plans, reset_r_plans + }, + { + NULL, NULL, NULL, NULL + } }; /*-----------------------------------------------------------------------*/ diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index 38a39ed392..5602cc992d 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.20 1998/02/10 04:00:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.21 1998/02/26 04:31:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -118,7 +118,7 @@ DefineVirtualRelation(char *relname, List *tlist) * This routine is called when defining/removing a view. *------------------------------------------------------------------ */ -char * +char * MakeRetrieveViewRuleName(char *viewName) { char *buf; diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index 450f6e5358..b2851d83b4 100644 --- a/src/backend/executor/execAmi.c +++ b/src/backend/executor/execAmi.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.18 1998/02/23 06:26:53 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.19 1998/02/26 04:31:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -296,29 +296,32 @@ void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent) { - if ( node->chgParam != NULL ) /* Wow! */ + if (node->chgParam != NULL) /* Wow! */ { - List *lst; - - foreach (lst, node->initPlan) + List *lst; + + foreach(lst, node->initPlan) { - Plan *splan = ((SubPlan*) lfirst (lst))->plan; - if ( splan->extParam != NULL ) /* don't care about child locParam */ - SetChangedParamList (splan, node->chgParam); - if ( splan->chgParam != NULL ) - ExecReScanSetParamPlan ((SubPlan*) lfirst (lst), node); + Plan *splan = ((SubPlan *) lfirst(lst))->plan; + + if (splan->extParam != NULL) /* don't care about child + * locParam */ + SetChangedParamList(splan, node->chgParam); + if (splan->chgParam != NULL) + ExecReScanSetParamPlan((SubPlan *) lfirst(lst), node); } - foreach (lst, node->subPlan) + foreach(lst, node->subPlan) { - Plan *splan = ((SubPlan*) lfirst (lst))->plan; - if ( splan->extParam != NULL ) - SetChangedParamList (splan, node->chgParam); + Plan *splan = ((SubPlan *) lfirst(lst))->plan; + + if (splan->extParam != NULL) + SetChangedParamList(splan, node->chgParam); } /* Well. Now set chgParam for left/right trees. */ - if ( node->lefttree != NULL ) - SetChangedParamList (node->lefttree, node->chgParam); - if ( node->righttree != NULL ) - SetChangedParamList (node->righttree, node->chgParam); + if (node->lefttree != NULL) + SetChangedParamList(node->lefttree, node->chgParam); + if (node->righttree != NULL) + SetChangedParamList(node->righttree, node->chgParam); } switch (nodeTag(node)) @@ -332,38 +335,38 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent) break; case T_Material: - ExecMaterialReScan((Material*) node, exprCtxt, parent); + ExecMaterialReScan((Material *) node, exprCtxt, parent); break; case T_NestLoop: - ExecReScanNestLoop((NestLoop*) node, exprCtxt, parent); + ExecReScanNestLoop((NestLoop *) node, exprCtxt, parent); break; case T_HashJoin: - ExecReScanHashJoin((HashJoin*) node, exprCtxt, parent); + ExecReScanHashJoin((HashJoin *) node, exprCtxt, parent); break; case T_Hash: - ExecReScanHash((Hash*) node, exprCtxt, parent); + ExecReScanHash((Hash *) node, exprCtxt, parent); break; case T_Agg: - ExecReScanAgg((Agg*) node, exprCtxt, parent); + ExecReScanAgg((Agg *) node, exprCtxt, parent); break; case T_Result: - ExecReScanResult((Result*) node, exprCtxt, parent); + ExecReScanResult((Result *) node, exprCtxt, parent); break; case T_Unique: - ExecReScanUnique((Unique*) node, exprCtxt, parent); + ExecReScanUnique((Unique *) node, exprCtxt, parent); break; case T_Sort: - ExecReScanSort((Sort*) node, exprCtxt, parent); + ExecReScanSort((Sort *) node, exprCtxt, parent); break; -/* +/* * Tee is never used case T_Tee: ExecTeeReScan((Tee *) node, exprCtxt, parent); @@ -373,10 +376,10 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent) elog(ERROR, "ExecReScan: node type %u not supported", nodeTag(node)); return; } - - if ( node->chgParam != NULL ) + + if (node->chgParam != NULL) { - freeList (node->chgParam); + freeList(node->chgParam); node->chgParam = NULL; } } @@ -415,7 +418,7 @@ ExecMarkPos(Plan *node) { switch (nodeTag(node)) { - case T_SeqScan: + case T_SeqScan: ExecSeqMarkPos((SeqScan *) node); break; @@ -445,7 +448,7 @@ ExecRestrPos(Plan *node) { switch (nodeTag(node)) { - case T_SeqScan: + case T_SeqScan: ExecSeqRestrPos((SeqScan *) node); return; @@ -510,7 +513,7 @@ ExecCreatR(TupleDesc tupType, * '\0 ' */ relDesc = heap_create("", tupType); - } + } else { /* ---------------- diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 760d277dee..6326ab215d 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.43 1998/02/21 06:31:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.44 1998/02/26 04:31:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,22 +57,28 @@ /* decls for local routines only used within this module */ -static void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable, +static void +ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable, Query *parseTree); -static TupleDesc InitPlan(CmdType operation, Query *parseTree, +static TupleDesc +InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate); static void EndPlan(Plan *plan, EState *estate); -static TupleTableSlot * ExecutePlan(EState *estate, Plan *plan, +static TupleTableSlot * +ExecutePlan(EState *estate, Plan *plan, Query *parseTree, CmdType operation, int numberTuples, ScanDirection direction, void (*printfunc) ()); static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc) (), EState *estate); -static void ExecAppend(TupleTableSlot *slot, ItemPointer tupleid, +static void +ExecAppend(TupleTableSlot *slot, ItemPointer tupleid, EState *estate); -static void ExecDelete(TupleTableSlot *slot, ItemPointer tupleid, +static void +ExecDelete(TupleTableSlot *slot, ItemPointer tupleid, EState *estate); -static void ExecReplace(TupleTableSlot *slot, ItemPointer tupleid, +static void +ExecReplace(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, Query *parseTree); /* end of local decls */ @@ -83,13 +89,14 @@ static int queryLimit = ALL_TUPLES; #undef ALL_TUPLES #define ALL_TUPLES queryLimit -int ExecutorLimit(int limit); +int ExecutorLimit(int limit); int ExecutorLimit(int limit) { return queryLimit = limit; } + #endif /* ---------------------------------------------------------------- @@ -110,14 +117,14 @@ ExecutorStart(QueryDesc *queryDesc, EState *estate) /* sanity checks */ Assert(queryDesc != NULL); - + if (queryDesc->plantree->nParamExec > 0) { - estate->es_param_exec_vals = (ParamExecData*) - palloc (queryDesc->plantree->nParamExec * sizeof (ParamExecData)); - memset (estate->es_param_exec_vals, 0 , queryDesc->plantree->nParamExec * sizeof (ParamExecData)); + estate->es_param_exec_vals = (ParamExecData *) + palloc(queryDesc->plantree->nParamExec * sizeof(ParamExecData)); + memset(estate->es_param_exec_vals, 0, queryDesc->plantree->nParamExec * sizeof(ParamExecData)); } - + result = InitPlan(queryDesc->operation, queryDesc->parsetree, queryDesc->plantree, @@ -301,11 +308,12 @@ ExecCheckPerms(CmdType operation, if (rte->skipAcl) { + /* - * This happens if the access to this table is due - * to a view query rewriting - the rewrite handler - * checked the permissions against the view owner, - * so we just skip this entry. + * This happens if the access to this table is due to a view + * query rewriting - the rewrite handler checked the + * permissions against the view owner, so we just skip this + * entry. */ continue; } @@ -1239,8 +1247,8 @@ ExecAttrDefault(Relation rel, HeapTuple tuple) econtext->ecxt_outertuple = NULL; /* outer tuple slot */ econtext->ecxt_relation = NULL; /* relation */ econtext->ecxt_relid = 0; /* relid */ - econtext->ecxt_param_list_info = NULL; /* param list info */ - econtext->ecxt_param_exec_vals = NULL; /* exec param values */ + econtext->ecxt_param_list_info = NULL; /* param list info */ + econtext->ecxt_param_exec_vals = NULL; /* exec param values */ econtext->ecxt_range_table = NULL; /* range table */ for (i = 0; i < ndef; i++) { @@ -1283,6 +1291,7 @@ ExecAttrDefault(Relation rel, HeapTuple tuple) return (newtuple); } + #endif static char * diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c index 017fdfba4d..f5842ecad3 100644 --- a/src/backend/executor/execProcnode.c +++ b/src/backend/executor/execProcnode.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.8 1998/02/13 03:26:40 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.9 1998/02/26 04:31:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -116,14 +116,14 @@ ExecInitNode(Plan *node, EState *estate, Plan *parent) */ if (node == NULL) return FALSE; - - foreach (subp, node->initPlan) + + foreach(subp, node->initPlan) { - result = ExecInitSubPlan ((SubPlan*) lfirst (subp), estate, node); - if ( result == FALSE ) + result = ExecInitSubPlan((SubPlan *) lfirst(subp), estate, node); + if (result == FALSE) return (FALSE); } - + switch (nodeTag(node)) { /* ---------------- @@ -202,13 +202,13 @@ ExecInitNode(Plan *node, EState *estate, Plan *parent) elog(ERROR, "ExecInitNode: node %d unsupported", nodeTag(node)); result = FALSE; } - - if ( result != FALSE ) + + if (result != FALSE) { - foreach (subp, node->subPlan) + foreach(subp, node->subPlan) { - result = ExecInitSubPlan ((SubPlan*) lfirst (subp), estate, node); - if ( result == FALSE ) + result = ExecInitSubPlan((SubPlan *) lfirst(subp), estate, node); + if (result == FALSE) return (FALSE); } } @@ -235,10 +235,10 @@ ExecProcNode(Plan *node, Plan *parent) */ if (node == NULL) return NULL; - - if ( node->chgParam != NULL ) /* something changed */ - ExecReScan (node, NULL, parent); /* let ReScan handle this */ - + + if (node->chgParam != NULL) /* something changed */ + ExecReScan(node, NULL, parent); /* let ReScan handle this */ + switch (nodeTag(node)) { /* ---------------- @@ -410,7 +410,7 @@ void ExecEndNode(Plan *node, Plan *parent) { List *subp; - + /* ---------------- * do nothing when we get to the end * of a leaf on tree. @@ -418,18 +418,18 @@ ExecEndNode(Plan *node, Plan *parent) */ if (node == NULL) return; - - foreach (subp, node->initPlan) + + foreach(subp, node->initPlan) { - ExecEndSubPlan ((SubPlan*) lfirst (subp)); + ExecEndSubPlan((SubPlan *) lfirst(subp)); } - foreach (subp, node->subPlan) + foreach(subp, node->subPlan) { - ExecEndSubPlan ((SubPlan*) lfirst (subp)); + ExecEndSubPlan((SubPlan *) lfirst(subp)); } - if ( node->chgParam != NULL ) + if (node->chgParam != NULL) { - freeList (node->chgParam); + freeList(node->chgParam); node->chgParam = NULL; } diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 78c91539c7..55a12bd831 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.25 1998/02/13 03:26:42 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.26 1998/02/26 04:31:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,19 +71,24 @@ int execConstLen; /* static functions decls */ static Datum ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull); -static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext, +static Datum +ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext, bool *isNull, bool *isDone); static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull); -static Datum ExecEvalFunc(Expr *funcClause, ExprContext *econtext, +static Datum +ExecEvalFunc(Expr *funcClause, ExprContext *econtext, bool *isNull, bool *isDone); -static void ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext, +static void +ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext, List *argList, Datum argV[], bool *argIsDone); static Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull); -static Datum ExecEvalOper(Expr *opClause, ExprContext *econtext, +static Datum +ExecEvalOper(Expr *opClause, ExprContext *econtext, bool *isNull); static Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull); static Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull); -static Datum ExecMakeFunctionResult(Node *node, List *arguments, +static Datum +ExecMakeFunctionResult(Node *node, List *arguments, ExprContext *econtext, bool *isNull, bool *isDone); static bool ExecQualClause(Node *clause, ExprContext *econtext); @@ -301,10 +306,11 @@ ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull) return (Datum) tempSlot; } - result = heap_getattr(heapTuple, /* tuple containing attribute */ - attnum, /* attribute number of desired attribute */ - tuple_type,/* tuple descriptor of tuple */ - isNull); /* return: is attribute null? */ + result = heap_getattr(heapTuple, /* tuple containing attribute */ + attnum, /* attribute number of desired + * attribute */ + tuple_type, /* tuple descriptor of tuple */ + isNull); /* return: is attribute null? */ /* ---------------- * return null if att is null @@ -379,18 +385,18 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull) AttrNumber thisParameterId = expression->paramid; int matchFound; ParamListInfo paramList; - - if ( thisParameterKind == PARAM_EXEC ) + + if (thisParameterKind == PARAM_EXEC) { - ParamExecData *prm = &(econtext->ecxt_param_exec_vals[thisParameterId]); - - if ( prm->execPlan != NULL ) - ExecSetParamPlan (prm->execPlan); - Assert (prm->execPlan == NULL); + ParamExecData *prm = &(econtext->ecxt_param_exec_vals[thisParameterId]); + + if (prm->execPlan != NULL) + ExecSetParamPlan(prm->execPlan); + Assert(prm->execPlan == NULL); *isNull = prm->isnull; return (prm->value); } - + thisParameterName = expression->paramname; paramList = econtext->ecxt_param_list_info; @@ -544,7 +550,7 @@ GetAttributeByNum(TupleTableSlot *slot, /* XXX char16 name for catalogs */ #ifdef NOT_USED -char * +char * att_by_num(TupleTableSlot *slot, AttrNumber attrno, bool *isNull) @@ -554,7 +560,7 @@ att_by_num(TupleTableSlot *slot, #endif -char * +char * GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull) { AttrNumber attrno; @@ -605,7 +611,7 @@ GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull) /* XXX char16 name for catalogs */ #ifdef NOT_USED -char * +char * att_by_name(TupleTableSlot *slot, char *attname, bool *isNull) { return (GetAttributeByName(slot, attname, isNull)); @@ -1045,19 +1051,21 @@ ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull) if (*isNull) { IsNull = *isNull; + /* - * Many functions don't (or can't!) check is an argument - * NULL or NOT_NULL and may return TRUE (1) with *isNull TRUE - * (an_int4_column <> 1: int4ne returns TRUE for NULLs). - * Not having time to fix function manager I want to fix - * OR: if we had 'x <> 1 OR x isnull' then TRUE, TRUE were - * returned by 'x <> 1' for NULL ... but ExecQualClause say - * that qualification *fails* if isnull is TRUE for all values - * returned by ExecEvalExpr. So, force this rule here: if isnull - * is TRUE then clause failed. Note: nullvalue() & nonnullvalue() - * always set isnull to FALSE for NULLs. - vadim 09/22/97 + * Many functions don't (or can't!) check is an argument NULL + * or NOT_NULL and may return TRUE (1) with *isNull TRUE + * (an_int4_column <> 1: int4ne returns TRUE for NULLs). Not + * having time to fix function manager I want to fix OR: if we + * had 'x <> 1 OR x isnull' then TRUE, TRUE were returned by + * 'x <> 1' for NULL ... but ExecQualClause say that + * qualification *fails* if isnull is TRUE for all values + * returned by ExecEvalExpr. So, force this rule here: if + * isnull is TRUE then clause failed. Note: nullvalue() & + * nonnullvalue() always set isnull to FALSE for NULLs. - + * vadim 09/22/97 */ - const_value = 0; + const_value = 0; } /* ---------------- @@ -1238,7 +1246,7 @@ ExecEvalExpr(Node *expression, retDatum = (Datum) ExecEvalNot(expr, econtext, isNull); break; case SUBPLAN_EXPR: - retDatum = (Datum) ExecSubPlan((SubPlan*) expr->oper, expr->args, econtext); + retDatum = (Datum) ExecSubPlan((SubPlan *) expr->oper, expr->args, econtext); break; default: elog(ERROR, "ExecEvalExpr: unknown expression type %d", expr->opType); diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 5f2336ce19..3d64ba0095 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.16 1998/02/10 04:00:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.17 1998/02/26 04:31:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -986,8 +986,8 @@ ExecTypeFromTL(List *targetList) resdom->resno, resdom->resname, /* fix for SELECT NULL ... */ - (restype ? restype : UNKNOWNOID), - resdom->restypmod, + (restype ? restype : UNKNOWNOID), + resdom->restypmod, 0, false); @@ -1021,7 +1021,7 @@ ExecTypeFromTL(List *targetList) fjRes->resno, fjRes->resname, restype, - fjRes->restypmod, + fjRes->restypmod, 0, false); /* @@ -1045,7 +1045,7 @@ ExecTypeFromTL(List *targetList) fjRes->resno, fjRes->resname, restype, - fjRes->restypmod, + fjRes->restypmod, 0, false); diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 69ef667107..6f30db27cf 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.29 1998/02/13 03:26:43 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.30 1998/02/26 04:31:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -189,7 +189,7 @@ ExecAssignExprContext(EState *estate, CommonState *commonstate) econtext->ecxt_relid = 0; /* relid */ econtext->ecxt_param_list_info = estate->es_param_list_info; econtext->ecxt_param_exec_vals = estate->es_param_exec_vals; - econtext->ecxt_range_table = estate->es_range_table; /* range table */ + econtext->ecxt_range_table = estate->es_range_table; /* range table */ commonstate->cs_ExprContext = econtext; } @@ -1176,24 +1176,24 @@ ExecInsertIndexTuples(TupleTableSlot *slot, pfree(econtext); } -void -SetChangedParamList (Plan *node, List *newchg) +void +SetChangedParamList(Plan *node, List *newchg) { - List *nl; - - foreach (nl, newchg) + List *nl; + + foreach(nl, newchg) { - int paramId = lfirsti(nl); - + int paramId = lfirsti(nl); + /* if this node doesn't depend on a param ... */ - if ( !intMember (paramId, node->extParam) && - !intMember (paramId, node->locParam) ) + if (!intMember(paramId, node->extParam) && + !intMember(paramId, node->locParam)) continue; /* if this param is already in list of changed ones ... */ - if ( intMember (paramId, node->chgParam) ) + if (intMember(paramId, node->chgParam)) continue; /* else - add this param to the list */ - node->chgParam = lappendi (node->chgParam, paramId); + node->chgParam = lappendi(node->chgParam, paramId); } } diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 9778e365a5..848bd616bf 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -121,7 +121,7 @@ ExecAgg(Agg *node) econtext = aggstate->csstate.cstate.cs_ExprContext; nagg = length(node->aggs); - aggregates = (Aggreg **)palloc(sizeof(Aggreg *) * nagg); + aggregates = (Aggreg **) palloc(sizeof(Aggreg *) * nagg); /* take List* and make it an array that can be quickly indexed */ alist = node->aggs; @@ -333,18 +333,18 @@ ExecAgg(Agg *node) break; case T_Expr: - { - FunctionCachePtr fcache_ptr; - - if (nodeTag(tagnode) == T_Func) - fcache_ptr = ((Func *) tagnode)->func_fcache; - else - fcache_ptr = ((Oper *) tagnode)->op_fcache; - attlen = fcache_ptr->typlen; - byVal = fcache_ptr->typbyval; - - break; - } + { + FunctionCachePtr fcache_ptr; + + if (nodeTag(tagnode) == T_Func) + fcache_ptr = ((Func *) tagnode)->func_fcache; + else + fcache_ptr = ((Oper *) tagnode)->op_fcache; + attlen = fcache_ptr->typlen; + byVal = fcache_ptr->typbyval; + + break; + } case T_Const: attlen = ((Const *) aggregates[i]->target)->constlen; byVal = ((Const *) aggregates[i]->target)->constbyval; @@ -375,8 +375,8 @@ ExecAgg(Agg *node) args[0] = value1[i]; args[1] = newVal; value1[i] = - (Datum) fmgr_c(&aggfns->xfn1, - (FmgrValues *) args, + (Datum) fmgr_c(&aggfns->xfn1, + (FmgrValues *) args, &isNull1); Assert(!isNull1); } @@ -440,7 +440,7 @@ ExecAgg(Agg *node) else elog(NOTICE, "ExecAgg: no valid transition functions??"); value1[i] = (Datum) fmgr_c(&aggfns->finalfn, - (FmgrValues *) args, &(nulls[i])); + (FmgrValues *) args, &(nulls[i])); } else if (aggfns->xfn1.fn_addr != NULL) { @@ -545,15 +545,15 @@ ExecInitAgg(Agg *node, EState *estate, Plan *parent) ExecInitNode(outerPlan, estate, (Plan *) node); /* - * Result runs in its own context, but make it use our aggregates - * fix for 'select sum(2+2)' + * Result runs in its own context, but make it use our aggregates fix + * for 'select sum(2+2)' */ if (nodeTag(outerPlan) == T_Result) { - ((Result *)outerPlan)->resstate->cstate.cs_ProjInfo->pi_exprContext->ecxt_values = - econtext->ecxt_values; - ((Result *)outerPlan)->resstate->cstate.cs_ProjInfo->pi_exprContext->ecxt_nulls = - econtext->ecxt_nulls; + ((Result *) outerPlan)->resstate->cstate.cs_ProjInfo->pi_exprContext->ecxt_values = + econtext->ecxt_values; + ((Result *) outerPlan)->resstate->cstate.cs_ProjInfo->pi_exprContext->ecxt_nulls = + econtext->ecxt_nulls; } @@ -661,7 +661,7 @@ aggGetAttr(TupleTableSlot *slot, return (Datum) tempSlot; } - result = + result = heap_getattr(heapTuple, /* tuple containing attribute */ attnum, /* attribute number of desired attribute */ tuple_type,/* tuple descriptor of tuple */ @@ -680,17 +680,18 @@ aggGetAttr(TupleTableSlot *slot, void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent) { - AggState *aggstate = node->aggstate; - ExprContext *econtext = aggstate->csstate.cstate.cs_ExprContext; + AggState *aggstate = node->aggstate; + ExprContext *econtext = aggstate->csstate.cstate.cs_ExprContext; aggstate->agg_done = FALSE; MemSet(econtext->ecxt_values, 0, sizeof(Datum) * length(node->aggs)); MemSet(econtext->ecxt_nulls, 0, length(node->aggs)); - /* - * if chgParam of subnode is not null then plan - * will be re-scanned by first ExecProcNode. + + /* + * if chgParam of subnode is not null then plan will be re-scanned by + * first ExecProcNode. */ - if (((Plan*) node)->lefttree->chgParam == NULL) - ExecReScan (((Plan*) node)->lefttree, exprCtxt, (Plan *) node); - + if (((Plan *) node)->lefttree->chgParam == NULL) + ExecReScan(((Plan *) node)->lefttree, exprCtxt, (Plan *) node); + } diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index cdc0e56a1b..86286284e9 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.10 1997/12/27 06:40:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.11 1998/02/26 04:31:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -150,7 +150,7 @@ exec_append_initialize_next(Append *node) } else estate->es_range_table = nth(whichplan, rts); - + if (unionstate->as_junkFilter_list) { estate->es_junkFilter = @@ -161,7 +161,7 @@ exec_append_initialize_next(Append *node) { estate->es_result_relation_info = (RelationInfo *) nth(whichplan, - unionstate->as_result_relation_info_list); + unionstate->as_result_relation_info_list); } result_slot->ttc_whichplan = whichplan; diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index fa733e2da0..81e4b540ec 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -13,7 +13,7 @@ * columns. (ie. tuples from the same group are consecutive) * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.17 1998/02/18 12:40:43 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.18 1998/02/26 04:31:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -113,24 +113,25 @@ ExecGroupEveryTuple(Group *node) firsttuple = grpstate->grp_firstTuple; /* this should occur on the first call only */ - if (firsttuple == NULL) + if (firsttuple == NULL) { - grpstate->grp_firstTuple = heap_copytuple (outerTuple); + grpstate->grp_firstTuple = heap_copytuple(outerTuple); } else { + /* - * Compare with first tuple and see if this tuple is of - * the same group. + * Compare with first tuple and see if this tuple is of the + * same group. */ if (!sameGroup(firsttuple, outerslot->val, - node->numCols, node->grpColIdx, - ExecGetScanType(&grpstate->csstate))) + node->numCols, node->grpColIdx, + ExecGetScanType(&grpstate->csstate))) { grpstate->grp_useFirstTuple = TRUE; - pfree (firsttuple); - grpstate->grp_firstTuple = heap_copytuple (outerTuple); - + pfree(firsttuple); + grpstate->grp_firstTuple = heap_copytuple(outerTuple); + return NULL; /* signifies the end of the group */ } } @@ -188,7 +189,7 @@ ExecGroupOneTuple(Group *node) firsttuple = grpstate->grp_firstTuple; /* this should occur on the first call only */ - if (firsttuple == NULL) + if (firsttuple == NULL) { outerslot = ExecProcNode(outerPlan(node), (Plan *) node); if (outerslot) @@ -198,7 +199,7 @@ ExecGroupOneTuple(Group *node) grpstate->grp_done = TRUE; return NULL; } - grpstate->grp_firstTuple = firsttuple = heap_copytuple (outerTuple); + grpstate->grp_firstTuple = firsttuple = heap_copytuple(outerTuple); } /* @@ -238,12 +239,12 @@ ExecGroupOneTuple(Group *node) false); econtext->ecxt_scantuple = grpstate->csstate.css_ScanTupleSlot; resultSlot = ExecProject(projInfo, &isDone); - + /* save outerTuple if we are not done yet */ if (!grpstate->grp_done) { - pfree (firsttuple); - grpstate->grp_firstTuple = heap_copytuple (outerTuple); + pfree(firsttuple); + grpstate->grp_firstTuple = heap_copytuple(outerTuple); } return resultSlot; @@ -340,7 +341,7 @@ ExecEndGroup(Group *node) ExecClearTuple(grpstate->csstate.css_ScanTupleSlot); if (grpstate->grp_firstTuple != NULL) { - pfree (grpstate->grp_firstTuple); + pfree(grpstate->grp_firstTuple); grpstate->grp_firstTuple = NULL; } } @@ -362,7 +363,7 @@ sameGroup(HeapTuple oldtuple, bool isNull1, isNull2; Datum attr1, - attr2; + attr2; char *val1, *val2; int i; @@ -391,10 +392,10 @@ sameGroup(HeapTuple oldtuple, val1 = fmgr(typoutput, attr1, gettypelem(tupdesc->attrs[att - 1]->atttypid), - tupdesc->attrs[att - 1]->atttypmod); + tupdesc->attrs[att - 1]->atttypmod); val2 = fmgr(typoutput, attr2, gettypelem(tupdesc->attrs[att - 1]->atttypid), - tupdesc->attrs[att - 1]->atttypmod); + tupdesc->attrs[att - 1]->atttypmod); /* * now, val1 and val2 are ascii representations so we can use @@ -402,12 +403,12 @@ sameGroup(HeapTuple oldtuple, */ if (strcmp(val1, val2) != 0) { - pfree (val1); - pfree (val2); + pfree(val1); + pfree(val2); return FALSE; } - pfree (val1); - pfree (val2); + pfree(val1); + pfree(val2); } else { diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 5ebf508c0c..81eca617fb 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.19 1998/02/13 03:26:46 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.20 1998/02/26 04:31:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -781,7 +781,7 @@ static int hashFunc(char *key, int len) { unsigned int h; - int l; + int l; unsigned char *k; /* @@ -901,12 +901,12 @@ ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent) pfree(hashstate->hashBatches); hashstate->hashBatches = NULL; } - - /* - * if chgParam of subnode is not null then plan - * will be re-scanned by first ExecProcNode. - */ - if (((Plan*) node)->lefttree->chgParam == NULL) - ExecReScan (((Plan*) node)->lefttree, exprCtxt, (Plan *) node); - + + /* + * if chgParam of subnode is not null then plan will be re-scanned by + * first ExecProcNode. + */ + if (((Plan *) node)->lefttree->chgParam == NULL) + ExecReScan(((Plan *) node)->lefttree, exprCtxt, (Plan *) node); + } diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 21132410d4..9a99e80da5 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.10 1998/02/13 03:26:47 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.11 1998/02/26 04:31:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -156,7 +156,7 @@ ExecHashJoin(HashJoin *node) } else if (hashtable == NULL) return (NULL); - + nbatch = hashtable->nbatch; outerbatches = hjstate->hj_OuterBatches; if (nbatch > 0 && outerbatches == NULL) @@ -212,12 +212,14 @@ ExecHashJoin(HashJoin *node) while (curbatch <= nbatch && TupIsNull(outerTupleSlot)) { + /* * if the current batch runs out, switch to new batch */ curbatch = ExecHashJoinNewBatch(hjstate); if (curbatch > nbatch) { + /* * when the last batch runs out, clean up */ @@ -350,6 +352,7 @@ ExecHashJoin(HashJoin *node) curbatch = ExecHashJoinNewBatch(hjstate); if (curbatch > nbatch) { + /* * when the last batch runs out, clean up */ @@ -806,7 +809,7 @@ ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable, int nbatch) * ---------------------------------------------------------------- */ -char * +char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, File file, @@ -845,16 +848,16 @@ ExecHashJoinSaveTuple(HeapTuple heapTuple, void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent) { - HashJoinState *hjstate = node->hashjoinstate; + HashJoinState *hjstate = node->hashjoinstate; if (!node->hashdone) return; - + node->hashdone = false; - - /* - * Unfortunately, currently we have to destroy hashtable - * in all cases... + + /* + * Unfortunately, currently we have to destroy hashtable in all + * cases... */ if (hjstate->hj_HashTable) { @@ -872,14 +875,14 @@ ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent) hjstate->jstate.cs_OuterTupleSlot = (TupleTableSlot *) NULL; hjstate->jstate.cs_TupFromTlist = (bool) false; - - /* - * if chgParam of subnodes is not null then plans - * will be re-scanned by first ExecProcNode. + + /* + * if chgParam of subnodes is not null then plans will be re-scanned + * by first ExecProcNode. */ - if (((Plan*) node)->lefttree->chgParam == NULL) - ExecReScan (((Plan*) node)->lefttree, exprCtxt, (Plan *) node); - if (((Plan*) node)->righttree->chgParam == NULL) - ExecReScan (((Plan*) node)->righttree, exprCtxt, (Plan *) node); - + if (((Plan *) node)->lefttree->chgParam == NULL) + ExecReScan(((Plan *) node)->lefttree, exprCtxt, (Plan *) node); + if (((Plan *) node)->righttree->chgParam == NULL) + ExecReScan(((Plan *) node)->righttree, exprCtxt, (Plan *) node); + } diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index d15c9bfb35..4c01e5b1f2 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.14 1998/02/13 03:26:49 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.15 1998/02/26 04:31:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -267,11 +267,11 @@ ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent) n_keys = numScanKeys[indexPtr]; run_keys = (int *) runtimeKeyInfo[indexPtr]; scan_keys = (ScanKey) scanKeys[indexPtr]; - + /* it's possible in subselects */ if (exprCtxt == NULL) exprCtxt = node->scan.scanstate->cstate.cs_ExprContext; - + for (j = 0; j < n_keys; j++) { @@ -488,7 +488,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) HeapScanDesc currentScanDesc; ScanDirection direction; int baseid; - + List *execParam = NULL; /* ---------------- @@ -711,22 +711,22 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) * it identifies the value to place in our scan key. * ---------------- */ - + /* Life was so easy before ... subselects */ - if ( ((Param *) leftop)->paramkind == PARAM_EXEC ) + if (((Param *) leftop)->paramkind == PARAM_EXEC) { have_runtime_keys = true; run_keys[j] = LEFT_OP; - execParam = lappendi (execParam, ((Param*) leftop)->paramid); + execParam = lappendi(execParam, ((Param *) leftop)->paramid); } else { scanvalue = ExecEvalParam((Param *) leftop, - scanstate->cstate.cs_ExprContext, + scanstate->cstate.cs_ExprContext, &isnull); if (isnull) flags |= SK_ISNULL; - + run_keys[j] = NO_OP; } } @@ -804,22 +804,22 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) * it identifies the value to place in our scan key. * ---------------- */ - + /* Life was so easy before ... subselects */ - if ( ((Param *) rightop)->paramkind == PARAM_EXEC ) + if (((Param *) rightop)->paramkind == PARAM_EXEC) { have_runtime_keys = true; run_keys[j] = RIGHT_OP; - execParam = lappendi (execParam, ((Param*) rightop)->paramid); + execParam = lappendi(execParam, ((Param *) rightop)->paramid); } else { scanvalue = ExecEvalParam((Param *) rightop, - scanstate->cstate.cs_ExprContext, + scanstate->cstate.cs_ExprContext, &isnull); if (isnull) flags |= SK_ISNULL; - + run_keys[j] = NO_OP; } } @@ -989,13 +989,13 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) indexstate->iss_ScanDescs = scanDescs; indexstate->cstate.cs_TupFromTlist = false; - - /* - * if there are some PARAM_EXEC in skankeys then - * force index rescan on first scan. + + /* + * if there are some PARAM_EXEC in skankeys then force index rescan on + * first scan. */ - ((Plan*) node)->chgParam = execParam; - + ((Plan *) node)->chgParam = execParam; + /* ---------------- * all done. * ---------------- diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index 800bab2b31..596b199ddc 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.12 1998/02/13 03:26:50 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.13 1998/02/26 04:31:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -350,16 +350,16 @@ ExecEndMaterial(Material *node) void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent) { - MaterialState *matstate = node->matstate; + MaterialState *matstate = node->matstate; if (matstate->mat_Flag == false) return; - - matstate->csstate.css_currentScanDesc = - ExecReScanR (matstate->csstate.css_currentRelation, - matstate->csstate.css_currentScanDesc, - node->plan.state->es_direction, 0, NULL); - + + matstate->csstate.css_currentScanDesc = + ExecReScanR(matstate->csstate.css_currentRelation, + matstate->csstate.css_currentScanDesc, + node->plan.state->es_direction, 0, NULL); + } #ifdef NOT_USED /* not used */ diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index e592bb3164..005047f337 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.12 1997/09/08 21:43:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.13 1998/02/26 04:31:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -749,7 +749,8 @@ ExecMergeJoin(MergeJoin *node) * * new outer tuple > marked tuple * - ***************************** + **************************** + * * * * @@ -831,7 +832,8 @@ ExecMergeJoin(MergeJoin *node) * we have to advance the outer scan until we find the outer * 8. * - ***************************** + **************************** + * * * * @@ -935,7 +937,8 @@ ExecMergeJoin(MergeJoin *node) * we have to advance the inner scan until we find the inner * 12. * - ***************************** + **************************** + * * * * diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 4d1fb12cd2..0d5b210945 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.8 1998/02/13 03:26:51 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.9 1998/02/26 04:31:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -380,18 +380,18 @@ ExecEndNestLoop(NestLoop *node) void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent) { - NestLoopState *nlstate = node->nlstate; - Plan *outerPlan = outerPlan((Plan*) node); + NestLoopState *nlstate = node->nlstate; + Plan *outerPlan = outerPlan((Plan *) node); /* - * If outerPlan->chgParam is not null then plan will be - * automatically re-scanned by first ExecProcNode. - * innerPlan is re-scanned for each new outer tuple and MUST NOT - * be re-scanned from here or you'll get troubles from inner - * index scans when outer Vars are used as run-time keys... + * If outerPlan->chgParam is not null then plan will be automatically + * re-scanned by first ExecProcNode. innerPlan is re-scanned for each + * new outer tuple and MUST NOT be re-scanned from here or you'll get + * troubles from inner index scans when outer Vars are used as + * run-time keys... */ if (outerPlan->chgParam == NULL) - ExecReScan (outerPlan, exprCtxt, (Plan *) node); + ExecReScan(outerPlan, exprCtxt, (Plan *) node); /* let outerPlan to free its result typle ... */ nlstate->jstate.cs_OuterTupleSlot = NULL; diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c index 8c2edfd44a..9bc6342b66 100644 --- a/src/backend/executor/nodeResult.c +++ b/src/backend/executor/nodeResult.c @@ -27,7 +27,7 @@ * SeqScan (emp.all) * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeResult.c,v 1.7 1998/02/18 07:19:34 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeResult.c,v 1.8 1998/02/26 04:31:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,8 +79,8 @@ ExecResult(Result *node) */ if (resstate->rs_checkqual) { - bool qualResult = ExecQual((List *) node->resconstantqual, econtext); - + bool qualResult = ExecQual((List *) node->resconstantqual, econtext); + resstate->rs_checkqual = false; if (qualResult == false) { @@ -195,7 +195,7 @@ ExecInitResult(Result *node, EState *estate, Plan *parent) resstate->rs_done = false; resstate->rs_checkqual = (node->resconstantqual == NULL) ? false : true; node->resstate = resstate; - + /* ---------------- * Miscellanious initialization * @@ -281,18 +281,18 @@ ExecEndResult(Result *node) void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent) { - ResultState *resstate = node->resstate; + ResultState *resstate = node->resstate; resstate->rs_done = false; resstate->cstate.cs_TupFromTlist = false; resstate->rs_checkqual = (node->resconstantqual == NULL) ? false : true; - - /* - * if chgParam of subnode is not null then plan - * will be re-scanned by first ExecProcNode. + + /* + * if chgParam of subnode is not null then plan will be re-scanned by + * first ExecProcNode. */ - if (((Plan*) node)->lefttree && - ((Plan*) node)->lefttree->chgParam == NULL) - ExecReScan (((Plan*) node)->lefttree, exprCtxt, (Plan *) node); - + if (((Plan *) node)->lefttree && + ((Plan *) node)->lefttree->chgParam == NULL) + ExecReScan(((Plan *) node)->lefttree, exprCtxt, (Plan *) node); + } diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c index 77d43f928a..665555fa45 100644 --- a/src/backend/executor/nodeSort.c +++ b/src/backend/executor/nodeSort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.13 1998/02/23 06:26:56 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.14 1998/02/26 04:31:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,7 +112,7 @@ ExecSort(Sort *node) ScanKey sortkeys; HeapTuple heapTuple; TupleTableSlot *slot; - bool should_free; + bool should_free; /* ---------------- * get state info from node @@ -395,21 +395,21 @@ ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent) SortState *sortstate = node->sortstate; /* - * If we haven't sorted yet, just return. If outerplan' - * chgParam is not NULL then it will be re-scanned by - * ExecProcNode, else - no reason to re-scan it at all. + * If we haven't sorted yet, just return. If outerplan' chgParam is + * not NULL then it will be re-scanned by ExecProcNode, else - no + * reason to re-scan it at all. */ if (sortstate->sort_Flag == false) return; - + ExecClearTuple(sortstate->csstate.cstate.cs_ResultTupleSlot); - - psort_rescan (node); - + + psort_rescan(node); + /* * If subnode is to be rescanned then we aren't sorted */ - if (((Plan*) node)->lefttree->chgParam != NULL) + if (((Plan *) node)->lefttree->chgParam != NULL) sortstate->sort_Flag = false; } diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 3c5560d13b..edd1908fc3 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,9 +7,9 @@ */ /* * INTERFACE ROUTINES - * ExecSubPlan - process a subselect + * ExecSubPlan - process a subselect * ExecInitSubPlan - initialize a subselect - * ExecEndSubPlan - shut down a subselect + * ExecEndSubPlan - shut down a subselect */ #include "postgres.h" @@ -27,77 +27,77 @@ Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext) { - Plan *plan = node->plan; - SubLink *sublink = node->sublink; + Plan *plan = node->plan; + SubLink *sublink = node->sublink; TupleTableSlot *slot; - List *lst; - bool result = false; - bool found = false; - - if ( node->setParam != NULL ) - elog (ERROR, "ExecSubPlan: can't set parent params from subquery"); - + List *lst; + bool result = false; + bool found = false; + + if (node->setParam != NULL) + elog(ERROR, "ExecSubPlan: can't set parent params from subquery"); + /* * Set Params of this plan from parent plan correlation Vars */ - if ( node->parParam != NULL ) + if (node->parParam != NULL) { - foreach (lst, node->parParam) + foreach(lst, node->parParam) { - ParamExecData *prm = &(econtext->ecxt_param_exec_vals[lfirsti(lst)]); - - prm->value = ExecEvalExpr ((Node*) lfirst(pvar), - econtext, - &(prm->isnull), NULL); - pvar = lnext (pvar); + ParamExecData *prm = &(econtext->ecxt_param_exec_vals[lfirsti(lst)]); + + prm->value = ExecEvalExpr((Node *) lfirst(pvar), + econtext, + &(prm->isnull), NULL); + pvar = lnext(pvar); } - plan->chgParam = nconc (plan->chgParam, listCopy(node->parParam)); + plan->chgParam = nconc(plan->chgParam, listCopy(node->parParam)); } - - ExecReScan (plan, (ExprContext*) NULL, plan); - - for (slot = ExecProcNode (plan, plan); - !TupIsNull(slot); - slot = ExecProcNode (plan, plan)) + + ExecReScan(plan, (ExprContext *) NULL, plan); + + for (slot = ExecProcNode(plan, plan); + !TupIsNull(slot); + slot = ExecProcNode(plan, plan)) { HeapTuple tup = slot->val; TupleDesc tdesc = slot->ttc_tupleDescriptor; int i = 1; - - if ( sublink->subLinkType == EXPR_SUBLINK && found ) + + if (sublink->subLinkType == EXPR_SUBLINK && found) { - elog (ERROR, "ExecSubPlan: more than one tuple returned by expression subselect"); + elog(ERROR, "ExecSubPlan: more than one tuple returned by expression subselect"); return ((Datum) false); } - - if ( sublink->subLinkType == EXISTS_SUBLINK ) + + if (sublink->subLinkType == EXISTS_SUBLINK) return ((Datum) true); - + found = true; - - foreach (lst, sublink->oper) + + foreach(lst, sublink->oper) { - Expr *expr = (Expr*) lfirst(lst); - Const *con = lsecond(expr->args); - bool isnull; - - con->constvalue = heap_getattr (tup, i, tdesc, &(con->constisnull)); - result = (bool) ExecEvalExpr ((Node*) expr, econtext, &isnull, (bool*) NULL); - if ( isnull ) + Expr *expr = (Expr *) lfirst(lst); + Const *con = lsecond(expr->args); + bool isnull; + + con->constvalue = heap_getattr(tup, i, tdesc, &(con->constisnull)); + result = (bool) ExecEvalExpr((Node *) expr, econtext, &isnull, (bool *) NULL); + if (isnull) result = false; - if ( (!result && !(sublink->useor)) || (result && sublink->useor) ) + if ((!result && !(sublink->useor)) || (result && sublink->useor)) break; i++; } - - if ( (!result && sublink->subLinkType == ALL_SUBLINK) || - (result && sublink->subLinkType == ANY_SUBLINK) ) + + if ((!result && sublink->subLinkType == ALL_SUBLINK) || + (result && sublink->subLinkType == ANY_SUBLINK)) break; } - - if ( !found && sublink->subLinkType == ALL_SUBLINK ) + + if (!found && sublink->subLinkType == ALL_SUBLINK) return ((Datum) true); - + return ((Datum) result); } @@ -109,42 +109,43 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext) bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent) { - EState *sp_estate = CreateExecutorState (); - + EState *sp_estate = CreateExecutorState(); + sp_estate->es_range_table = node->rtable; sp_estate->es_param_list_info = estate->es_param_list_info; sp_estate->es_param_exec_vals = estate->es_param_exec_vals; - sp_estate->es_tupleTable = - ExecCreateTupleTable (ExecCountSlotsNode(node->plan) + 10); - pfree (sp_estate->es_refcount); + sp_estate->es_tupleTable = + ExecCreateTupleTable(ExecCountSlotsNode(node->plan) + 10); + pfree(sp_estate->es_refcount); sp_estate->es_refcount = estate->es_refcount; - - if ( !ExecInitNode (node->plan, sp_estate, NULL) ) + + if (!ExecInitNode(node->plan, sp_estate, NULL)) return (false); - + node->shutdown = true; - + /* - * If this plan is un-correlated or undirect correlated one and - * want to set params for parent plan then prepare parameters. + * If this plan is un-correlated or undirect correlated one and want + * to set params for parent plan then prepare parameters. */ - if ( node->setParam != NULL ) + if (node->setParam != NULL) { - List *lst; - - foreach (lst, node->setParam) + List *lst; + + foreach(lst, node->setParam) { - ParamExecData *prm = &(estate->es_param_exec_vals[lfirsti(lst)]); - + ParamExecData *prm = &(estate->es_param_exec_vals[lfirsti(lst)]); + prm->execPlan = node; } + /* * Note that in the case of un-correlated subqueries we don't care - * about setting parent->chgParam here: indices take care about it, - * for others - it doesn't matter... + * about setting parent->chgParam here: indices take care about + * it, for others - it doesn't matter... */ } - + return (true); } @@ -155,92 +156,92 @@ ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent) * ---------------------------------------------------------------- */ void -ExecSetParamPlan (SubPlan *node) +ExecSetParamPlan(SubPlan *node) { - Plan *plan = node->plan; - SubLink *sublink = node->sublink; + Plan *plan = node->plan; + SubLink *sublink = node->sublink; TupleTableSlot *slot; - List *lst; - bool found = false; - - if ( sublink->subLinkType == ANY_SUBLINK || - sublink->subLinkType == ALL_SUBLINK ) - elog (ERROR, "ExecSetParamPlan: ANY/ALL subselect unsupported"); - - if ( plan->chgParam != NULL ) - ExecReScan (plan, (ExprContext*) NULL, plan); - - for (slot = ExecProcNode (plan, plan); - !TupIsNull(slot); - slot = ExecProcNode (plan, plan)) + List *lst; + bool found = false; + + if (sublink->subLinkType == ANY_SUBLINK || + sublink->subLinkType == ALL_SUBLINK) + elog(ERROR, "ExecSetParamPlan: ANY/ALL subselect unsupported"); + + if (plan->chgParam != NULL) + ExecReScan(plan, (ExprContext *) NULL, plan); + + for (slot = ExecProcNode(plan, plan); + !TupIsNull(slot); + slot = ExecProcNode(plan, plan)) { HeapTuple tup = slot->val; TupleDesc tdesc = slot->ttc_tupleDescriptor; int i = 1; - - if ( sublink->subLinkType == EXPR_SUBLINK && found ) + + if (sublink->subLinkType == EXPR_SUBLINK && found) { - elog (ERROR, "ExecSetParamPlan: more than one tuple returned by expression subselect"); + elog(ERROR, "ExecSetParamPlan: more than one tuple returned by expression subselect"); return; } - + found = true; - - if ( sublink->subLinkType == EXISTS_SUBLINK ) + + if (sublink->subLinkType == EXISTS_SUBLINK) { - ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(node->setParam)]); - + ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(node->setParam)]); + prm->execPlan = NULL; prm->value = (Datum) true; prm->isnull = false; break; } - - /* + + /* * If this is uncorrelated subquery then its plan will be closed * (see below) and this tuple will be free-ed - bad for not byval * types... But is free-ing possible in the next ExecProcNode in - * this loop ? Who knows... Someday we'll keep track of saved + * this loop ? Who knows... Someday we'll keep track of saved * tuples... */ - tup = heap_copytuple (tup); - - foreach (lst, node->setParam) + tup = heap_copytuple(tup); + + foreach(lst, node->setParam) { - ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(lst)]); - + ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(lst)]); + prm->execPlan = NULL; - prm->value = heap_getattr (tup, i, tdesc, &(prm->isnull)); + prm->value = heap_getattr(tup, i, tdesc, &(prm->isnull)); i++; } } - - if ( !found ) + + if (!found) { - if ( sublink->subLinkType == EXISTS_SUBLINK ) + if (sublink->subLinkType == EXISTS_SUBLINK) { - ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(node->setParam)]); - + ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(node->setParam)]); + prm->execPlan = NULL; prm->value = (Datum) false; prm->isnull = false; } else { - foreach (lst, node->setParam) + foreach(lst, node->setParam) { - ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(lst)]); - + ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(lst)]); + prm->execPlan = NULL; prm->value = (Datum) NULL; prm->isnull = true; } } } - - if ( plan->extParam == NULL ) /* un-correlated ... */ + + if (plan->extParam == NULL) /* un-correlated ... */ { - ExecEndNode (plan, plan); + ExecEndNode(plan, plan); node->shutdown = false; } } @@ -252,41 +253,40 @@ ExecSetParamPlan (SubPlan *node) void ExecEndSubPlan(SubPlan *node) { - - if ( node->shutdown ) + + if (node->shutdown) { - ExecEndNode (node->plan, node->plan); + ExecEndNode(node->plan, node->plan); node->shutdown = false; } - + } -void -ExecReScanSetParamPlan (SubPlan *node, Plan *parent) +void +ExecReScanSetParamPlan(SubPlan *node, Plan *parent) { - Plan *plan = node->plan; - List *lst; - - if ( node->parParam != NULL ) - elog (ERROR, "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"); - if ( node->setParam == NULL ) - elog (ERROR, "ExecReScanSetParamPlan: setParam list is NULL"); - if ( plan->extParam == NULL ) - elog (ERROR, "ExecReScanSetParamPlan: extParam list of plan is NULL"); - - /* - * Don't actual re-scan: ExecSetParamPlan does re-scan if - * node->plan->chgParam is not NULL... - ExecReScan (plan, NULL, plan); + Plan *plan = node->plan; + List *lst; + + if (node->parParam != NULL) + elog(ERROR, "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"); + if (node->setParam == NULL) + elog(ERROR, "ExecReScanSetParamPlan: setParam list is NULL"); + if (plan->extParam == NULL) + elog(ERROR, "ExecReScanSetParamPlan: extParam list of plan is NULL"); + + /* + * Don't actual re-scan: ExecSetParamPlan does re-scan if + * node->plan->chgParam is not NULL... ExecReScan (plan, NULL, plan); */ - - foreach (lst, node->setParam) + + foreach(lst, node->setParam) { - ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(lst)]); - + ParamExecData *prm = &(plan->state->es_param_exec_vals[lfirsti(lst)]); + prm->execPlan = node; } - - parent->chgParam = nconc (parent->chgParam, listCopy(node->setParam)); + + parent->chgParam = nconc(parent->chgParam, listCopy(node->setParam)); } diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c index f059ef8d6e..23e09682ea 100644 --- a/src/backend/executor/nodeTee.c +++ b/src/backend/executor/nodeTee.c @@ -15,7 +15,7 @@ * ExecEndTee * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.15 1998/01/07 21:02:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.16 1998/02/26 04:31:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -168,7 +168,7 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent) bufferRel = heap_openr(teeState->tee_bufferRelname); else bufferRel = heap_open( - heap_create_with_catalog(teeState->tee_bufferRelname, tupType)); + heap_create_with_catalog(teeState->tee_bufferRelname, tupType)); } else { @@ -177,7 +177,7 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent) newoid()); /* bufferRel = ExecCreatR(len, tupType, _TEMP_RELATION_ID); */ bufferRel = heap_open( - heap_create_with_catalog(teeState->tee_bufferRelname, tupType)); + heap_create_with_catalog(teeState->tee_bufferRelname, tupType)); } teeState->tee_bufferRel = bufferRel; @@ -246,7 +246,7 @@ initTeeScanDescs(Tee *node) { teeState->tee_leftScanDesc = heap_beginscan(bufferRel, ScanDirectionIsBackward(dir), - false, /* seeself */ + false, /* seeself */ 0, /* num scan keys */ NULL /* scan keys */ ); @@ -255,7 +255,7 @@ initTeeScanDescs(Tee *node) { teeState->tee_rightScanDesc = heap_beginscan(bufferRel, ScanDirectionIsBackward(dir), - false, /* seeself */ + false, /* seeself */ 0, /* num scan keys */ NULL /* scan keys */ ); diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c index 31c80e759a..66b11a6660 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.16 1998/02/23 06:26:58 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.17 1998/02/26 04:31:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -187,7 +187,7 @@ ExecUnique(Unique *node) char *val1, *val2; - attr1 = heap_getattr(slot->val, + attr1 = heap_getattr(slot->val, uniqueAttrNum, tupDesc, &isNull1); attr2 = heap_getattr(resultTupleSlot->val, uniqueAttrNum, tupDesc, &isNull2); @@ -197,11 +197,11 @@ ExecUnique(Unique *node) if (isNull1) /* both are null, they are equal */ continue; val1 = fmgr(typoutput, attr1, - gettypelem(tupDesc->attrs[uniqueAttrNum - 1]->atttypid), - tupDesc->attrs[uniqueAttrNum - 1]->atttypmod); + gettypelem(tupDesc->attrs[uniqueAttrNum - 1]->atttypid), + tupDesc->attrs[uniqueAttrNum - 1]->atttypmod); val2 = fmgr(typoutput, attr2, - gettypelem(tupDesc->attrs[uniqueAttrNum - 1]->atttypid), - tupDesc->attrs[uniqueAttrNum - 1]->atttypmod); + gettypelem(tupDesc->attrs[uniqueAttrNum - 1]->atttypid), + tupDesc->attrs[uniqueAttrNum - 1]->atttypmod); /* * now, val1 and val2 are ascii representations so we can @@ -209,12 +209,12 @@ ExecUnique(Unique *node) */ if (strcmp(val1, val2) == 0) /* they are equal */ { - pfree (val1); - pfree (val2); + pfree(val1); + pfree(val2); continue; } - pfree (val1); - pfree (val2); + pfree(val1); + pfree(val2); break; } else @@ -361,13 +361,14 @@ void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent) { UniqueState *uniquestate = node->uniquestate; - + ExecClearTuple(uniquestate->cs_ResultTupleSlot); - /* - * if chgParam of subnode is not null then plan - * will be re-scanned by first ExecProcNode. + + /* + * if chgParam of subnode is not null then plan will be re-scanned by + * first ExecProcNode. */ - if (((Plan*) node)->lefttree->chgParam == NULL) - ExecReScan (((Plan*) node)->lefttree, exprCtxt, (Plan *) node); - + if (((Plan *) node)->lefttree->chgParam == NULL) + ExecReScan(((Plan *) node)->lefttree, exprCtxt, (Plan *) node); + } diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index f1dfe837e2..040baa7d42 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -18,7 +18,7 @@ typedef struct Portal portal; /* portal per procedure */ MemoryContext savedcxt; CommandId savedId; -} _SPI_connection; +} _SPI_connection; static Portal _SPI_portal = (Portal) NULL; static _SPI_connection *_SPI_stack = NULL; @@ -38,24 +38,24 @@ typedef struct List *ptlist; int nargs; Oid *argtypes; -} _SPI_plan; +} _SPI_plan; -static int _SPI_execute(char *src, int tcount, _SPI_plan * plan); -static int _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount); +static int _SPI_execute(char *src, int tcount, _SPI_plan *plan); +static int _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount); #if 0 -static void _SPI_fetch(FetchStmt * stmt); +static void _SPI_fetch(FetchStmt *stmt); #endif static int -_SPI_execute_plan(_SPI_plan * plan, - Datum * Values, char *Nulls, int tcount); +_SPI_execute_plan(_SPI_plan *plan, + Datum *Values, char *Nulls, int tcount); #define _SPI_CPLAN_CURCXT 0 #define _SPI_CPLAN_PROCXT 1 #define _SPI_CPLAN_TOPCXT 2 -static _SPI_plan *_SPI_copy_plan(_SPI_plan * plan, int location); +static _SPI_plan *_SPI_copy_plan(_SPI_plan *plan, int location); static int _SPI_begin_call(bool execmem); static int _SPI_end_call(bool procmem); @@ -202,7 +202,7 @@ SPI_exec(char *src, int tcount) } int -SPI_execp(void *plan, Datum * Values, char *Nulls, int tcount) +SPI_execp(void *plan, Datum *Values, char *Nulls, int tcount) { int res; @@ -225,8 +225,8 @@ SPI_execp(void *plan, Datum * Values, char *Nulls, int tcount) return (res); } -void * -SPI_prepare(char *src, int nargs, Oid * argtypes) +void * +SPI_prepare(char *src, int nargs, Oid *argtypes) { _SPI_plan *plan; @@ -257,7 +257,7 @@ SPI_prepare(char *src, int nargs, Oid * argtypes) } -void * +void * SPI_saveplan(void *plan) { _SPI_plan *newplan; @@ -310,7 +310,7 @@ SPI_copytuple(HeapTuple tuple) HeapTuple SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum, - Datum * Values, char *Nulls) + Datum *Values, char *Nulls) { MemoryContext oldcxt = NULL; HeapTuple mtuple; @@ -392,7 +392,7 @@ SPI_fnumber(TupleDesc tupdesc, char *fname) return (SPI_ERROR_NOATTRIBUTE); } -char * +char * SPI_fname(TupleDesc tupdesc, int fnumber) { @@ -406,7 +406,7 @@ SPI_fname(TupleDesc tupdesc, int fnumber) return (nameout(&(tupdesc->attrs[fnumber - 1]->attname))); } -char * +char * SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber) { Datum val; @@ -431,12 +431,12 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber) } return (fmgr(foutoid, val, - gettypelem(tupdesc->attrs[fnumber - 1]->atttypid), - tupdesc->attrs[fnumber - 1]->atttypmod)); + gettypelem(tupdesc->attrs[fnumber - 1]->atttypid), + tupdesc->attrs[fnumber - 1]->atttypmod)); } Datum -SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull) +SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull) { Datum val; @@ -453,7 +453,7 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull) return (val); } -char * +char * SPI_gettype(TupleDesc tupdesc, int fnumber) { HeapTuple typeTuple; @@ -492,70 +492,70 @@ SPI_gettypeid(TupleDesc tupdesc, int fnumber) return (tupdesc->attrs[fnumber - 1]->atttypid); } -char * +char * SPI_getrelname(Relation rel) { return (pstrdup(rel->rd_rel->relname.data)); } void * -SPI_palloc (Size size) +SPI_palloc(Size size) { - MemoryContext oldcxt = NULL; - void *pointer; - + MemoryContext oldcxt = NULL; + void *pointer; + if (_SPI_curid + 1 == _SPI_connected) /* connected */ { if (_SPI_current != &(_SPI_stack[_SPI_curid + 1])) elog(FATAL, "SPI: stack corrupted"); oldcxt = MemoryContextSwitchTo(_SPI_current->savedcxt); } - - pointer = palloc (size); - + + pointer = palloc(size); + if (oldcxt) MemoryContextSwitchTo(oldcxt); - + return (pointer); } void * -SPI_repalloc (void *pointer, Size size) +SPI_repalloc(void *pointer, Size size) { - MemoryContext oldcxt = NULL; - + MemoryContext oldcxt = NULL; + if (_SPI_curid + 1 == _SPI_connected) /* connected */ { if (_SPI_current != &(_SPI_stack[_SPI_curid + 1])) elog(FATAL, "SPI: stack corrupted"); oldcxt = MemoryContextSwitchTo(_SPI_current->savedcxt); } - - pointer = repalloc (pointer, size); - + + pointer = repalloc(pointer, size); + if (oldcxt) MemoryContextSwitchTo(oldcxt); - + return (pointer); } -void -SPI_pfree (void *pointer) +void +SPI_pfree(void *pointer) { - MemoryContext oldcxt = NULL; - + MemoryContext oldcxt = NULL; + if (_SPI_curid + 1 == _SPI_connected) /* connected */ { if (_SPI_current != &(_SPI_stack[_SPI_curid + 1])) elog(FATAL, "SPI: stack corrupted"); oldcxt = MemoryContextSwitchTo(_SPI_current->savedcxt); } - - pfree (pointer); - + + pfree(pointer); + if (oldcxt) MemoryContextSwitchTo(oldcxt); - + return; } @@ -613,7 +613,7 @@ spi_printtup(HeapTuple tuple, TupleDesc tupdesc) */ static int -_SPI_execute(char *src, int tcount, _SPI_plan * plan) +_SPI_execute(char *src, int tcount, _SPI_plan *plan) { QueryTreeList *queryTree_list; List *planTree_list; @@ -710,7 +710,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan * plan) } static int -_SPI_execute_plan(_SPI_plan * plan, Datum * Values, char *Nulls, int tcount) +_SPI_execute_plan(_SPI_plan *plan, Datum *Values, char *Nulls, int tcount) { QueryTreeList *queryTree_list = plan->qtlist; List *planTree_list = plan->ptlist; @@ -781,12 +781,12 @@ _SPI_execute_plan(_SPI_plan * plan, Datum * Values, char *Nulls, int tcount) } static int -_SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount) +_SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount) { Query *parseTree = queryDesc->parsetree; Plan *plan = queryDesc->plantree; int operation = queryDesc->operation; - CommandDest dest = queryDesc->dest; + CommandDest dest = queryDesc->dest; TupleDesc tupdesc; bool isRetrieveIntoPortal = false; bool isRetrieveIntoRelation = false; @@ -810,7 +810,7 @@ _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount) { res = SPI_OK_SELINTO; isRetrieveIntoRelation = true; - queryDesc->dest = None; /* */ + queryDesc->dest = None; /* */ } break; case CMD_INSERT: @@ -878,7 +878,7 @@ _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount) #if 0 static void -_SPI_fetch(FetchStmt * stmt) +_SPI_fetch(FetchStmt *stmt) { char *name = stmt->portalname; int feature = (stmt->direction == FORWARD) ? EXEC_FOR : EXEC_BACK; @@ -1001,7 +1001,8 @@ _SPI_checktuples() if (tuptable != NULL) failed = true; } - else /* some tuples were processed */ + else +/* some tuples were processed */ { if (tuptable == NULL) /* spi_printtup was not called */ failed = true; @@ -1013,7 +1014,7 @@ _SPI_checktuples() } static _SPI_plan * -_SPI_copy_plan(_SPI_plan * plan, int location) +_SPI_copy_plan(_SPI_plan *plan, int location) { _SPI_plan *newplan; MemoryContext oldcxt = NULL; diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c index 85d1d7c5cd..2464d4ddef 100644 --- a/src/backend/lib/dllist.c +++ b/src/backend/lib/dllist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.8 1997/09/08 21:43:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.9 1998/02/26 04:31:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #include <lib/dllist.h> -Dllist * +Dllist * DLNewList(void) { Dllist *l; @@ -42,7 +42,7 @@ DLFreeList(Dllist *l) free(l); } -Dlelem * +Dlelem * DLNewElem(void *val) { Dlelem *e; @@ -61,7 +61,7 @@ DLFreeElem(Dlelem *e) free(e); } -Dlelem * +Dlelem * DLGetHead(Dllist *l) { return (l ? l->dll_head : 0); @@ -69,7 +69,7 @@ DLGetHead(Dllist *l) /* get the value stored in the first element */ #ifdef NOT_USED -void * +void * DLGetHeadVal(Dllist *l) { Dlelem *e = DLGetHead(l); @@ -79,7 +79,7 @@ DLGetHeadVal(Dllist *l) #endif -Dlelem * +Dlelem * DLGetTail(Dllist *l) { return (l ? l->dll_tail : 0); @@ -87,7 +87,7 @@ DLGetTail(Dllist *l) /* get the value stored in the first element */ #ifdef NOT_USED -void * +void * DLGetTailVal(Dllist *l) { Dlelem *e = DLGetTail(l); @@ -97,13 +97,13 @@ DLGetTailVal(Dllist *l) #endif -Dlelem * +Dlelem * DLGetPred(Dlelem *e) /* get predecessor */ { return (e ? e->dle_prev : 0); } -Dlelem * +Dlelem * DLGetSucc(Dlelem *e) /* get successor */ { return (e ? e->dle_next : 0); @@ -162,7 +162,7 @@ DLAddTail(Dllist *l, Dlelem *e) l->dll_head = l->dll_tail; } -Dlelem * +Dlelem * DLRemHead(Dllist *l) { /* remove and return the head */ @@ -188,7 +188,7 @@ DLRemHead(Dllist *l) return result; } -Dlelem * +Dlelem * DLRemTail(Dllist *l) { /* remove and return the tail */ diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c index 6ddae8fb7b..c6e2bdbab6 100644 --- a/src/backend/lib/lispsort.c +++ b/src/backend/lib/lispsort.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.7 1997/09/08 21:43:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.8 1998/02/26 04:31:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ ** as passed into lisp_qsort(), and returns a new list with ** the nodes sorted. The old list is *not* freed or modified (?) */ -List * +List * lisp_qsort(List *the_list, /* the list to be sorted */ int (*compare) ()) /* function to compare two nodes */ { diff --git a/src/backend/lib/qsort.c b/src/backend/lib/qsort.c index 01dada8fc2..264b941794 100644 --- a/src/backend/lib/qsort.c +++ b/src/backend/lib/qsort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/qsort.c,v 1.5 1998/02/11 19:10:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/qsort.c,v 1.6 1998/02/26 04:31:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -129,13 +129,13 @@ pg_qsort(void *bot, static void quick_sort(char *bot, int nmemb, int size, int (*compar) ()) { - int cnt; - u_char ch; - char *top, + int cnt; + u_char ch; + char *top, *mid, *t1, *t2; - int n1, + int n1, n2; char *bsv; @@ -277,9 +277,9 @@ swap: SWAP(bot, replace); static void insertion_sort(char *bot, int nmemb, int size, int (*compar) ()) { - int cnt; - u_char ch; - char *s1, + int cnt; + u_char ch; + char *s1, *s2, *t1, *t2, diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 2ea1f703cc..7cf875222a 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.26 1998/02/25 13:06:49 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.27 1998/02/26 04:31:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,16 +40,16 @@ #include <libpq/crypt.h> -static void sendAuthRequest(Port *port, AuthRequest areq, void (*handler)()); +static void sendAuthRequest(Port *port, AuthRequest areq, void (*handler) ()); static void handle_done_auth(Port *port); static void handle_krb4_auth(Port *port); static void handle_krb5_auth(Port *port); static void handle_password_auth(Port *port); static void readPasswordPacket(char *arg, PacketLen len, char *pkt); static void pg_passwordv0_recvauth(char *arg, PacketLen len, char *pkt); -static int checkPassword(Port *port, char *user, char *password); -static int old_be_recvauth(Port *port); -static int map_old_to_new(Port *port, UserAuth old, int status); +static int checkPassword(Port *port, char *user, char *password); +static int old_be_recvauth(Port *port); +static int map_old_to_new(Port *port, UserAuth old, int status); #ifdef KRB4 @@ -327,14 +327,18 @@ pg_krb5_recvauth(Port *port) * Handle a v0 password packet. */ -static void pg_passwordv0_recvauth(char *arg, PacketLen len, char *pkt) +static void +pg_passwordv0_recvauth(char *arg, PacketLen len, char *pkt) { - Port *port; + Port *port; PasswordPacketV0 *pp; - char *user, *password, *cp, *start; + char *user, + *password, + *cp, + *start; - port = (Port *)arg; - pp = (PasswordPacketV0 *)pkt; + port = (Port *) arg; + pp = (PasswordPacketV0 *) pkt; /* * The packet is supposed to comprise the user name and the password @@ -343,7 +347,7 @@ static void pg_passwordv0_recvauth(char *arg, PacketLen len, char *pkt) user = password = NULL; - len -= sizeof (pp->unused); + len -= sizeof(pp->unused); cp = start = pp->data; @@ -372,8 +376,8 @@ static void pg_passwordv0_recvauth(char *arg, PacketLen len, char *pkt) } else { - int status; - UserAuth saved; + int status; + UserAuth saved; /* Check the password. */ @@ -396,7 +400,8 @@ static void pg_passwordv0_recvauth(char *arg, PacketLen len, char *pkt) * Tell the user the authentication failed, but not why. */ -void auth_failed(Port *port) +void +auth_failed(Port *port) { PacketSendError(&port->pktInfo, "User authentication failed"); } @@ -405,15 +410,17 @@ void auth_failed(Port *port) /* * be_recvauth -- server demux routine for incoming authentication information */ -void be_recvauth(Port *port) +void +be_recvauth(Port *port) { + /* * Get the authentication method to use for this frontend/database * combination. */ if (hba_getauthmethod(&port->raddr, port->database, port->auth_arg, - &port->auth_method) != STATUS_OK) + &port->auth_method) != STATUS_OK) PacketSendError(&port->pktInfo, "Missing or mis-configured pg_hba.conf file"); else if (PG_PROTOCOL_MAJOR(port->proto) == 0) @@ -426,7 +433,7 @@ void be_recvauth(Port *port) else { AuthRequest areq; - void (*auth_handler)(); + void (*auth_handler) (); /* Keep the compiler quiet. */ @@ -438,44 +445,44 @@ void be_recvauth(Port *port) switch (port->auth_method) { - case uaReject: - break; - - case uaKrb4: - areq = AUTH_REQ_KRB4; - auth_handler = handle_krb4_auth; - break; + case uaReject: + break; - case uaKrb5: - areq = AUTH_REQ_KRB5; - auth_handler = handle_krb5_auth; - break; + case uaKrb4: + areq = AUTH_REQ_KRB4; + auth_handler = handle_krb4_auth; + break; - case uaTrust: - areq = AUTH_REQ_OK; - auth_handler = handle_done_auth; - break; + case uaKrb5: + areq = AUTH_REQ_KRB5; + auth_handler = handle_krb5_auth; + break; - case uaIdent: - if (authident(&port->raddr.in, &port->laddr.in, - port->user, port->auth_arg) == STATUS_OK) - { + case uaTrust: areq = AUTH_REQ_OK; auth_handler = handle_done_auth; - } + break; - break; + case uaIdent: + if (authident(&port->raddr.in, &port->laddr.in, + port->user, port->auth_arg) == STATUS_OK) + { + areq = AUTH_REQ_OK; + auth_handler = handle_done_auth; + } - case uaPassword: - areq = AUTH_REQ_PASSWORD; - auth_handler = handle_password_auth; - break; + break; - case uaCrypt: - areq = AUTH_REQ_CRYPT; - auth_handler = handle_password_auth; - break; - } + case uaPassword: + areq = AUTH_REQ_PASSWORD; + auth_handler = handle_password_auth; + break; + + case uaCrypt: + areq = AUTH_REQ_CRYPT; + auth_handler = handle_password_auth; + break; + } /* Tell the frontend what we want next. */ @@ -485,24 +492,26 @@ void be_recvauth(Port *port) auth_failed(port); } } - + /* * Send an authentication request packet to the frontend. */ -static void sendAuthRequest(Port *port, AuthRequest areq, void (*handler)()) +static void +sendAuthRequest(Port *port, AuthRequest areq, void (*handler) ()) { - char *dp, *sp; - int i; - uint32 net_areq; + char *dp, + *sp; + int i; + uint32 net_areq; /* Convert to a byte stream. */ net_areq = htonl(areq); dp = port->pktInfo.pkt.ar.data; - sp = (char *)&net_areq; + sp = (char *) &net_areq; *dp++ = 'R'; @@ -518,7 +527,7 @@ static void sendAuthRequest(Port *port, AuthRequest areq, void (*handler)()) i += 2; } - PacketSendSetup(&port -> pktInfo, i, handler, (char *)port); + PacketSendSetup(&port->pktInfo, i, handler, (char *) port); } @@ -526,8 +535,10 @@ static void sendAuthRequest(Port *port, AuthRequest areq, void (*handler)()) * Called when we have told the front end that it is authorised. */ -static void handle_done_auth(Port *port) +static void +handle_done_auth(Port *port) { + /* * Don't generate any more traffic. This will cause the backend to * start. @@ -542,7 +553,8 @@ static void handle_done_auth(Port *port) * authentication. */ -static void handle_krb4_auth(Port *port) +static void +handle_krb4_auth(Port *port) { if (pg_krb4_recvauth(port) != STATUS_OK) auth_failed(port); @@ -556,7 +568,8 @@ static void handle_krb4_auth(Port *port) * authentication. */ -static void handle_krb5_auth(Port *port) +static void +handle_krb5_auth(Port *port) { if (pg_krb5_recvauth(port) != STATUS_OK) auth_failed(port); @@ -570,11 +583,12 @@ static void handle_krb5_auth(Port *port) * authentication. */ -static void handle_password_auth(Port *port) +static void +handle_password_auth(Port *port) { /* Set up the read of the password packet. */ - PacketReceiveSetup(&port->pktInfo, readPasswordPacket, (char *)port); + PacketReceiveSetup(&port->pktInfo, readPasswordPacket, (char *) port); } @@ -582,19 +596,20 @@ static void handle_password_auth(Port *port) * Called when we have received the password packet. */ -static void readPasswordPacket(char *arg, PacketLen len, char *pkt) +static void +readPasswordPacket(char *arg, PacketLen len, char *pkt) { - char password[sizeof (PasswordPacket) + 1]; - Port *port; + char password[sizeof(PasswordPacket) + 1]; + Port *port; - port = (Port *)arg; + port = (Port *) arg; /* Silently truncate a password that is too big. */ - if (len > sizeof (PasswordPacket)) - len = sizeof (PasswordPacket); - - StrNCpy(password, ((PasswordPacket *)pkt)->passwd, len); + if (len > sizeof(PasswordPacket)) + len = sizeof(PasswordPacket); + + StrNCpy(password, ((PasswordPacket *) pkt)->passwd, len); if (checkPassword(port, port->user, password) != STATUS_OK) auth_failed(port); @@ -609,7 +624,8 @@ static void readPasswordPacket(char *arg, PacketLen len, char *pkt) * not. */ -static int checkPassword(Port *port, char *user, char *password) +static int +checkPassword(Port *port, char *user, char *password) { if (port->auth_method == uaPassword && port->auth_arg[0] != '\0') return verify_password(port->auth_arg, user, password); @@ -622,83 +638,85 @@ static int checkPassword(Port *port, char *user, char *password) * Server demux routine for incoming authentication information for protocol * version 0. */ -static int old_be_recvauth(Port *port) +static int +old_be_recvauth(Port *port) { - int status; - MsgType msgtype = (MsgType)port->proto; + int status; + MsgType msgtype = (MsgType) port->proto; /* Handle the authentication that's offered. */ switch (msgtype) - { - case STARTUP_KRB4_MSG: - status = map_old_to_new(port,uaKrb4,pg_krb4_recvauth(port)); - break; + { + case STARTUP_KRB4_MSG: + status = map_old_to_new(port, uaKrb4, pg_krb4_recvauth(port)); + break; - case STARTUP_KRB5_MSG: - status = map_old_to_new(port,uaKrb5,pg_krb5_recvauth(port)); - break; + case STARTUP_KRB5_MSG: + status = map_old_to_new(port, uaKrb5, pg_krb5_recvauth(port)); + break; - case STARTUP_MSG: - status = map_old_to_new(port,uaTrust,STATUS_OK); - break; + case STARTUP_MSG: + status = map_old_to_new(port, uaTrust, STATUS_OK); + break; - case STARTUP_PASSWORD_MSG: - PacketReceiveSetup(&port->pktInfo, pg_passwordv0_recvauth, - (char *)port); + case STARTUP_PASSWORD_MSG: + PacketReceiveSetup(&port->pktInfo, pg_passwordv0_recvauth, + (char *) port); - return STATUS_OK; + return STATUS_OK; - default: - fprintf(stderr, "Invalid startup message type: %u\n", msgtype); + default: + fprintf(stderr, "Invalid startup message type: %u\n", msgtype); - return STATUS_OK; - } + return STATUS_OK; + } return status; } - + /* - * The old style authentication has been done. Modify the result of this (eg. + * The old style authentication has been done. Modify the result of this (eg. * allow the connection anyway, disallow it anyway, or use the result) * depending on what authentication we really want to use. */ -static int map_old_to_new(Port *port, UserAuth old, int status) +static int +map_old_to_new(Port *port, UserAuth old, int status) { switch (port->auth_method) { - case uaCrypt: - case uaReject: - status = STATUS_ERROR; - break; - - case uaKrb4: - if (old != uaKrb4) + case uaCrypt: + case uaReject: status = STATUS_ERROR; - break; + break; - case uaKrb5: - if (old != uaKrb5) - status = STATUS_ERROR; - break; + case uaKrb4: + if (old != uaKrb4) + status = STATUS_ERROR; + break; - case uaTrust: - status = STATUS_OK; - break; + case uaKrb5: + if (old != uaKrb5) + status = STATUS_ERROR; + break; - case uaIdent: - status = authident(&port->raddr.in, &port->laddr.in, - port->user, port->auth_arg); - break; + case uaTrust: + status = STATUS_OK; + break; - case uaPassword: - if (old != uaPassword) - status = STATUS_ERROR; + case uaIdent: + status = authident(&port->raddr.in, &port->laddr.in, + port->user, port->auth_arg); + break; + + case uaPassword: + if (old != uaPassword) + status = STATUS_ERROR; - break; + break; } - + return status; } diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c index f662282898..9ac6af1d1f 100644 --- a/src/backend/libpq/be-dumpdata.c +++ b/src/backend/libpq/be-dumpdata.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.13 1998/02/10 16:03:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.14 1998/02/26 04:31:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -313,8 +313,8 @@ be_printtup(HeapTuple tuple, TupleDesc typeinfo) if (!isnull && OidIsValid(typoutput)) { values[i] = fmgr(typoutput, attr, - gettypelem(typeinfo->attrs[i]->atttypid), - typeinfo->attrs[i]->atttypmod); + gettypelem(typeinfo->attrs[i]->atttypid), + typeinfo->attrs[i]->atttypmod); } else values[i] = NULL; diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c index a63ff43161..9b3886065d 100644 --- a/src/backend/libpq/be-pqexec.c +++ b/src/backend/libpq/be-pqexec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.14 1998/01/26 01:41:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.15 1998/02/26 04:31:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ static char *strmake(char *str, int len); * This code scavanged from HandleFunctionRequest() in tcop/fastpath.h * ---------------- */ -char * +char * PQfn(int fnid, int *result_buf, /* can't use void, dec compiler barfs */ int result_len, @@ -129,7 +129,7 @@ PQfn(int fnid, * returns because the system longjmp's back to the main loop. * ---------------- */ -char * +char * PQexec(char *query) { PortalEntry *entry = NULL; diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index e6d3a7cf43..2dcb4f1be9 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -1,8 +1,8 @@ /*------------------------------------------------------------------------- * * crypt.c-- - * Look into pg_shadow and check the encrypted password with the one - * passed in from the frontend. + * Look into pg_shadow and check the encrypted password with the one + * passed in from the frontend. * * Modification History * @@ -28,262 +28,313 @@ #include <crypt.h> #endif -char** pwd_cache = NULL; -int pwd_cache_count = 0; +char **pwd_cache = NULL; +int pwd_cache_count = 0; /*-------------------------------------------------------------------------*/ -char* crypt_getpwdfilename() { +char * +crypt_getpwdfilename() +{ - static char* pfnam = NULL; + static char *pfnam = NULL; - if (!pfnam) { - pfnam = (char*)malloc(strlen(DataDir) + strlen(CRYPT_PWD_FILE) + 2); - sprintf(pfnam, "%s/%s", DataDir, CRYPT_PWD_FILE); - } + if (!pfnam) + { + pfnam = (char *) malloc(strlen(DataDir) + strlen(CRYPT_PWD_FILE) + 2); + sprintf(pfnam, "%s/%s", DataDir, CRYPT_PWD_FILE); + } - return pfnam; + return pfnam; } /*-------------------------------------------------------------------------*/ -char* crypt_getpwdreloadfilename() { +char * +crypt_getpwdreloadfilename() +{ - static char* rpfnam = NULL; + static char *rpfnam = NULL; - if (!rpfnam) { - char* pwdfilename; + if (!rpfnam) + { + char *pwdfilename; - pwdfilename = crypt_getpwdfilename(); - rpfnam = (char*)malloc(strlen(pwdfilename) + strlen(CRYPT_PWD_RELOAD_SUFX) + 1); - sprintf(rpfnam, "%s%s", pwdfilename, CRYPT_PWD_RELOAD_SUFX); - } + pwdfilename = crypt_getpwdfilename(); + rpfnam = (char *) malloc(strlen(pwdfilename) + strlen(CRYPT_PWD_RELOAD_SUFX) + 1); + sprintf(rpfnam, "%s%s", pwdfilename, CRYPT_PWD_RELOAD_SUFX); + } - return rpfnam; + return rpfnam; } /*-------------------------------------------------------------------------*/ static -FILE* crypt_openpwdfile() { - char* filename; - FILE* pwdfile; +FILE * +crypt_openpwdfile() +{ + char *filename; + FILE *pwdfile; - filename = crypt_getpwdfilename(); - pwdfile = AllocateFile(filename, "r"); + filename = crypt_getpwdfilename(); + pwdfile = AllocateFile(filename, "r"); - return pwdfile; + return pwdfile; } /*-------------------------------------------------------------------------*/ static -int compar_user(const void* user_a, const void* user_b) { - - int min, - value; - char* login_a; - char* login_b; - - login_a = *((char**)user_a); - login_b = *((char**)user_b); - - /* We only really want to compare the user logins which are first. We look - * for the first SEPSTR char getting the number of chars there are before it. - * We only need to compare to the min count from the two strings. - */ - min = strcspn(login_a, CRYPT_PWD_FILE_SEPSTR); - value = strcspn(login_b, CRYPT_PWD_FILE_SEPSTR); - if (value < min) - min = value; - - /* We add one to min so that the separator character is included in the - * comparison. Why? I believe this will prevent logins that are proper - * prefixes of other logins from being 'masked out'. Being conservative! - */ - return strncmp(login_a, login_b, min + 1); +int +compar_user(const void *user_a, const void *user_b) +{ + + int min, + value; + char *login_a; + char *login_b; + + login_a = *((char **) user_a); + login_b = *((char **) user_b); + + /* + * We only really want to compare the user logins which are first. We + * look for the first SEPSTR char getting the number of chars there + * are before it. We only need to compare to the min count from the + * two strings. + */ + min = strcspn(login_a, CRYPT_PWD_FILE_SEPSTR); + value = strcspn(login_b, CRYPT_PWD_FILE_SEPSTR); + if (value < min) + min = value; + + /* + * We add one to min so that the separator character is included in + * the comparison. Why? I believe this will prevent logins that are + * proper prefixes of other logins from being 'masked out'. Being + * conservative! + */ + return strncmp(login_a, login_b, min + 1); } /*-------------------------------------------------------------------------*/ static -void crypt_loadpwdfile() { - - char* filename; - int result; - FILE* pwd_file; - char buffer[256]; - - filename = crypt_getpwdreloadfilename(); - result = unlink(filename); - - /* We want to delete the flag file before reading the contents of the pg_pwd - * file. If result == 0 then the unlink of the reload file was successful. - * This means that a backend performed a COPY of the pg_shadow file to - * pg_pwd. Therefore we must now do a reload. - */ - if (!pwd_cache || !result) { - if (pwd_cache) { /* free the old data only if this is a reload */ - while (pwd_cache_count--) { - free((void*)pwd_cache[pwd_cache_count]); - } - free((void*)pwd_cache); - pwd_cache = NULL; - pwd_cache_count = 0; - } - - if (!(pwd_file = crypt_openpwdfile())) - return; - - /* Here is where we load the data from pg_pwd. - */ - while (fgets(buffer, 256, pwd_file) != NULL) { - /* We must remove the return char at the end of the string, as this will - * affect the correct parsing of the password entry. - */ - if (buffer[(result = strlen(buffer) - 1)] == '\n') - buffer[result] = '\0'; - - pwd_cache = (char**)realloc((void*)pwd_cache, sizeof(char*) * (pwd_cache_count + 1)); - pwd_cache[pwd_cache_count++] = strdup(buffer); - } - fclose(pwd_file); - - /* Now sort the entries in the cache for faster searching later. - */ - qsort((void*)pwd_cache, pwd_cache_count, sizeof(char*), compar_user); - } +void +crypt_loadpwdfile() +{ + + char *filename; + int result; + FILE *pwd_file; + char buffer[256]; + + filename = crypt_getpwdreloadfilename(); + result = unlink(filename); + + /* + * We want to delete the flag file before reading the contents of the + * pg_pwd file. If result == 0 then the unlink of the reload file was + * successful. This means that a backend performed a COPY of the + * pg_shadow file to pg_pwd. Therefore we must now do a reload. + */ + if (!pwd_cache || !result) + { + if (pwd_cache) + { /* free the old data only if this is a + * reload */ + while (pwd_cache_count--) + { + free((void *) pwd_cache[pwd_cache_count]); + } + free((void *) pwd_cache); + pwd_cache = NULL; + pwd_cache_count = 0; + } + + if (!(pwd_file = crypt_openpwdfile())) + return; + + /* + * Here is where we load the data from pg_pwd. + */ + while (fgets(buffer, 256, pwd_file) != NULL) + { + + /* + * We must remove the return char at the end of the string, as + * this will affect the correct parsing of the password entry. + */ + if (buffer[(result = strlen(buffer) - 1)] == '\n') + buffer[result] = '\0'; + + pwd_cache = (char **) realloc((void *) pwd_cache, sizeof(char *) * (pwd_cache_count + 1)); + pwd_cache[pwd_cache_count++] = strdup(buffer); + } + fclose(pwd_file); + + /* + * Now sort the entries in the cache for faster searching later. + */ + qsort((void *) pwd_cache, pwd_cache_count, sizeof(char *), compar_user); + } } /*-------------------------------------------------------------------------*/ static -void crypt_parsepwdentry(char* buffer, char** pwd, char** valdate) { - - char* parse = buffer; - int count, - i; - - /* skip to the password field - */ - for (i = 0; i < 6; i++) - parse += (strcspn(parse, CRYPT_PWD_FILE_SEPSTR) + 1); - - /* store a copy of user password to return - */ - count = strcspn(parse, CRYPT_PWD_FILE_SEPSTR); - *pwd = (char*)malloc(count + 1); - strncpy(*pwd, parse, count); - (*pwd)[count] = '\0'; - parse += (count + 1); - - /* store a copy of date login becomes invalid - */ - count = strcspn(parse, CRYPT_PWD_FILE_SEPSTR); - *valdate = (char*)malloc(count + 1); - strncpy(*valdate, parse, count); - (*valdate)[count] = '\0'; - parse += (count + 1); +void +crypt_parsepwdentry(char *buffer, char **pwd, char **valdate) +{ + + char *parse = buffer; + int count, + i; + + /* + * skip to the password field + */ + for (i = 0; i < 6; i++) + parse += (strcspn(parse, CRYPT_PWD_FILE_SEPSTR) + 1); + + /* + * store a copy of user password to return + */ + count = strcspn(parse, CRYPT_PWD_FILE_SEPSTR); + *pwd = (char *) malloc(count + 1); + strncpy(*pwd, parse, count); + (*pwd)[count] = '\0'; + parse += (count + 1); + + /* + * store a copy of date login becomes invalid + */ + count = strcspn(parse, CRYPT_PWD_FILE_SEPSTR); + *valdate = (char *) malloc(count + 1); + strncpy(*valdate, parse, count); + (*valdate)[count] = '\0'; + parse += (count + 1); } /*-------------------------------------------------------------------------*/ static -int crypt_getloginfo(const char* user, char** passwd, char** valuntil) { - - char* pwd; - char* valdate; - void* fakeout; - - *passwd = NULL; - *valuntil = NULL; - crypt_loadpwdfile(); - - if (pwd_cache) { - char** pwd_entry; - char user_search[NAMEDATALEN + 2]; - - sprintf(user_search, "%s\t", user); - fakeout = (void*)&user_search; - if ((pwd_entry = (char**)bsearch((void*)&fakeout, (void*)pwd_cache, pwd_cache_count, sizeof(char*), compar_user))) { - crypt_parsepwdentry(*pwd_entry, &pwd, &valdate); - *passwd = pwd; - *valuntil = valdate; - return STATUS_OK; - } - - return STATUS_OK; - } - - return STATUS_ERROR; +int +crypt_getloginfo(const char *user, char **passwd, char **valuntil) +{ + + char *pwd; + char *valdate; + void *fakeout; + + *passwd = NULL; + *valuntil = NULL; + crypt_loadpwdfile(); + + if (pwd_cache) + { + char **pwd_entry; + char user_search[NAMEDATALEN + 2]; + + sprintf(user_search, "%s\t", user); + fakeout = (void *) &user_search; + if ((pwd_entry = (char **) bsearch((void *) &fakeout, (void *) pwd_cache, pwd_cache_count, sizeof(char *), compar_user))) + { + crypt_parsepwdentry(*pwd_entry, &pwd, &valdate); + *passwd = pwd; + *valuntil = valdate; + return STATUS_OK; + } + + return STATUS_OK; + } + + return STATUS_ERROR; } /*-------------------------------------------------------------------------*/ #if 0 -MsgType crypt_salt(const char* user) { - - char* passwd; - char* valuntil; - - if (crypt_getloginfo(user, &passwd, &valuntil) == STATUS_ERROR) - return STARTUP_UNSALT_MSG; - - if (passwd == NULL || *passwd == '\0' || !strcmp(passwd, "\\N")) { - if (passwd) free((void*)passwd); - if (valuntil) free((void*)valuntil); - return STARTUP_UNSALT_MSG; - } - - free((void*)passwd); - if (valuntil) free((void*)valuntil); - return STARTUP_SALT_MSG; +MsgType +crypt_salt(const char *user) +{ + + char *passwd; + char *valuntil; + + if (crypt_getloginfo(user, &passwd, &valuntil) == STATUS_ERROR) + return STARTUP_UNSALT_MSG; + + if (passwd == NULL || *passwd == '\0' || !strcmp(passwd, "\\N")) + { + if (passwd) + free((void *) passwd); + if (valuntil) + free((void *) valuntil); + return STARTUP_UNSALT_MSG; + } + + free((void *) passwd); + if (valuntil) + free((void *) valuntil); + return STARTUP_SALT_MSG; } + #endif /*-------------------------------------------------------------------------*/ -int crypt_verify(Port* port, const char* user, const char* pgpass) { - - char* passwd; - char* valuntil; - char* crypt_pwd; - int retval = STATUS_ERROR; - AbsoluteTime vuntil, - current; - - if (crypt_getloginfo(user, &passwd, &valuntil) == STATUS_ERROR) - return STATUS_ERROR; - - if (passwd == NULL || *passwd == '\0') { - if (passwd) free((void*)passwd); - if (valuntil) free((void*)valuntil); - return STATUS_ERROR; - } - - /* - * Compare with the encrypted or plain password depending on the - * authentication method being used for this connection. - */ - - crypt_pwd = (port->auth_method == uaCrypt ? crypt(passwd, port->salt) : passwd); - - if (!strcmp(pgpass, crypt_pwd)) { - /* check here to be sure we are not past valuntil - */ - if (!valuntil || strcmp(valuntil, "\\N") == 0) - vuntil = INVALID_ABSTIME; - else - vuntil = nabstimein(valuntil); - current = GetCurrentAbsoluteTime(); - if (vuntil != INVALID_ABSTIME && vuntil < current) - retval = STATUS_ERROR; - else - retval = STATUS_OK; - } - - free((void*)passwd); - if (valuntil) free((void*)valuntil); - - return retval; +int +crypt_verify(Port *port, const char *user, const char *pgpass) +{ + + char *passwd; + char *valuntil; + char *crypt_pwd; + int retval = STATUS_ERROR; + AbsoluteTime vuntil, + current; + + if (crypt_getloginfo(user, &passwd, &valuntil) == STATUS_ERROR) + return STATUS_ERROR; + + if (passwd == NULL || *passwd == '\0') + { + if (passwd) + free((void *) passwd); + if (valuntil) + free((void *) valuntil); + return STATUS_ERROR; + } + + /* + * Compare with the encrypted or plain password depending on the + * authentication method being used for this connection. + */ + + crypt_pwd = (port->auth_method == uaCrypt ? crypt(passwd, port->salt) : passwd); + + if (!strcmp(pgpass, crypt_pwd)) + { + + /* + * check here to be sure we are not past valuntil + */ + if (!valuntil || strcmp(valuntil, "\\N") == 0) + vuntil = INVALID_ABSTIME; + else + vuntil = nabstimein(valuntil); + current = GetCurrentAbsoluteTime(); + if (vuntil != INVALID_ABSTIME && vuntil < current) + retval = STATUS_ERROR; + else + retval = STATUS_OK; + } + + free((void *) passwd); + if (valuntil) + free((void *) valuntil); + + return retval; } diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 872601293c..97045ff012 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.28 1998/02/24 15:18:41 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.29 1998/02/26 04:31:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -97,8 +97,8 @@ read_through_eol(FILE *file) static void -read_hba_entry2(FILE *file, UserAuth * userauth_p, char auth_arg[], - bool *error_p) +read_hba_entry2(FILE *file, UserAuth *userauth_p, char auth_arg[], + bool *error_p) { /*-------------------------------------------------------------------------- Read from file FILE the rest of a host record, after the mask field, @@ -156,7 +156,7 @@ read_hba_entry2(FILE *file, UserAuth * userauth_p, char auth_arg[], static void process_hba_record(FILE *file, SockAddr *raddr, const char database[], bool *matches_p, bool *error_p, - UserAuth * userauth_p, char auth_arg[]) + UserAuth *userauth_p, char auth_arg[]) { /*--------------------------------------------------------------------------- Process the non-comment record in the config file that is next on the file. @@ -167,7 +167,8 @@ process_hba_record(FILE *file, SockAddr *raddr, const char database[], return *error_p true, after issuing a message to stderr. If no error, leave *error_p as it was. ---------------------------------------------------------------------------*/ - char db[MAX_TOKEN], buf[MAX_TOKEN]; + char db[MAX_TOKEN], + buf[MAX_TOKEN]; /* Read the record type field. */ @@ -196,9 +197,9 @@ process_hba_record(FILE *file, SockAddr *raddr, const char database[], */ if (!*error_p && - (*userauth_p == uaIdent || - *userauth_p == uaKrb4 || - *userauth_p == uaKrb5)) + (*userauth_p == uaIdent || + *userauth_p == uaKrb4 || + *userauth_p == uaKrb5)) *error_p = true; if (*error_p) @@ -210,12 +211,13 @@ process_hba_record(FILE *file, SockAddr *raddr, const char database[], */ if ((strcmp(db, database) != 0 && strcmp(db, "all") != 0) || - raddr->sa.sa_family != AF_UNIX) + raddr->sa.sa_family != AF_UNIX) return; } else if (strcmp(buf, "host") == 0) { - struct in_addr file_ip_addr, mask; + struct in_addr file_ip_addr, + mask; /* Get the database. */ @@ -284,7 +286,7 @@ process_hba_record(FILE *file, SockAddr *raddr, const char database[], syntax: sprintf(PQerrormsg, - "process_hba_record: invalid syntax in pg_hba.conf file\n"); + "process_hba_record: invalid syntax in pg_hba.conf file\n"); fputs(PQerrormsg, stderr); pqdebug("%s", PQerrormsg); @@ -296,8 +298,8 @@ syntax: static void process_open_config_file(FILE *file, SockAddr *raddr, const char database[], - bool *host_ok_p, UserAuth * userauth_p, - char auth_arg[]) + bool *host_ok_p, UserAuth *userauth_p, + char auth_arg[]) { /*--------------------------------------------------------------------------- This function does the same thing as find_hba_entry, only with @@ -332,7 +334,7 @@ process_open_config_file(FILE *file, SockAddr *raddr, const char database[], else { process_hba_record(file, raddr, database, - &found_entry, &error, userauth_p, auth_arg); + &found_entry, &error, userauth_p, auth_arg); } } } @@ -352,7 +354,7 @@ process_open_config_file(FILE *file, SockAddr *raddr, const char database[], static void find_hba_entry(SockAddr *raddr, const char database[], bool *host_ok_p, - UserAuth * userauth_p, char auth_arg[]) + UserAuth *userauth_p, char auth_arg[]) { /*-------------------------------------------------------------------------- Read the config file and find an entry that allows connection from @@ -812,7 +814,7 @@ verify_against_usermap(const char pguser[], int -authident(struct sockaddr_in *raddr, struct sockaddr_in *laddr, +authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, const char postgres_username[], const char auth_arg[]) { @@ -840,7 +842,7 @@ authident(struct sockaddr_in *raddr, struct sockaddr_in *laddr, return STATUS_ERROR; verify_against_usermap(postgres_username, ident_username, auth_arg, - &checks_out); + &checks_out); return (checks_out ? STATUS_OK : STATUS_ERROR); } @@ -849,193 +851,207 @@ authident(struct sockaddr_in *raddr, struct sockaddr_in *laddr, #ifdef CYR_RECODE #define CHARSET_FILE "charset.conf" #define MAX_CHARSETS 10 -#define KEY_HOST 1 -#define KEY_BASE 2 -#define KEY_TABLE 3 +#define KEY_HOST 1 +#define KEY_BASE 2 +#define KEY_TABLE 3 struct CharsetItem { - char Orig[MAX_TOKEN]; - char Dest[MAX_TOKEN]; - char Table[MAX_TOKEN]; + char Orig[MAX_TOKEN]; + char Dest[MAX_TOKEN]; + char Table[MAX_TOKEN]; }; -int InRange(char *buf,int host) +int +InRange(char *buf, int host) { - int valid,i,FromAddr,ToAddr,tmp; - struct in_addr file_ip_addr; - char *p; - unsigned int one=0x80000000,NetMask=0; - unsigned char mask; - p = strchr(buf,'/'); - if(p) - { - *p++ = '\0'; - valid = inet_aton(buf, &file_ip_addr); - if(valid) - { - mask = strtoul(p,0,0); - FromAddr = ntohl(file_ip_addr.s_addr); - ToAddr = ntohl(file_ip_addr.s_addr); - for(i=0;i<mask;i++) - { - NetMask |= one; - one >>= 1; - } - FromAddr &= NetMask; - ToAddr = ToAddr | ~NetMask; - tmp = ntohl(host); - return ((unsigned)tmp>=(unsigned)FromAddr && - (unsigned)tmp<=(unsigned)ToAddr); - } - } - else - { - p = strchr(buf,'-'); - if(p) - { - *p++ = '\0'; - valid = inet_aton(buf, &file_ip_addr); - if(valid) - { - FromAddr = ntohl(file_ip_addr.s_addr); - valid = inet_aton(p, &file_ip_addr); - if(valid) - { - ToAddr = ntohl(file_ip_addr.s_addr); - tmp = ntohl(host); - return ((unsigned)tmp>=(unsigned)FromAddr && - (unsigned)tmp<=(unsigned)ToAddr); - } - } - } - else - { - valid = inet_aton(buf, &file_ip_addr); - if(valid) - { - FromAddr = file_ip_addr.s_addr; - return ((unsigned)FromAddr == (unsigned)host); - } - } - } - return false; + int valid, + i, + FromAddr, + ToAddr, + tmp; + struct in_addr file_ip_addr; + char *p; + unsigned int one = 0x80000000, + NetMask = 0; + unsigned char mask; + + p = strchr(buf, '/'); + if (p) + { + *p++ = '\0'; + valid = inet_aton(buf, &file_ip_addr); + if (valid) + { + mask = strtoul(p, 0, 0); + FromAddr = ntohl(file_ip_addr.s_addr); + ToAddr = ntohl(file_ip_addr.s_addr); + for (i = 0; i < mask; i++) + { + NetMask |= one; + one >>= 1; + } + FromAddr &= NetMask; + ToAddr = ToAddr | ~NetMask; + tmp = ntohl(host); + return ((unsigned) tmp >= (unsigned) FromAddr && + (unsigned) tmp <= (unsigned) ToAddr); + } + } + else + { + p = strchr(buf, '-'); + if (p) + { + *p++ = '\0'; + valid = inet_aton(buf, &file_ip_addr); + if (valid) + { + FromAddr = ntohl(file_ip_addr.s_addr); + valid = inet_aton(p, &file_ip_addr); + if (valid) + { + ToAddr = ntohl(file_ip_addr.s_addr); + tmp = ntohl(host); + return ((unsigned) tmp >= (unsigned) FromAddr && + (unsigned) tmp <= (unsigned) ToAddr); + } + } + } + else + { + valid = inet_aton(buf, &file_ip_addr); + if (valid) + { + FromAddr = file_ip_addr.s_addr; + return ((unsigned) FromAddr == (unsigned) host); + } + } + } + return false; } -void GetCharSetByHost(char TableName[],int host, const char DataDir[]) +void +GetCharSetByHost(char TableName[], int host, const char DataDir[]) { - FILE *file; - char buf[MAX_TOKEN],BaseCharset[MAX_TOKEN], - OrigCharset[MAX_TOKEN],DestCharset[MAX_TOKEN],HostCharset[MAX_TOKEN]; - char c,eof=false; - char *map_file; - int key=0,i; - struct CharsetItem* ChArray[MAX_CHARSETS]; - int ChIndex=0; - - *TableName = '\0'; - map_file = (char *) malloc((strlen(DataDir) + - strlen(CHARSET_FILE)+2)*sizeof(char)); - sprintf(map_file, "%s/%s", DataDir, CHARSET_FILE); - file = fopen(map_file, "r"); - if (file == NULL) - return; - while (!eof) - { - c = getc(file); - ungetc(c, file); - if (c == EOF) - eof = true; - else - { - if (c == '#') - read_through_eol(file); - else - { - /* Read the key */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - if (strcasecmp(buf, "HostCharset") == 0) - key = KEY_HOST; - if (strcasecmp(buf, "BaseCharset") == 0) - key = KEY_BASE; - if (strcasecmp(buf, "RecodeTable") == 0) - key = KEY_TABLE; - switch(key) - { - case KEY_HOST: - /* Read the host */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - if (InRange(buf,host)) - { - /* Read the charset */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - strcpy(HostCharset,buf); - } - } - } - break; - case KEY_BASE: - /* Read the base charset */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - strcpy(BaseCharset,buf); - } - break; - case KEY_TABLE: - /* Read the original charset */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - strcpy(OrigCharset,buf); - /* Read the destination charset */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - strcpy(DestCharset,buf); - /* Read the table filename */ - next_token(file, buf, sizeof(buf)); - if (buf[0] != '\0') - { - ChArray[ChIndex] = (struct CharsetItem *) malloc(sizeof(struct CharsetItem)); - strcpy(ChArray[ChIndex]->Orig,OrigCharset); - strcpy(ChArray[ChIndex]->Dest,DestCharset); - strcpy(ChArray[ChIndex]->Table,buf); - ChIndex++; - } - } - } - break; - } - read_through_eol(file); - } - } - } - } - fclose(file); - free(map_file); - - for(i=0; i<ChIndex; i++) - { - if(!strcasecmp(BaseCharset,ChArray[i]->Orig) && - !strcasecmp(HostCharset,ChArray[i]->Dest)) - { - strncpy(TableName,ChArray[i]->Table,79); - } - free((struct CharsetItem *) ChArray[i]); - } + FILE *file; + char buf[MAX_TOKEN], + BaseCharset[MAX_TOKEN], + OrigCharset[MAX_TOKEN], + DestCharset[MAX_TOKEN], + HostCharset[MAX_TOKEN]; + char c, + eof = false; + char *map_file; + int key = 0, + i; + struct CharsetItem *ChArray[MAX_CHARSETS]; + int ChIndex = 0; + + *TableName = '\0'; + map_file = (char *) malloc((strlen(DataDir) + + strlen(CHARSET_FILE) + 2) * sizeof(char)); + sprintf(map_file, "%s/%s", DataDir, CHARSET_FILE); + file = fopen(map_file, "r"); + if (file == NULL) + return; + while (!eof) + { + c = getc(file); + ungetc(c, file); + if (c == EOF) + eof = true; + else + { + if (c == '#') + read_through_eol(file); + else + { + /* Read the key */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + if (strcasecmp(buf, "HostCharset") == 0) + key = KEY_HOST; + if (strcasecmp(buf, "BaseCharset") == 0) + key = KEY_BASE; + if (strcasecmp(buf, "RecodeTable") == 0) + key = KEY_TABLE; + switch (key) + { + case KEY_HOST: + /* Read the host */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + if (InRange(buf, host)) + { + /* Read the charset */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + strcpy(HostCharset, buf); + } + } + } + break; + case KEY_BASE: + /* Read the base charset */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + strcpy(BaseCharset, buf); + } + break; + case KEY_TABLE: + /* Read the original charset */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + strcpy(OrigCharset, buf); + /* Read the destination charset */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + strcpy(DestCharset, buf); + /* Read the table filename */ + next_token(file, buf, sizeof(buf)); + if (buf[0] != '\0') + { + ChArray[ChIndex] = (struct CharsetItem *) malloc(sizeof(struct CharsetItem)); + strcpy(ChArray[ChIndex]->Orig, OrigCharset); + strcpy(ChArray[ChIndex]->Dest, DestCharset); + strcpy(ChArray[ChIndex]->Table, buf); + ChIndex++; + } + } + } + break; + } + read_through_eol(file); + } + } + } + } + fclose(file); + free(map_file); + + for (i = 0; i < ChIndex; i++) + { + if (!strcasecmp(BaseCharset, ChArray[i]->Orig) && + !strcasecmp(HostCharset, ChArray[i]->Dest)) + { + strncpy(TableName, ChArray[i]->Table, 79); + } + free((struct CharsetItem *) ChArray[i]); + } } + #endif extern int hba_getauthmethod(SockAddr *raddr, char *database, char *auth_arg, - UserAuth *auth_method) + UserAuth *auth_method) { /*--------------------------------------------------------------------------- Determine what authentication method should be used when accessing database diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c index c77b065e33..1bb503bdcf 100644 --- a/src/backend/libpq/password.c +++ b/src/backend/libpq/password.c @@ -12,8 +12,8 @@ int verify_password(char *auth_arg, char *user, char *password) { - char *pw_file_fullname; - FILE *pw_file; + char *pw_file_fullname; + FILE *pw_file; pw_file_fullname = (char *) palloc(strlen(DataDir) + strlen(auth_arg) + 2); strcpy(pw_file_fullname, DataDir); @@ -36,9 +36,12 @@ verify_password(char *auth_arg, char *user, char *password) while (!feof(pw_file)) { - char pw_file_line[255], *p, *test_user, *test_pw; + char pw_file_line[255], + *p, + *test_user, + *test_pw; - fgets(pw_file_line, sizeof (pw_file_line), pw_file); + fgets(pw_file_line, sizeof(pw_file_line), pw_file); p = pw_file_line; test_user = strtok(p, ":"); diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c index 14c11127bc..922b622b4e 100644 --- a/src/backend/libpq/portal.c +++ b/src/backend/libpq/portal.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.12 1997/12/09 03:10:43 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.13 1998/02/26 04:31:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -295,7 +295,7 @@ PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name) * the group index and field index. * -------------------------------- */ -char * +char * PQfnameGroup(PortalBuffer *portal, int group_index, int field_number) { GroupBuffer *gbp; @@ -451,7 +451,7 @@ PQfnumber(PortalBuffer *portal, int tuple_index, char *field_name) * PQfname - Return the name of a field * -------------------------------- */ -char * +char * PQfname(PortalBuffer *portal, int tuple_index, int field_number) { GroupBuffer *gbp; @@ -578,7 +578,7 @@ PQGetTupleBlock(PortalBuffer *portal, * PQgetvalue - Return an attribute (field) value * -------------------------------- */ -char * +char * PQgetvalue(PortalBuffer *portal, int tuple_index, int field_number) @@ -598,7 +598,7 @@ PQgetvalue(PortalBuffer *portal, * a copy. The CALLER is responsible for free'ing the data returned. * -------------------------------- */ -char * +char * PQgetAttr(PortalBuffer *portal, int tuple_index, int field_number) diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c index 7bdebc2b34..f3cbf22a20 100644 --- a/src/backend/libpq/portalbuf.c +++ b/src/backend/libpq/portalbuf.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.9 1997/12/09 03:10:45 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.10 1998/02/26 04:31:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -235,7 +235,7 @@ pbuf_addTuple(int n) * pbuf_addTupleValueLengths - Allocate a tuple of n lengths (attributes) * -------------------------------- */ -int * +int * pbuf_addTupleValueLengths(int n) { return (int *) @@ -246,7 +246,7 @@ pbuf_addTupleValueLengths(int n) * pbuf_addValues - Allocate n bytes for a value * -------------------------------- */ -char * +char * pbuf_addValues(int n) { return @@ -510,7 +510,7 @@ pbuf_checkFnumber(GroupBuffer *group, * pbuf_findFname - Find the field name given the field index * -------------------------------- */ -char * +char * pbuf_findFname(GroupBuffer *group, int field_number) { diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index e1252d2a74..204578cb64 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.38 1998/02/24 04:01:53 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.39 1998/02/26 04:31:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,9 +38,9 @@ #include <stdio.h> #if defined(HAVE_STRING_H) -# include <string.h> +#include <string.h> #else -# include <strings.h> +#include <strings.h> #endif #include <signal.h> #include <errno.h> @@ -558,7 +558,7 @@ pq_async_notify() * RETURNS: STATUS_OK or STATUS_ERROR */ -static char sock_path[MAXPGPATH+1] = ""; +static char sock_path[MAXPGPATH + 1] = ""; /* do_unlink() * Shutdown routine for backend connection @@ -574,7 +574,7 @@ do_unlink() int StreamServerPort(char *hostName, short portName, int *fdP) { - SockAddr saddr; + SockAddr saddr; int fd, err, family; @@ -613,22 +613,22 @@ StreamServerPort(char *hostName, short portName, int *fdP) { saddr.in.sin_addr.s_addr = htonl(INADDR_ANY); saddr.in.sin_port = htons(portName); - len = sizeof (struct sockaddr_in); + len = sizeof(struct sockaddr_in); } err = bind(fd, &saddr.sa, len); if (err < 0) { - sprintf(PQerrormsg, - "FATAL: StreamServerPort: bind() failed: errno=%d\n", - errno); - pqdebug("%s", PQerrormsg); - strcat(PQerrormsg, "\tIs another postmaster already running on that port?\n"); - if (family == AF_UNIX) - strcat(PQerrormsg, "\tIf not, remove socket node (/tmp/.s.PGSQL.<portnr>)and retry.\n"); - else - strcat(PQerrormsg, "\tIf not, wait a few seconds and retry.\n"); - fputs(PQerrormsg, stderr); - return (STATUS_ERROR); + sprintf(PQerrormsg, + "FATAL: StreamServerPort: bind() failed: errno=%d\n", + errno); + pqdebug("%s", PQerrormsg); + strcat(PQerrormsg, "\tIs another postmaster already running on that port?\n"); + if (family == AF_UNIX) + strcat(PQerrormsg, "\tIf not, remove socket node (/tmp/.s.PGSQL.<portnr>)and retry.\n"); + else + strcat(PQerrormsg, "\tIf not, wait a few seconds and retry.\n"); + fputs(PQerrormsg, stderr); + return (STATUS_ERROR); } listen(fd, SOMAXCONN); @@ -643,10 +643,10 @@ StreamServerPort(char *hostName, short portName, int *fdP) *fdP = fd; if (family == AF_UNIX) - { - chmod(sock_path, 0777); - atexit(do_unlink); - } + { + chmod(sock_path, 0777); + atexit(do_unlink); + } return (STATUS_OK); } diff --git a/src/backend/libpq/pqcomprim.c b/src/backend/libpq/pqcomprim.c index 96acff1196..7631e1c765 100644 --- a/src/backend/libpq/pqcomprim.c +++ b/src/backend/libpq/pqcomprim.c @@ -63,12 +63,12 @@ int pqPutShort(int integer, FILE *f) { - uint16 n; + uint16 n; #ifdef FRONTEND - n = htons((uint16)integer); + n = htons((uint16) integer); #else - n = ((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? hton_s(integer) : htons((uint16)integer)); + n = ((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? hton_s(integer) : htons((uint16) integer)); #endif if (fwrite(&n, 2, 1, f) != 1) @@ -81,12 +81,12 @@ pqPutShort(int integer, FILE *f) int pqPutLong(int integer, FILE *f) { - uint32 n; + uint32 n; #ifdef FRONTEND - n = htonl((uint32)integer); + n = htonl((uint32) integer); #else - n = ((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? hton_l(integer) : htonl((uint32)integer)); + n = ((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? hton_l(integer) : htonl((uint32) integer)); #endif if (fwrite(&n, 4, 1, f) != 1) @@ -99,15 +99,15 @@ pqPutLong(int integer, FILE *f) int pqGetShort(int *result, FILE *f) { - uint16 n; + uint16 n; if (fread(&n, 2, 1, f) != 1) return EOF; #ifdef FRONTEND - *result = (int)ntohs(n); + *result = (int) ntohs(n); #else - *result = (int)((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? ntoh_s(n) : ntohs(n)); + *result = (int) ((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? ntoh_s(n) : ntohs(n)); #endif return 0; @@ -117,15 +117,15 @@ pqGetShort(int *result, FILE *f) int pqGetLong(int *result, FILE *f) { - uint32 n; + uint32 n; if (fread(&n, 4, 1, f) != 1) return EOF; #ifdef FRONTEND - *result = (int)ntohl(n); + *result = (int) ntohl(n); #else - *result = (int)((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? ntoh_l(n) : ntohl(n)); + *result = (int) ((PG_PROTOCOL_MAJOR(FrontendProtocol) == 0) ? ntoh_l(n) : ntohl(n)); #endif return 0; @@ -139,7 +139,7 @@ pqGetLong(int *result, FILE *f) int pqGetNBytes(char *s, size_t len, FILE *f) { - int cnt; + int cnt; if (f == NULL) return EOF; @@ -167,7 +167,7 @@ pqPutNBytes(const char *s, size_t len, FILE *f) int pqGetString(char *s, size_t len, FILE *f) { - int c; + int c; if (f == NULL) return EOF; diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c index 66b7ea4393..97caae952a 100644 --- a/src/backend/libpq/pqpacket.c +++ b/src/backend/libpq/pqpacket.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.14 1998/01/31 20:12:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.15 1998/02/26 04:31:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,30 +33,31 @@ * Set up a packet read for the postmaster event loop. */ -void PacketReceiveSetup(Packet *pkt, void (*iodone)(), char *arg) +void PacketReceiveSetup(Packet *pkt, void (*iodone) (), char *arg) { - pkt->nrtodo = sizeof (pkt->len); - pkt->ptr = (char *)&pkt->len; + pkt->nrtodo = sizeof(pkt->len); + pkt->ptr = (char *) &pkt->len; pkt->iodone = iodone; pkt->arg = arg; pkt->state = ReadingPacketLength; /* Clear the destination. */ - MemSet(&pkt->pkt, 0, sizeof (pkt->pkt)); + MemSet(&pkt->pkt, 0, sizeof(pkt->pkt)); } /* - * Read a packet fragment. Return STATUS_OK if the connection should stay + * Read a packet fragment. Return STATUS_OK if the connection should stay * open. */ -int PacketReceiveFragment(Packet *pkt, int sock) +int +PacketReceiveFragment(Packet *pkt, int sock) { - int got; + int got; - if ((got = read(sock,pkt->ptr,pkt->nrtodo)) > 0) + if ((got = read(sock, pkt->ptr, pkt->nrtodo)) > 0) { pkt->nrtodo -= got; pkt->ptr += got; @@ -67,18 +68,18 @@ int PacketReceiveFragment(Packet *pkt, int sock) { pkt->len = ntohl(pkt->len); - if (pkt->len < sizeof (pkt->len) || - pkt->len > sizeof (pkt->len) + sizeof (pkt->pkt)) + if (pkt->len < sizeof(pkt->len) || + pkt->len > sizeof(pkt->len) + sizeof(pkt->pkt)) { - PacketSendError(pkt,"Invalid packet length"); + PacketSendError(pkt, "Invalid packet length"); return STATUS_OK; } /* Set up for the rest of the packet. */ - pkt->nrtodo = pkt->len - sizeof (pkt->len); - pkt->ptr = (char *)&pkt->pkt; + pkt->nrtodo = pkt->len - sizeof(pkt->len); + pkt->ptr = (char *) &pkt->pkt; pkt->state = ReadingPacket; } @@ -93,8 +94,8 @@ int PacketReceiveFragment(Packet *pkt, int sock) if (pkt->iodone == NULL) return STATUS_ERROR; - (*pkt->iodone)(pkt->arg, pkt->len - sizeof (pkt->len), - (char *)&pkt->pkt); + (*pkt->iodone) (pkt->arg, pkt->len - sizeof(pkt->len), + (char *) &pkt->pkt); } return STATUS_OK; @@ -116,10 +117,10 @@ int PacketReceiveFragment(Packet *pkt, int sock) * Set up a packet write for the postmaster event loop. */ -void PacketSendSetup(Packet *pkt, int nbytes, void (*iodone)(), char *arg) +void PacketSendSetup(Packet *pkt, int nbytes, void (*iodone) (), char *arg) { pkt->nrtodo = nbytes; - pkt->ptr = (char *)&pkt->pkt; + pkt->ptr = (char *) &pkt->pkt; pkt->iodone = iodone; pkt->arg = arg; pkt->state = WritingPacket; @@ -131,11 +132,12 @@ void PacketSendSetup(Packet *pkt, int nbytes, void (*iodone)(), char *arg) * open. */ -int PacketSendFragment(Packet *pkt, int sock) +int +PacketSendFragment(Packet *pkt, int sock) { - int done; + int done; - if ((done = write(sock,pkt->ptr,pkt->nrtodo)) > 0) + if ((done = write(sock, pkt->ptr, pkt->nrtodo)) > 0) { pkt->nrtodo -= done; pkt->ptr += done; @@ -151,7 +153,7 @@ int PacketSendFragment(Packet *pkt, int sock) if (pkt->iodone == NULL) return STATUS_ERROR; - (*pkt->iodone)(pkt->arg); + (*pkt->iodone) (pkt->arg); } return STATUS_OK; @@ -173,12 +175,13 @@ int PacketSendFragment(Packet *pkt, int sock) * Send an error message from the postmaster to the frontend. */ -void PacketSendError(Packet *pkt, char *errormsg) +void +PacketSendError(Packet *pkt, char *errormsg) { fprintf(stderr, "%s\n", errormsg); pkt->pkt.em.data[0] = 'E'; - StrNCpy(&pkt->pkt.em.data[1], errormsg, sizeof (pkt->pkt.em.data) - 2); + StrNCpy(&pkt->pkt.em.data[1], errormsg, sizeof(pkt->pkt.em.data) - 2); /* * The NULL i/o callback will cause the connection to be broken when diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 4c78339ad4..8d09242bf5 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.13 1998/02/05 04:21:56 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.14 1998/02/26 04:31:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,17 +36,19 @@ main(int argc, char *argv[]) int len; #if defined(alpha) -# ifdef NOFIXADE - int buffer[] = {SSIN_UACPROC, UAC_SIGBUS}; -# endif /* NOFIXADE */ -# ifdef NOPRINTADE - int buffer[] = {SSIN_UACPROC, UAC_NOPRINT}; -# endif /* NOPRINTADE */ +#ifdef NOFIXADE + int buffer[] = {SSIN_UACPROC, UAC_SIGBUS}; + +#endif /* NOFIXADE */ +#ifdef NOPRINTADE + int buffer[] = {SSIN_UACPROC, UAC_NOPRINT}; + +#endif /* NOPRINTADE */ #endif #ifdef USE_LOCALE setlocale(LC_CTYPE, ""); /* take locale information from an - * environment */ + * environment */ setlocale(LC_COLLATE, ""); setlocale(LC_MONETARY, ""); #endif @@ -58,18 +60,18 @@ main(int argc, char *argv[]) */ #if defined(ultrix4) - syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL); + syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL); #endif #if defined(alpha) if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL, - (unsigned long) NULL) < 0) + (unsigned long) NULL) < 0) { elog(NOTICE, "setsysinfo failed: %d\n", errno); } -#endif +#endif -#endif /* NOFIXADE || NOPRINTADE */ +#endif /* NOFIXADE || NOPRINTADE */ /* * use one executable for both postgres and postmaster, invoke one or diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 991965436a..40d8abce0c 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.40 1998/02/23 02:54:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.41 1998/02/26 04:32:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ * this copy function only copies the "lcons-cells" of the list but not * its contents. (good for list of pointers as well as list of integers). */ -List * +List * listCopy(List *list) { List *newlist = NIL; @@ -79,8 +79,8 @@ listCopy(List *list) static void CopyPlanFields(Plan *from, Plan *newnode) { - extern List *SS_pull_subplan (void *expr); - + extern List *SS_pull_subplan(void *expr); + newnode->cost = from->cost; newnode->plan_size = from->plan_size; newnode->plan_width = from->plan_width; @@ -90,12 +90,12 @@ CopyPlanFields(Plan *from, Plan *newnode) newnode->qual = copyObject(from->qual); newnode->lefttree = copyObject(from->lefttree); newnode->righttree = copyObject(from->righttree); - newnode->extParam = listCopy (from->extParam); - newnode->locParam = listCopy (from->locParam); - newnode->chgParam = listCopy (from->chgParam); + newnode->extParam = listCopy(from->extParam); + newnode->locParam = listCopy(from->locParam); + newnode->chgParam = listCopy(from->chgParam); Node_Copy(from, newnode, initPlan); - if ( from->subPlan != NULL ) - newnode->subPlan = SS_pull_subplan (newnode->qual); + if (from->subPlan != NULL) + newnode->subPlan = SS_pull_subplan(newnode->qual); else newnode->subPlan = NULL; newnode->nParamExec = from->nParamExec; @@ -471,7 +471,7 @@ _copySort(Sort *from) Node_Copy(from, newnode, sortstate); Node_Copy(from, newnode, psortstate); newnode->cleaned = from->cleaned; - + return newnode; } @@ -484,13 +484,13 @@ static Group * _copyGroup(Group *from) { Group *newnode = makeNode(Group); - + CopyPlanFields((Plan *) from, (Plan *) newnode); newnode->tuplePerGroup = from->tuplePerGroup; newnode->numCols = from->numCols; - newnode->grpColIdx = palloc (from->numCols * sizeof (AttrNumber)); - memcpy (newnode->grpColIdx, from->grpColIdx, from->numCols * sizeof (AttrNumber)); + newnode->grpColIdx = palloc(from->numCols * sizeof(AttrNumber)); + memcpy(newnode->grpColIdx, from->grpColIdx, from->numCols * sizeof(AttrNumber)); Node_Copy(from, newnode, grpstate); return newnode; @@ -520,12 +520,12 @@ _copyAgg(Agg *from) static GroupClause * _copyGroupClause(GroupClause *from) { - GroupClause *newnode = makeNode(GroupClause); + GroupClause *newnode = makeNode(GroupClause); - Node_Copy(from, newnode, entry); - newnode->grpOpoid = from->grpOpoid; + Node_Copy(from, newnode, entry); + newnode->grpOpoid = from->grpOpoid; - return newnode; + return newnode; } @@ -592,13 +592,13 @@ _copyHash(Hash *from) static SubPlan * _copySubPlan(SubPlan *from) { - SubPlan *newnode = makeNode(SubPlan); - + SubPlan *newnode = makeNode(SubPlan); + Node_Copy(from, newnode, plan); newnode->plan_id = from->plan_id; Node_Copy(from, newnode, rtable); - newnode->setParam = listCopy (from->setParam); - newnode->parParam = listCopy (from->parParam); + newnode->setParam = listCopy(from->setParam); + newnode->parParam = listCopy(from->parParam); Node_Copy(from, newnode, sublink); newnode->shutdown = from->shutdown; @@ -761,7 +761,7 @@ _copyConst(Const *from) * XXX super cheesy hack until parser/planner * puts in the right values here. * - * But I like cheese. + * But I like cheese. * ---------------- */ if (!from->constisnull && cached_type != from->consttype) @@ -931,7 +931,7 @@ _copyAggreg(Aggreg *from) static SubLink * _copySubLink(SubLink *from) { - SubLink *newnode = makeNode(SubLink); + SubLink *newnode = makeNode(SubLink); /* ---------------- * copy remainder of node @@ -1049,7 +1049,7 @@ _copyRel(Rel *from) newnode->relam = from->relam; newnode->indproc = from->indproc; Node_Copy(from, newnode, indpred); - + if (from->ordering) { for (len = 0; from->ordering[len] != 0; len++) @@ -1389,7 +1389,7 @@ _copyHInfo(HInfo *from) * copy remainder of node * ---------------- */ - CopyJoinMethodFields((JoinMethod *)from, (JoinMethod *)newnode); + CopyJoinMethodFields((JoinMethod *) from, (JoinMethod *) newnode); newnode->hashop = from->hashop; return newnode; @@ -1408,7 +1408,7 @@ _copyMInfo(MInfo *from) * copy remainder of node * ---------------- */ - CopyJoinMethodFields((JoinMethod *)from, (JoinMethod *)newnode); + CopyJoinMethodFields((JoinMethod *) from, (JoinMethod *) newnode); Node_Copy(from, newnode, m_ordering); return newnode; @@ -1498,9 +1498,9 @@ _copyRangeTblEntry(RangeTblEntry *from) newnode->relid = from->relid; newnode->inh = from->inh; newnode->inFromCl = from->inFromCl; - newnode->skipAcl = from->skipAcl; + newnode->skipAcl = from->skipAcl; + - return newnode; } @@ -1545,7 +1545,7 @@ static Query * _copyQuery(Query *from) { Query *newnode = makeNode(Query); - + newnode->commandType = from->commandType; if (from->utilityStmt && nodeTag(from->utilityStmt) == T_NotifyStmt) { @@ -1576,13 +1576,14 @@ _copyQuery(Query *from) if (from->unionClause) { - List *ulist, *temp_list = NIL; + List *ulist, + *temp_list = NIL; foreach(ulist, from->unionClause) - temp_list = lappend(temp_list,copyObject(lfirst(ulist))); + temp_list = lappend(temp_list, copyObject(lfirst(ulist))); newnode->unionClause = temp_list; } - + return newnode; } @@ -1625,7 +1626,7 @@ _copyValue(Value *from) * recursively copies its items. * ---------------- */ -void * +void * copyObject(void *from) { void *retval; diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index b0eb91c11f..3c6bbe4d30 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.15 1998/02/13 03:27:44 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.16 1998/02/26 04:32:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -512,7 +512,7 @@ _equalSubPlan(SubPlan *a, SubPlan *b) if (!equal((a->sublink->oper), (b->sublink->oper))) return (false); - + return (true); } diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c index 6a7b7e12be..e0e7f7f9be 100644 --- a/src/backend/nodes/list.c +++ b/src/backend/nodes/list.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.11 1998/01/15 18:59:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.12 1998/02/26 04:32:08 momjian Exp $ * * NOTES * XXX a few of the following functions are duplicated to handle @@ -29,7 +29,7 @@ #include "utils/elog.h" #include "utils/palloc.h" -List * +List * makeList(void *elem,...) { va_list args; @@ -57,7 +57,7 @@ makeList(void *elem,...) return (retval); } -List * +List * lcons(void *obj, List *list) { List *l = makeNode(List); @@ -67,7 +67,7 @@ lcons(void *obj, List *list) return l; } -List * +List * lconsi(int datum, List *list) { List *l = makeNode(List); @@ -77,19 +77,19 @@ lconsi(int datum, List *list) return l; } -List * +List * lappend(List *list, void *obj) { return nconc(list, lcons(obj, NIL)); } -List * +List * lappendi(List *list, int datum) { return nconc(list, lconsi(datum, NIL)); } -List * +List * nconc(List *l1, List *l2) { List *temp; @@ -109,7 +109,7 @@ nconc(List *l1, List *l2) } -List * +List * nreverse(List *list) { List *rlist = NIL; @@ -131,7 +131,7 @@ nreverse(List *list) return (list); } -Value * +Value * makeInteger(long i) { Value *v = makeNode(Value); @@ -141,7 +141,7 @@ makeInteger(long i) return v; } -Value * +Value * makeFloat(double d) { Value *v = makeNode(Value); @@ -151,7 +151,7 @@ makeFloat(double d) return v; } -Value * +Value * makeString(char *str) { Value *v = makeNode(Value); @@ -162,7 +162,7 @@ makeString(char *str) } /* n starts with 0 */ -void * +void * nth(int n, List *l) { /* XXX assume list is long enough */ @@ -228,7 +228,7 @@ freeList(List *list) /* * below are for backwards compatibility */ -List * +List * append(List *l1, List *l2) { List *newlist, @@ -250,7 +250,7 @@ append(List *l1, List *l2) /* * below are for backwards compatibility */ -List * +List * intAppend(List *l1, List *l2) { List *newlist, @@ -299,7 +299,7 @@ same(List *l1, List *l2) } -List * +List * LispUnion(List *l1, List *l2) { List *retval = NIL; @@ -331,7 +331,7 @@ LispUnion(List *l1, List *l2) return (retval); } -List * +List * LispUnioni(List *l1, List *l2) { List *retval = NIL; @@ -394,7 +394,7 @@ intMember(int l1, List *l2) * lremove - * only does pointer comparisons. Removes 'elem' from the the linked list. */ -List * +List * lremove(void *elem, List *list) { List *l; @@ -421,7 +421,7 @@ lremove(void *elem, List *list) return result; } -List * +List * LispRemove(void *elem, List *list) { List *temp = NIL; @@ -446,7 +446,7 @@ LispRemove(void *elem, List *list) } #ifdef NOT_USED -List * +List * intLispRemove(int elem, List *list) { List *temp = NIL; @@ -472,7 +472,7 @@ intLispRemove(int elem, List *list) #endif -List * +List * set_difference(List *l1, List *l2) { List *temp1 = NIL; @@ -489,7 +489,7 @@ set_difference(List *l1, List *l2) return (result); } -List * +List * set_differencei(List *l1, List *l2) { List *temp1 = NIL; diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c index 4dbdea460e..4a9581bd1e 100644 --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.8 1998/02/21 16:58:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.9 1998/02/26 04:32:08 momjian Exp $ * * NOTES * Creator functions in POSTGRES 4.2 are generated automatically. Most of @@ -27,7 +27,7 @@ * makeOper - * creates an Oper node */ -Oper * +Oper * makeOper(Oid opno, Oid opid, Oid opresulttype, @@ -49,7 +49,7 @@ makeOper(Oid opno, * creates a Var node * */ -Var * +Var * makeVar(Index varno, AttrNumber varattno, Oid vartype, @@ -75,7 +75,7 @@ makeVar(Index varno, * makeResdom - * creates a Resdom (Result Domain) node */ -Resdom * +Resdom * makeResdom(AttrNumber resno, Oid restype, int16 restypmod, @@ -100,7 +100,7 @@ makeResdom(AttrNumber resno, * makeConst - * creates a Const node */ -Const * +Const * makeConst(Oid consttype, int constlen, Datum constvalue, diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index a7c5364ba1..6ea35a3af7 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.6 1997/09/08 21:44:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.7 1998/02/26 04:32:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,7 +89,7 @@ var_is_rel(Var *var) * Returns the modified oper node. * */ -Oper * +Oper * replace_opid(Oper *oper) { oper->opid = get_opcode(oper->opno); diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c index cab477ca26..c11928f8cd 100644 --- a/src/backend/nodes/nodes.c +++ b/src/backend/nodes/nodes.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.4 1997/09/18 20:20:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.5 1998/02/26 04:32:10 momjian Exp $ * * HISTORY * Andrew Yu Oct 20, 1994 file creation @@ -31,7 +31,7 @@ * macro makeNode. eg. to create a Resdom node, use makeNode(Resdom) * */ -Node * +Node * newNode(Size size, NodeTag tag) { Node *newNode; diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 4738054520..309d2f96cd 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.32 1998/02/21 18:17:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.33 1998/02/26 04:32:12 momjian Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -102,9 +102,9 @@ _outIndexStmt(StringInfo str, IndexStmt *node) appendStringInfo(str, " :rangetable "); _outNode(str, node->rangetable); appendStringInfo(str, " :lossy "); - appendStringInfo(str, (node->lossy ? "true": "false")); + appendStringInfo(str, (node->lossy ? "true" : "false")); appendStringInfo(str, " :unique "); - appendStringInfo(str, (node->unique ? "true": "false")); + appendStringInfo(str, (node->unique ? "true" : "false")); } static void @@ -117,7 +117,7 @@ _outColumnDef(StringInfo str, ColumnDef *node) appendStringInfo(str, " :typename "); _outNode(str, node->typename); appendStringInfo(str, " :is_not_null "); - appendStringInfo(str, (node->is_not_null ? "true": "false")); + appendStringInfo(str, (node->is_not_null ? "true" : "false")); appendStringInfo(str, " :defval "); appendStringInfo(str, node->defval); appendStringInfo(str, " :constraints"); @@ -127,8 +127,8 @@ _outColumnDef(StringInfo str, ColumnDef *node) static void _outTypeName(StringInfo str, TypeName *node) { - char buf[500]; - + char buf[500]; + appendStringInfo(str, "TYPENAME"); appendStringInfo(str, " :name "); @@ -138,7 +138,7 @@ _outTypeName(StringInfo str, TypeName *node) appendStringInfo(str, " :setof "); appendStringInfo(str, (node->setof ? "true" : "false")); appendStringInfo(str, " :typmod "); - sprintf(buf," %d ", node->typmod); + sprintf(buf, " %d ", node->typmod); appendStringInfo(str, buf); appendStringInfo(str, " :arrayBounds "); _outNode(str, node->arrayBounds); @@ -163,11 +163,11 @@ static void _outQuery(StringInfo str, Query *node) { char buf[500]; - + appendStringInfo(str, "QUERY"); appendStringInfo(str, " :command "); - sprintf(buf," %d ", node->commandType); + sprintf(buf, " %d ", node->commandType); appendStringInfo(str, buf); if (node->utilityStmt) @@ -227,26 +227,26 @@ _outQuery(StringInfo str, Query *node) appendStringInfo(str, " :groupClause "); _outNode(str, node->groupClause); appendStringInfo(str, " :havingQual "); - _outNode(str, node->havingQual); + _outNode(str, node->havingQual); appendStringInfo(str, " :hasAggs "); appendStringInfo(str, (node->hasAggs ? "true" : "false")); appendStringInfo(str, " :hasSubLinks "); appendStringInfo(str, (node->hasSubLinks ? "true" : "false")); appendStringInfo(str, " :unionClause "); - _outNode(str, node->unionClause); + _outNode(str, node->unionClause); } static void _outSortClause(StringInfo str, SortClause *node) { char buf[500]; - + appendStringInfo(str, "SORTCLAUSE"); appendStringInfo(str, " :resdom "); _outNode(str, node->resdom); appendStringInfo(str, " :opoid "); - sprintf(buf," %u ", node->opoid); + sprintf(buf, " %u ", node->opoid); appendStringInfo(str, buf); } @@ -254,13 +254,13 @@ static void _outGroupClause(StringInfo str, GroupClause *node) { char buf[500]; - + appendStringInfo(str, "GROUPCLAUSE"); appendStringInfo(str, " :entry "); _outNode(str, node->entry); appendStringInfo(str, " :grpOpoid "); - sprintf(buf," %u ", node->grpOpoid); + sprintf(buf, " %u ", node->grpOpoid); appendStringInfo(str, buf); } @@ -279,7 +279,7 @@ _outPlanInfo(StringInfo str, Plan *node) sprintf(buf, " :width %d ", node->plan_width); appendStringInfo(str, buf); appendStringInfo(str, " :state "); - appendStringInfo(str, node->state ? "not-NULL" : "<>"); + appendStringInfo(str, node->state ? "not-NULL" : "<>"); appendStringInfo(str, " :qptargetlist "); _outNode(str, node->targetlist); appendStringInfo(str, " :qpqual "); @@ -428,9 +428,9 @@ _outSubPlan(StringInfo str, SubPlan *node) appendStringInfo(str, " :rtable "); _outNode(str, node->rtable); appendStringInfo(str, " :setprm "); - _outIntList (str, node->setParam); + _outIntList(str, node->setParam); appendStringInfo(str, " :parprm "); - _outIntList (str, node->parParam); + _outIntList(str, node->parParam); appendStringInfo(str, " :slink "); _outNode(str, node->sublink); } @@ -1815,7 +1815,7 @@ _outNode(StringInfo str, void *obj) * nodeToString - * returns the ascii representation of the Node */ -char * +char * nodeToString(void *obj) { StringInfo str; diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c index 58153ad9ce..a0a627899c 100644 --- a/src/backend/nodes/read.c +++ b/src/backend/nodes/read.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.10 1998/01/07 21:03:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.11 1998/02/26 04:32:16 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -28,7 +28,7 @@ * stringToNode - * returns a Node with a given legal ascii representation */ -void * +void * stringToNode(char *str) { void *retval; @@ -94,7 +94,7 @@ nodeTokenType(char *token, int length) retval = (*token != '.') ? T_Integer : T_Float; } - else if (isalpha(*token) || *token == '_' || + else if (isalpha(*token) || *token == '_' || (token[0] == '<' && token[1] == '>')) retval = ATOM_TOKEN; else if (*token == '(') @@ -117,7 +117,7 @@ nodeTokenType(char *token, int length) * returning a token by calling lsptok with length == NULL. * */ -char * +char * lsptok(char *string, int *length) { static char *local_str; @@ -151,8 +151,8 @@ lsptok(char *string, int *length) (*length)++; local_str++; } - /* NULL */ - else if (local_str[0] == '<' && local_str[1] == '>' ) + /* NULL */ + else if (local_str[0] == '<' && local_str[1] == '>') { *length = 0; local_str += 2; @@ -182,7 +182,7 @@ lsptok(char *string, int *length) * Secrets: He assumes that lsptok already has the string (see below). * Any callers should set read_car_only to true. */ -void * +void * nodeRead(bool read_car_only) { char *token; diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 0c6d22d69f..79611ba058 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.27 1998/02/21 18:17:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.28 1998/02/26 04:32:17 momjian Exp $ * * NOTES * Most of the read functions for plan nodes are tested. (In fact, they @@ -76,7 +76,7 @@ _readQuery() Query *local_node; char *token; int length; - + local_node = makeNode(Query); token = lsptok(NULL, &length); /* skip the :command */ @@ -84,7 +84,7 @@ _readQuery() local_node->commandType = atoi(token); token = lsptok(NULL, &length); /* skip :utility */ - /* we can't get create or index here, can we? */ + /* we can't get create or index here, can we? */ token = lsptok(NULL, &length); /* get the notify name if any */ if (length == 0) @@ -94,7 +94,7 @@ _readQuery() NotifyStmt *n = makeNode(NotifyStmt); n->relname = palloc(length + 1); - StrNCpy(n->relname, token, length+1); + StrNCpy(n->relname, token, length + 1); local_node->utilityStmt = (Node *) n; } @@ -109,21 +109,21 @@ _readQuery() else { local_node->into = palloc(length + 1); - StrNCpy(local_node->into, token, length+1); + StrNCpy(local_node->into, token, length + 1); } token = lsptok(NULL, &length); /* skip :isPortal */ token = lsptok(NULL, &length); /* get isPortal */ local_node->isPortal = (token[0] == 't') ? true : false; - + token = lsptok(NULL, &length); /* skip :isBinary */ token = lsptok(NULL, &length); /* get isBinary */ local_node->isBinary = (token[0] == 't') ? true : false; - + token = lsptok(NULL, &length); /* skip :unionall */ token = lsptok(NULL, &length); /* get unionall */ local_node->unionall = (token[0] == 't') ? true : false; - + token = lsptok(NULL, &length); /* skip :uniqueFlag */ token = lsptok(NULL, &length); /* get uniqueFlag */ if (length == 0) @@ -131,7 +131,7 @@ _readQuery() else { local_node->uniqueFlag = palloc(length + 1); - StrNCpy(local_node->uniqueFlag, token, length+1); + StrNCpy(local_node->uniqueFlag, token, length + 1); } token = lsptok(NULL, &length); /* skip :sortClause */ @@ -184,7 +184,7 @@ _readSortClause() token = lsptok(NULL, &length); /* skip :opoid */ token = lsptok(NULL, &length); /* get opoid */ - local_node->opoid = strtoul(token,NULL,10); + local_node->opoid = strtoul(token, NULL, 10); return (local_node); } @@ -207,7 +207,7 @@ _readGroupClause() token = lsptok(NULL, &length); /* skip :grpOpoid */ token = lsptok(NULL, &length); /* get grpOpoid */ - local_node->grpOpoid = strtoul(token,NULL,10); + local_node->grpOpoid = strtoul(token, NULL, 10); return (local_node); } @@ -328,11 +328,11 @@ _readAppend() local_node->unionplans = nodeRead(true); /* now read it */ token = lsptok(NULL, &length); /* eat :unionrts */ - local_node->unionrts = nodeRead(true); /* now read it */ + local_node->unionrts = nodeRead(true); /* now read it */ token = lsptok(NULL, &length); /* eat :unionrelid */ token = lsptok(NULL, &length); /* get unionrelid */ - local_node->unionrelid = strtoul(token,NULL,10); + local_node->unionrelid = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :unionrtentries */ local_node->unionrtentries = nodeRead(true); /* now read it */ @@ -438,7 +438,7 @@ _readHashJoin() token = lsptok(NULL, &length); /* eat :hashjoinop */ token = lsptok(NULL, &length); /* get hashjoinop */ - local_node->hashjoinop = strtoul(token,NULL,10); + local_node->hashjoinop = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :hashjointable */ token = lsptok(NULL, &length); /* eat hashjointable */ @@ -479,7 +479,7 @@ _getScan(Scan *node) token = lsptok(NULL, &length); /* eat :scanrelid */ token = lsptok(NULL, &length); /* get scanrelid */ - node->scanrelid = strtoul(token,NULL,10); + node->scanrelid = strtoul(token, NULL, 10); } /* ---------------- @@ -718,12 +718,12 @@ _readResdom() else { local_node->resname = (char *) palloc(length + 1); - StrNCpy(local_node->resname, token, length+1); + StrNCpy(local_node->resname, token, length + 1); } token = lsptok(NULL, &length); /* eat :reskey */ token = lsptok(NULL, &length); /* get reskey */ - local_node->reskey = strtoul(token,NULL,10); + local_node->reskey = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :reskeyop */ token = lsptok(NULL, &length); /* get reskeyop */ @@ -808,7 +808,7 @@ _readVar() token = lsptok(NULL, &length); /* eat :varno */ token = lsptok(NULL, &length); /* get varno */ - local_node->varno = strtoul(token,NULL,10); + local_node->varno = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :varattno */ token = lsptok(NULL, &length); /* get varattno */ @@ -854,7 +854,7 @@ _readArray() token = lsptok(NULL, &length); /* eat :arrayelemtype */ token = lsptok(NULL, &length); /* get arrayelemtype */ - local_node->arrayelemtype = strtoul(token,NULL,10); + local_node->arrayelemtype = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :arrayelemlength */ token = lsptok(NULL, &length); /* get arrayelemlength */ @@ -896,7 +896,7 @@ _readArrayRef() token = lsptok(NULL, &length); /* eat :refelemtype */ token = lsptok(NULL, &length); /* get refelemtype */ - local_node->refelemtype = strtoul(token,NULL,10); + local_node->refelemtype = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :refattrlength */ token = lsptok(NULL, &length); /* get refattrlength */ @@ -947,7 +947,7 @@ _readConst() token = lsptok(NULL, &length); /* get :constlen */ token = lsptok(NULL, &length); /* now read it */ - local_node->constlen = strtol(token,NULL,10); + local_node->constlen = strtol(token, NULL, 10); token = lsptok(NULL, &length); /* get :constisnull */ token = lsptok(NULL, &length); /* now read it */ @@ -1112,7 +1112,7 @@ _readParam() else { local_node->paramname = (char *) palloc(length + 1); - StrNCpy(local_node->paramname, token, length+1); + StrNCpy(local_node->paramname, token, length + 1); } token = lsptok(NULL, &length); /* get :paramtype */ @@ -1143,7 +1143,7 @@ _readAggreg() token = lsptok(NULL, &length); /* eat :aggname */ token = lsptok(NULL, &length); /* get aggname */ local_node->aggname = (char *) palloc(length + 1); - StrNCpy(local_node->aggname, token, length+1); + StrNCpy(local_node->aggname, token, length + 1); token = lsptok(NULL, &length); /* eat :basetype */ token = lsptok(NULL, &length); /* get basetype */ @@ -1176,7 +1176,7 @@ _readAggreg() static SubLink * _readSubLink() { - SubLink *local_node; + SubLink *local_node; char *token; int length; @@ -1194,7 +1194,7 @@ _readSubLink() local_node->lefthand = nodeRead(true); /* now read it */ token = lsptok(NULL, &length); /* eat :oper */ - local_node->oper = nodeRead(true); /* now read it */ + local_node->oper = nodeRead(true); /* now read it */ token = lsptok(NULL, &length); /* eat :subselect */ local_node->subselect = nodeRead(true); /* now read it */ @@ -1367,7 +1367,7 @@ _readRangeTblEntry() else { local_node->relname = (char *) palloc(length + 1); - StrNCpy(local_node->relname, token, length+1); + StrNCpy(local_node->relname, token, length + 1); } token = lsptok(NULL, &length); /* eat :refname */ @@ -1377,12 +1377,12 @@ _readRangeTblEntry() else { local_node->refname = (char *) palloc(length + 1); - StrNCpy(local_node->refname, token, length+1); + StrNCpy(local_node->refname, token, length + 1); } token = lsptok(NULL, &length); /* eat :relid */ token = lsptok(NULL, &length); /* get :relid */ - local_node->relid = strtoul(token,NULL,10); + local_node->relid = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* eat :inh */ token = lsptok(NULL, &length); /* get :inh */ @@ -1719,7 +1719,7 @@ _readOrderKey() token = lsptok(NULL, &length); /* get :array_index */ token = lsptok(NULL, &length); /* now read it */ - local_node->array_index = strtoul(token,NULL,10); + local_node->array_index = strtoul(token, NULL, 10); return (local_node); } @@ -1881,7 +1881,7 @@ _readHInfo() token = lsptok(NULL, &length); /* get :hashop */ token = lsptok(NULL, &length); /* now read it */ - local_node->hashop = strtoul(token,NULL,10); + local_node->hashop = strtoul(token, NULL, 10); token = lsptok(NULL, &length); /* get :jmkeys */ local_node->jmethod.jmkeys = nodeRead(true); /* now read it */ @@ -1969,7 +1969,7 @@ _readIter() * The string passed to parsePlanString must be null-terminated. * ---------------- */ -Node * +Node * parsePlanString(void) { char *token; diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index de001f9ee9..8dc2f9fb4b 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -3,7 +3,7 @@ * geqo_erx.c-- * edge recombination crossover [ER] * -* $Id: geqo_erx.c,v 1.7 1998/01/07 21:03:40 momjian Exp $ +* $Id: geqo_erx.c,v 1.8 1998/02/26 04:32:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ static Gene edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene); * */ -Edge * +Edge * alloc_edge_table(int num_gene) { Edge *edge_table; diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c index 89ce162505..67b967533f 100644 --- a/src/backend/optimizer/geqo/geqo_eval.c +++ b/src/backend/optimizer/geqo/geqo_eval.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_eval.c,v 1.17 1998/01/07 21:03:42 momjian Exp $ + * $Id: geqo_eval.c,v 1.18 1998/02/26 04:32:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,7 +98,7 @@ geqo_eval(Query *root, Gene *tour, int num_gene) * * Returns a new join relation incorporating all joins in a left-sided tree. */ -Rel * +Rel * gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel) { Rel *inner_rel; /* current relation */ diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index 027beb934f..2073416c2e 100644 --- a/src/backend/optimizer/geqo/geqo_main.c +++ b/src/backend/optimizer/geqo/geqo_main.c @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_main.c,v 1.6 1997/09/08 21:44:25 momjian Exp $ + * $Id: geqo_main.c,v 1.7 1998/02/26 04:32:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,7 +63,7 @@ * similar to a constrained Traveling Salesman Problem (TSP) */ -Rel * +Rel * geqo(Query *root) { int generation; diff --git a/src/backend/optimizer/geqo/geqo_paths.c b/src/backend/optimizer/geqo/geqo_paths.c index 16e67c8bfc..f347ebb784 100644 --- a/src/backend/optimizer/geqo/geqo_paths.c +++ b/src/backend/optimizer/geqo/geqo_paths.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_paths.c,v 1.7 1997/09/08 21:44:32 momjian Exp $ + * $Id: geqo_paths.c,v 1.8 1998/02/26 04:32:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ static Path *set_paths(Rel *rel, Path *unorderedpath); * Returns the resulting list. * */ -List * +List * geqo_prune_rels(List *rel_list) { List *temp_list = NIL; diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c index f6f3d6372c..085a649796 100644 --- a/src/backend/optimizer/geqo/geqo_pool.c +++ b/src/backend/optimizer/geqo/geqo_pool.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.c,v 1.4 1997/09/08 21:44:34 momjian Exp $ + * $Id: geqo_pool.c,v 1.5 1998/02/26 04:32:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,7 +50,7 @@ static int compare(void *arg1, void *arg2); * alloc-pool-- * allocates memory for GA pool */ -Pool * +Pool * alloc_pool(int pool_size, int string_length) { Pool *new_pool; diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c index 14bf713140..a045c32769 100644 --- a/src/backend/optimizer/geqo/geqo_recombination.c +++ b/src/backend/optimizer/geqo/geqo_recombination.c @@ -3,7 +3,7 @@ * geqo_recombination.c-- * misc recombination procedures * -* $Id: geqo_recombination.c,v 1.4 1997/09/08 21:44:36 momjian Exp $ +* $Id: geqo_recombination.c,v 1.5 1998/02/26 04:32:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ init_tour(Gene *tour, int num_gene) * allocate memory for city table * */ -City * +City * alloc_city_table(int num_gene) { City *city_table; diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index e691e8cfc5..8548dcf542 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.14 1997/12/21 05:18:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.15 1998/02/26 04:32:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ static List *find_join_paths(Query *root, List *outer_rels, int levels_needed); * * 'rels' is the list of single relation entries appearing in the query */ -List * +List * find_paths(Query *root, List *rels) { int levels_needed; @@ -189,66 +189,69 @@ find_join_paths(Query *root, List *outer_rels, int levels_needed) * rest will be deprecated in case of GEQO * *******************************************/ - while (--levels_needed) - { + while (--levels_needed) + { + /* * Determine all possible pairs of relations to be joined at this - * level. Determine paths for joining these relation pairs and modify - * 'new-rels' accordingly, then eliminate redundant join relations. + * level. Determine paths for joining these relation pairs and + * modify 'new-rels' accordingly, then eliminate redundant join + * relations. */ new_rels = find_join_rels(root, outer_rels); - + find_all_join_paths(root, new_rels); - + prune_joinrels(new_rels); - + #if 0 - + /* - * * for each expensive predicate in each path in each distinct rel, * - * consider doing pullup -- JMH + * * for each expensive predicate in each path in each distinct + * rel, * consider doing pullup -- JMH */ if (XfuncMode != XFUNC_NOPULL && XfuncMode != XFUNC_OFF) foreach(x, new_rels) xfunc_trypullup((Rel *) lfirst(x)); #endif - + prune_rel_paths(new_rels); - + if (BushyPlanFlag) { - + /* - * In case of bushy trees if there is still a join between a join - * relation and another relation, add a new joininfo that involves - * the join relation to the joininfo list of the other relation + * In case of bushy trees if there is still a join between a + * join relation and another relation, add a new joininfo that + * involves the join relation to the joininfo list of the + * other relation */ add_new_joininfos(root, new_rels, outer_rels); } - + foreach(x, new_rels) { rel = (Rel *) lfirst(x); if (rel->size <= 0) rel->size = compute_rel_size(rel); rel->width = compute_rel_width(rel); - - /*#define OPTIMIZER_DEBUG*/ + + /* #define OPTIMIZER_DEBUG */ #ifdef OPTIMIZER_DEBUG printf("levels left: %d\n", levels_left); debug_print_rel(root, rel); #endif } - + if (BushyPlanFlag) { - + /* - * prune rels that have been completely incorporated into new join - * rels + * prune rels that have been completely incorporated into new + * join rels */ outer_rels = prune_oldrels(outer_rels); - + /* * merge join rels if then contain the same list of base rels */ diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index 54c2c9b831..2911f19f4c 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.5 1998/02/13 03:29:36 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.6 1998/02/26 04:32:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -273,16 +273,17 @@ compute_selec(Query *root, List *clauses, List *or_selectivities) /* this isn't an Oper, it's a Func!! */ /* - * This is not an operator, so we guess at the selectivity. - * THIS IS A HACK TO GET V4 OUT THE DOOR. FUNCS SHOULD BE ABLE - * TO HAVE SELECTIVITIES THEMSELVES. -- JMH 7/9/92 + * This is not an operator, so we guess at the selectivity. THIS + * IS A HACK TO GET V4 OUT THE DOOR. FUNCS SHOULD BE ABLE TO HAVE + * SELECTIVITIES THEMSELVES. -- JMH 7/9/92 */ s1 = 0.1; } - else if (is_subplan ((Node *) clause)) + else if (is_subplan((Node *) clause)) { + /* - * Just for the moment! FIX ME! - vadim 02/04/98 + * Just for the moment! FIX ME! - vadim 02/04/98 */ s1 = 1.0; } diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c index ffc332e8b2..88206ea6b0 100644 --- a/src/backend/optimizer/path/hashutils.c +++ b/src/backend/optimizer/path/hashutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.4 1997/09/08 21:44:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.5 1998/02/26 04:32:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ static HInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list); * Returns the new list of hashinfo nodes. * */ -List * +List * group_clauses_by_hashop(List *clauseinfo_list, int inner_relid) { diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 50d8fb934e..849b9f9406 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.13 1998/02/13 03:29:39 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.14 1998/02/26 04:32:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -113,7 +113,7 @@ static bool SingleAttributeIndex(Rel *index); * Returns a list of index nodes. * */ -List * +List * find_index_paths(Query *root, Rel *rel, List *indices, diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index 7e28ee5cc6..7917baed09 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.7 1997/09/08 21:45:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.8 1998/02/26 04:32:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ set_joinrel_size(Rel *joinrel, Rel *outer_rel, Rel *inner_rel, * * Returns a list of rel nodes corresponding to the new join relations. */ -List * +List * find_join_rels(Query *root, List *outer_rels) { List *joins = NIL; @@ -486,7 +486,7 @@ add_new_joininfos(Query *root, List *joinrels, List *outerrels) * * Returns the list of final join relations. */ -List * +List * final_join_rels(List *join_rel_list) { List *xrel = NIL; diff --git a/src/backend/optimizer/path/joinutils.c b/src/backend/optimizer/path/joinutils.c index 2c08c77b09..2dfad7ec59 100644 --- a/src/backend/optimizer/path/joinutils.c +++ b/src/backend/optimizer/path/joinutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.4 1997/09/08 21:45:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.5 1998/02/26 04:32:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,7 @@ new_matching_subkeys(Var *subkey, List *considered_subkeys, * Returns a list of matched join keys and a list of matched join clauses * in matchedJoinClausesPtr. - ay 11/94 */ -List * +List * match_pathkeys_joinkeys(List *pathkeys, List *joinkeys, List *joinclauses, @@ -211,7 +211,7 @@ every_func(List *joinkeys, List *pathkey, int which_subkey) * match_paths_joinkeys - * find the cheapest path that matches the join keys */ -Path * +Path * match_paths_joinkeys(List *joinkeys, PathOrder *ordering, List *paths, @@ -263,7 +263,7 @@ match_paths_joinkeys(List *joinkeys, * Returns a list of pathkeys: ((tlvar1)(tlvar2)...(tlvarN)). * [I've no idea why they have to be list of lists. Should be fixed. -ay 12/94] */ -List * +List * extract_path_keys(List *joinkeys, List *tlist, int which_subkey) @@ -325,7 +325,7 @@ extract_path_keys(List *joinkeys, * Returns the list of new path keys. * */ -List * +List * new_join_pathkeys(List *outer_pathkeys, List *join_rel_tlist, List *joinclauses) diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c index 9210326877..938fb13864 100644 --- a/src/backend/optimizer/path/mergeutils.c +++ b/src/backend/optimizer/path/mergeutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.4 1997/09/08 21:45:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.5 1998/02/26 04:32:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ * Returns the new list of mergeinfo nodes. * */ -List * +List * group_clauses_by_order(List *clauseinfo_list, int inner_relid) { @@ -105,7 +105,7 @@ group_clauses_by_order(List *clauseinfo_list, * Returns the node if it exists. * */ -MInfo * +MInfo * match_order_mergeinfo(PathOrder *ordering, List *mergeinfo_list) { MergeOrder *xmergeorder; diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c index 60d36ae349..073aa18eb9 100644 --- a/src/backend/optimizer/path/orindxpath.c +++ b/src/backend/optimizer/path/orindxpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.4 1997/09/08 21:45:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.5 1998/02/26 04:32:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,7 +50,7 @@ best_or_subclause_index(Query *root, Rel *rel, Expr *subclause, * Returns a list of these index path nodes. * */ -List * +List * create_or_index_paths(Query *root, Rel *rel, List *clauses) { diff --git a/src/backend/optimizer/path/predmig.c b/src/backend/optimizer/path/predmig.c index 807a297f0c..544a3c1c8e 100644 --- a/src/backend/optimizer/path/predmig.c +++ b/src/backend/optimizer/path/predmig.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.8 1998/01/07 21:03:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.9 1998/02/26 04:32:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ static int xfunc_stream_compare(void *arg1, void *arg2); static bool xfunc_check_stream(Stream node); static bool xfunc_in_stream(Stream node, Stream stream); -/* ----------------- MAIN FUNCTIONS ------------------------ */ +/* ----------------- MAIN FUNCTIONS ------------------------ */ /* ** xfunc_do_predmig ** wrapper for Predicate Migration. It calls xfunc_predmig until no @@ -495,7 +495,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom) } -/* ------------------- UTILITY FUNCTIONS ------------------------- */ +/* ------------------- UTILITY FUNCTIONS ------------------------- */ /* ** xfunc_free_stream -- @@ -765,7 +765,7 @@ xfunc_stream_compare(void *arg1, void *arg2) } } -/* ------------------ DEBUGGING ROUTINES ---------------------------- */ +/* ------------------ DEBUGGING ROUTINES ---------------------------- */ /* ** Make sure all pointers in stream make sense. Make sure no joins are diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c index e6b83a643d..014c72e906 100644 --- a/src/backend/optimizer/path/prune.c +++ b/src/backend/optimizer/path/prune.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.11 1998/01/07 21:03:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.12 1998/02/26 04:32:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,8 @@ prune_joinrels(List *rel_list) List *i; /* - * rel_list can shorten while running as duplicate relations are deleted + * rel_list can shorten while running as duplicate relations are + * deleted */ foreach(i, rel_list) lnext(i) = prune_joinrel((Rel *) lfirst(i), lnext(i)); @@ -60,13 +61,13 @@ prune_joinrels(List *rel_list) static List * prune_joinrel(Rel *rel, List *other_rels) { - List *cur = NIL; - List *return_list = NIL; + List *cur = NIL; + List *return_list = NIL; /* find first relation that doesn't match */ foreach(cur, other_rels) { - Rel *other_rel = (Rel *) lfirst(cur); + Rel *other_rel = (Rel *) lfirst(cur); if (!same(rel->relids, other_rel->relids)) break; @@ -74,18 +75,21 @@ prune_joinrel(Rel *rel, List *other_rels) /* we now know cur doesn't match, or is NIL */ return_list = cur; - - /* remove relations that do match, we use lnext so we can remove easily */ + + /* + * remove relations that do match, we use lnext so we can remove + * easily + */ while (cur != NIL && lnext(cur) != NIL) { - Rel *other_rel = (Rel *) lfirst(lnext(cur)); + Rel *other_rel = (Rel *) lfirst(lnext(cur)); if (same(rel->relids, other_rel->relids)) { rel->pathlist = add_pathlist(rel, rel->pathlist, other_rel->pathlist); - lnext(cur) = lnext(lnext(cur)); /* delete it */ + lnext(cur) = lnext(lnext(cur)); /* delete it */ } cur = lnext(cur); } @@ -145,7 +149,7 @@ prune_rel_paths(List *rel_list) * Returns the cheapest path. * */ -Path * +Path * prune_rel_path(Rel *rel, Path *unorderedpath) { Path *cheapest = set_cheapest(rel, rel->pathlist); @@ -176,7 +180,7 @@ prune_rel_path(Rel *rel, Path *unorderedpath) * * Returns one pruned rel node list */ -List * +List * merge_joinrels(List *rel_list1, List *rel_list2) { List *xrel = NIL; @@ -202,7 +206,7 @@ merge_joinrels(List *rel_list1, List *rel_list2) * * Returns a new list of rel nodes */ -List * +List * prune_oldrels(List *old_rels) { Rel *rel; @@ -223,7 +227,7 @@ prune_oldrels(List *old_rels) foreach(xjoininfo, joininfo_list) { JInfo *joininfo = (JInfo *) lfirst(xjoininfo); - + if (!joininfo->inactive) { temp_list = lcons(rel, temp_list); @@ -232,5 +236,5 @@ prune_oldrels(List *old_rels) } } } - return temp_list; + return temp_list; } diff --git a/src/backend/optimizer/path/xfunc.c b/src/backend/optimizer/path/xfunc.c index cf23b22510..3b77217481 100644 --- a/src/backend/optimizer/path/xfunc.c +++ b/src/backend/optimizer/path/xfunc.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.12 1998/01/13 04:04:07 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.13 1998/02/26 04:32:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ #include "optimizer/internal.h" #include "optimizer/keys.h" #include "optimizer/pathnode.h" -#include "optimizer/tlist.h" /* for get_expr */ +#include "optimizer/tlist.h" /* for get_expr */ #include "optimizer/xfunc.h" #include "storage/buf_internals.h" /* for NBuffers */ #include "tcop/dest.h" @@ -532,7 +532,7 @@ xfunc_func_expense(LispValue node, LispValue args) if (nargs > 0) argOidVect = proc->proargtypes; planlist = (List) pg_parse_and_plan(pq_src, argOidVect, nargs, - &parseTree_list, None); + &parseTree_list, None); if (IsA(node, Func)) set_func_planlist((Func) node, planlist); diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 85ede31987..7c450104ce 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.26 1998/02/13 03:36:54 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.27 1998/02/26 04:32:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,33 +46,44 @@ static List *switch_outer(List *clauses); static Scan *create_scan_node(Path *best_path, List *tlist); static Join *create_join_node(JoinPath *best_path, List *tlist); -static SeqScan *create_seqscan_node(Path *best_path, List *tlist, +static SeqScan * +create_seqscan_node(Path *best_path, List *tlist, List *scan_clauses); -static IndexScan *create_indexscan_node(IndexPath *best_path, List *tlist, +static IndexScan * +create_indexscan_node(IndexPath *best_path, List *tlist, List *scan_clauses); -static NestLoop *create_nestloop_node(JoinPath *best_path, List *tlist, +static NestLoop * +create_nestloop_node(JoinPath *best_path, List *tlist, List *clauses, Plan *outer_node, List *outer_tlist, Plan *inner_node, List *inner_tlist); -static MergeJoin *create_mergejoin_node(MergePath *best_path, List *tlist, +static MergeJoin * +create_mergejoin_node(MergePath *best_path, List *tlist, List *clauses, Plan *outer_node, List *outer_tlist, Plan *inner_node, List *inner_tlist); -static HashJoin *create_hashjoin_node(HashPath *best_path, List *tlist, +static HashJoin * +create_hashjoin_node(HashPath *best_path, List *tlist, List *clauses, Plan *outer_node, List *outer_tlist, Plan *inner_node, List *inner_tlist); static Node *fix_indxqual_references(Node *clause, Path *index_path); -static Temp *make_temp(List *tlist, List *keys, Oid *operators, +static Temp * +make_temp(List *tlist, List *keys, Oid *operators, Plan *plan_node, int temptype); -static IndexScan *make_indexscan(List *qptlist, List *qpqual, Index scanrelid, +static IndexScan * +make_indexscan(List *qptlist, List *qpqual, Index scanrelid, List *indxid, List *indxqual, Cost cost); -static NestLoop *make_nestloop(List *qptlist, List *qpqual, Plan *lefttree, +static NestLoop * +make_nestloop(List *qptlist, List *qpqual, Plan *lefttree, Plan *righttree); -static HashJoin *make_hashjoin(List *tlist, List *qpqual, +static HashJoin * +make_hashjoin(List *tlist, List *qpqual, List *hashclauses, Plan *lefttree, Plan *righttree); static Hash *make_hash(List *tlist, Var *hashkey, Plan *lefttree); -static MergeJoin *make_mergesort(List *tlist, List *qpqual, +static MergeJoin * +make_mergesort(List *tlist, List *qpqual, List *mergeclauses, Oid opcode, Oid *rightorder, Oid *leftorder, Plan *righttree, Plan *lefttree); -static Material *make_material(List *tlist, Oid tempid, Plan *lefttree, +static Material * +make_material(List *tlist, Oid tempid, Plan *lefttree, int keycount); /* @@ -90,7 +101,7 @@ static Material *make_material(List *tlist, Oid tempid, Plan *lefttree, * * Returns the optimal(?) access plan. */ -Plan * +Plan * create_plan(Path *best_path) { List *tlist; @@ -931,7 +942,7 @@ make_seqscan(List *qptlist, SeqScan *node = makeNode(SeqScan); Plan *plan = &node->plan; - plan->cost = (lefttree ? lefttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0); plan->state = (EState *) NULL; plan->targetlist = qptlist; plan->qual = qpqual; @@ -949,7 +960,7 @@ make_indexscan(List *qptlist, Index scanrelid, List *indxid, List *indxqual, - Cost cost) + Cost cost) { IndexScan *node = makeNode(IndexScan); Plan *plan = &node->scan.plan; @@ -978,8 +989,8 @@ make_nestloop(List *qptlist, NestLoop *node = makeNode(NestLoop); Plan *plan = &node->join; - plan->cost = (lefttree ? lefttree->cost : 0) + - (righttree ? righttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0) + + (righttree ? righttree->cost : 0); plan->state = (EState *) NULL; plan->targetlist = qptlist; plan->qual = qpqual; @@ -1000,8 +1011,8 @@ make_hashjoin(List *tlist, HashJoin *node = makeNode(HashJoin); Plan *plan = &node->join; - plan->cost = (lefttree ? lefttree->cost : 0) + - (righttree ? righttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0) + + (righttree ? righttree->cost : 0); plan->cost = 0.0; plan->state = (EState *) NULL; plan->targetlist = tlist; @@ -1023,7 +1034,7 @@ make_hash(List *tlist, Var *hashkey, Plan *lefttree) Hash *node = makeNode(Hash); Plan *plan = &node->plan; - plan->cost = (lefttree ? lefttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0); plan->cost = 0.0; plan->state = (EState *) NULL; plan->targetlist = tlist; @@ -1051,8 +1062,8 @@ make_mergesort(List *tlist, MergeJoin *node = makeNode(MergeJoin); Plan *plan = &node->join; - plan->cost = (lefttree ? lefttree->cost : 0) + - (righttree ? righttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0) + + (righttree ? righttree->cost : 0); plan->state = (EState *) NULL; plan->targetlist = tlist; plan->qual = qpqual; @@ -1066,13 +1077,13 @@ make_mergesort(List *tlist, return (node); } -Sort * +Sort * make_sort(List *tlist, Oid tempid, Plan *lefttree, int keycount) { Sort *node = makeNode(Sort); Plan *plan = &node->plan; - plan->cost = (lefttree ? lefttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0); plan->state = (EState *) NULL; plan->targetlist = tlist; plan->qual = NIL; @@ -1093,7 +1104,7 @@ make_material(List *tlist, Material *node = makeNode(Material); Plan *plan = &node->plan; - plan->cost = (lefttree ? lefttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0); plan->state = (EState *) NULL; plan->targetlist = tlist; plan->qual = NIL; @@ -1105,12 +1116,12 @@ make_material(List *tlist, return (node); } -Agg * +Agg * make_agg(List *tlist, Plan *lefttree) { Agg *node = makeNode(Agg); - node->plan.cost = (lefttree ? lefttree->cost : 0); + node->plan.cost = (lefttree ? lefttree->cost : 0); node->plan.state = (EState *) NULL; node->plan.qual = NULL; node->plan.targetlist = tlist; @@ -1121,7 +1132,7 @@ make_agg(List *tlist, Plan *lefttree) return (node); } -Group * +Group * make_group(List *tlist, bool tuplePerGroup, int ngrp, @@ -1130,7 +1141,7 @@ make_group(List *tlist, { Group *node = makeNode(Group); - node->plan.cost = (lefttree ? lefttree->plan.cost : 0); + node->plan.cost = (lefttree ? lefttree->plan.cost : 0); node->plan.state = (EState *) NULL; node->plan.qual = NULL; node->plan.targetlist = tlist; @@ -1151,13 +1162,13 @@ make_group(List *tlist, * or "*" */ -Unique * +Unique * make_unique(List *tlist, Plan *lefttree, char *uniqueAttr) { Unique *node = makeNode(Unique); Plan *plan = &node->plan; - plan->cost = (lefttree ? lefttree->cost : 0); + plan->cost = (lefttree ? lefttree->cost : 0); plan->state = (EState *) NULL; plan->targetlist = tlist; plan->qual = NIL; @@ -1175,7 +1186,7 @@ make_unique(List *tlist, Plan *lefttree, char *uniqueAttr) } #ifdef NOT_USED -List * +List * generate_fjoin(List *tlist) { List tlistP; @@ -1228,5 +1239,5 @@ generate_fjoin(List *tlist) return newTlist; return tlist; /* do nothing for now - ay 10/94 */ } -#endif +#endif diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index ca5859cb04..132cda732b 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.19 1998/02/13 03:36:57 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.20 1998/02/26 04:32:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ make_groupPlan(List **tlist, bool tuplePerGroup, * * Returns a query plan. */ -Plan * +Plan * query_planner(Query *root, int command_type, List *tlist, @@ -74,18 +74,18 @@ query_planner(Query *root, List *var_only_tlist = NIL; List *level_tlist = NIL; Plan *subplan = NULL; - - if ( PlannerQueryLevel > 1 ) + + if (PlannerQueryLevel > 1) { /* should copy be made ? */ - tlist = (List *) SS_replace_correlation_vars ((Node*)tlist); - qual = (List *) SS_replace_correlation_vars ((Node*)qual); + tlist = (List *) SS_replace_correlation_vars((Node *) tlist); + qual = (List *) SS_replace_correlation_vars((Node *) qual); } if (root->hasSubLinks) - qual = (List *) SS_process_sublinks ((Node*) qual); - + qual = (List *) SS_process_sublinks((Node *) qual); + qual = cnfify((Expr *) qual, true); - + /* * A command without a target list or qualification is an error, * except for "delete foo". @@ -158,7 +158,7 @@ query_planner(Query *root, if (constant_qual != NULL) { return ((Plan *) make_result(tlist, - (Node *) constant_qual, + (Node *) constant_qual, (Plan *) scan)); } else @@ -187,10 +187,10 @@ query_planner(Query *root, */ if (constant_qual) { - subplan = (Plan *)make_result((!root->hasAggs && !root->groupClause) - ? tlist : subplan->targetlist, - (Node *) constant_qual, - subplan); + subplan = (Plan *) make_result((!root->hasAggs && !root->groupClause) + ? tlist : subplan->targetlist, + (Node *) constant_qual, + subplan); /* * Change all varno's of the Result's node target list. @@ -200,6 +200,7 @@ query_planner(Query *root, return subplan; } + /* * fix up the flattened target list of the plan root node so that * expressions are evaluated. this forces expression evaluations that @@ -213,15 +214,16 @@ query_planner(Query *root, * aggregates fixing only other entries (i.e. - GroupBy-ed and so * fixed by make_groupPlan). - vadim 04/05/97 */ - else - { + else + { if (!root->hasAggs && !root->groupClause) subplan->targetlist = flatten_tlist_vars(tlist, - subplan->targetlist); + subplan->targetlist); return subplan; - } - + } + #ifdef NOT_USED + /* * Destructively modify the query plan's targetlist to add fjoin lists * to flatten functions that return sets of base types @@ -330,7 +332,7 @@ make_result(List *tlist, #ifdef NOT_USED tlist = generate_fjoin(tlist); #endif - plan->cost = (subplan ? subplan->cost : 0); + plan->cost = (subplan ? subplan->cost : 0); plan->state = (EState *) NULL; plan->targetlist = tlist; plan->lefttree = subplan; @@ -379,9 +381,9 @@ make_groupPlan(List **tlist, */ foreach(sl, sort_tlist) { - Resdom *resdom = NULL; - TargetEntry *te = (TargetEntry *) lfirst(sl); - int keyno = 0; + Resdom *resdom = NULL; + TargetEntry *te = (TargetEntry *) lfirst(sl); + int keyno = 0; foreach(gl, groupClause) { diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 367978eb57..824c0d29b3 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.22 1998/02/13 03:36:59 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.23 1998/02/26 04:32:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,7 +49,8 @@ #include "executor/executor.h" static Plan *make_sortplan(List *tlist, List *sortcls, Plan *plannode); -extern Plan *make_groupPlan(List **tlist, bool tuplePerGroup, +extern Plan * +make_groupPlan(List **tlist, bool tuplePerGroup, List *groupClause, Plan *subplan); /***************************************************************************** @@ -58,27 +59,27 @@ extern Plan *make_groupPlan(List **tlist, bool tuplePerGroup, * *****************************************************************************/ -Plan* +Plan * planner(Query *parse) { Plan *result_plan; - + PlannerQueryLevel = 1; PlannerVarParam = NULL; PlannerParamVar = NULL; PlannerInitPlan = NULL; PlannerPlanId = 0; - - result_plan = union_planner (parse); - - Assert (PlannerQueryLevel == 1); - if ( PlannerPlanId > 0 ) + + result_plan = union_planner(parse); + + Assert(PlannerQueryLevel == 1); + if (PlannerPlanId > 0) { result_plan->initPlan = PlannerInitPlan; - (void) SS_finalize_plan (result_plan); + (void) SS_finalize_plan(result_plan); } - result_plan->nParamExec = length (PlannerParamVar); - + result_plan->nParamExec = length(PlannerParamVar); + return (result_plan); } @@ -91,7 +92,7 @@ planner(Query *parse) * Returns a query plan. * */ -Plan * +Plan * union_planner(Query *parse) { List *tlist = parse->targetList; @@ -100,7 +101,7 @@ union_planner(Query *parse) Plan *result_plan = (Plan *) NULL; Index rt_index; - + if (parse->unionClause) { @@ -112,7 +113,7 @@ union_planner(Query *parse) parse->rtable); } else if ((rt_index = - first_inherit_rt_entry(rangetable)) != -1) + first_inherit_rt_entry(rangetable)) != -1) { result_plan = (Plan *) plan_inherit_queries(parse, rt_index); /* XXX do we need to do this? bjm 12/19/97 */ @@ -123,27 +124,27 @@ union_planner(Query *parse) } else { - List **vpm = NULL; - + List **vpm = NULL; + tlist = preprocess_targetlist(tlist, parse->commandType, parse->resultRelation, parse->rtable); - if ( parse->rtable != NULL ) + if (parse->rtable != NULL) { - vpm = (List **) palloc (length (parse->rtable) * sizeof (List*)); - memset (vpm, 0, length (parse->rtable) * sizeof (List*)); + vpm = (List **) palloc(length(parse->rtable) * sizeof(List *)); + memset(vpm, 0, length(parse->rtable) * sizeof(List *)); } - PlannerVarParam = lcons (vpm, PlannerVarParam); + PlannerVarParam = lcons(vpm, PlannerVarParam); result_plan = query_planner(parse, parse->commandType, tlist, - (List*) parse->qual); - PlannerVarParam = lnext (PlannerVarParam); - if ( vpm != NULL ) - pfree (vpm); + (List *) parse->qual); + PlannerVarParam = lnext(PlannerVarParam); + if (vpm != NULL) + pfree(vpm); } - + /* * If we have a GROUP BY clause, insert a group node (with the * appropriate sort node.) @@ -161,10 +162,10 @@ union_planner(Query *parse) tuplePerGroup = parse->hasAggs; result_plan = - make_groupPlan( &tlist, - tuplePerGroup, - parse->groupClause, - result_plan); + make_groupPlan(&tlist, + tuplePerGroup, + parse->groupClause, + result_plan); } @@ -173,14 +174,14 @@ union_planner(Query *parse) */ if (parse->hasAggs) { - result_plan = (Plan *)make_agg(tlist, result_plan); + result_plan = (Plan *) make_agg(tlist, result_plan); /* * set the varno/attno entries to the appropriate references to * the result tuple of the subplans. */ - ((Agg *)result_plan)->aggs = - set_agg_tlist_references((Agg *)result_plan); + ((Agg *) result_plan)->aggs = + set_agg_tlist_references((Agg *) result_plan); } /* diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index fc51657b8d..c82a711637 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.18 1998/02/13 03:37:02 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.19 1998/02/26 04:32:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,9 +36,11 @@ static void set_join_tlist_references(Join *join); static void set_tempscan_tlist_references(SeqScan *tempscan); static void set_temp_tlist_references(Temp *temp); -static List *replace_clause_joinvar_refs(Expr *clause, +static List * +replace_clause_joinvar_refs(Expr *clause, List *outer_tlist, List *inner_tlist); -static List *replace_subclause_joinvar_refs(List *clauses, +static List * +replace_subclause_joinvar_refs(List *clauses, List *outer_tlist, List *inner_tlist); static Var *replace_joinvar_refs(Var *var, List *outer_tlist, List *inner_tlist); static List *tlist_temp_references(Oid tempid, List *tlist); @@ -216,7 +218,7 @@ set_temp_tlist_references(Temp *temp) * Returns the new join clauses. * */ -List * +List * join_references(List *clauses, List *outer_tlist, List *inner_tlist) @@ -242,7 +244,7 @@ join_references(List *clauses, * Returns the new list of clauses. * */ -List * +List * index_outerjoin_references(List *inner_indxqual, List *outer_tlist, Index inner_relid) @@ -407,19 +409,19 @@ replace_clause_joinvar_refs(Expr *clause, } else if (is_subplan(clause)) { - ((Expr*) clause)->args = - replace_subclause_joinvar_refs(((Expr*) clause)->args, - outer_tlist, - inner_tlist); - ((SubPlan*) ((Expr*) clause)->oper)->sublink->oper = - replace_subclause_joinvar_refs(((SubPlan*) ((Expr*) clause)->oper)->sublink->oper, - outer_tlist, - inner_tlist); - return ((List*) clause); + ((Expr *) clause)->args = + replace_subclause_joinvar_refs(((Expr *) clause)->args, + outer_tlist, + inner_tlist); + ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper = + replace_subclause_joinvar_refs(((SubPlan *) ((Expr *) clause)->oper)->sublink->oper, + outer_tlist, + inner_tlist); + return ((List *) clause); } /* shouldn't reach here */ - elog (ERROR, "replace_clause_joinvar_refs: unsupported clause %d", - nodeTag (clause)); + elog(ERROR, "replace_clause_joinvar_refs: unsupported clause %d", + nodeTag(clause)); return NULL; } @@ -612,7 +614,7 @@ replace_result_clause(Node *clause, } else if (is_funcclause(clause)) { - List *subExpr; + List *subExpr; /* * This is a function. Recursively call this routine for its @@ -627,7 +629,7 @@ replace_result_clause(Node *clause, else if (IsA(clause, ArrayRef)) { ArrayRef *aref = (ArrayRef *) clause; - + /* * This is an arrayref. Recursively call this routine for its * expression and its index expression... @@ -647,18 +649,18 @@ replace_result_clause(Node *clause, } else if (is_opclause(clause)) { - Node *subNode; + Node *subNode; /* * This is an operator. Recursively call this routine for both its * left and right operands */ - subNode = (Node *)get_leftop((Expr *) clause); + subNode = (Node *) get_leftop((Expr *) clause); replace_result_clause(subNode, subplanTargetList); subNode = (Node *) get_rightop((Expr *) clause); replace_result_clause(subNode, subplanTargetList); } - else if (IsA(clause, Param) || IsA(clause, Const)) + else if (IsA(clause, Param) ||IsA(clause, Const)) { /* do nothing! */ } @@ -730,7 +732,7 @@ set_agg_tlist_references(Agg *aggNode) TargetEntry *tle = lfirst(tl); aggreg_list = nconc( - replace_agg_clause(tle->expr, subplanTargetList),aggreg_list); + replace_agg_clause(tle->expr, subplanTargetList), aggreg_list); } return aggreg_list; } @@ -739,7 +741,7 @@ static List * replace_agg_clause(Node *clause, List *subplanTargetList) { List *t; - List *agg_list = NIL; + List *agg_list = NIL; if (IsA(clause, Var)) { @@ -760,6 +762,7 @@ replace_agg_clause(Node *clause, List *subplanTargetList) } else if (is_funcclause(clause)) { + /* * This is a function. Recursively call this routine for its * arguments... @@ -767,19 +770,19 @@ replace_agg_clause(Node *clause, List *subplanTargetList) foreach(t, ((Expr *) clause)->args) { agg_list = nconc(agg_list, - replace_agg_clause(lfirst(t), subplanTargetList)); + replace_agg_clause(lfirst(t), subplanTargetList)); } return agg_list; } else if (IsA(clause, Aggreg)) { return lcons(clause, - replace_agg_clause(((Aggreg *) clause)->target, subplanTargetList)); + replace_agg_clause(((Aggreg *) clause)->target, subplanTargetList)); } else if (IsA(clause, ArrayRef)) { ArrayRef *aref = (ArrayRef *) clause; - + /* * This is an arrayref. Recursively call this routine for its * expression and its index expression... @@ -787,35 +790,36 @@ replace_agg_clause(Node *clause, List *subplanTargetList) foreach(t, aref->refupperindexpr) { agg_list = nconc(agg_list, - replace_agg_clause(lfirst(t), subplanTargetList)); + replace_agg_clause(lfirst(t), subplanTargetList)); } foreach(t, aref->reflowerindexpr) { agg_list = nconc(agg_list, - replace_agg_clause(lfirst(t), subplanTargetList)); + replace_agg_clause(lfirst(t), subplanTargetList)); } agg_list = nconc(agg_list, - replace_agg_clause(aref->refexpr, subplanTargetList)); + replace_agg_clause(aref->refexpr, subplanTargetList)); agg_list = nconc(agg_list, - replace_agg_clause(aref->refassgnexpr, subplanTargetList)); + replace_agg_clause(aref->refassgnexpr, subplanTargetList)); return agg_list; } else if (is_opclause(clause)) { + /* * This is an operator. Recursively call this routine for both its * left and right operands */ Node *left = (Node *) get_leftop((Expr *) clause); Node *right = (Node *) get_rightop((Expr *) clause); - + if (left != (Node *) NULL) agg_list = nconc(agg_list, - replace_agg_clause(left, subplanTargetList)); + replace_agg_clause(left, subplanTargetList)); if (right != (Node *) NULL) agg_list = nconc(agg_list, - replace_agg_clause(right, subplanTargetList)); + replace_agg_clause(right, subplanTargetList)); return agg_list; } @@ -840,7 +844,8 @@ replace_agg_clause(Node *clause, List *subplanTargetList) * Remove the Agg nodes from the target list * We do this so inheritance only does aggregates in the upper node */ -void del_agg_tlist_references(List *tlist) +void +del_agg_tlist_references(List *tlist) { List *tl; @@ -863,6 +868,7 @@ del_agg_clause(Node *clause) } else if (is_funcclause(clause)) { + /* * This is a function. Recursively call this routine for its * arguments... diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 4d4378780c..11e466ce5e 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -26,61 +26,61 @@ #include "optimizer/var.h" #include "optimizer/cost.h" -int PlannerQueryLevel; /* level of current query */ -List *PlannerVarParam; /* correlation Vars to Param mapper */ -List *PlannerParamVar; /* to get Var from Param->paramid */ -List *PlannerInitPlan; /* init subplans for current query */ -int PlannerPlanId; +int PlannerQueryLevel; /* level of current query */ +List *PlannerVarParam; /* correlation Vars to Param mapper */ +List *PlannerParamVar; /* to get Var from Param->paramid */ +List *PlannerInitPlan; /* init subplans for current query */ +int PlannerPlanId; static int -_new_param (Var *var, int varlevel) +_new_param(Var *var, int varlevel) { - List *last; - int i = 0; - - if ( PlannerParamVar == NULL ) + List *last; + int i = 0; + + if (PlannerParamVar == NULL) last = PlannerParamVar = makeNode(List); else { - for (last = PlannerParamVar; ; ) + for (last = PlannerParamVar;;) { i++; - if ( lnext(last) == NULL ) + if (lnext(last) == NULL) break; last = lnext(last); } lnext(last) = makeNode(List); last = lnext(last); } - + lnext(last) = NULL; - lfirst(last) = makeVar (var->varno, var->varattno, var->vartype, - var->vartypmod, varlevel, var->varnoold, var->varoattno); - + lfirst(last) = makeVar(var->varno, var->varattno, var->vartype, + var->vartypmod, varlevel, var->varnoold, var->varoattno); + return (i); } -static Param* -_replace_var (Var *var) +static Param * +_replace_var(Var *var) { - List **rt = (List**) nth (var->varlevelsup, PlannerVarParam); - List *vpe = rt[var->varno - 1]; - Param *retval; - int i; - - if ( vpe == NULL ) + List **rt = (List **) nth(var->varlevelsup, PlannerVarParam); + List *vpe = rt[var->varno - 1]; + Param *retval; + int i; + + if (vpe == NULL) { vpe = rt[var->varno - 1] = makeNode(List); lfirsti(vpe) = -1; lnext(vpe) = NULL; } - - for (i = 1; ; i++) + + for (i = 1;; i++) { - if ( i == var->varattno ) + if (i == var->varattno) break; - if ( lnext(vpe) == NULL ) + if (lnext(vpe) == NULL) { lnext(vpe) = makeNode(List); vpe = lnext(vpe); @@ -90,381 +90,385 @@ _replace_var (Var *var) else vpe = lnext(vpe); } - - if ( (i = lfirsti(vpe)) < 0 ) /* parameter is not assigned */ + + if ((i = lfirsti(vpe)) < 0) /* parameter is not assigned */ { - i = _new_param (var, PlannerQueryLevel - var->varlevelsup); + i = _new_param(var, PlannerQueryLevel - var->varlevelsup); } - + retval = makeNode(Param); retval->paramkind = PARAM_EXEC; retval->paramid = (AttrNumber) i; retval->paramtype = var->vartype; - + return (retval); } -static Node* -_make_subplan (SubLink *slink) +static Node * +_make_subplan(SubLink *slink) { - SubPlan *node = makeNode (SubPlan); + SubPlan *node = makeNode(SubPlan); Plan *plan; List *lst; Node *result; List *saved_ip = PlannerInitPlan; - + PlannerInitPlan = NULL; - + PlannerQueryLevel++; /* we becomes child */ - - node->plan = plan = union_planner ((Query*) slink->subselect); - - /* - * Assign subPlan, extParam and locParam to plan nodes. - * At the moment, SS_finalize_plan doesn't handle initPlan-s - * and so we assigne them to the topmost plan node and take - * care about its extParam too. + + node->plan = plan = union_planner((Query *) slink->subselect); + + /* + * Assign subPlan, extParam and locParam to plan nodes. At the moment, + * SS_finalize_plan doesn't handle initPlan-s and so we assigne them + * to the topmost plan node and take care about its extParam too. */ - (void) SS_finalize_plan (plan); + (void) SS_finalize_plan(plan); plan->initPlan = PlannerInitPlan; - + /* Get extParam from InitPlan-s */ - foreach (lst, PlannerInitPlan) + foreach(lst, PlannerInitPlan) { - List *lp; - - foreach (lp, ((SubPlan*) lfirst (lst))->plan->extParam) + List *lp; + + foreach(lp, ((SubPlan *) lfirst(lst))->plan->extParam) { - if ( !intMember (lfirsti(lp), plan->extParam) ) - plan->extParam = lappendi (plan->extParam, lfirsti(lp)); + if (!intMember(lfirsti(lp), plan->extParam)) + plan->extParam = lappendi(plan->extParam, lfirsti(lp)); } } - + /* and now we are parent again */ PlannerInitPlan = saved_ip; PlannerQueryLevel--; - + node->plan_id = PlannerPlanId++; - node->rtable = ((Query*) slink->subselect)->rtable; + node->rtable = ((Query *) slink->subselect)->rtable; node->sublink = slink; slink->subselect = NULL; /* cool ?! */ - + /* make parParam list */ - foreach (lst, plan->extParam) + foreach(lst, plan->extParam) { - Var *var = nth (lfirsti(lst), PlannerParamVar); - - if ( var->varlevelsup == PlannerQueryLevel ) - node->parParam = lappendi (node->parParam, lfirsti(lst)); + Var *var = nth(lfirsti(lst), PlannerParamVar); + + if (var->varlevelsup == PlannerQueryLevel) + node->parParam = lappendi(node->parParam, lfirsti(lst)); } - - /* - * Un-correlated or undirect correlated plans of EXISTS or EXPR - * types can be used as initPlans... + + /* + * Un-correlated or undirect correlated plans of EXISTS or EXPR types + * can be used as initPlans... */ - if ( node->parParam == NULL && slink->subLinkType == EXPR_SUBLINK ) + if (node->parParam == NULL && slink->subLinkType == EXPR_SUBLINK) { - int i = 0; - + int i = 0; + /* transform right side of all sublink Oper-s into Param */ - foreach (lst, slink->oper) + foreach(lst, slink->oper) { - List *rside = lnext(((Expr*) lfirst(lst))->args); - TargetEntry *te = nth (i, plan->targetlist); - Var *var = makeVar (0, 0, te->resdom->restype, - te->resdom->restypmod, - PlannerQueryLevel, 0, 0); - Param *prm = makeNode(Param); - + List *rside = lnext(((Expr *) lfirst(lst))->args); + TargetEntry *te = nth(i, plan->targetlist); + Var *var = makeVar(0, 0, te->resdom->restype, + te->resdom->restypmod, + PlannerQueryLevel, 0, 0); + Param *prm = makeNode(Param); + prm->paramkind = PARAM_EXEC; - prm->paramid = (AttrNumber) _new_param (var, PlannerQueryLevel); + prm->paramid = (AttrNumber) _new_param(var, PlannerQueryLevel); prm->paramtype = var->vartype; lfirst(rside) = prm; - node->setParam = lappendi (node->setParam, prm->paramid); - pfree (var); + node->setParam = lappendi(node->setParam, prm->paramid); + pfree(var); i++; } - PlannerInitPlan = lappend (PlannerInitPlan, node); - if ( i > 1 ) - result = (Node*) ((slink->useor) ? make_orclause (slink->oper) : - make_andclause (slink->oper)); + PlannerInitPlan = lappend(PlannerInitPlan, node); + if (i > 1) + result = (Node *) ((slink->useor) ? make_orclause(slink->oper) : + make_andclause(slink->oper)); else - result = (Node*) lfirst (slink->oper); + result = (Node *) lfirst(slink->oper); } - else if ( node->parParam == NULL && slink->subLinkType == EXISTS_SUBLINK ) + else if (node->parParam == NULL && slink->subLinkType == EXISTS_SUBLINK) { - Var *var = makeVar (0, 0, BOOLOID, -1, PlannerQueryLevel, 0, 0); + Var *var = makeVar(0, 0, BOOLOID, -1, PlannerQueryLevel, 0, 0); Param *prm = makeNode(Param); - + prm->paramkind = PARAM_EXEC; - prm->paramid = (AttrNumber) _new_param (var, PlannerQueryLevel); + prm->paramid = (AttrNumber) _new_param(var, PlannerQueryLevel); prm->paramtype = var->vartype; - node->setParam = lappendi (node->setParam, prm->paramid); - pfree (var); - PlannerInitPlan = lappend (PlannerInitPlan, node); - result = (Node*) prm; + node->setParam = lappendi(node->setParam, prm->paramid); + pfree(var); + PlannerInitPlan = lappend(PlannerInitPlan, node); + result = (Node *) prm; } - else /* make expression of SUBPLAN type */ + else +/* make expression of SUBPLAN type */ { - Expr *expr = makeNode (Expr); - List *args = NULL; - int i = 0; - + Expr *expr = makeNode(Expr); + List *args = NULL; + int i = 0; + expr->typeOid = BOOLOID; expr->opType = SUBPLAN_EXPR; - expr->oper = (Node*) node; - - /* - * Make expr->args from parParam. Left sides of sublink Oper-s - * are handled by optimizer directly... - * Also, transform right side of sublink Oper-s into Const. + expr->oper = (Node *) node; + + /* + * Make expr->args from parParam. Left sides of sublink Oper-s are + * handled by optimizer directly... Also, transform right side of + * sublink Oper-s into Const. */ - foreach (lst, node->parParam) + foreach(lst, node->parParam) { - Var *var = nth (lfirsti (lst), PlannerParamVar); - - var = (Var*) copyObject (var); + Var *var = nth(lfirsti(lst), PlannerParamVar); + + var = (Var *) copyObject(var); var->varlevelsup = 0; - args = lappend (args, var); + args = lappend(args, var); } - foreach (lst, slink->oper) + foreach(lst, slink->oper) { - List *rside = lnext(((Expr*) lfirst(lst))->args); - TargetEntry *te = nth (i, plan->targetlist); - Const *con = makeConst (te->resdom->restype, - 0, 0, true, 0, 0, 0); + List *rside = lnext(((Expr *) lfirst(lst))->args); + TargetEntry *te = nth(i, plan->targetlist); + Const *con = makeConst(te->resdom->restype, + 0, 0, true, 0, 0, 0); + lfirst(rside) = con; i++; } expr->args = args; - result = (Node*) expr; + result = (Node *) expr; } - + return (result); - + } static List * -set_unioni (List *l1, List *l2) +set_unioni(List *l1, List *l2) { if (l1 == NULL) return (l2); if (l2 == NULL) return (l1); - - return (nconc (l1, set_differencei (l2, l1))); + + return (nconc(l1, set_differencei(l2, l1))); } static List * -_finalize_primnode (void *expr, List **subplan) +_finalize_primnode(void *expr, List **subplan) { - List *result = NULL; - - if ( expr == NULL ) + List *result = NULL; + + if (expr == NULL) return (NULL); - - if (IsA (expr, Param)) + + if (IsA(expr, Param)) { - if ( ((Param*) expr)->paramkind == PARAM_EXEC ) - return (lconsi (((Param*) expr)->paramid, (List*) NULL)); + if (((Param *) expr)->paramkind == PARAM_EXEC) + return (lconsi(((Param *) expr)->paramid, (List *) NULL)); } else if (single_node(expr)) return (NULL); - else if (IsA (expr, List)) + else if (IsA(expr, List)) { - List *le; - foreach (le, (List*) expr) - result = set_unioni (result, - _finalize_primnode (lfirst(le), subplan)); + List *le; + + foreach(le, (List *) expr) + result = set_unioni(result, + _finalize_primnode(lfirst(le), subplan)); } - else if (IsA (expr, Iter)) - return (_finalize_primnode (((Iter*) expr)->iterexpr, subplan)); - else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || - not_clause (expr) || is_funcclause(expr)) - return (_finalize_primnode (((Expr*) expr)->args, subplan)); - else if (IsA (expr, Aggreg)) - return (_finalize_primnode (((Aggreg *) expr)->target, subplan)); - else if (IsA (expr, ArrayRef)) + else if (IsA(expr, Iter)) + return (_finalize_primnode(((Iter *) expr)->iterexpr, subplan)); + else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || + not_clause(expr) || is_funcclause(expr)) + return (_finalize_primnode(((Expr *) expr)->args, subplan)); + else if (IsA(expr, Aggreg)) + return (_finalize_primnode(((Aggreg *) expr)->target, subplan)); + else if (IsA(expr, ArrayRef)) { - result = _finalize_primnode (((ArrayRef*) expr)->refupperindexpr, subplan); - result = set_unioni (result, - _finalize_primnode (((ArrayRef *) expr)->reflowerindexpr, subplan)); - result = set_unioni (result, - _finalize_primnode (((ArrayRef *) expr)->refexpr, subplan)); - result = set_unioni (result, - _finalize_primnode (((ArrayRef *) expr)->refassgnexpr, subplan)); + result = _finalize_primnode(((ArrayRef *) expr)->refupperindexpr, subplan); + result = set_unioni(result, + _finalize_primnode(((ArrayRef *) expr)->reflowerindexpr, subplan)); + result = set_unioni(result, + _finalize_primnode(((ArrayRef *) expr)->refexpr, subplan)); + result = set_unioni(result, + _finalize_primnode(((ArrayRef *) expr)->refassgnexpr, subplan)); } - else if (IsA (expr, TargetEntry)) - return (_finalize_primnode (((TargetEntry*) expr)->expr, subplan)); - else if (is_subplan (expr)) + else if (IsA(expr, TargetEntry)) + return (_finalize_primnode(((TargetEntry *) expr)->expr, subplan)); + else if (is_subplan(expr)) { - List *lst; - - *subplan = lappend (*subplan, ((Expr*) expr)->oper); - foreach (lst, ((SubPlan*) ((Expr*) expr)->oper)->plan->extParam) + List *lst; + + *subplan = lappend(*subplan, ((Expr *) expr)->oper); + foreach(lst, ((SubPlan *) ((Expr *) expr)->oper)->plan->extParam) { - Var *var = nth (lfirsti(lst), PlannerParamVar); - - if ( var->varlevelsup < PlannerQueryLevel && - !intMember (lfirsti(lst), result) ) - result = lappendi (result, lfirsti(lst)); + Var *var = nth(lfirsti(lst), PlannerParamVar); + + if (var->varlevelsup < PlannerQueryLevel && + !intMember(lfirsti(lst), result)) + result = lappendi(result, lfirsti(lst)); } } else - elog (ERROR, "_finalize_primnode: can't handle node %d", - nodeTag (expr)); - + elog(ERROR, "_finalize_primnode: can't handle node %d", + nodeTag(expr)); + return (result); } Node * -SS_replace_correlation_vars (Node *expr) +SS_replace_correlation_vars(Node *expr) { - if ( expr == NULL ) + if (expr == NULL) return (NULL); - if (IsA (expr, List)) + if (IsA(expr, List)) { - List *le; - foreach (le, (List*) expr) - lfirst(le) = SS_replace_correlation_vars ((Node*) lfirst(le)); + List *le; + + foreach(le, (List *) expr) + lfirst(le) = SS_replace_correlation_vars((Node *) lfirst(le)); } - else if (IsA (expr, Var)) + else if (IsA(expr, Var)) { - if ( ((Var*) expr)->varlevelsup > 0 ) + if (((Var *) expr)->varlevelsup > 0) { - Assert (((Var*) expr)->varlevelsup < PlannerQueryLevel); - expr = (Node*) _replace_var ((Var*) expr); + Assert(((Var *) expr)->varlevelsup < PlannerQueryLevel); + expr = (Node *) _replace_var((Var *) expr); } } - else if (IsA (expr, Iter)) + else if (IsA(expr, Iter)) { - ((Iter*) expr)->iterexpr = - SS_replace_correlation_vars(((Iter*) expr)->iterexpr); + ((Iter *) expr)->iterexpr = + SS_replace_correlation_vars(((Iter *) expr)->iterexpr); } else if (single_node(expr)) return (expr); - else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || - not_clause (expr) || is_funcclause(expr)) - ((Expr *) expr)->args = (List*) - SS_replace_correlation_vars ((Node*) ((Expr *) expr)->args); - else if (IsA (expr, Aggreg)) - ((Aggreg *) expr)->target = - SS_replace_correlation_vars ((Node*) ((Aggreg *) expr)->target); - else if (IsA (expr, ArrayRef)) + else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || + not_clause(expr) || is_funcclause(expr)) + ((Expr *) expr)->args = (List *) + SS_replace_correlation_vars((Node *) ((Expr *) expr)->args); + else if (IsA(expr, Aggreg)) + ((Aggreg *) expr)->target = + SS_replace_correlation_vars((Node *) ((Aggreg *) expr)->target); + else if (IsA(expr, ArrayRef)) { - ((ArrayRef *) expr)->refupperindexpr = (List*) - SS_replace_correlation_vars ((Node*) ((ArrayRef *) expr)->refupperindexpr); - ((ArrayRef *) expr)->reflowerindexpr = (List*) - SS_replace_correlation_vars ((Node*) ((ArrayRef *) expr)->reflowerindexpr); - ((ArrayRef *) expr)->refexpr = - SS_replace_correlation_vars ((Node*) ((ArrayRef *) expr)->refexpr); - ((ArrayRef *) expr)->refassgnexpr = - SS_replace_correlation_vars (((ArrayRef *) expr)->refassgnexpr); + ((ArrayRef *) expr)->refupperindexpr = (List *) + SS_replace_correlation_vars((Node *) ((ArrayRef *) expr)->refupperindexpr); + ((ArrayRef *) expr)->reflowerindexpr = (List *) + SS_replace_correlation_vars((Node *) ((ArrayRef *) expr)->reflowerindexpr); + ((ArrayRef *) expr)->refexpr = + SS_replace_correlation_vars((Node *) ((ArrayRef *) expr)->refexpr); + ((ArrayRef *) expr)->refassgnexpr = + SS_replace_correlation_vars(((ArrayRef *) expr)->refassgnexpr); } - else if (IsA (expr, TargetEntry)) - ((TargetEntry*) expr)->expr = - SS_replace_correlation_vars ((Node*) ((TargetEntry*) expr)->expr); - else if (IsA (expr, SubLink)) + else if (IsA(expr, TargetEntry)) + ((TargetEntry *) expr)->expr = + SS_replace_correlation_vars((Node *) ((TargetEntry *) expr)->expr); + else if (IsA(expr, SubLink)) { - List *le; - - foreach (le, ((SubLink*) expr)->oper) /* left sides only */ + List *le; + + foreach(le, ((SubLink *) expr)->oper) /* left sides only */ { - List *oparg = ((Expr*) lfirst (le))->args; - - lfirst (oparg) = (List*) - SS_replace_correlation_vars ((Node*) lfirst (oparg)); + List *oparg = ((Expr *) lfirst(le))->args; + + lfirst(oparg) = (List *) + SS_replace_correlation_vars((Node *) lfirst(oparg)); } - ((SubLink*) expr)->lefthand = (List*) - SS_replace_correlation_vars ((Node*) ((SubLink*) expr)->lefthand); + ((SubLink *) expr)->lefthand = (List *) + SS_replace_correlation_vars((Node *) ((SubLink *) expr)->lefthand); } else - elog (NOTICE, "SS_replace_correlation_vars: can't handle node %d", - nodeTag (expr)); - + elog(NOTICE, "SS_replace_correlation_vars: can't handle node %d", + nodeTag(expr)); + return (expr); } -Node* -SS_process_sublinks (Node *expr) +Node * +SS_process_sublinks(Node *expr) { - if ( expr == NULL ) + if (expr == NULL) return (NULL); - if (IsA (expr, List)) + if (IsA(expr, List)) { - List *le; - foreach (le, (List*) expr) - lfirst(le) = SS_process_sublinks ((Node*) lfirst(le)); + List *le; + + foreach(le, (List *) expr) + lfirst(le) = SS_process_sublinks((Node *) lfirst(le)); } - else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || - not_clause (expr) || is_funcclause(expr)) - ((Expr *) expr)->args = (List*) - SS_process_sublinks ((Node*) ((Expr *) expr)->args); - else if (IsA (expr, SubLink)) /* got it! */ - expr = _make_subplan ((SubLink*) expr); - + else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || + not_clause(expr) || is_funcclause(expr)) + ((Expr *) expr)->args = (List *) + SS_process_sublinks((Node *) ((Expr *) expr)->args); + else if (IsA(expr, SubLink))/* got it! */ + expr = _make_subplan((SubLink *) expr); + return (expr); } -List* -SS_finalize_plan (Plan *plan) +List * +SS_finalize_plan(Plan *plan) { - List *extParam = NULL; - List *locParam = NULL; - List *subPlan = NULL; - List *param_list; - List *lst; - - if ( plan == NULL ) + List *extParam = NULL; + List *locParam = NULL; + List *subPlan = NULL; + List *param_list; + List *lst; + + if (plan == NULL) return (NULL); - - param_list = _finalize_primnode (plan->targetlist, &subPlan); - Assert (subPlan == NULL); - + + param_list = _finalize_primnode(plan->targetlist, &subPlan); + Assert(subPlan == NULL); + switch (nodeTag(plan)) { case T_Result: - param_list = set_unioni (param_list, - _finalize_primnode (((Result*) plan)->resconstantqual, &subPlan)); + param_list = set_unioni(param_list, + _finalize_primnode(((Result *) plan)->resconstantqual, &subPlan)); break; case T_Append: - foreach (lst, ((Append*) plan)->unionplans) - param_list = set_unioni (param_list, - SS_finalize_plan ((Plan*) lfirst (lst))); + foreach(lst, ((Append *) plan)->unionplans) + param_list = set_unioni(param_list, + SS_finalize_plan((Plan *) lfirst(lst))); break; - + case T_IndexScan: - param_list = set_unioni (param_list, - _finalize_primnode (((IndexScan*) plan)->indxqual, &subPlan)); - Assert (subPlan == NULL); + param_list = set_unioni(param_list, + _finalize_primnode(((IndexScan *) plan)->indxqual, &subPlan)); + Assert(subPlan == NULL); break; case T_MergeJoin: - param_list = set_unioni (param_list, - _finalize_primnode (((MergeJoin*) plan)->mergeclauses, &subPlan)); - Assert (subPlan == NULL); + param_list = set_unioni(param_list, + _finalize_primnode(((MergeJoin *) plan)->mergeclauses, &subPlan)); + Assert(subPlan == NULL); break; case T_HashJoin: - param_list = set_unioni (param_list, - _finalize_primnode (((HashJoin*) plan)->hashclauses, &subPlan)); - Assert (subPlan == NULL); + param_list = set_unioni(param_list, + _finalize_primnode(((HashJoin *) plan)->hashclauses, &subPlan)); + Assert(subPlan == NULL); break; - + case T_Hash: - param_list = set_unioni (param_list, - _finalize_primnode (((Hash*) plan)->hashkey, &subPlan)); - Assert (subPlan == NULL); + param_list = set_unioni(param_list, + _finalize_primnode(((Hash *) plan)->hashkey, &subPlan)); + Assert(subPlan == NULL); break; case T_Agg: - param_list = set_unioni (param_list, - _finalize_primnode (((Agg*) plan)->aggs, &subPlan)); - Assert (subPlan == NULL); + param_list = set_unioni(param_list, + _finalize_primnode(((Agg *) plan)->aggs, &subPlan)); + Assert(subPlan == NULL); break; - + case T_SeqScan: case T_NestLoop: case T_Material: @@ -476,74 +480,75 @@ SS_finalize_plan (Plan *plan) elog(ERROR, "SS_finalize_plan: node %d unsupported", nodeTag(plan)); return (NULL); } - - param_list = set_unioni (param_list, _finalize_primnode (plan->qual, &subPlan)); - param_list = set_unioni (param_list, SS_finalize_plan (plan->lefttree)); - param_list = set_unioni (param_list, SS_finalize_plan (plan->righttree)); - - foreach (lst, param_list) + + param_list = set_unioni(param_list, _finalize_primnode(plan->qual, &subPlan)); + param_list = set_unioni(param_list, SS_finalize_plan(plan->lefttree)); + param_list = set_unioni(param_list, SS_finalize_plan(plan->righttree)); + + foreach(lst, param_list) { - Var *var = nth (lfirsti(lst), PlannerParamVar); - - if ( var->varlevelsup < PlannerQueryLevel ) - extParam = lappendi (extParam, lfirsti(lst)); - else if ( var->varlevelsup > PlannerQueryLevel ) - elog (ERROR, "SS_finalize_plan: plan shouldn't reference subplan' variable"); + Var *var = nth(lfirsti(lst), PlannerParamVar); + + if (var->varlevelsup < PlannerQueryLevel) + extParam = lappendi(extParam, lfirsti(lst)); + else if (var->varlevelsup > PlannerQueryLevel) + elog(ERROR, "SS_finalize_plan: plan shouldn't reference subplan' variable"); else { - Assert (var->varno == 0 && var->varattno == 0); - locParam = lappendi (locParam, lfirsti(lst)); + Assert(var->varno == 0 && var->varattno == 0); + locParam = lappendi(locParam, lfirsti(lst)); } } - + plan->extParam = extParam; plan->locParam = locParam; plan->subPlan = subPlan; - + return (param_list); } -List *SS_pull_subplan (void *expr); +List *SS_pull_subplan(void *expr); List * -SS_pull_subplan (void *expr) +SS_pull_subplan(void *expr) { - List *result = NULL; - - if ( expr == NULL || single_node(expr) ) + List *result = NULL; + + if (expr == NULL || single_node(expr)) return (NULL); - - if (IsA (expr, List)) + + if (IsA(expr, List)) { - List *le; - foreach (le, (List*) expr) - result = nconc (result, SS_pull_subplan (lfirst(le))); + List *le; + + foreach(le, (List *) expr) + result = nconc(result, SS_pull_subplan(lfirst(le))); } - else if (IsA (expr, Iter)) - return (SS_pull_subplan (((Iter*) expr)->iterexpr)); - else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || - not_clause (expr) || is_funcclause(expr)) - return (SS_pull_subplan (((Expr*) expr)->args)); - else if (IsA (expr, Aggreg)) - return (SS_pull_subplan (((Aggreg *) expr)->target)); - else if (IsA (expr, ArrayRef)) + else if (IsA(expr, Iter)) + return (SS_pull_subplan(((Iter *) expr)->iterexpr)); + else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || + not_clause(expr) || is_funcclause(expr)) + return (SS_pull_subplan(((Expr *) expr)->args)); + else if (IsA(expr, Aggreg)) + return (SS_pull_subplan(((Aggreg *) expr)->target)); + else if (IsA(expr, ArrayRef)) { - result = SS_pull_subplan (((ArrayRef*) expr)->refupperindexpr); - result = nconc (result, - SS_pull_subplan (((ArrayRef *) expr)->reflowerindexpr)); - result = nconc (result, - SS_pull_subplan (((ArrayRef *) expr)->refexpr)); - result = nconc (result, - SS_pull_subplan (((ArrayRef *) expr)->refassgnexpr)); + result = SS_pull_subplan(((ArrayRef *) expr)->refupperindexpr); + result = nconc(result, + SS_pull_subplan(((ArrayRef *) expr)->reflowerindexpr)); + result = nconc(result, + SS_pull_subplan(((ArrayRef *) expr)->refexpr)); + result = nconc(result, + SS_pull_subplan(((ArrayRef *) expr)->refassgnexpr)); } - else if (IsA (expr, TargetEntry)) - return (SS_pull_subplan (((TargetEntry*) expr)->expr)); - else if (is_subplan (expr)) - return (lcons (((Expr*) expr)->oper, NULL)); + else if (IsA(expr, TargetEntry)) + return (SS_pull_subplan(((TargetEntry *) expr)->expr)); + else if (is_subplan(expr)) + return (lcons(((Expr *) expr)->oper, NULL)); else - elog (ERROR, "SS_pull_subplan: can't handle node %d", - nodeTag (expr)); - + elog(ERROR, "SS_pull_subplan: can't handle node %d", + nodeTag(expr)); + return (result); } diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index ae65df8bf4..b6443b8a09 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.7 1997/12/18 12:54:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.8 1998/02/26 04:32:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ static List *remove_duplicates(List *list); * and from the rule manager (removeAndFlag = false). * */ -List * +List * cnfify(Expr *qual, bool removeAndFlag) { Expr *newqual = NULL; diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index 43ba76ff54..5e67d26010 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.9 1998/02/10 04:01:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.10 1998/02/26 04:33:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,7 +55,7 @@ new_relation_targetlist(Oid relid, Index rt_index, * * Returns the new targetlist. */ -List * +List * preprocess_targetlist(List *tlist, int command_type, Index result_relation, @@ -297,7 +297,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type) temp, (Datum) typedefault, (typedefault == (struct varlena *) NULL), - /* XXX ? */ + /* XXX ? */ false, false, /* not a set */ false); @@ -325,7 +325,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type) temp_list = MakeTLE(makeResdom(attno, atttype, - get_atttypmod(relid, attno), + get_atttypmod(relid, attno), attname, 0, (Oid) 0, diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index ae73d81691..7b36d3b8e8 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.19 1998/02/13 03:39:26 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.20 1998/02/26 04:33:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,16 +34,21 @@ #include "optimizer/planner.h" #include "optimizer/planmain.h" -static List *plan_inherit_query(List *relids, Index rt_index, - RangeTblEntry *rt_entry, Query *parse, - List **union_rtentriesPtr); -static RangeTblEntry *new_rangetable_entry(Oid new_relid, +static List * +plan_inherit_query(List *relids, Index rt_index, + RangeTblEntry *rt_entry, Query *parse, + List **union_rtentriesPtr); +static RangeTblEntry * +new_rangetable_entry(Oid new_relid, RangeTblEntry *old_entry); -static Query *subst_rangetable(Query *root, Index index, +static Query * +subst_rangetable(Query *root, Index index, RangeTblEntry *new_entry); -static void fix_parsetree_attnums(Index rt_index, Oid old_relid, +static void +fix_parsetree_attnums(Index rt_index, Oid old_relid, Oid new_relid, Query *parsetree); -static Append *make_append(List *unionplans, List *unionrts, Index rt_index, +static Append * +make_append(List *unionplans, List *unionrts, Index rt_index, List *union_rt_entries, List *tlist); @@ -54,61 +59,43 @@ static Append *make_append(List *unionplans, List *unionrts, Index rt_index, * * Returns a list containing a list of plans and a list of rangetables */ -Append * +Append * plan_union_queries(Query *parse) { - List *union_plans = NIL, *ulist, *unionall_queries, *union_rts, - *last_union = NIL; - bool union_all_found = false, union_found = false, - last_unionall_flag = false; - + List *union_plans = NIL, + *ulist, + *unionall_queries, + *union_rts, + *last_union = NIL; + bool union_all_found = false, + union_found = false, + last_unionall_flag = false; + /* - * Do we need to split up our unions because we have UNION - * and UNION ALL? + * Do we need to split up our unions because we have UNION and UNION + * ALL? + * + * We are checking for the case of: SELECT 1 UNION SELECT 2 UNION SELECT + * 3 UNION ALL SELECT 4 UNION ALL SELECT 5 * - * We are checking for the case of: - * SELECT 1 - * UNION - * SELECT 2 - * UNION - * SELECT 3 - * UNION ALL - * SELECT 4 - * UNION ALL - * SELECT 5 + * where we have to do a DISTINCT on the output of the first three + * queries, then add the rest. If they have used UNION and UNION ALL, + * we grab all queries up to the last UNION query, make them their own + * UNION with the owner as the first query in the list. Then, we take + * the remaining queries, which is UNION ALL, and add them to the list + * of union queries. * - * where we have to do a DISTINCT on the output of the first three - * queries, then add the rest. If they have used UNION and - * UNION ALL, we grab all queries up to the last UNION query, - * make them their own UNION with the owner as the first query - * in the list. Then, we take the remaining queries, which is UNION - * ALL, and add them to the list of union queries. + * So the above query becomes: * - * So the above query becomes: + * Append Node { Sort and Unique { Append Node { SELECT 1 + * This is really a sub-UNION, unionClause We run a + * DISTINCT on these. { SELECT 2 SELECT 3 } } } SELECT 4 SELECT 5 } * - * Append Node - * { - * Sort and Unique - * { - * Append Node - * { - * SELECT 1 This is really a sub-UNION, - * unionClause We run a DISTINCT on these. - * { - * SELECT 2 - * SELECT 3 - * } - * } - * } - * SELECT 4 - * SELECT 5 - * } - * */ foreach(ulist, parse->unionClause) { - Query *union_query = lfirst(ulist); + Query *union_query = lfirst(ulist); if (union_query->unionall) union_all_found = true; @@ -123,18 +110,18 @@ plan_union_queries(Query *parse) /* Is this a simple one */ if (!union_all_found || !union_found || - /* A trailing UNION negates the affect of earlier UNION ALLs */ + /* A trailing UNION negates the affect of earlier UNION ALLs */ !last_unionall_flag) { - List *hold_unionClause = parse->unionClause; + List *hold_unionClause = parse->unionClause; - parse->unionClause = NIL; /* prevent recursion */ + parse->unionClause = NIL; /* prevent recursion */ union_plans = lcons(union_planner(parse), NIL); union_rts = lcons(parse->rtable, NIL); foreach(ulist, hold_unionClause) { - Query *union_query = lfirst(ulist); + Query *union_query = lfirst(ulist); union_plans = lappend(union_plans, union_planner(union_query)); union_rts = lappend(union_rts, union_query->rtable); @@ -142,22 +129,23 @@ plan_union_queries(Query *parse) } else { + /* - * We have mixed unions and non-unions + * We have mixed unions and non-unions * - * We need to restructure this to put the UNIONs on their own - * so we can do a DISTINCT. + * We need to restructure this to put the UNIONs on their own so we + * can do a DISTINCT. */ - /* save off everthing past the last UNION */ + /* save off everthing past the last UNION */ unionall_queries = lnext(last_union); /* clip off the list to remove the trailing UNION ALLs */ lnext(last_union) = NIL; /* - * Recursion, but UNION only. - * The last one is a UNION, so it will not come here in recursion, + * Recursion, but UNION only. The last one is a UNION, so it will + * not come here in recursion, */ union_plans = lcons(union_planner(parse), NIL); union_rts = lcons(parse->rtable, NIL); @@ -165,20 +153,20 @@ plan_union_queries(Query *parse) /* Append the remainging UNION ALLs */ foreach(ulist, unionall_queries) { - Query *unionall_query = lfirst(ulist); + Query *unionall_query = lfirst(ulist); union_plans = lappend(union_plans, union_planner(unionall_query)); union_rts = lappend(union_rts, unionall_query->rtable); } } - + /* We have already split UNION and UNION ALL and we made it consistent */ if (!last_unionall_flag) { parse->uniqueFlag = "*"; parse->sortClause = transformSortClause(NULL, NIL, - parse->sortClause, - parse->targetList, "*"); + parse->sortClause, + parse->targetList, "*"); } else /* needed so we don't take the flag from the first query */ @@ -204,7 +192,7 @@ plan_union_queries(Query *parse) * entries to be inserted into an APPEND node. * XXX - what exactly does this mean, look for make_append */ -Append * +Append * plan_inherit_queries(Query *parse, Index rt_index) { List *union_plans = NIL; @@ -218,6 +206,7 @@ plan_inherit_queries(Query *parse, Index rt_index) find_all_inheritors(lconsi(rt_entry->relid, NIL), NIL); + /* * Remove the flag for this relation, since we're about to handle it * (do it before recursing!). XXX destructive parse tree change @@ -225,7 +214,7 @@ plan_inherit_queries(Query *parse, Index rt_index) rt_fetch(rt_index, rangetable)->inh = false; union_plans = plan_inherit_query(union_relids, rt_index, rt_entry, - parse, &union_rt_entries); + parse, &union_rt_entries); return (make_append(union_plans, NULL, @@ -241,10 +230,10 @@ plan_inherit_queries(Query *parse, Index rt_index) */ static List * plan_inherit_query(List *relids, - Index rt_index, - RangeTblEntry *rt_entry, - Query *root, - List **union_rtentriesPtr) + Index rt_index, + RangeTblEntry *rt_entry, + Query *root, + List **union_rtentriesPtr) { List *i; List *union_plans = NIL; @@ -290,7 +279,7 @@ plan_inherit_query(List *relids, * attributes from any relations listed in either of the argument relid * lists. */ -List * +List * find_all_inheritors(List *unexamined_relids, List *examined_relids) { diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c index 3dfa5de4f9..7b7fdfc407 100644 --- a/src/backend/optimizer/util/clauseinfo.c +++ b/src/backend/optimizer/util/clauseinfo.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.6 1997/09/08 21:45:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.7 1998/02/26 04:33:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,7 +44,7 @@ valid_or_clause(CInfo *clauseinfo) * Returns a list containing the clauses from 'clauseinfo-list'. * */ -List * +List * get_actual_clauses(List *clauseinfo_list) { List *temp = NIL; @@ -173,7 +173,7 @@ get_joinvars(Oid relid, * of a list of clauseinfo nodes to be used with an index. * */ -List * +List * get_opnos(List *clauseinfo_list) { CInfo *temp = (CInfo *) NULL; diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index aa77085c55..17b6113be8 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.15 1998/02/13 03:40:19 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.16 1998/02/26 04:33:11 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -38,7 +38,7 @@ static bool agg_clause(Node *clause); -Expr * +Expr * make_clause(int type, Node *oper, List *args) { if (type == AND_EXPR || type == OR_EXPR || type == NOT_EXPR || @@ -58,7 +58,7 @@ make_clause(int type, Node *oper, List *args) } else { - elog (ERROR, "make_clause: unsupported type %d", type); + elog(ERROR, "make_clause: unsupported type %d", type); /* will this ever happen? translated from lispy C code - ay 10/94 */ return ((Expr *) args); } @@ -94,7 +94,7 @@ is_opclause(Node *clause) * operand (if it is non-null). * */ -Expr * +Expr * make_opclause(Oper *op, Var *leftop, Var *rightop) { Expr *expr = makeNode(Expr); @@ -113,7 +113,7 @@ make_opclause(Oper *op, Var *leftop, Var *rightop) * or (op expr) * NB: it is assumed (for now) that all expr must be Var nodes */ -Var * +Var * get_leftop(Expr *clause) { if (clause->args != NULL) @@ -128,7 +128,7 @@ get_leftop(Expr *clause) * Returns the right operand in a clause of the form (op expr expr). * */ -Var * +Var * get_rightop(Expr *clause) { if (clause->args != NULL && lnext(clause->args) != NULL) @@ -173,7 +173,7 @@ is_funcclause(Node *clause) * arguments. * */ -Expr * +Expr * make_funcclause(Func *func, List *funcargs) { Expr *expr = makeNode(Expr); @@ -209,7 +209,7 @@ or_clause(Node *clause) * Creates an 'or' clause given a list of its subclauses. * */ -Expr * +Expr * make_orclause(List *orclauses) { Expr *expr = makeNode(Expr); @@ -245,7 +245,7 @@ not_clause(Node *clause) * Create a 'not' clause given the expression to be negated. * */ -Expr * +Expr * make_notclause(Expr *notclause) { Expr *expr = makeNode(Expr); @@ -263,7 +263,7 @@ make_notclause(Expr *notclause) * Retrieve the clause within a 'not' clause * */ -Expr * +Expr * get_notclausearg(Expr *notclause) { return (lfirst(notclause->args)); @@ -294,7 +294,7 @@ and_clause(Node *clause) * Create an 'and' clause given its arguments in a list. * */ -Expr * +Expr * make_andclause(List *andclauses) { Expr *expr = makeNode(Expr); @@ -322,7 +322,7 @@ make_andclause(List *andclauses) * quals as the return value. * */ -List * +List * pull_constant_clauses(List *quals, List **constantQual) { List *q; @@ -377,8 +377,8 @@ clause_relids_vars(Node *clause, List **relids, List **vars) foreach(vi, var_list) { Var *in_list = (Var *) lfirst(vi); - - Assert (var->varlevelsup == 0); + + Assert(var->varlevelsup == 0); if (in_list->varno == var->varno && in_list->varattno == var->varattno) break; @@ -553,15 +553,15 @@ fix_opid(Node *clause) { fix_opid(((Aggreg *) clause)->target); } - else if (is_subplan(clause) && - ((SubPlan*) ((Expr*) clause)->oper)->sublink->subLinkType != EXISTS_SUBLINK) + else if (is_subplan(clause) && + ((SubPlan *) ((Expr *) clause)->oper)->sublink->subLinkType != EXISTS_SUBLINK) { - List *lst; - - foreach (lst, ((SubPlan*) ((Expr*) clause)->oper)->sublink->oper) + List *lst; + + foreach(lst, ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper) { - replace_opid((Oper*) ((Expr*) lfirst(lst))->oper); - fix_opid((Node*) get_leftop((Expr*) lfirst(lst))); + replace_opid((Oper *) ((Expr *) lfirst(lst))->oper); + fix_opid((Node *) get_leftop((Expr *) lfirst(lst))); } } @@ -574,7 +574,7 @@ fix_opid(Node *clause) * Returns its argument. * */ -List * +List * fix_opids(List *clauses) { List *clause; @@ -642,7 +642,7 @@ get_relattval(Node *clause, } } - else if (is_opclause(clause) && IsA(left, Var) && IsA(right, Param)) + else if (is_opclause(clause) && IsA(left, Var) &&IsA(right, Param)) { *relid = left->varno; *attno = left->varattno; @@ -653,8 +653,8 @@ get_relattval(Node *clause, is_funcclause((Node *) left) && IsA(right, Const)) { - List *vars = pull_var_clause((Node*)left); - + List *vars = pull_var_clause((Node *) left); + *relid = ((Var *) lfirst(vars))->varno; *attno = InvalidAttrNumber; *constval = ((Const *) right)->constvalue; @@ -664,8 +664,8 @@ get_relattval(Node *clause, is_funcclause((Node *) right) && IsA(left, Const)) { - List *vars = pull_var_clause((Node*)right); - + List *vars = pull_var_clause((Node *) right); + *relid = ((Var *) lfirst(vars))->varno; *attno = InvalidAttrNumber; *constval = ((Const *) left)->constvalue; @@ -692,7 +692,7 @@ get_relattval(Node *clause, *flag = (_SELEC_NOT_CONSTANT_); } } - else if (is_opclause(clause) && IsA(right, Var) && IsA(left, Param)) + else if (is_opclause(clause) && IsA(right, Var) &&IsA(left, Param)) { *relid = right->varno; *attno = right->varattno; diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c index 0c4b370db1..3b3c44c3be 100644 --- a/src/backend/optimizer/util/indexnode.c +++ b/src/backend/optimizer/util/indexnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.5 1997/09/08 21:45:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.6 1998/02/26 04:33:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ static List *find_secondary_index(Query *root, Oid relid); * each (secondary) index defined on a relation. * */ -List * +List * find_relation_indices(Query *root, Rel *rel) { if (rel->indexed) diff --git a/src/backend/optimizer/util/internal.c b/src/backend/optimizer/util/internal.c index 258f745a81..fdb094a3db 100644 --- a/src/backend/optimizer/util/internal.c +++ b/src/backend/optimizer/util/internal.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.6 1997/09/08 21:45:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.7 1998/02/26 04:33:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,7 @@ MakeTLE(Resdom *resdom, Node *expr) return rt; } -Var * +Var * get_expr(TargetEntry *tle) { Assert(tle != NULL); diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index 03ec95db61..90c03f3f8e 100644 --- a/src/backend/optimizer/util/joininfo.c +++ b/src/backend/optimizer/util/joininfo.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.5 1997/09/08 21:45:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.6 1998/02/26 04:33:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ * exists. * */ -JInfo * +JInfo * joininfo_member(List *join_relids, List *joininfo_list) { List *i = NIL; @@ -61,7 +61,7 @@ joininfo_member(List *join_relids, List *joininfo_list) * Returns a joininfo node. * */ -JInfo * +JInfo * find_joininfo_node(Rel *this_rel, List *join_relids) { JInfo *joininfo = joininfo_member(join_relids, @@ -88,7 +88,7 @@ find_joininfo_node(Rel *this_rel, List *join_relids) * Returns the other var node in the joinclause if it is, nil if not. * */ -Var * +Var * other_join_clause_var(Var *var, Expr *clause) { Var *retval; diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c index 2699ec98b3..eb49cb5ad3 100644 --- a/src/backend/optimizer/util/keys.c +++ b/src/backend/optimizer/util/keys.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.5 1997/09/08 21:45:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.6 1998/02/26 04:33:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,7 +85,7 @@ equal_indexkey_var(int index_key, Var *var) * lelation. * */ -Var * +Var * extract_subkey(JoinKey *jk, int which_subkey) { Var *retval; @@ -178,7 +178,7 @@ matching2_tlvar(int var, List *tlist, bool (*test) ()) } -List * +List * collect_index_pathkeys(int *index_keys, List *tlist) { List *retval = NIL; diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 61cd7be84c..96a5bb9a12 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.6 1997/09/08 21:45:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.7 1998/02/26 04:33:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,7 +61,7 @@ path_is_cheaper(Path *path1, Path *path2) * is minimum. * */ -Path * +Path * set_cheapest(Rel *parent_rel, List *pathlist) { List *p; @@ -100,7 +100,7 @@ set_cheapest(Rel *parent_rel, List *pathlist) * Returns the list of unique pathnodes. * */ -List * +List * add_pathlist(Rel *parent_rel, List *unique_paths, List *new_paths) { List *x; @@ -207,7 +207,7 @@ better_path(Path *new_path, List *unique_paths, bool *noOther) * pathnode. * */ -Path * +Path * create_seqscan_path(Rel *rel) { int relid = 0; diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index f00a9a9f28..2237d6c1b3 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.15 1998/02/11 19:10:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.16 1998/02/26 04:33:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -403,7 +403,7 @@ join_selectivity(Oid functionObjectId, * Returns a LISP list containing the OIDs of all relations which * inherits from the relation with OID 'inhparent'. */ -List * +List * find_inheritance_children(Oid inhparent) { static ScanKeyData key[1] = { @@ -440,7 +440,7 @@ find_inheritance_children(Oid inhparent) * Returns a LISP list containing the OIDs of all relations which are * base relations of the relation with OID 'verrelid'. */ -List * +List * VersionGetParents(Oid verrelid) { static ScanKeyData key[1] = { diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index dc242e531e..b18f334201 100644 --- a/src/backend/optimizer/util/relnode.c +++ b/src/backend/optimizer/util/relnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.4 1997/09/08 21:45:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.5 1998/02/26 04:33:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ * necessary. This is for base relations. * */ -Rel * +Rel * get_base_rel(Query *root, int relid) { List *relids; @@ -100,7 +100,7 @@ get_base_rel(Query *root, int relid) * creating a new one if necessary. This is for join relations. * */ -Rel * +Rel * get_join_rel(Query *root, List *relid) { return rel_member(relid, root->join_relation_list_); @@ -114,7 +114,7 @@ get_join_rel(Query *root, List *relid) * Returns the corresponding entry in 'rels' if it is there. * */ -Rel * +Rel * rel_member(List *relid, List *rels) { List *temp = NIL; diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index a98ee8f22c..2ed37d5f5c 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.11 1998/02/13 03:40:21 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.12 1998/02/26 04:33:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ tlistentry_member(Var *var, List *targetlist) * REQUIRES: "test" operates on lispval unions, * */ -Expr * +Expr * matching_tlvar(Var *var, List *targetlist) { TargetEntry *tlentry; @@ -153,7 +153,7 @@ create_tl_element(Var *var, int resdomno) * Returns the targetlist elements from a relation tlist. * */ -List * +List * get_actual_tlist(List *tlist) { @@ -200,7 +200,7 @@ get_actual_tlist(List *tlist) * Returns the resdom entry of the matching var node. * */ -Resdom * +Resdom * tlist_member(Var *var, List *tlist) { List *i = NIL; @@ -230,7 +230,7 @@ tlist_member(Var *var, List *tlist) /* * Routine to get the resdom out of a targetlist. */ -Resdom * +Resdom * tlist_resdom(List *tlist, Resdom *resnode) { Resdom *resdom = (Resdom *) NULL; @@ -273,7 +273,7 @@ match_varid(Var *test_var, List *tlist) type_var = (Oid) test_var->vartype; - Assert (test_var->varlevelsup == 0); + Assert(test_var->varlevelsup == 0); foreach(tl, tlist) { TargetEntry *entry; @@ -289,9 +289,9 @@ match_varid(Var *test_var, List *tlist) * we test the original varno (instead of varno which might be * changed to INNER/OUTER. */ - Assert (tlvar->varlevelsup == 0); + Assert(tlvar->varlevelsup == 0); if (tlvar->varnoold == test_var->varnoold && - tlvar->varoattno == test_var->varoattno) + tlvar->varoattno == test_var->varoattno) { if (tlvar->vartype == type_var) @@ -313,7 +313,7 @@ match_varid(Var *test_var, List *tlist) * Returns the resulting target list. * */ -List * +List * new_unsorted_tlist(List *targetlist) { List *new_targetlist = (List *) copyObject((Node *) targetlist); @@ -341,7 +341,7 @@ new_unsorted_tlist(List *targetlist) * Returns a new target list. * */ -List * +List * copy_vars(List *target, List *source) { List *result = NIL; @@ -369,7 +369,7 @@ copy_vars(List *target, List *source) * Returns the "flattened" new target list. * */ -List * +List * flatten_tlist(List *tlist) { int last_resdomno = 1; @@ -425,7 +425,7 @@ flatten_tlist(List *tlist) * Returns the modified actual target list. * */ -List * +List * flatten_tlist_vars(List *full_tlist, List *flat_tlist) { List *x = NIL; @@ -556,7 +556,7 @@ MakeTLE(Resdom *resdom, Node *expr) return rt; } -Var * +Var * get_expr(TargetEntry *tle) { Assert(tle != NULL); diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index 4c3ebe7f32..346e163589 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.10 1998/02/13 03:40:23 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.11 1998/02/26 04:33:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ * XXX assumes varno's are always integers, which shouldn't be true... * (though it currently is, see primnodes.h) */ -List * +List * pull_varnos(Node *me) { List *i, @@ -107,9 +107,9 @@ contain_var_clause(Node *clause) return TRUE; } /* Ok - check left sides of Oper-s */ - foreach(temp, ((SubPlan*) ((Expr *) clause)->oper)->sublink->oper) + foreach(temp, ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper) { - if (contain_var_clause(lfirst(((Expr*) lfirst(temp))->args))) + if (contain_var_clause(lfirst(((Expr *) lfirst(temp))->args))) return TRUE; } return FALSE; @@ -150,7 +150,7 @@ contain_var_clause(Node *clause) * * Returns list of varnodes found. */ -List * +List * pull_var_clause(Node *clause) { List *retval = NIL; @@ -174,12 +174,12 @@ pull_var_clause(Node *clause) { List *temp; - foreach(temp, ((Expr*) clause)->args) + foreach(temp, ((Expr *) clause)->args) retval = nconc(retval, pull_var_clause(lfirst(temp))); /* Ok - get Var-s from left sides of Oper-s */ - foreach(temp, ((SubPlan*) ((Expr*) clause)->oper)->sublink->oper) - retval = nconc(retval, - pull_var_clause(lfirst(((Expr*) lfirst(temp))->args))); + foreach(temp, ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper) + retval = nconc(retval, + pull_var_clause(lfirst(((Expr *) lfirst(temp))->args))); } else if (IsA(clause, Aggreg)) { @@ -224,7 +224,7 @@ var_equal(Var *var1, Var *var2) (((Var *) var1)->varlevelsup == ((Var *) var2)->varlevelsup) && (((Var *) var1)->varattno == ((Var *) var2)->varattno)) { - Assert (((Var *) var1)->varlevelsup == 0); + Assert(((Var *) var1)->varlevelsup == 0); return (true); } else diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index fc5ce5736e..64ec5fa37d 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.70 1998/02/10 04:01:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.71 1998/02/26 04:33:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,7 +42,7 @@ static Query *transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt); static Query *transformCursorStmt(ParseState *pstate, SelectStmt *stmt); static Query *transformCreateStmt(ParseState *pstate, CreateStmt *stmt); -List *extras = NIL; +List *extras = NIL; /* * parse_analyze - @@ -102,10 +102,10 @@ transformStmt(ParseState *pstate, Node *parseTree) switch (nodeTag(parseTree)) { - /*------------------------ - * Non-optimizable statements - *------------------------ - */ + /*------------------------ + * Non-optimizable statements + *------------------------ + */ case T_CreateStmt: result = transformCreateStmt(pstate, (CreateStmt *) parseTree); break; @@ -162,10 +162,10 @@ transformStmt(ParseState *pstate, Node *parseTree) } break; - /*------------------------ - * Optimizable statements - *------------------------ - */ + /*------------------------ + * Optimizable statements + *------------------------ + */ case T_InsertStmt: result = transformInsertStmt(pstate, (InsertStmt *) parseTree); break; @@ -179,7 +179,7 @@ transformStmt(ParseState *pstate, Node *parseTree) break; case T_SelectStmt: - if (!((SelectStmt *)parseTree)->portalname) + if (!((SelectStmt *) parseTree)->portalname) result = transformSelectStmt(pstate, (SelectStmt *) parseTree); else result = transformCursorStmt(pstate, (SelectStmt *) parseTree); @@ -218,7 +218,7 @@ transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt) /* fix where clause */ qry->qual = transformWhereClause(pstate, stmt->whereClause); qry->hasSubLinks = pstate->p_hasSubLinks; - + qry->rtable = pstate->p_rtable; qry->resultRelation = refnameRangeTablePosn(pstate, stmt->relname, NULL); @@ -249,43 +249,43 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) /* fix the target list */ icolumns = pstate->p_insert_columns = makeTargetNames(pstate, stmt->cols); - + qry->targetList = transformTargetList(pstate, stmt->targetList); - + /* DEFAULT handling */ if (length(qry->targetList) < pstate->p_target_relation->rd_att->natts && pstate->p_target_relation->rd_att->constr && pstate->p_target_relation->rd_att->constr->num_defval > 0) { - AttributeTupleForm *att = pstate->p_target_relation->rd_att->attrs; - AttrDefault *defval = pstate->p_target_relation->rd_att->constr->defval; - int ndef = pstate->p_target_relation->rd_att->constr->num_defval; - - /* + AttributeTupleForm *att = pstate->p_target_relation->rd_att->attrs; + AttrDefault *defval = pstate->p_target_relation->rd_att->constr->defval; + int ndef = pstate->p_target_relation->rd_att->constr->num_defval; + + /* * if stmt->cols == NIL then makeTargetNames returns list of all * attrs: have to shorter icolumns list... */ if (stmt->cols == NIL) { - List *extrl; - int i = length(qry->targetList); - - foreach (extrl, icolumns) + List *extrl; + int i = length(qry->targetList); + + foreach(extrl, icolumns) { if (--i <= 0) break; } - freeList (lnext(extrl)); + freeList(lnext(extrl)); lnext(extrl) = NIL; } - + while (ndef-- > 0) { - List *tl; - Ident *id; - TargetEntry *te; - - foreach (tl, icolumns) + List *tl; + Ident *id; + TargetEntry *te; + + foreach(tl, icolumns) { id = (Ident *) lfirst(tl); if (!namestrcmp(&(att[defval[ndef].adnum - 1]->attname), id->name)) @@ -293,33 +293,34 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) } if (tl != NIL) /* something given for this attr */ continue; - /* - * Nothing given for this attr with DEFAULT expr, so - * add new TargetEntry to qry->targetList. - * Note, that we set resno to defval[ndef].adnum: - * it's what transformTargetList()->make_targetlist_expr() - * does for INSERT ... SELECT. But for INSERT ... VALUES - * pstate->p_last_resno is used. It doesn't matter for - * "normal" using (planner creates proper target list - * in preptlist.c), but may break RULEs in some way. - * It seems better to create proper target list here... + + /* + * Nothing given for this attr with DEFAULT expr, so add new + * TargetEntry to qry->targetList. Note, that we set resno to + * defval[ndef].adnum: it's what + * transformTargetList()->make_targetlist_expr() does for + * INSERT ... SELECT. But for INSERT ... VALUES + * pstate->p_last_resno is used. It doesn't matter for + * "normal" using (planner creates proper target list in + * preptlist.c), but may break RULEs in some way. It seems + * better to create proper target list here... */ te = makeNode(TargetEntry); te->resdom = makeResdom(defval[ndef].adnum, att[defval[ndef].adnum - 1]->atttypid, - att[defval[ndef].adnum - 1]->atttypmod, - pstrdup(nameout(&(att[defval[ndef].adnum - 1]->attname))), + att[defval[ndef].adnum - 1]->atttypmod, + pstrdup(nameout(&(att[defval[ndef].adnum - 1]->attname))), 0, 0, 0); te->fjoin = NULL; te->expr = (Node *) stringToNode(defval[ndef].adbin); - qry->targetList = lappend (qry->targetList, te); + qry->targetList = lappend(qry->targetList, te); } } - + /* fix where clause */ qry->qual = transformWhereClause(pstate, stmt->whereClause); qry->hasSubLinks = pstate->p_hasSubLinks; - + /* now the range table will not change */ qry->rtable = pstate->p_rtable; qry->resultRelation = refnameRangeTablePosn(pstate, stmt->relname, NULL); @@ -340,7 +341,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) parseCheckAggregates(pstate, qry); /* The INSERT INTO ... SELECT ... could have a UNION */ - qry->unionall = stmt->unionall; /* in child, so unionClause may be false */ + qry->unionall = stmt->unionall; /* in child, so unionClause may be + * false */ qry->unionClause = transformUnionClause(stmt->unionClause, qry->targetList); return (Query *) qry; @@ -353,33 +355,33 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) static char * makeTableName(void *elem,...) { - va_list args; + va_list args; - char *name; - char buf[NAMEDATALEN+1]; + char *name; + char buf[NAMEDATALEN + 1]; buf[0] = '\0'; - va_start(args,elem); + va_start(args, elem); name = elem; while (name != NULL) { /* not enough room for next part? then return nothing */ - if ((strlen(buf)+strlen(name)) >= (sizeof(buf)-1)) + if ((strlen(buf) + strlen(name)) >= (sizeof(buf) - 1)) return (NULL); if (strlen(buf) > 0) - strcat(buf,"_"); - strcat(buf,name); + strcat(buf, "_"); + strcat(buf, name); - name = va_arg(args,void *); + name = va_arg(args, void *); } va_end(args); - name = palloc(strlen(buf)+1); - strcpy(name,buf); + name = palloc(strlen(buf) + 1); + strcpy(name, buf); return (name); } @@ -391,10 +393,10 @@ CreateIndexName(char *tname, char *cname, char *label, List *indices) char *iname = NULL; List *ilist; IndexStmt *index; - char name2[NAMEDATALEN+1]; + char name2[NAMEDATALEN + 1]; /* use working storage, since we might be trying several possibilities */ - strcpy(name2,cname); + strcpy(name2, cname); while (iname == NULL) { iname = makeTableName(tname, name2, label, NULL); @@ -406,7 +408,7 @@ CreateIndexName(char *tname, char *cname, char *label, List *indices) while (ilist != NIL) { index = lfirst(ilist); - if (strcasecmp(iname,index->idxname) == 0) + if (strcasecmp(iname, index->idxname) == 0) break; ilist = lnext(ilist); @@ -419,7 +421,7 @@ CreateIndexName(char *tname, char *cname, char *label, List *indices) pfree(iname); iname = NULL; pass++; - sprintf(name2, "%s_%d", cname, (pass+1)); + sprintf(name2, "%s_%d", cname, (pass + 1)); } return (iname); @@ -444,7 +446,8 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) List *columns; List *dlist; ColumnDef *column; - List *constraints, *clist; + List *constraints, + *clist; Constraint *constraint; List *keys; Ident *key; @@ -467,7 +470,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) { case T_ColumnDef: column = (ColumnDef *) element; - columns = lappend(columns,column); + columns = lappend(columns, column); if (column->constraints != NIL) { clist = column->constraints; @@ -478,15 +481,15 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) { case CONSTR_NOTNULL: if (column->is_not_null) - elog(ERROR,"CREATE TABLE/NOT NULL already specified" - " for %s.%s", stmt->relname, column->colname); + elog(ERROR, "CREATE TABLE/NOT NULL already specified" + " for %s.%s", stmt->relname, column->colname); column->is_not_null = TRUE; break; case CONSTR_DEFAULT: if (column->defval != NULL) - elog(ERROR,"CREATE TABLE/DEFAULT multiple values specified" - " for %s.%s", stmt->relname, column->colname); + elog(ERROR, "CREATE TABLE/DEFAULT multiple values specified" + " for %s.%s", stmt->relname, column->colname); column->defval = constraint->def; break; @@ -513,7 +516,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) break; default: - elog(ERROR,"parser: internal error; unrecognized constraint",NULL); + elog(ERROR, "parser: internal error; unrecognized constraint", NULL); break; } clist = lnext(clist); @@ -545,16 +548,16 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) case CONSTR_NOTNULL: case CONSTR_DEFAULT: - elog(ERROR,"parser: internal error; illegal context for constraint",NULL); + elog(ERROR, "parser: internal error; illegal context for constraint", NULL); break; default: - elog(ERROR,"parser: internal error; unrecognized constraint",NULL); + elog(ERROR, "parser: internal error; unrecognized constraint", NULL); break; } break; default: - elog(ERROR,"parser: internal error; unrecognized node",NULL); + elog(ERROR, "parser: internal error; unrecognized node", NULL); } elements = lnext(elements); @@ -568,25 +571,25 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) * For UNIQUE, create an index as for PRIMARY KEYS, but do not insist on NOT NULL. * * Note that this code does not currently look for all possible redundant cases - * and either ignore or stop with warning. The create might fail later when - * names for indices turn out to be redundant, or a user might have specified - * extra useless indices which might hurt performance. - thomas 1997-12-08 + * and either ignore or stop with warning. The create might fail later when + * names for indices turn out to be redundant, or a user might have specified + * extra useless indices which might hurt performance. - thomas 1997-12-08 */ ilist = NIL; while (dlist != NIL) { constraint = lfirst(dlist); if (nodeTag(constraint) != T_Constraint) - elog(ERROR,"parser: internal error; unrecognized deferred node",NULL); + elog(ERROR, "parser: internal error; unrecognized deferred node", NULL); if (constraint->contype == CONSTR_PRIMARY) if (have_pkey) - elog(ERROR,"CREATE TABLE/PRIMARY KEY multiple primary keys" - " for table %s are not legal", stmt->relname); - else + elog(ERROR, "CREATE TABLE/PRIMARY KEY multiple primary keys" + " for table %s are not legal", stmt->relname); + else have_pkey = TRUE; else if (constraint->contype != CONSTR_UNIQUE) - elog(ERROR,"parser: internal error; unrecognized deferred constraint",NULL); + elog(ERROR, "parser: internal error; unrecognized deferred constraint", NULL); index = makeNode(IndexStmt); @@ -596,7 +599,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) else if (constraint->contype == CONSTR_PRIMARY) { if (have_pkey) - elog(ERROR,"CREATE TABLE/PRIMARY KEY multiple keys for table %s are not legal", stmt->relname); + elog(ERROR, "CREATE TABLE/PRIMARY KEY multiple keys for table %s are not legal", stmt->relname); have_pkey = TRUE; index->idxname = makeTableName(stmt->relname, "pkey", NULL); @@ -609,7 +612,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) index->indexParams = NIL; index->withClause = NIL; index->whereClause = NULL; - + keys = constraint->keys; while (keys != NIL) { @@ -619,17 +622,19 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) while (columns != NIL) { column = lfirst(columns); - if (strcasecmp(column->colname,key->name) == 0) break; - else column = NULL; + if (strcasecmp(column->colname, key->name) == 0) + break; + else + column = NULL; columns = lnext(columns); } if (column == NULL) - elog(ERROR,"parser: column '%s' in key does not exist",key->name); + elog(ERROR, "parser: column '%s' in key does not exist", key->name); if (constraint->contype == CONSTR_PRIMARY) column->is_not_null = TRUE; iparam = makeNode(IndexElem); - iparam->name = strcpy(palloc(strlen(column->colname)+1), column->colname); + iparam->name = strcpy(palloc(strlen(column->colname) + 1), column->colname); iparam->args = NIL; iparam->class = NULL; iparam->tname = NULL; @@ -642,12 +647,12 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) } if (index->idxname == NULL) - elog(ERROR,"parser: unable to construct implicit index for table %s" - "; name too long", stmt->relname); + elog(ERROR, "parser: unable to construct implicit index for table %s" + "; name too long", stmt->relname); else - elog(NOTICE,"CREATE TABLE/%s will create implicit index %s for table %s", - ((constraint->contype == CONSTR_PRIMARY)? "PRIMARY KEY": "UNIQUE"), - index->idxname, stmt->relname); + elog(NOTICE, "CREATE TABLE/%s will create implicit index %s for table %s", + ((constraint->contype == CONSTR_PRIMARY) ? "PRIMARY KEY" : "UNIQUE"), + index->idxname, stmt->relname); ilist = lappend(ilist, index); dlist = lnext(dlist); @@ -674,7 +679,7 @@ transformIndexStmt(ParseState *pstate, IndexStmt *stmt) /* take care of the where clause */ stmt->whereClause = transformWhereClause(pstate, stmt->whereClause); qry->hasSubLinks = pstate->p_hasSubLinks; - + stmt->rangetable = pstate->p_rtable; qry->utilityStmt = (Node *) stmt; @@ -793,7 +798,8 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt) if (pstate->p_hasAggs) parseCheckAggregates(pstate, qry); - qry->unionall = stmt->unionall; /* in child, so unionClause may be false */ + qry->unionall = stmt->unionall; /* in child, so unionClause may be + * false */ qry->unionClause = transformUnionClause(stmt->unionClause, qry->targetList); return (Query *) qry; diff --git a/src/backend/parser/parse.h b/src/backend/parser/parse.h index 7b653a162b..1bf37f80bf 100644 --- a/src/backend/parser/parse.h +++ b/src/backend/parser/parse.h @@ -1,224 +1,225 @@ typedef union { - double dval; - int ival; - char chr; - char *str; - bool boolean; - bool* pboolean; /* for pg_user privileges */ - List *list; - Node *node; - Value *value; + double dval; + int ival; + char chr; + char *str; + bool boolean; + bool *pboolean; /* for pg_user privileges */ + List *list; + Node *node; + Value *value; - Attr *attr; + Attr *attr; - TypeName *typnam; - DefElem *defelt; - ParamString *param; - SortGroupBy *sortgroupby; - IndexElem *ielem; - RangeVar *range; - RelExpr *relexp; - A_Indices *aind; - ResTarget *target; - ParamNo *paramno; + TypeName *typnam; + DefElem *defelt; + ParamString *param; + SortGroupBy *sortgroupby; + IndexElem *ielem; + RangeVar *range; + RelExpr *relexp; + A_Indices *aind; + ResTarget *target; + ParamNo *paramno; - VersionStmt *vstmt; - DefineStmt *dstmt; - RuleStmt *rstmt; - InsertStmt *astmt; + VersionStmt *vstmt; + DefineStmt *dstmt; + RuleStmt *rstmt; + InsertStmt *astmt; } YYSTYPE; -#define ACTION 258 -#define ADD 259 -#define ALL 260 -#define ALTER 261 -#define AND 262 -#define ANY 263 -#define AS 264 -#define ASC 265 -#define BEGIN_TRANS 266 -#define BETWEEN 267 -#define BOTH 268 -#define BY 269 -#define CASCADE 270 -#define CAST 271 -#define CHAR 272 -#define CHARACTER 273 -#define CHECK 274 -#define CLOSE 275 -#define COLLATE 276 -#define COLUMN 277 -#define COMMIT 278 -#define CONSTRAINT 279 -#define CREATE 280 -#define CROSS 281 -#define CURRENT 282 -#define CURRENT_DATE 283 -#define CURRENT_TIME 284 -#define CURRENT_TIMESTAMP 285 -#define CURRENT_USER 286 -#define CURSOR 287 -#define DAY_P 288 -#define DECIMAL 289 -#define DECLARE 290 -#define DEFAULT 291 -#define DELETE 292 -#define DESC 293 -#define DISTINCT 294 -#define DOUBLE 295 -#define DROP 296 -#define END_TRANS 297 -#define EXECUTE 298 -#define EXISTS 299 -#define EXTRACT 300 -#define FETCH 301 -#define FLOAT 302 -#define FOR 303 -#define FOREIGN 304 -#define FROM 305 -#define FULL 306 -#define GRANT 307 -#define GROUP 308 -#define HAVING 309 -#define HOUR_P 310 -#define IN 311 -#define INNER_P 312 -#define INSERT 313 -#define INTERVAL 314 -#define INTO 315 -#define IS 316 -#define JOIN 317 -#define KEY 318 -#define LANGUAGE 319 -#define LEADING 320 -#define LEFT 321 -#define LIKE 322 -#define LOCAL 323 -#define MATCH 324 -#define MINUTE_P 325 -#define MONTH_P 326 -#define NATIONAL 327 -#define NATURAL 328 -#define NCHAR 329 -#define NO 330 -#define NOT 331 -#define NOTIFY 332 -#define NULL_P 333 -#define NUMERIC 334 -#define ON 335 -#define OPTION 336 -#define OR 337 -#define ORDER 338 -#define OUTER_P 339 -#define PARTIAL 340 -#define POSITION 341 -#define PRECISION 342 -#define PRIMARY 343 -#define PRIVILEGES 344 -#define PROCEDURE 345 -#define PUBLIC 346 -#define REFERENCES 347 -#define REVOKE 348 -#define RIGHT 349 -#define ROLLBACK 350 -#define SECOND_P 351 -#define SELECT 352 -#define SET 353 -#define SUBSTRING 354 -#define TABLE 355 -#define TIME 356 -#define TIMESTAMP 357 -#define TO 358 -#define TRAILING 359 -#define TRANSACTION 360 -#define TRIM 361 -#define UNION 362 -#define UNIQUE 363 -#define UPDATE 364 -#define USING 365 -#define VALUES 366 -#define VARCHAR 367 -#define VARYING 368 -#define VIEW 369 -#define WHERE 370 -#define WITH 371 -#define WORK 372 -#define YEAR_P 373 -#define ZONE 374 -#define FALSE_P 375 -#define TRIGGER 376 -#define TRUE_P 377 -#define TYPE_P 378 -#define ABORT_TRANS 379 -#define AFTER 380 -#define AGGREGATE 381 -#define ANALYZE 382 -#define BACKWARD 383 -#define BEFORE 384 -#define BINARY 385 -#define CLUSTER 386 -#define COPY 387 -#define DATABASE 388 -#define DELIMITERS 389 -#define DO 390 -#define EACH 391 -#define EXPLAIN 392 -#define EXTEND 393 -#define FORWARD 394 -#define FUNCTION 395 -#define HANDLER 396 -#define INDEX 397 -#define INHERITS 398 -#define INSTEAD 399 -#define ISNULL 400 -#define LANCOMPILER 401 -#define LISTEN 402 -#define LOAD 403 -#define LOCK_P 404 -#define LOCATION 405 -#define MOVE 406 -#define NEW 407 -#define NONE 408 -#define NOTHING 409 -#define NOTNULL 410 -#define OIDS 411 -#define OPERATOR 412 -#define PROCEDURAL 413 -#define RECIPE 414 -#define RENAME 415 -#define RESET 416 -#define RETURNS 417 -#define ROW 418 -#define RULE 419 -#define SEQUENCE 420 -#define SETOF 421 -#define SHOW 422 -#define STATEMENT 423 -#define STDIN 424 -#define STDOUT 425 -#define TRUSTED 426 -#define VACUUM 427 -#define VERBOSE 428 -#define VERSION 429 -#define ARCHIVE 430 -#define USER 431 -#define PASSWORD 432 -#define CREATEDB 433 -#define NOCREATEDB 434 -#define CREATEUSER 435 -#define NOCREATEUSER 436 -#define VALID 437 -#define UNTIL 438 -#define IDENT 439 -#define SCONST 440 -#define Op 441 -#define ICONST 442 -#define PARAM 443 -#define FCONST 444 -#define OP 445 -#define UMINUS 446 -#define TYPECAST 447 -#define REDUCE 448 + +#define ACTION 258 +#define ADD 259 +#define ALL 260 +#define ALTER 261 +#define AND 262 +#define ANY 263 +#define AS 264 +#define ASC 265 +#define BEGIN_TRANS 266 +#define BETWEEN 267 +#define BOTH 268 +#define BY 269 +#define CASCADE 270 +#define CAST 271 +#define CHAR 272 +#define CHARACTER 273 +#define CHECK 274 +#define CLOSE 275 +#define COLLATE 276 +#define COLUMN 277 +#define COMMIT 278 +#define CONSTRAINT 279 +#define CREATE 280 +#define CROSS 281 +#define CURRENT 282 +#define CURRENT_DATE 283 +#define CURRENT_TIME 284 +#define CURRENT_TIMESTAMP 285 +#define CURRENT_USER 286 +#define CURSOR 287 +#define DAY_P 288 +#define DECIMAL 289 +#define DECLARE 290 +#define DEFAULT 291 +#define DELETE 292 +#define DESC 293 +#define DISTINCT 294 +#define DOUBLE 295 +#define DROP 296 +#define END_TRANS 297 +#define EXECUTE 298 +#define EXISTS 299 +#define EXTRACT 300 +#define FETCH 301 +#define FLOAT 302 +#define FOR 303 +#define FOREIGN 304 +#define FROM 305 +#define FULL 306 +#define GRANT 307 +#define GROUP 308 +#define HAVING 309 +#define HOUR_P 310 +#define IN 311 +#define INNER_P 312 +#define INSERT 313 +#define INTERVAL 314 +#define INTO 315 +#define IS 316 +#define JOIN 317 +#define KEY 318 +#define LANGUAGE 319 +#define LEADING 320 +#define LEFT 321 +#define LIKE 322 +#define LOCAL 323 +#define MATCH 324 +#define MINUTE_P 325 +#define MONTH_P 326 +#define NATIONAL 327 +#define NATURAL 328 +#define NCHAR 329 +#define NO 330 +#define NOT 331 +#define NOTIFY 332 +#define NULL_P 333 +#define NUMERIC 334 +#define ON 335 +#define OPTION 336 +#define OR 337 +#define ORDER 338 +#define OUTER_P 339 +#define PARTIAL 340 +#define POSITION 341 +#define PRECISION 342 +#define PRIMARY 343 +#define PRIVILEGES 344 +#define PROCEDURE 345 +#define PUBLIC 346 +#define REFERENCES 347 +#define REVOKE 348 +#define RIGHT 349 +#define ROLLBACK 350 +#define SECOND_P 351 +#define SELECT 352 +#define SET 353 +#define SUBSTRING 354 +#define TABLE 355 +#define TIME 356 +#define TIMESTAMP 357 +#define TO 358 +#define TRAILING 359 +#define TRANSACTION 360 +#define TRIM 361 +#define UNION 362 +#define UNIQUE 363 +#define UPDATE 364 +#define USING 365 +#define VALUES 366 +#define VARCHAR 367 +#define VARYING 368 +#define VIEW 369 +#define WHERE 370 +#define WITH 371 +#define WORK 372 +#define YEAR_P 373 +#define ZONE 374 +#define FALSE_P 375 +#define TRIGGER 376 +#define TRUE_P 377 +#define TYPE_P 378 +#define ABORT_TRANS 379 +#define AFTER 380 +#define AGGREGATE 381 +#define ANALYZE 382 +#define BACKWARD 383 +#define BEFORE 384 +#define BINARY 385 +#define CLUSTER 386 +#define COPY 387 +#define DATABASE 388 +#define DELIMITERS 389 +#define DO 390 +#define EACH 391 +#define EXPLAIN 392 +#define EXTEND 393 +#define FORWARD 394 +#define FUNCTION 395 +#define HANDLER 396 +#define INDEX 397 +#define INHERITS 398 +#define INSTEAD 399 +#define ISNULL 400 +#define LANCOMPILER 401 +#define LISTEN 402 +#define LOAD 403 +#define LOCK_P 404 +#define LOCATION 405 +#define MOVE 406 +#define NEW 407 +#define NONE 408 +#define NOTHING 409 +#define NOTNULL 410 +#define OIDS 411 +#define OPERATOR 412 +#define PROCEDURAL 413 +#define RECIPE 414 +#define RENAME 415 +#define RESET 416 +#define RETURNS 417 +#define ROW 418 +#define RULE 419 +#define SEQUENCE 420 +#define SETOF 421 +#define SHOW 422 +#define STATEMENT 423 +#define STDIN 424 +#define STDOUT 425 +#define TRUSTED 426 +#define VACUUM 427 +#define VERBOSE 428 +#define VERSION 429 +#define ARCHIVE 430 +#define USER 431 +#define PASSWORD 432 +#define CREATEDB 433 +#define NOCREATEDB 434 +#define CREATEUSER 435 +#define NOCREATEUSER 436 +#define VALID 437 +#define UNTIL 438 +#define IDENT 439 +#define SCONST 440 +#define Op 441 +#define ICONST 442 +#define PARAM 443 +#define FCONST 444 +#define OP 445 +#define UMINUS 446 +#define TYPECAST 447 +#define REDUCE 448 extern YYSTYPE yylval; diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 8474d2be41..e7a8810196 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.8 1998/01/20 05:04:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.9 1998/02/26 04:33:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -218,9 +218,9 @@ parseCheckAggregates(ParseState *pstate, Query *qry) } -Aggreg * +Aggreg * ParseAgg(ParseState *pstate, char *aggname, Oid basetype, - List *target, int precedence) + List *target, int precedence) { Oid fintype; Oid vartype; @@ -229,7 +229,7 @@ ParseAgg(ParseState *pstate, char *aggname, Oid basetype, Aggreg *aggreg; HeapTuple theAggTuple; bool usenulls = false; - + theAggTuple = SearchSysCacheTuple(AGGNAME, PointerGetDatum(aggname), ObjectIdGetDatum(basetype), 0, 0); @@ -237,34 +237,33 @@ ParseAgg(ParseState *pstate, char *aggname, Oid basetype, elog(ERROR, "aggregate %s does not exist", aggname); /* - * We do a major hack for count(*) here. + * We do a major hack for count(*) here. * - * Count(*) poses several problems. First, we need a field that is - * guaranteed to be in the range table, and unique. Using a constant - * causes the optimizer to properly remove the aggragate from any - * elements of the query. - * Using just 'oid', which can not be null, in the parser fails on: + * Count(*) poses several problems. First, we need a field that is + * guaranteed to be in the range table, and unique. Using a constant + * causes the optimizer to properly remove the aggragate from any + * elements of the query. Using just 'oid', which can not be null, in + * the parser fails on: * - * select count(*) from tab1, tab2 -- oid is not unique - * select count(*) from viewtable -- views don't have real oids + * select count(*) from tab1, tab2 -- oid is not unique select + * count(*) from viewtable -- views don't have real oids * - * So, for an aggregate with parameter '*', we use the first valid - * range table entry, and pick the first column from the table. - * We set a flag to count nulls, because we could have nulls in - * that column. + * So, for an aggregate with parameter '*', we use the first valid range + * table entry, and pick the first column from the table. We set a + * flag to count nulls, because we could have nulls in that column. * - * It's an ugly job, but someone has to do it. - * bjm 1998/1/18 + * It's an ugly job, but someone has to do it. bjm 1998/1/18 */ - + if (nodeTag(lfirst(target)) == T_Const) { - Const *con = (Const *)lfirst(target); - + Const *con = (Const *) lfirst(target); + if (con->consttype == UNKNOWNOID && VARSIZE(con->constvalue) == VARHDRSZ) { - Attr *attr = makeNode(Attr); - List *rtable, *rlist; + Attr *attr = makeNode(Attr); + List *rtable, + *rlist; RangeTblEntry *first_valid_rte; Assert(lnext(target) == NULL); @@ -273,12 +272,12 @@ ParseAgg(ParseState *pstate, char *aggname, Oid basetype, rtable = lnext(lnext(pstate->p_rtable)); else rtable = pstate->p_rtable; - + first_valid_rte = NULL; foreach(rlist, rtable) { RangeTblEntry *rte = lfirst(rlist); - + /* only entries on outer(non-function?) scope */ if (!rte->inFromCl && rte != pstate->p_target_rangetblentry) continue; @@ -288,16 +287,16 @@ ParseAgg(ParseState *pstate, char *aggname, Oid basetype, } if (first_valid_rte == NULL) elog(ERROR, "Can't find column to do aggregate(*) on."); - + attr->relname = first_valid_rte->refname; attr->attrs = lcons(makeString( - get_attname(first_valid_rte->relid,1)),NIL); + get_attname(first_valid_rte->relid, 1)), NIL); lfirst(target) = transformExpr(pstate, (Node *) attr, precedence); usenulls = true; } } - + aggform = (Form_pg_aggregate) GETSTRUCT(theAggTuple); fintype = aggform->aggfinaltype; xfn1 = aggform->aggtransfn1; diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 8fdd77ea72..ad38817a0b 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.12 1998/01/20 22:55:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.13 1998/02/26 04:33:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,8 +26,9 @@ #include "parser/parse_relation.h" #include "parser/parse_target.h" -static TargetEntry *find_targetlist_entry(ParseState *pstate, - SortGroupBy *sortgroupby, List *tlist); +static TargetEntry * +find_targetlist_entry(ParseState *pstate, + SortGroupBy *sortgroupby, List *tlist); static void parseFromClause(ParseState *pstate, List *frmList); /* @@ -39,8 +40,8 @@ void makeRangeTable(ParseState *pstate, char *relname, List *frmList) { RangeTblEntry *rte; - int sublevels_up; - + int sublevels_up; + parseFromClause(pstate, frmList); if (relname == NULL) @@ -48,7 +49,7 @@ makeRangeTable(ParseState *pstate, char *relname, List *frmList) if (refnameRangeTablePosn(pstate, relname, &sublevels_up) == 0 || sublevels_up != 0) - rte = addRangeTableEntry(pstate, relname, relname, FALSE, FALSE); + rte = addRangeTableEntry(pstate, relname, relname, FALSE, FALSE); else rte = refnameRangeTableEntry(pstate, relname); @@ -69,7 +70,7 @@ transformWhereClause(ParseState *pstate, Node *a_expr) Node *qual; if (a_expr == NULL) - return NULL; /* no qualifiers */ + return NULL; /* no qualifiers */ pstate->p_in_where_clause = true; qual = transformExpr(pstate, a_expr, EXPR_COLUMN_FIRST); @@ -139,7 +140,7 @@ find_targetlist_entry(ParseState *pstate, SortGroupBy *sortgroupby, List *tlist) TargetEntry *target_result = NULL; if (sortgroupby->range) - real_rtable_pos = refnameRangeTablePosn(pstate, sortgroupby->range, NULL); + real_rtable_pos = refnameRangeTablePosn(pstate, sortgroupby->range, NULL); foreach(i, tlist) { @@ -216,21 +217,21 @@ transformGroupClause(ParseState *pstate, List *grouplist, List *targetlist) else { List *i; - - foreach (i, glist) + + foreach(i, glist) { - GroupClause *gcl = (GroupClause *) lfirst (i); - - if ( gcl->entry == grpcl->entry ) + GroupClause *gcl = (GroupClause *) lfirst(i); + + if (gcl->entry == grpcl->entry) break; } - if ( i == NIL ) /* not in grouplist already */ + if (i == NIL) /* not in grouplist already */ { lnext(gl) = lcons(grpcl, NIL); gl = lnext(gl); } else - pfree (grpcl); /* get rid of this */ + pfree(grpcl); /* get rid of this */ } grouplist = lnext(grouplist); } @@ -259,7 +260,7 @@ transformSortClause(ParseState *pstate, TargetEntry *restarget; Resdom *resdom; - + restarget = find_targetlist_entry(pstate, sortby, targetlist); if (restarget == NULL) elog(ERROR, "The field being ordered by must appear in the target list"); @@ -273,21 +274,21 @@ transformSortClause(ParseState *pstate, else { List *i; - - foreach (i, sortlist) + + foreach(i, sortlist) { - SortClause *scl = (SortClause *) lfirst (i); - - if ( scl->resdom == sortcl->resdom ) + SortClause *scl = (SortClause *) lfirst(i); + + if (scl->resdom == sortcl->resdom) break; } - if ( i == NIL ) /* not in sortlist already */ + if (i == NIL) /* not in sortlist already */ { lnext(s) = lcons(sortcl, NIL); s = lnext(s); } else - pfree (sortcl); /* get rid of this */ + pfree(sortcl); /* get rid of this */ } orderlist = lnext(orderlist); } @@ -295,7 +296,7 @@ transformSortClause(ParseState *pstate, if (uniqueFlag) { List *i; - + if (uniqueFlag[0] == '*') { @@ -342,7 +343,7 @@ transformSortClause(ParseState *pstate, } if (i == NIL) elog(ERROR, "The field specified in the UNIQUE ON clause is not in the targetlist"); - + foreach(s, sortlist) { SortClause *sortcl = lfirst(s); @@ -375,15 +376,15 @@ transformSortClause(ParseState *pstate, List * transformUnionClause(List *unionClause, List *targetlist) { - List *union_list = NIL; + List *union_list = NIL; QueryTreeList *qlist; - int i; + int i; if (unionClause) { qlist = parse_analyze(unionClause, NULL); - for (i=0; i < qlist->len; i++) + for (i = 0; i < qlist->len; i++) union_list = lappend(union_list, qlist->qtrees[i]); /* we need to check return types are consistent here */ return union_list; diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 8f0a959682..62a53976a5 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.21 1998/02/13 08:10:33 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.22 1998/02/26 04:33:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) /* what if att.attrs == "*"? */ temp = ParseNestedFuncOrColumn(pstate, att, &pstate->p_last_resno, - precedence); + precedence); if (att->indirection != NIL) { List *idx = att->indirection; @@ -147,8 +147,8 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) result = ParseFuncOrColumn(pstate, "nullvalue", lcons(lexpr, NIL), - &pstate->p_last_resno, - precedence); + &pstate->p_last_resno, + precedence); } break; case NOTNULL: @@ -157,8 +157,8 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) result = ParseFuncOrColumn(pstate, "nonnullvalue", lcons(lexpr, NIL), - &pstate->p_last_resno, - precedence); + &pstate->p_last_resno, + precedence); } break; case AND: @@ -169,11 +169,11 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) if (exprType(lexpr) != BOOLOID) elog(ERROR, "left-hand side of AND is type '%s', not bool", - typeidTypeName(exprType(lexpr))); + typeidTypeName(exprType(lexpr))); if (exprType(rexpr) != BOOLOID) elog(ERROR, "right-hand side of AND is type '%s', not bool", - typeidTypeName(exprType(rexpr))); + typeidTypeName(exprType(rexpr))); expr->typeOid = BOOLOID; expr->opType = AND_EXPR; @@ -218,6 +218,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) } case T_Ident: { + /* * look for a column name or a relation name (the default * behavior) @@ -234,58 +235,59 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) foreach(args, fn->args) lfirst(args) = transformExpr(pstate, (Node *) lfirst(args), precedence); result = ParseFuncOrColumn(pstate, - fn->funcname, fn->args, &pstate->p_last_resno, - precedence); + fn->funcname, fn->args, &pstate->p_last_resno, + precedence); break; } case T_SubLink: { - SubLink *sublink = (SubLink *) expr; - QueryTreeList *qtree; - List *llist; + SubLink *sublink = (SubLink *) expr; + QueryTreeList *qtree; + List *llist; pstate->p_hasSubLinks = true; - qtree = parse_analyze(lcons(sublink->subselect,NIL), pstate); - if (qtree->len != 1 || - qtree->qtrees[0]->commandType != CMD_SELECT || - qtree->qtrees[0]->resultRelation != 0 ) - elog (ERROR, "parser: bad query in subselect"); + qtree = parse_analyze(lcons(sublink->subselect, NIL), pstate); + if (qtree->len != 1 || + qtree->qtrees[0]->commandType != CMD_SELECT || + qtree->qtrees[0]->resultRelation != 0) + elog(ERROR, "parser: bad query in subselect"); sublink->subselect = (Node *) qtree->qtrees[0]; - + if (sublink->subLinkType != EXISTS_SUBLINK) { - char *op = lfirst(sublink->oper); - List *left_expr = sublink->lefthand; - List *right_expr = ((Query*) sublink->subselect)->targetList; - List *elist; + char *op = lfirst(sublink->oper); + List *left_expr = sublink->lefthand; + List *right_expr = ((Query *) sublink->subselect)->targetList; + List *elist; foreach(llist, left_expr) lfirst(llist) = transformExpr(pstate, lfirst(llist), precedence); - + if (length(left_expr) != length(right_expr)) - elog(ERROR,"parser: Subselect has too many or too few fields."); - + elog(ERROR, "parser: Subselect has too many or too few fields."); + sublink->oper = NIL; foreach(elist, left_expr) { - Node *lexpr = lfirst(elist); - Node *rexpr = lfirst(right_expr); - TargetEntry *tent = (TargetEntry *)rexpr; - Expr *op_expr; + Node *lexpr = lfirst(elist); + Node *rexpr = lfirst(right_expr); + TargetEntry *tent = (TargetEntry *) rexpr; + Expr *op_expr; op_expr = make_op(op, lexpr, tent->expr); + /* - * HACK! Second IF is more valid but currently - * we don't support EXPR subqueries inside + * HACK! Second IF is more valid but currently we + * don't support EXPR subqueries inside * expressions generally, only in WHERE clauses. * After fixing this, first IF must be removed. */ if (op_expr->typeOid != BOOLOID) - elog (ERROR, "parser: '%s' must return 'bool' to be used with subquery", op); - if (op_expr->typeOid != BOOLOID && - sublink->subLinkType != EXPR_SUBLINK) - elog (ERROR, "parser: '%s' must return 'bool' to be used with quantified predicate subquery", op); + elog(ERROR, "parser: '%s' must return 'bool' to be used with subquery", op); + if (op_expr->typeOid != BOOLOID && + sublink->subLinkType != EXPR_SUBLINK) + elog(ERROR, "parser: '%s' must return 'bool' to be used with quantified predicate subquery", op); sublink->oper = lappend(sublink->oper, op_expr); right_expr = lnext(right_expr); } @@ -325,7 +327,7 @@ transformIdent(ParseState *pstate, Node *expr, int precedence) att->attrs = lcons(makeString(ident->name), NIL); column_result = (Node *) ParseNestedFuncOrColumn(pstate, att, &pstate->p_last_resno, - precedence); + precedence); } /* try to find the ident as a relation */ @@ -407,7 +409,7 @@ exprType(Node *expr) return type; } -static Node * +static Node * parser_typecast(Value *expr, TypeName *typename, int16 atttypmod) { /* check for passing non-ints */ @@ -432,7 +434,7 @@ parser_typecast(Value *expr, TypeName *typename, int16 atttypmod) break; default: elog(ERROR, - "parser_typecast: cannot cast this expression to type '%s'", + "parser_typecast: cannot cast this expression to type '%s'", typename->name); } @@ -485,7 +487,7 @@ parser_typecast(Value *expr, TypeName *typename, int16 atttypmod) return (Node *) adt; } -Node * +Node * parser_typecast2(Node *expr, Oid exprType, Type tp, int16 atttypmod) { /* check for passing non-ints */ @@ -605,10 +607,11 @@ parser_typecast2(Node *expr, Oid exprType, Type tp, int16 atttypmod) true /* is cast */ ); /* - * printf("adt %s : %u %d %d\n",CString(expr),typeTypeId(tp) , len,cp); + * printf("adt %s : %u %d %d\n",CString(expr),typeTypeId(tp) , + * len,cp); */ if (string_palloced) pfree(const_string); return ((Node *) adt); -} +} diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index e1a7e52d46..ba79cc4272 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.14 1998/02/10 16:03:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.15 1998/02/26 04:33:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,34 +43,39 @@ #include "utils/lsyscache.h" #include "utils/syscache.h" -static Node *ParseComplexProjection(ParseState *pstate, - char *funcname, - Node *first_arg, - bool *attisset); -static Oid ** argtype_inherit(int nargs, Oid *oid_array); +static Node * +ParseComplexProjection(ParseState *pstate, + char *funcname, + Node *first_arg, + bool *attisset); +static Oid **argtype_inherit(int nargs, Oid *oid_array); static bool can_coerce(int nargs, Oid *input_typeids, Oid *func_typeids); -static int find_inheritors(Oid relid, Oid **supervec); +static int find_inheritors(Oid relid, Oid **supervec); static CandidateList func_get_candidates(char *funcname, int nargs); -static bool func_get_detail(char *funcname, - int nargs, - Oid *oid_array, - Oid *funcid, /* return value */ - Oid *rettype, /* return value */ - bool *retset, /* return value */ - Oid **true_typeids); -static Oid * func_select_candidate(int nargs, - Oid *input_typeids, - CandidateList candidates); -static Oid funcid_get_rettype(Oid funcid); +static bool +func_get_detail(char *funcname, + int nargs, + Oid *oid_array, + Oid *funcid, /* return value */ + Oid *rettype, /* return value */ + bool *retset, /* return value */ + Oid **true_typeids); +static Oid * +func_select_candidate(int nargs, + Oid *input_typeids, + CandidateList candidates); +static Oid funcid_get_rettype(Oid funcid); static Oid **gen_cross_product(InhPaths *arginh, int nargs); -static void make_arguments(int nargs, - List *fargs, - Oid *input_typeids, - Oid *function_typeids); -static int match_argtypes(int nargs, - Oid *input_typeids, - CandidateList function_typeids, - CandidateList *candidates); +static void +make_arguments(int nargs, + List *fargs, + Oid *input_typeids, + Oid *function_typeids); +static int +match_argtypes(int nargs, + Oid *input_typeids, + CandidateList function_typeids, + CandidateList *candidates); static List *setup_tlist(char *attname, Oid relid); static List *setup_base_tlist(Oid typeid); @@ -99,9 +104,9 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int pre Param *param = (Param *) transformExpr(pstate, (Node *) attr->paramNo, EXPR_RELATION_FIRST); retval = ParseFuncOrColumn(pstate, strVal(lfirst(attr->attrs)), - lcons(param, NIL), - curr_resno, - precedence); + lcons(param, NIL), + curr_resno, + precedence); } else { @@ -110,18 +115,18 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int pre ident->name = attr->relname; ident->isRel = TRUE; retval = ParseFuncOrColumn(pstate, strVal(lfirst(attr->attrs)), - lcons(ident, NIL), - curr_resno, - precedence); + lcons(ident, NIL), + curr_resno, + precedence); } /* Do more attributes follow this one? */ foreach(mutator_iter, lnext(attr->attrs)) { retval = ParseFuncOrColumn(pstate, strVal(lfirst(mutator_iter)), - lcons(retval, NIL), - curr_resno, - precedence); + lcons(retval, NIL), + curr_resno, + precedence); } return (retval); @@ -132,7 +137,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int pre */ Node * ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, - int *curr_resno, int precedence) + int *curr_resno, int precedence) { Oid rettype = (Oid) 0; Oid argrelid = (Oid) 0; @@ -174,6 +179,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, { RangeTblEntry *rte; Ident *ident = (Ident *) first_arg; + /* * first arg is a relation. This could be a projection. */ @@ -193,9 +199,9 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, if (get_attnum(relid, funcname) != InvalidAttrNumber) { return (Node *) make_var(pstate, - relid, - refname, - funcname); + relid, + refname, + funcname); } else { @@ -262,8 +268,8 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, PointerGetDatum(funcname), ObjectIdGetDatum(basetype), 0, 0)) - return (Node *)ParseAgg(pstate, funcname, basetype, - fargs, precedence); + return (Node *) ParseAgg(pstate, funcname, basetype, + fargs, precedence); } } @@ -285,6 +291,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, if (nodeTag(pair) == T_Ident && ((Ident *) pair)->isRel) { + /* * a relation */ @@ -415,15 +422,15 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, char *seqrel; text *seqname; int32 aclcheck_result = -1; - extern text *lower (text *string); + extern text *lower(text *string); Assert(length(fargs) == 1); seq = (Const *) lfirst(fargs); if (!IsA((Node *) seq, Const)) elog(ERROR, "%s: only constant sequence names are acceptable", funcname); - seqname = lower ((text*)DatumGetPointer(seq->constvalue)); - pfree (DatumGetPointer(seq->constvalue)); - seq->constvalue = PointerGetDatum (seqname); + seqname = lower((text *) DatumGetPointer(seq->constvalue)); + pfree(DatumGetPointer(seq->constvalue)); + seq->constvalue = PointerGetDatum(seqname); seqrel = textout(seqname); if ((aclcheck_result = pg_aclcheck(seqrel, GetPgUserName(), @@ -827,7 +834,8 @@ argtype_inherit(int nargs, Oid *oid_array) return (gen_cross_product(arginh, nargs)); } -static int find_inheritors(Oid relid, Oid **supervec) +static int +find_inheritors(Oid relid, Oid **supervec) { Oid *relidvec; Relation inhrel; @@ -1065,7 +1073,7 @@ setup_tlist(char *attname, Oid relid) typeid = get_atttype(relid, attno); type_mod = get_atttypmod(relid, attno); - + resnode = makeResdom(1, typeid, type_mod, @@ -1301,9 +1309,12 @@ func_error(char *caller, char *funcname, int nargs, Oid *argtypes) ptr += strlen(ptr); } - if(caller == NULL) { - elog(ERROR, "function %s(%s) does not exist", funcname, p); - } else { - elog(ERROR, "%s: function %s(%s) does not exist", caller, funcname, p); - } + if (caller == NULL) + { + elog(ERROR, "function %s(%s) does not exist", funcname, p); + } + else + { + elog(ERROR, "%s: function %s(%s) does not exist", caller, funcname, p); + } } diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 708bb54103..3a36fcd576 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.13 1998/02/13 19:45:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.14 1998/02/26 04:33:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,8 @@ #include "utils/lsyscache.h" static void disallow_setop(char *op, Type optype, Node *operand); -static Node *make_operand(char *opname, +static Node * +make_operand(char *opname, Node *tree, Oid orig_typeId, Oid true_typeId); @@ -52,7 +53,7 @@ make_parsestate(ParseState *parentParseState) pstate->p_last_resno = 1; pstate->parentParseState = parentParseState; - + return (pstate); } @@ -125,7 +126,7 @@ disallow_setop(char *op, Type optype, Node *operand) } } -Expr * +Expr * make_op(char *opname, Node *ltree, Node *rtree) { Oid ltypeId, @@ -238,9 +239,9 @@ make_op(char *opname, Node *ltree, Node *rtree) return result; } -Var * +Var * make_var(ParseState *pstate, Oid relid, char *refname, - char *attrname) + char *attrname) { Var *varnode; int vnum, @@ -321,6 +322,7 @@ make_array_ref(Node *expr, A_Indices *ind = lfirst(indirection); if (ind->lidx) + /* * XXX assumes all lower indices non null in this case */ @@ -426,7 +428,7 @@ make_array_set(Expr *target_expr, * * eventually, produces a "const" lisp-struct as per nodedefs.cl */ -Const * +Const * make_const(Value *value) { Type tp; @@ -454,8 +456,8 @@ make_const(Value *value) break; case T_String: - tp = typeidType(UNKNOWNOID); /* unknown for now, will be type - * coerced */ + tp = typeidType(UNKNOWNOID); /* unknown for now, will + * be type coerced */ val = PointerGetDatum(textin(strVal(value))); break; @@ -481,4 +483,3 @@ make_const(Value *value) return (con); } - diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index ded519a72b..b24094924a 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.8 1998/01/20 05:04:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.9 1998/02/26 04:33:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,21 +26,24 @@ #include "storage/bufmgr.h" #include "utils/syscache.h" -static int binary_oper_get_candidates(char *opname, +static int +binary_oper_get_candidates(char *opname, Oid leftTypeId, Oid rightTypeId, CandidateList *candidates); -static CandidateList binary_oper_select_candidate(Oid arg1, +static CandidateList +binary_oper_select_candidate(Oid arg1, Oid arg2, CandidateList candidates); static bool equivalentOpersAfterPromotion(CandidateList candidates); static void op_error(char *op, Oid arg1, Oid arg2); -static int unary_oper_get_candidates(char *op, +static int +unary_oper_get_candidates(char *op, Oid typeId, CandidateList *candidates, char rightleft); - + Oid any_ordering_op(int restype) { @@ -577,7 +580,7 @@ op_error(char *op, Oid arg1, Oid arg2) op, typeTypeName(tp1), typeTypeName(tp2)); #endif elog(ERROR, "There is no operator '%s' for types '%s' and '%s'" - "\n\tYou will either have to retype this query using an explicit cast," - "\n\tor you will have to define the operator using CREATE OPERATOR", - op, typeTypeName(tp1), typeTypeName(tp2)); + "\n\tYou will either have to retype this query using an explicit cast," + "\n\tor you will have to define the operator using CREATE OPERATOR", + op, typeTypeName(tp1), typeTypeName(tp2)); } diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index e5a774dc89..6bd26066b2 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.10 1998/02/10 04:01:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.11 1998/02/26 04:33:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,8 @@ #include "utils/builtins.h" #include "utils/lsyscache.h" -static void checkTargetTypes(ParseState *pstate, char *target_colname, +static void +checkTargetTypes(ParseState *pstate, char *target_colname, char *refname, char *colname); struct @@ -76,14 +77,15 @@ refnameRangeTableEntry(ParseState *pstate, char *refname) foreach(temp, pstate->p_rtable) { RangeTblEntry *rte = lfirst(temp); - + if (!strcmp(rte->refname, refname)) return rte; } /* only allow correlated columns in WHERE clause */ if (pstate->p_in_where_clause) pstate = pstate->parentParseState; - else break; + else + break; } return NULL; } @@ -95,7 +97,7 @@ refnameRangeTablePosn(ParseState *pstate, char *refname, int *sublevels_up) int index; List *temp; - + if (sublevels_up) *sublevels_up = 0; @@ -105,7 +107,7 @@ refnameRangeTablePosn(ParseState *pstate, char *refname, int *sublevels_up) foreach(temp, pstate->p_rtable) { RangeTblEntry *rte = lfirst(temp); - + if (!strcmp(rte->refname, refname)) return index; index++; @@ -117,7 +119,8 @@ refnameRangeTablePosn(ParseState *pstate, char *refname, int *sublevels_up) if (sublevels_up) (*sublevels_up)++; } - else break; + else + break; } return 0; } @@ -143,11 +146,11 @@ colnameRangeTableEntry(ParseState *pstate, char *colname) foreach(et, rtable) { RangeTblEntry *rte = lfirst(et); - + /* only entries on outer(non-function?) scope */ if (!rte->inFromCl && rte != pstate->p_target_rangetblentry) continue; - + if (get_attnum(rte->relid, colname) != InvalidAttrNumber) { if (rte_result != NULL) @@ -163,7 +166,8 @@ colnameRangeTableEntry(ParseState *pstate, char *colname) /* only allow correlated columns in WHERE clause */ if (pstate->p_in_where_clause && rte_result == NULL) pstate = pstate->parentParseState; - else break; + else + break; } return rte_result; } @@ -181,31 +185,30 @@ addRangeTableEntry(ParseState *pstate, { Relation relation; RangeTblEntry *rte = makeNode(RangeTblEntry); - int sublevels_up; + int sublevels_up; if (pstate != NULL) { if (refnameRangeTablePosn(pstate, refname, &sublevels_up) != 0 && - (!inFromCl || sublevels_up == 0)) + (!inFromCl || sublevels_up == 0)) elog(ERROR, "Table name %s specified more than once", refname); } - + rte->relname = pstrdup(relname); rte->refname = pstrdup(refname); relation = heap_openr(relname); if (relation == NULL) elog(ERROR, "%s: %s", - relname, aclcheck_error_strings[ACLCHECK_NO_CLASS]); + relname, aclcheck_error_strings[ACLCHECK_NO_CLASS]); rte->relid = RelationGetRelationId(relation); heap_close(relation); /* - * Flags - zero or more from inheritance,union,version or - * recursive (transitive closure) [we don't support them all -- ay - * 9/94 ] + * Flags - zero or more from inheritance,union,version or recursive + * (transitive closure) [we don't support them all -- ay 9/94 ] */ rte->inh = inh; @@ -225,7 +228,7 @@ addRangeTableEntry(ParseState *pstate, * expandAll - * makes a list of attributes */ -List * +List * expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno) { Relation rdesc; @@ -308,7 +311,7 @@ attnameAttNum(Relation rd, char *a) /* on failure */ elog(ERROR, "Relation %s does not have attribute %s", RelationGetRelationName(rd), a); - return 0; /* lint */ + return 0; /* lint */ } /* diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 7dbeb91ce6..b9ab916d88 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.10 1998/02/13 19:45:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.11 1998/02/26 04:33:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,8 @@ static List *expandAllTables(ParseState *pstate); static char *figureColname(Node *expr, Node *resval); -static TargetEntry *make_targetlist_expr(ParseState *pstate, +static TargetEntry * +make_targetlist_expr(ParseState *pstate, char *colname, Node *expr, List *arrayRef); @@ -63,13 +64,14 @@ transformTargetList(ParseState *pstate, List *targetlist) handleTargetColname(pstate, &res->name, NULL, identname); /* - * here we want to look for column names only, not relation - * names (even though they can be stored in Ident nodes, too) + * here we want to look for column names only, not + * relation names (even though they can be stored in + * Ident nodes, too) */ expr = transformIdent(pstate, (Node *) res->val, EXPR_COLUMN_FIRST); type_id = exprType(expr); if (nodeTag(expr) == T_Var) - type_mod = ((Var *)expr)->vartypmod; + type_mod = ((Var *) expr)->vartypmod; else type_mod = -1; resname = (res->name) ? res->name : identname; @@ -257,9 +259,10 @@ transformTargetList(ParseState *pstate, List *targetlist) /* - * Target item is fully specified: ie. relation.attribute + * Target item is fully specified: ie. + * relation.attribute */ - result = ParseNestedFuncOrColumn(pstate, att, &pstate->p_last_resno,EXPR_COLUMN_FIRST); + result = ParseNestedFuncOrColumn(pstate, att, &pstate->p_last_resno, EXPR_COLUMN_FIRST); handleTargetColname(pstate, &res->name, att->relname, attrname); if (att->indirection != NIL) { @@ -277,7 +280,7 @@ transformTargetList(ParseState *pstate, List *targetlist) } type_id = exprType(result); if (nodeTag(result) == T_Var) - type_mod = ((Var *)result)->vartypmod; + type_mod = ((Var *) result)->vartypmod; else type_mod = -1; /* move to last entry */ @@ -345,7 +348,7 @@ make_targetlist_expr(ParseState *pstate, type_id = exprType(expr); if (nodeTag(expr) == T_Var) - type_mod = ((Var *)expr)->vartypmod; + type_mod = ((Var *) expr)->vartypmod; else type_mod = -1; @@ -395,7 +398,7 @@ make_targetlist_expr(ParseState *pstate, makeConst(attrtype, attrlen, (Datum) fmgr(typeidInfunc(attrtype), - val, typeidTypElem(attrtype), -1), + val, typeidTypElem(attrtype), -1), false, true /* Maybe correct-- 80% chance */ , false, /* is not a set */ @@ -464,8 +467,8 @@ make_targetlist_expr(ParseState *pstate, att->relname = pstrdup(RelationGetRelationName(rd)->data); att->attrs = lcons(makeString(colname), NIL); target_expr = (Expr *) ParseNestedFuncOrColumn(pstate, att, - &pstate->p_last_resno, - EXPR_COLUMN_FIRST); + &pstate->p_last_resno, + EXPR_COLUMN_FIRST); while (ar != NIL) { A_Indices *ind = lfirst(ar); @@ -556,15 +559,15 @@ makeTargetNames(ParseState *pstate, List *cols) { List *nxt; char *name = ((Ident *) lfirst(tl))->name; - + /* elog on failure */ attnameAttNum(pstate->p_target_relation, name); foreach(nxt, lnext(tl)) if (!strcmp(name, ((Ident *) lfirst(nxt))->name)) - elog(ERROR, "Attribute '%s' should be specified only once", name); + elog(ERROR, "Attribute '%s' should be specified only once", name); } } - + return cols; } @@ -643,8 +646,8 @@ figureColname(Node *expr, Node *resval) { switch (nodeTag(expr)) { - case T_Aggreg: - return (char *) ((Aggreg *) expr)->aggname; + case T_Aggreg: + return (char *) ((Aggreg *) expr)->aggname; case T_Expr: if (((Expr *) expr)->opType == FUNC_EXPR) { diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c index 6ca081b4e5..97c080ca24 100644 --- a/src/backend/parser/parse_type.c +++ b/src/backend/parser/parse_type.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.6 1998/02/13 19:45:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.7 1998/02/26 04:33:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ typeidIsValid(Oid id) } /* return a type name, given a typeid */ -char * +char * typeidTypeName(Oid id) { HeapTuple tup; @@ -114,7 +114,7 @@ typeByVal(Type t) } /* given type (as type struct), return the name of type */ -char * +char * typeTypeName(Type t) { TypeTupleForm typ; @@ -142,7 +142,8 @@ stringTypeString(Type tp, char *string, int16 atttypmod) Oid typelem; op = ((TypeTupleForm) GETSTRUCT(tp))->typinput; - typelem = ((TypeTupleForm) GETSTRUCT(tp))->typelem; /* XXX - used for array_in */ + typelem = ((TypeTupleForm) GETSTRUCT(tp))->typelem; /* XXX - used for + * array_in */ return ((char *) fmgr(op, string, typelem, atttypmod)); } diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index 0a7a8d5800..765a59c61a 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.32 1998/01/19 05:06:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.33 1998/02/26 04:33:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ parser(char *str, Oid *typev, int nargs) clearerr(stdin); - if (yyresult) /* error */ + if (yyresult) /* error */ return ((QueryTreeList *) NULL); queryList = parse_analyze(parsetree, NULL); @@ -175,5 +175,5 @@ define_sets(Node *clause) define_sets(get_rightop(clause)); } } -#endif +#endif diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c index 84ef988ddb..d82ffaa15c 100644 --- a/src/backend/parser/scansup.c +++ b/src/backend/parser/scansup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.9 1997/11/26 01:11:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.10 1998/02/26 04:33:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ * ---------------- */ -char * +char * scanstr(char *s) { static char newStr[MAX_PARSE_BUFFER]; diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index d8ecbe1289..4e1f62cedf 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -72,10 +72,10 @@ static int readExports(ModulePtr); static void terminate(void); static void *findMain(void); -void * +void * dlopen(const char *path, int mode) { - ModulePtr mp; + ModulePtr mp; static void *mainModule; /* @@ -168,7 +168,7 @@ dlopen(const char *path, int mode) */ if (mode & RTLD_GLOBAL) { - ModulePtr mp1; + ModulePtr mp1; for (mp1 = mp->next; mp1; mp1 = mp1->next) if (loadbind(0, mp1->entry, mp->entry) == -1) @@ -221,7 +221,7 @@ dlopen(const char *path, int mode) static void caterr(char *s) { - char *p = s; + char *p = s; while (*p >= '0' && *p <= '9') p++; @@ -255,12 +255,12 @@ caterr(char *s) } } -void * +void * dlsym(void *handle, const char *symbol) { - ModulePtr mp = (ModulePtr) handle; - ExportPtr ep; - int i; + ModulePtr mp = (ModulePtr) handle; + ExportPtr ep; + int i; /* * Could speed up the search, but I assume that one assigns the result @@ -275,7 +275,7 @@ dlsym(void *handle, const char *symbol) return NULL; } -char * +char * dlerror(void) { if (errvalid) @@ -289,9 +289,9 @@ dlerror(void) int dlclose(void *handle) { - ModulePtr mp = (ModulePtr) handle; + ModulePtr mp = (ModulePtr) handle; int result; - ModulePtr mp1; + ModulePtr mp1; if (--mp->refCnt > 0) return 0; @@ -311,8 +311,8 @@ dlclose(void *handle) } if (mp->exports) { - ExportPtr ep; - int i; + ExportPtr ep; + int i; for (ep = mp->exports, i = mp->nExports; i; i--, ep++) if (ep->name) @@ -537,7 +537,7 @@ readExports(ModulePtr mp) * first SYMNMLEN chars and make sure we have a zero byte at * the end. */ - StrNCpy(tmpsym, ls->l_name, SYMNMLEN+1); + StrNCpy(tmpsym, ls->l_name, SYMNMLEN + 1); symname = tmpsym; } ep->name = strdup(symname); diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c index 8c9f680a81..957dc29767 100644 --- a/src/backend/port/dynloader/bsd.c +++ b/src/backend/port/dynloader/bsd.c @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; static char error_message[BUFSIZ]; -char * +char * BSD44_derived_dlerror(void) { static char ret[BUFSIZ]; @@ -58,7 +58,7 @@ BSD44_derived_dlerror(void) return ((ret[0] == 0) ? (char *) NULL : ret); } -void * +void * BSD44_derived_dlopen(const char *file, int num) { #if defined(__mips__) || (defined(__NetBSD__) && defined(vax)) @@ -75,7 +75,7 @@ BSD44_derived_dlopen(const char *file, int num) #endif } -void * +void * BSD44_derived_dlsym(void *handle, const char *name) { #if defined(__mips__) || (defined(__NetBSD__) && defined(vax)) diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index fb275c8cbb..f23267e586 100644 --- a/src/backend/port/dynloader/bsdi.c +++ b/src/backend/port/dynloader/bsdi.c @@ -24,7 +24,7 @@ extern char pg_pathname[]; -void * +void * pg_dlopen(char *filename) { static int dl_initialized = 0; @@ -97,7 +97,7 @@ pg_dlopen(char *filename) return (void *) strdup(filename); } -char * +char * pg_dlerror() { return dld_strerror(dld_errno); diff --git a/src/backend/port/dynloader/dgux.c b/src/backend/port/dynloader/dgux.c index 37e836c2e6..a646272542 100644 --- a/src/backend/port/dynloader/dgux.c +++ b/src/backend/port/dynloader/dgux.c @@ -2,6 +2,5 @@ * * see dgux.h * - * $Id: dgux.c,v 1.2 1998/02/14 19:56:19 scrappy Exp $ + * $Id: dgux.c,v 1.3 1998/02/26 04:34:24 momjian Exp $ */ - diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index c7b5a53d48..8942cb0981 100644 --- a/src/backend/port/dynloader/dgux.h +++ b/src/backend/port/dynloader/dgux.h @@ -1,10 +1,10 @@ /*------------------------------------------------------------------------- * * dgux.h-- - * + * * Copyright (c) 1994, Regents of the University of California * - * $Id: dgux.h,v 1.2 1998/02/14 19:56:21 scrappy Exp $ + * $Id: dgux.h,v 1.3 1998/02/26 04:34:25 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c index 5649274da3..0f1517ac96 100644 --- a/src/backend/port/dynloader/hpux.c +++ b/src/backend/port/dynloader/hpux.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.2 1998/02/02 00:10:10 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.3 1998/02/26 04:34:26 momjian Exp $ * * NOTES * all functions are defined here -- it's impossible to trace the @@ -24,7 +24,7 @@ #include "utils/dynamic_loader.h" #include "dynloader.h" -void * +void * pg_dlopen(char *filename) { shl_t handle = shl_load(filename, BIND_DEFERRED, 0); @@ -50,7 +50,7 @@ pg_dlclose(void *handle) shl_unload((shl_t) handle); } -char * +char * pg_dlerror() { static char errmsg[] = "shl_load failed"; diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index 065a6ca5db..41507207d0 100644 --- a/src/backend/port/dynloader/linux.c +++ b/src/backend/port/dynloader/linux.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.6 1998/01/07 21:04:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.7 1998/02/26 04:34:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ #if FALSE extern char pg_pathname[]; -void * +void * pg_dlopen(char *filename) { #ifndef HAVE_DLD_H @@ -106,7 +106,7 @@ pg_dlopen(char *filename) #endif } -char * +char * pg_dlerror() { #ifndef HAVE_DLD_H @@ -115,4 +115,5 @@ pg_dlerror() return dld_strerror(dld_errno); #endif } + #endif diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index 148a0ce1da..72e48925c6 100644 --- a/src/backend/port/dynloader/linux.h +++ b/src/backend/port/dynloader/linux.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: linux.h,v 1.2 1998/01/01 06:02:04 thomas Exp $ + * $Id: linux.h,v 1.3 1998/02/26 04:34:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,4 @@ /* port.c */ -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/univel.c b/src/backend/port/dynloader/univel.c index c603e81f9e..d0cd246636 100644 --- a/src/backend/port/dynloader/univel.c +++ b/src/backend/port/dynloader/univel.c @@ -1,4 +1,4 @@ -/* Dummy file used for nothing at this point
- *
- * see univel.h
- */
+/* Dummy file used for nothing at this point + * + * see univel.h + */
diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 56b9961930..38e43833da 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -1,15 +1,15 @@ -/*-------------------------------------------------------------------------
- *
- * port-protos.h--
- * port-specific prototypes for Intel x86/UNIXWARE
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
+/*------------------------------------------------------------------------- + * + * port-protos.h-- + * port-specific prototypes for Intel x86/UNIXWARE + * + * + * Copyright (c) 1994, Regents of the University of California + * + * port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp + * + *------------------------------------------------------------------------- + */
#ifndef PORT_PROTOS_H
#define PORT_PROTOS_H
@@ -17,18 +17,18 @@ #include "fmgr.h" /* for func_ptr */
#include "utils/dynamic_loader.h"
-/* dynloader.c */
-/*
- * Dynamic Loader on Intel x86/Intel SVR4.
- *
- * this dynamic loader uses the system dynamic loading interface for shared
- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
- * library as the file to be dynamically loaded.
- *
- */
+ /* dynloader.c */
+/* + * Dynamic Loader on Intel x86/Intel SVR4. + * + * this dynamic loader uses the system dynamic loading interface for shared + * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared + * library as the file to be dynamically loaded. + * + */
#define pg_dlopen(f) dlopen(f,RTLD_LAZY)
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
-#endif /* PORT_PROTOS_H */
+#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/getrusage.c b/src/backend/port/getrusage.c index 169e9063ff..fb2a1fe7a3 100644 --- a/src/backend/port/getrusage.c +++ b/src/backend/port/getrusage.c @@ -1,20 +1,21 @@ -/* $Id: getrusage.c,v 1.6 1998/02/24 03:45:06 scrappy Exp $ */ +/* $Id: getrusage.c,v 1.7 1998/02/26 04:34:00 momjian Exp $ */ -#include <math.h> /* for pow() prototype */ +#include <math.h> /* for pow() prototype */ #include <errno.h> #include "rusagestub.h" -#if 0 /* this is from univel port ... how does compiler define? */ - /* same for i386_solaris port ... how does compiler define? */ - /* same for sco port ... how does compiler define? */ - /* same for sparc_solaris port ... how does compiler define? */ - /* same for svr4 port ... how does compiler define? */ +#if 0 /* this is from univel port ... how does + * compiler define? */ + /* same for i386_solaris port ... how does compiler define? */ + /* same for sco port ... how does compiler define? */ + /* same for sparc_solaris port ... how does compiler define? */ + /* same for svr4 port ... how does compiler define? */ int getrusage(int who, struct rusage * rusage) { struct tms tms; - int tick_rate = CLK_TCK; /* ticks per second */ + int tick_rate = CLK_TCK; /* ticks per second */ clock_t u, s; @@ -50,11 +51,14 @@ getrusage(int who, struct rusage * rusage) rusage->ru_stime.tv_usec = TICK_TO_USEC(u, tick_rate); return (0); } + #endif -#if 0 /* this is for hpux port ... how does compiler define? */ +#if 0 /* this is for hpux port ... how does + * compiler define? */ getrusage(int who, struct rusage * ru) { - return (syscall(SYS_GETRUSAGE, who, ru)); + return (syscall(SYS_GETRUSAGE, who, ru)); } + #endif diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c index 239970f0af..0cf6e15dae 100644 --- a/src/backend/port/inet_aton.c +++ b/src/backend/port/inet_aton.c @@ -1,4 +1,4 @@ -/* $Id: inet_aton.c,v 1.13 1998/02/11 19:11:05 momjian Exp $ +/* $Id: inet_aton.c,v 1.14 1998/02/26 04:34:04 momjian Exp $ * * This inet_aton() function was taken from the GNU C library and * incorporated into Postgres for those systems which do not have this @@ -57,11 +57,11 @@ int inet_aton(const char *cp, struct in_addr * addr) { unsigned int val; - int base, + int base, n; - char c; + char c; u_int parts[4]; - u_int *pp = parts; + u_int *pp = parts; for (;;) { diff --git a/src/backend/port/inet_aton.h b/src/backend/port/inet_aton.h index f91f93e2c6..9908cc7401 100644 --- a/src/backend/port/inet_aton.h +++ b/src/backend/port/inet_aton.h @@ -1,3 +1,3 @@ -/* $Id: inet_aton.h,v 1.6 1997/12/19 13:34:29 scrappy Exp $ */ +/* $Id: inet_aton.h,v 1.7 1998/02/26 04:34:08 momjian Exp $ */ -int inet_aton(const char *cp, struct in_addr * addr); +int inet_aton(const char *cp, struct in_addr * addr); diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c index d29363b467..d96e328d12 100644 --- a/src/backend/port/isinf.c +++ b/src/backend/port/isinf.c @@ -1,16 +1,16 @@ -/* $Id: isinf.c,v 1.3 1998/02/17 02:00:12 scrappy Exp $ */ +/* $Id: isinf.c,v 1.4 1998/02/26 04:34:10 momjian Exp $ */ -#include <math.h> +#include <math.h> #include "config.h" #if HAVE_FPCLASS -# if HAVE_IEEEFP_H -# include <ieeefp.h> -# endif +#if HAVE_IEEEFP_H +#include <ieeefp.h> +#endif int isinf(double d) { - fpclass_t type = fpclass(d); + fpclass_t type = fpclass(d); switch (type) { @@ -24,36 +24,40 @@ isinf(double d) } return (0); } + +#else + +#if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D) +#if HAVE_FP_CLASS_H +#include <fp_class.h> +#endif +int +isinf(x) +double x; +{ +#if HAVE_FP_CLASS + int fpclass = fp_class(x); + #else + int fpclass = fp_class_d(x); + +#endif -# if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D) -# if HAVE_FP_CLASS_H -# include <fp_class.h> -# endif -int -isinf(x) -double x; -{ -# if HAVE_FP_CLASS - int fpclass = fp_class(x); -# else - int fpclass = fp_class_d(x); -# endif - - if (fpclass == FP_POS_INF) - return (1); + if (fpclass == FP_POS_INF) + return (1); if (fpclass == FP_NEG_INF) return (-1); return (0); } -# endif + +#endif #endif #if defined(HAVE_CLASS) int isinf(double x) { - int fpclass = class(x); + int fpclass = class(x); if (fpclass == FP_PLUS_INF) return (1); @@ -61,4 +65,5 @@ isinf(double x) return (-1); return (0); } + #endif diff --git a/src/backend/port/nextstep/dynloader.c b/src/backend/port/nextstep/dynloader.c index 649454d48a..66cbba9e8c 100644 --- a/src/backend/port/nextstep/dynloader.c +++ b/src/backend/port/nextstep/dynloader.c @@ -31,7 +31,7 @@ TransferError(NXStream * s) strcpy(lastError, buffer); } -void * +void * next_dlopen(char *name) { int rld_success; @@ -60,7 +60,7 @@ next_dlclose(void *handle) return 0; } -void * +void * next_dlsym(void *handle, char *symbol) { NXStream *errorStream = OpenError(); @@ -74,7 +74,7 @@ next_dlsym(void *handle, char *symbol) return (void *) symref; } -char * +char * next_dlerror(void) { return lastError; diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c index 6bdb549cdb..0b3db95ed0 100644 --- a/src/backend/port/nextstep/port.c +++ b/src/backend/port/nextstep/port.c @@ -50,7 +50,7 @@ sigemptyset(int *set) return (*set = 0); } -char * +char * getcwd(char *buf, size_t size) { return getwd(buf); diff --git a/src/backend/port/random.c b/src/backend/port/random.c index a409803a04..30be3a8607 100644 --- a/src/backend/port/random.c +++ b/src/backend/port/random.c @@ -1,6 +1,6 @@ -/* $Id: random.c,v 1.3 1998/02/24 03:45:07 scrappy Exp $ */ +/* $Id: random.c,v 1.4 1998/02/26 04:34:11 momjian Exp $ */ -#include <math.h> /* for pow() prototype */ +#include <math.h> /* for pow() prototype */ #include <errno.h> #include "rusagestub.h" @@ -10,4 +10,3 @@ random() { return (lrand48()); } - diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c index 1bc81bb2cb..7a443acb9e 100644 --- a/src/backend/port/srandom.c +++ b/src/backend/port/srandom.c @@ -1,6 +1,6 @@ -/* $Id: srandom.c,v 1.4 1998/02/24 03:45:07 scrappy Exp $ */ +/* $Id: srandom.c,v 1.5 1998/02/26 04:34:14 momjian Exp $ */ -#include <math.h> /* for pow() prototype */ +#include <math.h> /* for pow() prototype */ #include <errno.h> #include "rusagestub.h" @@ -10,4 +10,3 @@ srandom(unsigned int seed) { srand48((long int) seed); } - diff --git a/src/backend/port/strtol.c b/src/backend/port/strtol.c index 0db8dda3a7..ab2d110810 100644 --- a/src/backend/port/strtol.c +++ b/src/backend/port/strtol.c @@ -53,13 +53,13 @@ long strtol(nptr, endptr, base) const char *nptr; char **endptr; -int base; +int base; { const char *s = nptr; unsigned long acc; - int c; + int c; unsigned long cutoff; - int neg = 0, + int neg = 0, any, cutlim; diff --git a/src/backend/port/strtoul.c b/src/backend/port/strtoul.c index 304150a546..550cea7133 100644 --- a/src/backend/port/strtoul.c +++ b/src/backend/port/strtoul.c @@ -6,22 +6,22 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: + * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -33,7 +33,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ + +#endif /* LIBC_SCCS and not lint */ #include <limits.h> #include <ctype.h> @@ -48,38 +49,45 @@ static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; */ unsigned long strtoul(nptr, endptr, base) - const char *nptr; - char **endptr; - register int base; +const char *nptr; +char **endptr; +register int base; { register const char *s = nptr; register unsigned long acc; register unsigned char c; register unsigned long cutoff; - register int neg = 0, any, cutlim; + register int neg = 0, + any, + cutlim; /* * See strtol for comments as to the logic used. */ - do { + do + { c = *s++; } while (isspace(c)); - if (c == '-') { + if (c == '-') + { neg = 1; c = *s++; - } else if (c == '+') + } + else if (c == '+') c = *s++; if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X')) + { c = s[1]; s += 2; base = 16; } if (base == 0) base = c == '0' ? 8 : 10; - cutoff = (unsigned long)ULONG_MAX / (unsigned long)base; - cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; - for (acc = 0, any = 0;; c = *s++) { + cutoff = (unsigned long) ULONG_MAX / (unsigned long) base; + cutlim = (unsigned long) ULONG_MAX % (unsigned long) base; + for (acc = 0, any = 0;; c = *s++) + { if (!isascii(c)) break; if (isdigit(c)) @@ -92,18 +100,21 @@ strtoul(nptr, endptr, base) break; if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) any = -1; - else { + else + { any = 1; acc *= base; acc += c; } } - if (any < 0) { + if (any < 0) + { acc = ULONG_MAX; errno = ERANGE; - } else if (neg) + } + else if (neg) acc = -acc; if (endptr != 0) - *endptr = (char *)(any ? s - 1 : nptr); + *endptr = (char *) (any ? s - 1 : nptr); return (acc); } diff --git a/src/backend/port/ultrix4/dynloader.c b/src/backend/port/ultrix4/dynloader.c index 761289233e..55271c5e0e 100644 --- a/src/backend/port/ultrix4/dynloader.c +++ b/src/backend/port/ultrix4/dynloader.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/dynloader.c,v 1.5 1997/09/08 02:27:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/dynloader.c,v 1.6 1998/02/26 04:34:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ extern char pg_pathname[]; -void * +void * pg_dlopen(char *filename) { static int dl_initialized = 0; diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 255fe2df35..7ed1808f65 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.74 1998/02/24 15:19:00 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.75 1998/02/26 04:34:43 momjian Exp $ * * NOTES * @@ -88,7 +88,7 @@ #include "storage/proc.h" #include "utils/elog.h" #ifndef HAVE_GETHOSTNAME -# include "port-protos.h" /* For gethostname() */ +#include "port-protos.h" /* For gethostname() */ #endif #include "storage/fd.h" @@ -102,8 +102,8 @@ #endif #endif -#define INVALID_SOCK (-1) -#define ARGV_SIZE 64 +#define INVALID_SOCK (-1) +#define ARGV_SIZE 64 /* * Max time in seconds for socket to linger (close() to block) waiting @@ -129,30 +129,35 @@ static Dllist *PortList; static short PostPortName = -1; static short ActiveBackends = FALSE; - /* This is a boolean indicating that there is at least one backend - that is accessing the current shared memory and semaphores. - Between the time that we start up, or throw away shared memory - segments and start over, and the time we generate the next - backend (because we received a connection request), it is false. - Other times, it is true. - */ + + /* + * This is a boolean indicating that there is at least one backend that + * is accessing the current shared memory and semaphores. Between the + * time that we start up, or throw away shared memory segments and start + * over, and the time we generate the next backend (because we received a + * connection request), it is false. Other times, it is true. + */ static short shmem_seq = 0; - /* This is a sequence number that indicates how many times we've had - to throw away the shared memory and start over because we doubted - its integrity. It starts off at zero and is incremented every - time we start over. We use this to ensure that we use a new - IPC shared memory key for the new shared memory segment in case - the old segment isn't entirely gone yet. - The sequence actually cycles back to 0 after 9, so pathologically - there could be an IPC failure if 10 sets of backends are all stuck - and won't release IPC resources. - */ + /* + * This is a sequence number that indicates how many times we've had to + * throw away the shared memory and start over because we doubted its + * integrity. It starts off at zero and is incremented every time we + * start over. We use this to ensure that we use a new IPC shared memory + * key for the new shared memory segment in case the old segment isn't + * entirely gone yet. + * + * The sequence actually cycles back to 0 after 9, so pathologically there + * could be an IPC failure if 10 sets of backends are all stuck and won't + * release IPC resources. + */ -static IpcMemoryKey ipc_key; - /* This is the base IPC shared memory key. Other keys are generated by - adding to this. - */ +static IpcMemoryKey ipc_key; + + /* + * This is the base IPC shared memory key. Other keys are generated by + * adding to this. + */ static int NextBackendId = MAXINT; /* XXX why? */ @@ -200,11 +205,12 @@ static void usage(const char *); static int ServerLoop(void); static int BackendStartup(Port *port); static void readStartupPacket(char *arg, PacketLen len, char *pkt); -static int initMasks(fd_set *rmask, fd_set *wmask); -static void RandomSalt(char* salt); +static int initMasks(fd_set *rmask, fd_set *wmask); +static void RandomSalt(char *salt); #ifdef CYR_RECODE -void GetCharSetByHost(char *,int,char *); +void GetCharSetByHost(char *, int, char *); + #endif extern char *optarg; @@ -516,9 +522,10 @@ usage(const char *progname) static int ServerLoop(void) { - fd_set readmask, writemask; - int nSockets; - Dlelem *curr; + fd_set readmask, + writemask; + int nSockets; + Dlelem *curr; /* * GH: For !HAVE_SIGPROCMASK (NEXTSTEP), TRH implemented an @@ -542,8 +549,9 @@ ServerLoop(void) #endif for (;;) { - Port *port; - fd_set rmask, wmask; + Port *port; + fd_set rmask, + wmask; #ifdef HAVE_SIGPROCMASK sigprocmask(SIG_SETMASK, &oldsigmask, 0); @@ -554,7 +562,7 @@ ServerLoop(void) memmove((char *) &rmask, (char *) &readmask, sizeof(fd_set)); memmove((char *) &wmask, (char *) &writemask, sizeof(fd_set)); if (select(nSockets, &rmask, &wmask, (fd_set *) NULL, - (struct timeval *) NULL) < 0) + (struct timeval *) NULL) < 0) { if (errno == EINTR) continue; @@ -578,18 +586,18 @@ ServerLoop(void) /* new connection pending on our well-known port's socket */ if (ServerSock_UNIX != INVALID_SOCK && - FD_ISSET(ServerSock_UNIX, &rmask) && - (port = ConnCreate(ServerSock_UNIX)) != NULL) + FD_ISSET(ServerSock_UNIX, &rmask) && + (port = ConnCreate(ServerSock_UNIX)) != NULL) PacketReceiveSetup(&port->pktInfo, - readStartupPacket, - (char *)port); + readStartupPacket, + (char *) port); if (ServerSock_INET != INVALID_SOCK && - FD_ISSET(ServerSock_INET, &rmask) && - (port = ConnCreate(ServerSock_INET)) != NULL) + FD_ISSET(ServerSock_INET, &rmask) && + (port = ConnCreate(ServerSock_INET)) != NULL) PacketReceiveSetup(&port->pktInfo, - readStartupPacket, - (char *)port); + readStartupPacket, + (char *) port); /* Build up new masks for select(). */ @@ -600,8 +608,8 @@ ServerLoop(void) while (curr) { Port *port = (Port *) DLE_VAL(curr); - int status = STATUS_OK; - Dlelem *next; + int status = STATUS_OK; + Dlelem *next; if (FD_ISSET(port->sock, &rmask)) { @@ -628,25 +636,24 @@ ServerLoop(void) next = DLGetSucc(curr); /* - * If there is no error and no outstanding data transfer - * going on, then the authentication handshake must be - * complete to the postmaster's satisfaction. So, - * start the backend. + * If there is no error and no outstanding data transfer going + * on, then the authentication handshake must be complete to + * the postmaster's satisfaction. So, start the backend. */ if (status == STATUS_OK && port->pktInfo.state == Idle) { + /* - * If the backend start fails then keep the - * connection open to report it. Otherwise, - * pretend there is an error to close the - * connection which will now be managed by the - * backend. + * If the backend start fails then keep the connection + * open to report it. Otherwise, pretend there is an + * error to close the connection which will now be managed + * by the backend. */ if (BackendStartup(port) != STATUS_OK) PacketSendError(&port->pktInfo, - "Backend startup failed"); + "Backend startup failed"); else status = STATUS_ERROR; } @@ -684,9 +691,10 @@ ServerLoop(void) * we are listening on. Return the number of sockets to listen on. */ -static int initMasks(fd_set *rmask, fd_set *wmask) +static int +initMasks(fd_set *rmask, fd_set *wmask) { - int nsocks = -1; + int nsocks = -1; FD_ZERO(rmask); FD_ZERO(wmask); @@ -715,38 +723,39 @@ static int initMasks(fd_set *rmask, fd_set *wmask) * Called when the startup packet has been read. */ -static void readStartupPacket(char *arg, PacketLen len, char *pkt) +static void +readStartupPacket(char *arg, PacketLen len, char *pkt) { - Port *port; + Port *port; StartupPacket *si; - port = (Port *)arg; - si = (StartupPacket *)pkt; + port = (Port *) arg; + si = (StartupPacket *) pkt; /* - * Get the parameters from the startup packet as C strings. The packet - * destination was cleared first so a short packet has zeros silently - * added and a long packet is silently truncated. + * Get the parameters from the startup packet as C strings. The + * packet destination was cleared first so a short packet has zeros + * silently added and a long packet is silently truncated. */ - StrNCpy(port->database, si->database, sizeof (port->database) - 1); - StrNCpy(port->user, si->user, sizeof (port->user) - 1); - StrNCpy(port->options, si->options, sizeof (port->options) - 1); - StrNCpy(port->tty, si->tty, sizeof (port->tty) - 1); + StrNCpy(port->database, si->database, sizeof(port->database) - 1); + StrNCpy(port->user, si->user, sizeof(port->user) - 1); + StrNCpy(port->options, si->options, sizeof(port->options) - 1); + StrNCpy(port->tty, si->tty, sizeof(port->tty) - 1); /* The database defaults to the user name. */ if (port->database[0] == '\0') - StrNCpy(port->database, si->user, sizeof (port->database) - 1); + StrNCpy(port->database, si->user, sizeof(port->database) - 1); /* Check we can handle the protocol the frontend is using. */ port->proto = ntohl(si->protoVersion); if (PG_PROTOCOL_MAJOR(port->proto) < PG_PROTOCOL_MAJOR(PG_PROTOCOL_EARLIEST) || - PG_PROTOCOL_MAJOR(port->proto) > PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST) || - (PG_PROTOCOL_MAJOR(port->proto) == PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST) && - PG_PROTOCOL_MINOR(port->proto) > PG_PROTOCOL_MINOR(PG_PROTOCOL_LATEST))) + PG_PROTOCOL_MAJOR(port->proto) > PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST) || + (PG_PROTOCOL_MAJOR(port->proto) == PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST) && + PG_PROTOCOL_MINOR(port->proto) > PG_PROTOCOL_MINOR(PG_PROTOCOL_LATEST))) { PacketSendError(&port->pktInfo, "Unsupported frontend protocol."); return; @@ -757,7 +766,7 @@ static void readStartupPacket(char *arg, PacketLen len, char *pkt) if (port->user[0] == '\0') { PacketSendError(&port->pktInfo, - "No Postgres username specified in startup packet."); + "No Postgres username specified in startup packet."); return; } @@ -805,11 +814,12 @@ ConnCreate(int serverFd) static void reset_shared(short port) { - ipc_key = port * 1000 + shmem_seq * 100; - CreateSharedMemoryAndSemaphores(ipc_key); - ActiveBackends = FALSE; - shmem_seq += 1; - if (shmem_seq >= 10) shmem_seq -= 10; + ipc_key = port * 1000 + shmem_seq * 100; + CreateSharedMemoryAndSemaphores(ipc_key); + ActiveBackends = FALSE; + shmem_seq += 1; + if (shmem_seq >= 10) + shmem_seq -= 10; } /* @@ -981,14 +991,15 @@ BackendStartup(Port *port) #ifdef CYR_RECODE #define NR_ENVIRONMENT_VBL 6 -char ChTable[80]; + char ChTable[80]; + #else #define NR_ENVIRONMENT_VBL 5 #endif - static char envEntry[NR_ENVIRONMENT_VBL][2 * ARGV_SIZE]; + static char envEntry[NR_ENVIRONMENT_VBL][2 * ARGV_SIZE]; - for (i = 0; i < NR_ENVIRONMENT_VBL; ++i) + for (i = 0; i < NR_ENVIRONMENT_VBL; ++i) { MemSet(envEntry[i], 0, 2 * ARGV_SIZE); } @@ -1012,11 +1023,11 @@ char ChTable[80]; putenv(envEntry[4]); #ifdef CYR_RECODE - GetCharSetByHost(ChTable,port->raddr.in.sin_addr.s_addr,DataDir); - if(*ChTable != '\0') + GetCharSetByHost(ChTable, port->raddr.in.sin_addr.s_addr, DataDir); + if (*ChTable != '\0') { - sprintf(envEntry[5], "PG_RECODETABLE=%s", ChTable); - putenv(envEntry[5]); + sprintf(envEntry[5], "PG_RECODETABLE=%s", ChTable); + putenv(envEntry[5]); } #endif @@ -1238,39 +1249,42 @@ dumpstatus(SIGNAL_ARGS) * CharRemap */ static char -CharRemap(long int ch) { +CharRemap(long int ch) +{ - if (ch < 0) - ch = -ch; + if (ch < 0) + ch = -ch; - ch = ch % 62; - if (ch < 26) - return ('A' + ch); + ch = ch % 62; + if (ch < 26) + return ('A' + ch); - ch -= 26; - if (ch < 26) - return ('a' + ch); + ch -= 26; + if (ch < 26) + return ('a' + ch); - ch -= 26; - return ('0' + ch); + ch -= 26; + return ('0' + ch); } /* * RandomSalt */ static void -RandomSalt(char* salt) { +RandomSalt(char *salt) +{ - static bool initialized = false; + static bool initialized = false; - if (!initialized) { - time_t now; + if (!initialized) + { + time_t now; - now = time(NULL); - srandom((unsigned int)now); - initialized = true; - } + now = time(NULL); + srandom((unsigned int) now); + initialized = true; + } - *salt = CharRemap(random()); - *(salt + 1) = CharRemap(random()); + *salt = CharRemap(random()); + *(salt + 1) = CharRemap(random()); } diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c index 6679ba384a..4801361f90 100644 --- a/src/backend/regex/engine.c +++ b/src/backend/regex/engine.c @@ -161,12 +161,12 @@ size_t nmatch; regmatch_t pmatch[]; int eflags; { - char *endp; - int i; + char *endp; + int i; struct match mv; struct match *m = &mv; - char *dp; - const sopno gf = g->firststate + 1; /* +1 for OEND */ + char *dp; + const sopno gf = g->firststate + 1; /* +1 for OEND */ const sopno gl = g->laststate; char *start; char *stop; @@ -344,19 +344,19 @@ char *stop; sopno startst; sopno stopst; { - int i; - sopno ss; /* start sop of current subRE */ - sopno es; /* end sop of current subRE */ - char *sp; /* start of string matched by it */ - char *stp; /* string matched by it cannot pass here */ - char *rest; /* start of rest of string */ - char *tail; /* string unmatched by rest of RE */ - sopno ssub; /* start sop of subsubRE */ - sopno esub; /* end sop of subsubRE */ - char *ssp; /* start of string matched by subsubRE */ - char *sep; /* end of string matched by subsubRE */ - char *oldssp; /* previous ssp */ - char *dp; + int i; + sopno ss; /* start sop of current subRE */ + sopno es; /* end sop of current subRE */ + char *sp; /* start of string matched by it */ + char *stp; /* string matched by it cannot pass here */ + char *rest; /* start of rest of string */ + char *tail; /* string unmatched by rest of RE */ + sopno ssub; /* start sop of subsubRE */ + sopno esub; /* end sop of subsubRE */ + char *ssp; /* start of string matched by subsubRE */ + char *sep; /* end of string matched by subsubRE */ + char *oldssp; /* previous ssp */ + char *dp; AT("diss", start, stop, startst, stopst); sp = start; @@ -545,18 +545,18 @@ sopno startst; sopno stopst; sopno lev; /* PLUS nesting level */ { - int i; - sopno ss; /* start sop of current subRE */ - char *sp; /* start of string matched by it */ - sopno ssub; /* start sop of subsubRE */ - sopno esub; /* end sop of subsubRE */ - char *ssp; /* start of string matched by subsubRE */ - char *dp; - size_t len; - int hard; - sop s; - regoff_t offsave; - cset *cs; + int i; + sopno ss; /* start sop of current subRE */ + char *sp; /* start of string matched by it */ + sopno ssub; /* start sop of subsubRE */ + sopno esub; /* end sop of subsubRE */ + char *ssp; /* start of string matched by subsubRE */ + char *dp; + size_t len; + int hard; + sop s; + regoff_t offsave; + cset *cs; AT("back", start, stop, startst, stopst); sp = start; @@ -758,15 +758,15 @@ char *stop; sopno startst; sopno stopst; { - states st = m->st; - states fresh = m->fresh; - states tmp = m->tmp; - char *p = start; - int c = (start == m->beginp) ? OUT : *(start - 1); - int lastc; /* previous c */ - int flagch; - int i; - char *coldp; /* last p after which no match was + states st = m->st; + states fresh = m->fresh; + states tmp = m->tmp; + char *p = start; + int c = (start == m->beginp) ? OUT : *(start - 1); + int lastc; /* previous c */ + int flagch; + int i; + char *coldp; /* last p after which no match was * underway */ CLEAR(st); @@ -857,15 +857,15 @@ char *stop; sopno startst; sopno stopst; { - states st = m->st; - states empty = m->empty; - states tmp = m->tmp; - char *p = start; - int c = (start == m->beginp) ? OUT : *(start - 1); - int lastc; /* previous c */ - int flagch; - int i; - char *matchp; /* last p at which a match ended */ + states st = m->st; + states empty = m->empty; + states tmp = m->tmp; + char *p = start; + int c = (start == m->beginp) ? OUT : *(start - 1); + int lastc; /* previous c */ + int flagch; + int i; + char *matchp; /* last p at which a match ended */ AT("slow", start, stop, startst, stopst); CLEAR(st); @@ -957,16 +957,16 @@ step(g, start, stop, bef, ch, aft) struct re_guts *g; sopno start; /* start state within strip */ sopno stop; /* state after stop state within strip */ -states bef; /* states reachable before */ +states bef; /* states reachable before */ int ch; /* character or NONCHAR code */ -states aft; /* states already known reachable after */ +states aft; /* states already known reachable after */ { - cset *cs; - sop s; - sopno pc; - onestate here; /* note, macros know this name */ - sopno look; - int i; + cset *cs; + sop s; + sopno pc; + onestate here; /* note, macros know this name */ + sopno look; + int i; for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) { @@ -1088,8 +1088,8 @@ int ch; FILE *d; { struct re_guts *g = m->g; - int i; - int first = 1; + int i; + int first = 1; if (!(m->eflags & REG_TRACE)) return; diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 74ac3acc43..e31f865404 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -188,8 +188,8 @@ int cflags; struct parse pa; struct re_guts *g; struct parse *p = &pa; - int i; - size_t len; + int i; + size_t len; #ifdef REDEBUG #define GOODFLAGS(f) (f) @@ -294,11 +294,11 @@ p_ere(p, stop) struct parse *p; int stop; /* character this ERE should end at */ { - char c; - sopno prevback = 0; - sopno prevfwd = 0; - sopno conc; - int first = 1; /* is this the first alternative? */ + char c; + sopno prevback = 0; + sopno prevfwd = 0; + sopno conc; + int first = 1; /* is this the first alternative? */ for (;;) { @@ -342,11 +342,11 @@ static void p_ere_exp(p) struct parse *p; { - char c; - sopno pos; - int count; - int count2; - sopno subno; + char c; + sopno pos; + int count; + int count2; + sopno subno; int wascaret = 0; assert(MORE()); /* caller should have ensured this */ @@ -523,12 +523,12 @@ struct parse *p; static void p_bre(p, end1, end2) struct parse *p; -int end1; /* first terminating character */ -int end2; /* second terminating character */ +int end1; /* first terminating character */ +int end2; /* second terminating character */ { - sopno start = HERE(); - int first = 1; /* first subexpression? */ - int wasdollar = 0; + sopno start = HERE(); + int first = 1; /* first subexpression? */ + int wasdollar = 0; if (EAT('^')) { @@ -561,12 +561,12 @@ p_simp_re(p, starordinary) struct parse *p; int starordinary; /* is a leading * an ordinary character? */ { - int c; - int count; - int count2; - sopno pos; - int i; - sopno subno; + int c; + int count; + int count2; + sopno pos; + int i; + sopno subno; #define BACKSL (1<<CHAR_BIT) @@ -695,8 +695,8 @@ static int /* the value */ p_count(p) struct parse *p; { - int count = 0; - int ndigits = 0; + int count = 0; + int ndigits = 0; while (MORE() && isdigit(PEEK()) && count <= DUPMAX) { @@ -719,8 +719,8 @@ static void p_bracket(p) struct parse *p; { - cset *cs = allocset(p); - int invert = 0; + cset *cs = allocset(p); + int invert = 0; /* Dept of Truly Sickening Special-Case Kludges */ if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0) @@ -753,8 +753,8 @@ struct parse *p; if (p->g->cflags & REG_ICASE) { - int i; - int ci; + int i; + int ci; for (i = p->g->csetsize - 1; i >= 0; i--) if (CHIN(cs, i) && isalpha(i)) @@ -768,7 +768,7 @@ struct parse *p; } if (invert) { - int i; + int i; for (i = p->g->csetsize - 1; i >= 0; i--) if (CHIN(cs, i)) @@ -799,12 +799,12 @@ struct parse *p; static void p_b_term(p, cs) struct parse *p; -cset *cs; +cset *cs; { - char c; - char start, + char c; + char start, finish; - int i; + int i; /* classify what we've got */ switch ((MORE()) ? PEEK() : '\0') @@ -870,13 +870,13 @@ cset *cs; static void p_b_cclass(p, cs) struct parse *p; -cset *cs; +cset *cs; { - char *sp = p->next; + char *sp = p->next; struct cclass *cp; - size_t len; - char *u; - char c; + size_t len; + char *u; + char c; while (MORE() && isalpha(PEEK())) NEXT(); @@ -907,9 +907,9 @@ cset *cs; static void p_b_eclass(p, cs) struct parse *p; -cset *cs; +cset *cs; { - char c; + char c; c = p_b_coll_elem(p, '='); CHadd(cs, c); @@ -923,7 +923,7 @@ static char /* value of symbol */ p_b_symbol(p) struct parse *p; { - char value; + char value; REQUIRE(MORE(), REG_EBRACK); if (!EATTWO('[', '.')) @@ -944,9 +944,9 @@ p_b_coll_elem(p, endc) struct parse *p; int endc; /* name ended by endc,']' */ { - char *sp = p->next; + char *sp = p->next; struct cname *cp; - int len; + int len; while (MORE() && !SEETWO(endc, ']')) NEXT(); @@ -994,8 +994,8 @@ bothcases(p, ch) struct parse *p; int ch; { - char *oldnext = p->next; - char *oldend = p->end; + char *oldnext = p->next; + char *oldend = p->end; char bracket[3]; assert(othercase(ch) != ch);/* p_bracket() would recurse */ @@ -1017,9 +1017,9 @@ int ch; static void ordinary(p, ch) struct parse *p; -int ch; +int ch; { - cat_t *cap = p->g->categories; + cat_t *cap = p->g->categories; if ((p->g->cflags & REG_ICASE) && isalpha(ch) && othercase(ch) != ch) bothcases(p, ch); @@ -1041,8 +1041,8 @@ static void nonnewline(p) struct parse *p; { - char *oldnext = p->next; - char *oldend = p->end; + char *oldnext = p->next; + char *oldend = p->end; char bracket[4]; p->next = bracket; @@ -1069,13 +1069,13 @@ int from; /* repeated from this number */ int to; /* to this number of times (maybe * INFINITY) */ { - sopno finish = HERE(); + sopno finish = HERE(); #define N 2 #define INF 3 #define REP(f, t) ((f)*8 + (t)) #define MAP(n) (((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N) - sopno copy; + sopno copy; if (p->error != 0) /* head off possible runaway recursion */ return; @@ -1156,12 +1156,12 @@ static cset * allocset(p) struct parse *p; { - int no = p->g->ncsets++; - size_t nc; - size_t nbytes; - cset *cs; - size_t css = (size_t) p->g->csetsize; - int i; + int no = p->g->ncsets++; + size_t nc; + size_t nbytes; + cset *cs; + size_t css = (size_t) p->g->csetsize; + int i; if (no >= p->ncsalloc) { /* need another column of space */ @@ -1213,11 +1213,11 @@ struct parse *p; static void freeset(p, cs) struct parse *p; -cset *cs; +cset *cs; { - int i; - cset *top = &p->g->sets[p->g->ncsets]; - size_t css = (size_t) p->g->csetsize; + int i; + cset *top = &p->g->sets[p->g->ncsets]; + size_t css = (size_t) p->g->csetsize; for (i = 0; i < css; i++) CHsub(cs, i); @@ -1238,13 +1238,13 @@ cset *cs; static int /* set number */ freezeset(p, cs) struct parse *p; -cset *cs; +cset *cs; { - uch h = cs->hash; - int i; - cset *top = &p->g->sets[p->g->ncsets]; - cset *cs2; - size_t css = (size_t) p->g->csetsize; + uch h = cs->hash; + int i; + cset *top = &p->g->sets[p->g->ncsets]; + cset *cs2; + size_t css = (size_t) p->g->csetsize; /* look for an earlier one which is the same */ for (cs2 = &p->g->sets[0]; cs2 < top; cs2++) @@ -1274,10 +1274,10 @@ cset *cs; static int /* character; there is no "none" value */ firstch(p, cs) struct parse *p; -cset *cs; +cset *cs; { - int i; - size_t css = (size_t) p->g->csetsize; + int i; + size_t css = (size_t) p->g->csetsize; for (i = 0; i < css; i++) if (CHIN(cs, i)) @@ -1293,11 +1293,11 @@ cset *cs; static int nch(p, cs) struct parse *p; -cset *cs; +cset *cs; { - int i; - size_t css = (size_t) p->g->csetsize; - int n = 0; + int i; + size_t css = (size_t) p->g->csetsize; + int n = 0; for (i = 0; i < css; i++) if (CHIN(cs, i)) @@ -1313,10 +1313,10 @@ cset *cs; static void mcadd(p, cs, cp) struct parse *p; -cset *cs; -char *cp; +cset *cs; +char *cp; { - size_t oldend = cs->smultis; + size_t oldend = cs->smultis; cs->smultis += strlen(cp) + 1; if (cs->multis == NULL) @@ -1406,7 +1406,7 @@ char *cp; static void mcinvert(p, cs) struct parse *p; -cset *cs; +cset *cs; { assert(cs->multis == NULL); /* xxx */ } @@ -1421,7 +1421,7 @@ cset *cs; static void mccase(p, cs) struct parse *p; -cset *cs; +cset *cs; { assert(cs->multis == NULL); /* xxx */ } @@ -1435,10 +1435,10 @@ isinsets(g, c) struct re_guts *g; int c; { - uch *col; - int i; - int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT; - unsigned uc = (unsigned char) c; + uch *col; + int i; + int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT; + unsigned uc = (unsigned char) c; for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize) if (col[uc] != 0) @@ -1456,11 +1456,11 @@ struct re_guts *g; int c1; int c2; { - uch *col; - int i; - int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT; - unsigned uc1 = (unsigned char) c1; - unsigned uc2 = (unsigned char) c2; + uch *col; + int i; + int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT; + unsigned uc1 = (unsigned char) c1; + unsigned uc2 = (unsigned char) c2; for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize) if (col[uc1] != col[uc2]) @@ -1477,10 +1477,10 @@ categorize(p, g) struct parse *p; struct re_guts *g; { - cat_t *cats = g->categories; - int c; - int c2; - cat_t cat; + cat_t *cats = g->categories; + int c; + int c2; + cat_t cat; /* avoid making error situations worse */ if (p->error != 0) @@ -1507,8 +1507,8 @@ struct parse *p; sopno start; /* from here */ sopno finish; /* to this less one */ { - sopno ret = HERE(); - sopno len = finish - start; + sopno ret = HERE(); + sopno len = finish - start; assert(finish >= start); if (len == 0) @@ -1562,9 +1562,9 @@ sop op; size_t opnd; sopno pos; { - sopno sn; - sop s; - int i; + sopno sn; + sop s; + int i; /* avoid making error situations worse */ if (p->error != 0) @@ -1601,7 +1601,7 @@ sopno pos; static void dofwd(p, pos, value) struct parse *p; -sopno pos; +sopno pos; sop value; { /* avoid making error situations worse */ @@ -1619,9 +1619,9 @@ sop value; static void enlarge(p, size) struct parse *p; -sopno size; +sopno size; { - sop *sp; + sop *sp; if (p->ssize >= size) return; @@ -1669,13 +1669,13 @@ findmust(p, g) struct parse *p; struct re_guts *g; { - sop *scan; + sop *scan; sop *start = 0; - sop *newstart = 0; - sopno newlen; - sop s; - char *cp; - sopno i; + sop *newstart = 0; + sopno newlen; + sop s; + char *cp; + sopno i; /* avoid making error situations worse */ if (p->error != 0) @@ -1757,10 +1757,10 @@ pluscount(p, g) struct parse *p; struct re_guts *g; { - sop *scan; - sop s; - sopno plusnest = 0; - sopno maxnest = 0; + sop *scan; + sop s; + sopno plusnest = 0; + sopno maxnest = 0; if (p->error != 0) return (0); /* there may not be an OEND */ diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index 3125e1cc96..a8ba2443c5 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -161,9 +161,9 @@ char *errbuf; size_t errbuf_size; { struct rerr *r; - size_t len; - int target = errcode & ~REG_ITOA; - char *s; + size_t len; + int target = errcode & ~REG_ITOA; + char *s; char convbuf[50]; if (errcode == REG_ATOI) diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c index 56bd8e053b..ac21bed840 100644 --- a/src/backend/rewrite/locks.c +++ b/src/backend/rewrite/locks.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.8 1998/01/21 04:24:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.9 1998/02/26 04:35:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ */ static bool nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum, - int sublevels_up) + int sublevels_up) { if (node == NULL) return FALSE; @@ -48,7 +48,7 @@ nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum, Expr *expr = (Expr *) node; return nodeThisLockWasTriggered((Node *) expr->args, varno, - attnum, sublevels_up); + attnum, sublevels_up); } break; case T_TargetEntry: @@ -56,15 +56,15 @@ nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum, TargetEntry *tle = (TargetEntry *) node; return nodeThisLockWasTriggered(tle->expr, varno, attnum, - sublevels_up); + sublevels_up); } break; case T_Aggreg: { - Aggreg *agg = (Aggreg *) node; + Aggreg *agg = (Aggreg *) node; return nodeThisLockWasTriggered(agg->target, varno, attnum, - sublevels_up); + sublevels_up); } break; case T_List: @@ -74,7 +74,7 @@ nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum, foreach(l, (List *) node) { if (nodeThisLockWasTriggered(lfirst(l), varno, attnum, - sublevels_up)) + sublevels_up)) return TRUE; } return FALSE; @@ -82,11 +82,11 @@ nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum, break; case T_SubLink: { - SubLink *sublink = (SubLink *) node; - Query *query = (Query *)sublink->subselect; + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; return nodeThisLockWasTriggered(query->qual, varno, attnum, - sublevels_up + 1); + sublevels_up + 1); } break; default: @@ -106,7 +106,7 @@ thisLockWasTriggered(int varno, AttrNumber attnum, Query *parsetree) { - + if (nodeThisLockWasTriggered(parsetree->qual, varno, attnum, 0)) return true; @@ -114,14 +114,14 @@ thisLockWasTriggered(int varno, return true; return false; - + } /* * matchLocks - * match the list of locks and returns the matching rules */ -List * +List * matchLocks(CmdType event, RuleLock *rulelocks, int varno, diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index b38949fba4..f3ccf54c23 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.13 1998/02/25 13:07:18 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.14 1998/02/26 04:35:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,13 +34,15 @@ #include "utils/acl.h" #include "catalog/pg_shadow.h" -static void ApplyRetrieveRule(Query *parsetree, RewriteRule *rule, +static void +ApplyRetrieveRule(Query *parsetree, RewriteRule *rule, int rt_index, int relation_level, Relation relation, int *modified); -static List *fireRules(Query *parsetree, int rt_index, CmdType event, +static List * +fireRules(Query *parsetree, int rt_index, CmdType event, bool *instead_flag, List *locks, List **qual_products); static void QueryRewriteSubLink(Node *node); -static List *QueryRewriteOne(Query *parsetree); +static List *QueryRewriteOne(Query *parsetree); static List *deepRewriteQuery(Query *parsetree); static void CheckViewPerms(Relation view, List *rtable); @@ -270,34 +272,30 @@ ApplyRetrieveRule(Query *parsetree, if (rule->actions) { if (length(rule->actions) > 1) /* ??? because we don't handle - * rules with more than one - * action? -ay */ - - /* WARNING!!! - * If we sometimes handle - * rules with more than one - * action, the view acl checks - * might get broken. - * viewAclOverride should only - * become true (below) if this - * is a relation_level, instead, - * select query - Jan - */ + * rules with more than one + * action? -ay */ + + /* + * WARNING!!! If we sometimes handle rules with more than one + * action, the view acl checks might get broken. + * viewAclOverride should only become true (below) if this is + * a relation_level, instead, select query - Jan + */ return; rule_action = copyObject(lfirst(rule->actions)); nothing = FALSE; /* - * If this rule is on the relation level, the rule action - * is a select and the rule is instead then it must be - * a view. Permissions for views now follow the owner of - * the view, not the current user. + * If this rule is on the relation level, the rule action is a + * select and the rule is instead then it must be a view. + * Permissions for views now follow the owner of the view, not the + * current user. */ if (relation_level && rule_action->commandType == CMD_SELECT - && rule->isInstead) + && rule->isInstead) { - CheckViewPerms(relation, rule_action->rtable); - viewAclOverride = TRUE; + CheckViewPerms(relation, rule_action->rtable); + viewAclOverride = TRUE; } } else @@ -320,8 +318,9 @@ ApplyRetrieveRule(Query *parsetree, if (viewAclOverride) { - List *rule_rtable, *rule_rt; - RangeTblEntry *rte; + List *rule_rtable, + *rule_rt; + RangeTblEntry *rte; rule_rtable = copyObject(rule_action->rtable); foreach(rule_rt, rule_rtable) @@ -329,8 +328,8 @@ ApplyRetrieveRule(Query *parsetree, rte = lfirst(rule_rt); /* - * tell the executor that the ACL check on this - * range table entry is already done + * tell the executor that the ACL check on this range table + * entry is already done */ rte->skipAcl = true; } @@ -655,8 +654,8 @@ RewriteQuery(Query *parsetree, bool *instead_flag, List **qual_products) Query *other; /* - * ApplyRetrieveRule changes the range table - * XXX Unions are copied again. + * ApplyRetrieveRule changes the range table XXX Unions are copied + * again. */ other = copyObject(parsetree); @@ -681,7 +680,7 @@ static int numQueryRewriteInvoked = 0; * rewrite one query via QueryRewrite system, possibly returning 0, or many * queries */ -List * +List * QueryRewrite(Query *parsetree) { @@ -712,7 +711,7 @@ QueryRewriteSubLink(Node *node) { Expr *expr = (Expr *) node; - QueryRewriteSubLink((Node *)expr->args); + QueryRewriteSubLink((Node *) expr->args); } break; case T_Var: @@ -727,15 +726,15 @@ QueryRewriteSubLink(Node *node) break; case T_SubLink: { - SubLink *sublink = (SubLink *) node; - Query *query = (Query *)sublink->subselect; - List *ret; + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; + List *ret; /* - * Nest down first. We do this so if a rewrite adds a - * SubLink we don't process it as part of this loop. + * Nest down first. We do this so if a rewrite adds a + * SubLink we don't process it as part of this loop. */ - QueryRewriteSubLink((Node *)query->qual); + QueryRewriteSubLink((Node *) query->qual); ret = QueryRewriteOne(query); if (!ret) @@ -743,7 +742,7 @@ QueryRewriteSubLink(Node *node) else if (lnext(ret) == NIL) sublink->subselect = lfirst(ret); else - elog(ERROR,"Don't know how to process subquery that rewrites to multiple queries."); + elog(ERROR, "Don't know how to process subquery that rewrites to multiple queries."); } break; default: @@ -757,7 +756,7 @@ QueryRewriteSubLink(Node *node) * QueryOneRewrite - * rewrite one query */ -static List * +static List * QueryRewriteOne(Query *parsetree) { numQueryRewriteInvoked = 0; @@ -813,8 +812,8 @@ CheckViewPerms(Relation view, List *rtable) { HeapTuple utup; NameData uname; - List *rt; - RangeTblEntry *rte; + List *rt; + RangeTblEntry *rte; int32 aclcheck_res; /* @@ -824,19 +823,19 @@ CheckViewPerms(Relation view, List *rtable) if (!HeapTupleIsValid(utup)) { elog(ERROR, "cache lookup for userid %d failed", - view->rd_rel->relowner); + view->rd_rel->relowner); } StrNCpy(uname.data, ((Form_pg_shadow) GETSTRUCT(utup))->usename.data, NAMEDATALEN); /* - * check that we have read access to all the - * classes in the range table of the view + * check that we have read access to all the classes in the range + * table of the view */ foreach(rt, rtable) { - rte = (RangeTblEntry *)lfirst(rt); + rte = (RangeTblEntry *) lfirst(rt); aclcheck_res = pg_aclcheck(rte->relname, uname.data, ACL_RD); if (aclcheck_res != ACLCHECK_OK) @@ -845,6 +844,3 @@ CheckViewPerms(Relation view, List *rtable) } } } - - - diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index be8fa5d075..8c9bc3412a 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.12 1998/02/10 04:02:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.13 1998/02/26 04:35:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,8 +28,9 @@ #include "nodes/plannodes.h" #include "optimizer/clauses.h" -static void ResolveNew(RewriteInfo *info, List *targetlist, - Node **node, int sublevels_up); +static void +ResolveNew(RewriteInfo *info, List *targetlist, + Node **node, int sublevels_up); @@ -49,7 +50,7 @@ OffsetVarNodes(Node *node, int offset) break; case T_Aggreg: { - Aggreg *agg = (Aggreg *) node; + Aggreg *agg = (Aggreg *) node; OffsetVarNodes(agg->target, offset); } @@ -101,7 +102,7 @@ ChangeVarNodes(Node *node, int old_varno, int new_varno, int sublevels_up) break; case T_Aggreg: { - Aggreg *agg = (Aggreg *) node; + Aggreg *agg = (Aggreg *) node; ChangeVarNodes(agg->target, old_varno, new_varno, sublevels_up); } @@ -135,11 +136,11 @@ ChangeVarNodes(Node *node, int old_varno, int new_varno, int sublevels_up) break; case T_SubLink: { - SubLink *sublink = (SubLink *) node; - Query *query = (Query *)sublink->subselect; + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; - ChangeVarNodes((Node *)query->qual, old_varno, new_varno, - sublevels_up + 1); + ChangeVarNodes((Node *) query->qual, old_varno, new_varno, + sublevels_up + 1); } break; default: @@ -247,7 +248,7 @@ FindMatchingTLEntry(List *tlist, char *e_attname) static void ResolveNew(RewriteInfo *info, List *targetlist, Node **nodePtr, - int sublevels_up) + int sublevels_up) { Node *node = *nodePtr; @@ -258,21 +259,21 @@ ResolveNew(RewriteInfo *info, List *targetlist, Node **nodePtr, { case T_TargetEntry: ResolveNew(info, targetlist, &((TargetEntry *) node)->expr, - sublevels_up); + sublevels_up); break; case T_Aggreg: ResolveNew(info, targetlist, &((Aggreg *) node)->target, - sublevels_up); + sublevels_up); break; case T_Expr: ResolveNew(info, targetlist, (Node **) (&(((Expr *) node)->args)), - sublevels_up); + sublevels_up); break; case T_Var: { - int this_varno = (int) ((Var *) node)->varno; - int this_varlevelsup = (int) ((Var *) node)->varlevelsup; - Node *n; + int this_varno = (int) ((Var *) node)->varno; + int this_varlevelsup = (int) ((Var *) node)->varlevelsup; + Node *n; if (this_varno == info->new_varno && this_varlevelsup == sublevels_up) @@ -304,15 +305,15 @@ ResolveNew(RewriteInfo *info, List *targetlist, Node **nodePtr, foreach(l, (List *) node) ResolveNew(info, targetlist, (Node **) &(lfirst(l)), - sublevels_up); + sublevels_up); break; } case T_SubLink: { - SubLink *sublink = (SubLink *) node; - Query *query = (Query *)sublink->subselect; + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; - ResolveNew(info, targetlist, (Node **)&(query->qual), sublevels_up + 1); + ResolveNew(info, targetlist, (Node **) &(query->qual), sublevels_up + 1); } break; default: @@ -350,17 +351,17 @@ nodeHandleRIRAttributeRule(Node **nodePtr, TargetEntry *tle = (TargetEntry *) node; nodeHandleRIRAttributeRule(&tle->expr, rtable, targetlist, - rt_index, attr_num, modified, badsql, - sublevels_up); + rt_index, attr_num, modified, badsql, + sublevels_up); } break; case T_Aggreg: { - Aggreg *agg = (Aggreg *) node; + Aggreg *agg = (Aggreg *) node; nodeHandleRIRAttributeRule(&agg->target, rtable, targetlist, - rt_index, attr_num, modified, badsql, - sublevels_up); + rt_index, attr_num, modified, badsql, + sublevels_up); } break; case T_Expr: @@ -402,7 +403,7 @@ nodeHandleRIRAttributeRule(Node **nodePtr, if (name_to_look_for.data[0]) { Node *n; - + n = FindMatchingTLEntry(targetlist, (char *) &name_to_look_for); if (n == NULL) *nodePtr = make_null(((Var *) node)->vartype); @@ -422,18 +423,18 @@ nodeHandleRIRAttributeRule(Node **nodePtr, { nodeHandleRIRAttributeRule((Node **) (&(lfirst(i))), rtable, targetlist, rt_index, attr_num, - modified, badsql, sublevels_up); + modified, badsql, sublevels_up); } } break; case T_SubLink: { - SubLink *sublink = (SubLink *) node; - Query *query = (Query *)sublink->subselect; + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; - nodeHandleRIRAttributeRule((Node **)&(query->qual), rtable, targetlist, - rt_index, attr_num, modified, badsql, - sublevels_up + 1); + nodeHandleRIRAttributeRule((Node **) &(query->qual), rtable, targetlist, + rt_index, attr_num, modified, badsql, + sublevels_up + 1); } break; default: @@ -455,7 +456,7 @@ HandleRIRAttributeRule(Query *parsetree, int *modified, int *badsql) { - + nodeHandleRIRAttributeRule((Node **) (&(parsetree->targetList)), rtable, targetlist, rt_index, attr_num, modified, badsql, 0); @@ -470,7 +471,7 @@ nodeHandleViewRule(Node **nodePtr, List *targetlist, int rt_index, int *modified, - int sublevels_up) + int sublevels_up) { Node *node = *nodePtr; @@ -489,7 +490,7 @@ nodeHandleViewRule(Node **nodePtr, break; case T_Aggreg: { - Aggreg *agg = (Aggreg *) node; + Aggreg *agg = (Aggreg *) node; nodeHandleViewRule(&(agg->target), rtable, targetlist, rt_index, modified, sublevels_up); @@ -512,7 +513,7 @@ nodeHandleViewRule(Node **nodePtr, Node *n; if (this_varno == rt_index && - this_varlevelsup == sublevels_up) + this_varlevelsup == sublevels_up) { n = FindMatchingTLEntry(targetlist, get_attname(getrelid(this_varno, @@ -540,10 +541,10 @@ nodeHandleViewRule(Node **nodePtr, break; case T_SubLink: { - SubLink *sublink = (SubLink *) node; - Query *query = (Query *)sublink->subselect; + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; - nodeHandleViewRule((Node **)&(query->qual), rtable, targetlist, + nodeHandleViewRule((Node **) &(query->qual), rtable, targetlist, rt_index, modified, sublevels_up + 1); } break; diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index f7dea7cdf3..0f92cf1939 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.10 1998/01/31 04:38:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.11 1998/02/26 04:35:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ * RewriteGetRuleEventRel *----------------------------------------------------------------------- */ -char * +char * RewriteGetRuleEventRel(char *rulename) { HeapTuple htp; diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index bf8d6977d1..b701fbd415 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.15 1998/01/31 04:38:39 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.16 1998/02/26 04:35:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,13 +58,13 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees) if (ruletuple == NULL) elog(ERROR, "rule %u isn't in rewrite system relation", ruleoid); - ruleaction = (char *)heap_getattr(ruletuple, - Anum_pg_rewrite_ev_action, - ruleTupdesc, - &action_is_null); - rule_evqual_string = (char *)heap_getattr(ruletuple, - Anum_pg_rewrite_ev_qual, - ruleTupdesc, &action_is_null); + ruleaction = (char *) heap_getattr(ruletuple, + Anum_pg_rewrite_ev_action, + ruleTupdesc, + &action_is_null); + rule_evqual_string = (char *) heap_getattr(ruletuple, + Anum_pg_rewrite_ev_qual, + ruleTupdesc, &action_is_null); *instead_flag = !!heap_getattr(ruletuple, Anum_pg_rewrite_is_instead, ruleTupdesc, &instead_is_null); diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 2ff414bcbb..29476547c1 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.34 1998/02/11 19:11:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.35 1998/02/26 04:35:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -100,7 +100,7 @@ static void BufferSync(void); static int BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld); /* not static but used by vacuum only ... */ -int BlowawayRelationBuffers(Relation rdesc, BlockNumber block); +int BlowawayRelationBuffers(Relation rdesc, BlockNumber block); /* --------------------------------------------------- * RelationGetBufferWithBuffer @@ -829,7 +829,7 @@ FlushBuffer(Buffer buffer, bool release) status = smgrflush(DEFAULT_SMGR, bufrel, bufHdr->tag.blockNum, (char *) MAKE_PTR(bufHdr->data)); - + RelationDecrementReferenceCount(bufrel); if (status == SM_FAIL) @@ -1197,7 +1197,7 @@ ResetBufferUsage() void ResetBufferPool() { - int i; + int i; for (i = 1; i <= NBuffers; i++) { @@ -1225,7 +1225,7 @@ ResetBufferPool() int BufferPoolCheckLeak() { - int i; + int i; int error = 0; for (i = 1; i <= NBuffers; i++) @@ -1384,7 +1384,7 @@ BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld) bufHdr->tag.blockNum, (char *) MAKE_PTR(bufHdr->data)); } - + if (reln != (Relation) NULL) RelationDecrementReferenceCount(reln); @@ -1444,7 +1444,7 @@ BufferGetBlock(Buffer buffer) void ReleaseRelationBuffers(Relation rdesc) { - int i; + int i; int holding = 0; BufferDesc *buf; @@ -1501,7 +1501,7 @@ ReleaseRelationBuffers(Relation rdesc) void DropBuffers(Oid dbid) { - int i; + int i; BufferDesc *buf; SpinAcquire(BufMgrLock); @@ -1587,7 +1587,7 @@ blockNum=%d, flags=0x%x, refcount=%d %d)\n", void BufferPoolBlowaway() { - int i; + int i; BufferSync(); for (i = 1; i <= NBuffers; i++) @@ -1608,9 +1608,9 @@ BufferPoolBlowaway() * * This function blowaway all the pages with blocknumber >= passed * of a relation in the buffer pool. Used by vacuum before truncation... - * + * * Returns: 0 - Ok, -1 - DIRTY, -2 - PINNED - * + * * XXX currently it sequentially searches the buffer pool, should be * changed to more clever ways of searching. * -------------------------------------------------------------------- @@ -1618,28 +1618,28 @@ BufferPoolBlowaway() int BlowawayRelationBuffers(Relation rdesc, BlockNumber block) { - int i; - BufferDesc *buf; + int i; + BufferDesc *buf; if (rdesc->rd_islocal) { for (i = 0; i < NLocBuffer; i++) { buf = &LocalBufferDescriptors[i]; - if (buf->tag.relId.relId == rdesc->rd_id && + if (buf->tag.relId.relId == rdesc->rd_id && buf->tag.blockNum >= block) { if (buf->flags & BM_DIRTY) { - elog (NOTICE, "BlowawayRelationBuffers(%s (local), %u): block %u is dirty", - rdesc->rd_rel->relname.data, block, buf->tag.blockNum); + elog(NOTICE, "BlowawayRelationBuffers(%s (local), %u): block %u is dirty", + rdesc->rd_rel->relname.data, block, buf->tag.blockNum); return (-1); } if (LocalRefCount[i] > 0) { - elog (NOTICE, "BlowawayRelationBuffers(%s (local), %u): block %u is referenced (%d)", - rdesc->rd_rel->relname.data, block, - buf->tag.blockNum, LocalRefCount[i]); + elog(NOTICE, "BlowawayRelationBuffers(%s (local), %u): block %u is referenced (%d)", + rdesc->rd_rel->relname.data, block, + buf->tag.blockNum, LocalRefCount[i]); return (-2); } buf->tag.relId.relId = InvalidOid; @@ -1653,22 +1653,22 @@ BlowawayRelationBuffers(Relation rdesc, BlockNumber block) { buf = &BufferDescriptors[i]; if (buf->tag.relId.dbId == MyDatabaseId && - buf->tag.relId.relId == rdesc->rd_id && + buf->tag.relId.relId == rdesc->rd_id && buf->tag.blockNum >= block) { if (buf->flags & BM_DIRTY) { - elog (NOTICE, "BlowawayRelationBuffers(%s, %u): block %u is dirty (private %d, last %d, global %d)", - buf->sb_relname, block, buf->tag.blockNum, - PrivateRefCount[i], LastRefCount[i], buf->refcount); + elog(NOTICE, "BlowawayRelationBuffers(%s, %u): block %u is dirty (private %d, last %d, global %d)", + buf->sb_relname, block, buf->tag.blockNum, + PrivateRefCount[i], LastRefCount[i], buf->refcount); SpinRelease(BufMgrLock); return (-1); } if (!(buf->flags & BM_FREE)) { - elog (NOTICE, "BlowawayRelationBuffers(%s, %u): block %u is referenced (private %d, last %d, global %d)", - buf->sb_relname, block, buf->tag.blockNum, - PrivateRefCount[i], LastRefCount[i], buf->refcount); + elog(NOTICE, "BlowawayRelationBuffers(%s, %u): block %u is referenced (private %d, last %d, global %d)", + buf->sb_relname, block, buf->tag.blockNum, + PrivateRefCount[i], LastRefCount[i], buf->refcount); SpinRelease(BufMgrLock); return (-2); } diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 8c13462167..3d05dc4b85 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.17 1998/01/13 04:04:20 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.18 1998/02/26 04:35:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -205,7 +205,7 @@ FlushLocalBuffer(Buffer buffer, bool release) (char *) MAKE_PTR(bufHdr->data)); LocalBufferFlushCount++; RelationDecrementReferenceCount(bufrel); - + Assert(LocalRefCount[bufid] > 0); if (release) LocalRefCount[bufid]--; @@ -279,7 +279,7 @@ LocalBufferSync(void) (char *) MAKE_PTR(buf->data)); LocalBufferFlushCount++; RelationDecrementReferenceCount(bufrel); - + buf->tag.relId.relId = InvalidOid; buf->flags &= ~BM_DIRTY; } diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c index 493139ed5d..1a194eb4a4 100644 --- a/src/backend/storage/buffer/s_lock.c +++ b/src/backend/storage/buffer/s_lock.c @@ -7,15 +7,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.2 1998/01/07 17:02:52 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.3 1998/02/26 04:35:28 momjian Exp $ * *------------------------------------------------------------------------- */ /* * S_LOCK() -- Implements the S_LOCK function for the Linux/Alpha platform. - * This function is usually an inlined macro for all other platforms, - * but must be a seperate function for the Linux/Alpha platform, due - * to the assembly code involved. + * This function is usually an inlined macro for all other platforms, + * but must be a seperate function for the Linux/Alpha platform, due + * to the assembly code involved. */ @@ -38,14 +38,16 @@ #include "storage/s_lock.h" #if defined(__alpha__) && defined(linux) -void S_LOCK(slock_t* lock) +void +S_LOCK(slock_t *lock) { - do - { - slock_t _res; - do - { - __asm__(" ldq $0, %0 \n\ + do + { + slock_t _res; + + do + { + __asm__(" ldq $0, %0 \n\ bne $0, already_set \n\ ldq_l $0, %0 \n\ bne $0, already_set \n\ @@ -58,7 +60,8 @@ void S_LOCK(slock_t* lock) stqc_fail: or $31, 1, $0 \n\ already_set: bis $0, $0, %1 \n\ end: nop ": "=m"(*lock), "=r"(_res): :"0"); - } while (_res != 0); - } while (0); + } while (_res != 0); + } while (0); } + #endif diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 63fe50c72b..9f48b222b2 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -6,7 +6,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Id: fd.c,v 1.29 1998/01/07 21:04:58 momjian Exp $ + * $Id: fd.c,v 1.30 1998/02/26 04:35:29 momjian Exp $ * * NOTES: * @@ -483,7 +483,7 @@ filepath(char *filename) } #ifdef FILEDEBUG -printf("filepath: path is %s\n", buf); + printf("filepath: path is %s\n", buf); #endif return (buf); @@ -852,7 +852,7 @@ FileNameUnlink(char *filename) */ static int allocatedFiles = 0; -FILE * +FILE * AllocateFile(char *name, char *mode) { FILE *file; diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index 49843807a0..b0219b5635 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.18 1998/01/07 21:05:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.19 1998/02/26 04:35:38 momjian Exp $ * * NOTES * @@ -561,7 +561,7 @@ IpcMemoryDetach(int status, char *shmaddr) /* CALL IT: addr = (struct <MemoryStructure> *) IpcMemoryAttach(memId); */ /* */ /****************************************************************************/ -char * +char * IpcMemoryAttach(IpcMemoryId memId) { char *memAddress; @@ -618,7 +618,7 @@ IpcMemoryKill(IpcMemoryKey memKey) */ /* used in spin.c */ -SLock *SLockArray = NULL; +SLock *SLockArray = NULL; static SLock **FreeSLockPP; static int *UnusedSLockIP; @@ -686,6 +686,7 @@ LockIsFree(int lockid) { return (SLockArray[lockid].flag == NOLOCK); } + #endif #endif /* HAS_TEST_AND_SET */ diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index c477b7d401..655adc9d31 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.16 1998/01/07 21:05:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.17 1998/02/26 04:35:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -276,7 +276,7 @@ InitShmem(unsigned int key, unsigned int size) * of space. Has to return a real pointer in order * to be compatable with malloc(). */ -long * +long * ShmemAlloc(unsigned long size) { unsigned long tmpFree; @@ -338,7 +338,7 @@ ShmemIsValid(unsigned long addr) * table at once. Use SpinAlloc() to create a spinlock * for the structure before creating the structure itself. */ -HTAB * +HTAB * ShmemInitHash(char *name, /* table string name for binding */ long init_size, /* initial size */ long max_size, /* max size of the table */ @@ -496,7 +496,7 @@ ShmemPIDDestroy(int pid) * the object is already in the binding table (hence, already * initialized). */ -long * +long * ShmemInitStruct(char *name, unsigned long size, bool *foundPtr) { BindingEnt *result, diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 7a444a15fa..f97e2ebdfb 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.25 1998/01/28 06:52:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.26 1998/02/26 04:36:07 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -50,9 +50,10 @@ #include "access/xact.h" #include "access/transam.h" -static int WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, +static int +WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, LOCKT lockt); - + /*#define LOCK_MGR_DEBUG*/ #ifndef LOCK_MGR_DEBUG @@ -542,7 +543,7 @@ LockAcquire(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt) * word alignment and ensures hashing consistency). * ------------------ */ - MemSet(&item, 0, XID_TAGSIZE); /* must clear padding, needed */ + MemSet(&item, 0, XID_TAGSIZE); /* must clear padding, needed */ TransactionIdStore(myXid, &item.tag.xid); item.tag.lock = MAKE_OFFSET(lock); #if 0 @@ -713,12 +714,12 @@ LockResolveConflicts(LOCKTAB *ltable, { /* ------------------------ * If someone with a greater priority is waiting for the lock, - * do not continue and share the lock, even if we can. bjm + * do not continue and share the lock, even if we can. bjm * ------------------------ */ - int myprio = ltable->ctl->prio[lockt]; - PROC_QUEUE *waitQueue = &(lock->waitProcs); - PROC *topproc = (PROC *) MAKE_PTR(waitQueue->links.prev); + int myprio = ltable->ctl->prio[lockt]; + PROC_QUEUE *waitQueue = &(lock->waitProcs); + PROC *topproc = (PROC *) MAKE_PTR(waitQueue->links.prev); if (waitQueue->size && topproc->prio > myprio) return STATUS_FOUND; @@ -902,7 +903,8 @@ LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt) #endif /* - * let the caller print its own error message, too. Do not elog(ERROR). + * let the caller print its own error message, too. Do not + * elog(ERROR). */ if (!lock) { @@ -1430,16 +1432,16 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) SHMEM_OFFSET end = MAKE_OFFSET(lockQueue); LOCK *lock; - LOCKTAB *ltable; + LOCKTAB *ltable; XIDLookupEnt *result, item; HTAB *xidTable; bool found; - static PROC* checked_procs[MaxBackendId]; - static int nprocs; - static bool MyNHolding; - + static PROC *checked_procs[MaxBackendId]; + static int nprocs; + static bool MyNHolding; + /* initialize at start of recursion */ if (skip_check) { @@ -1455,15 +1457,15 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) #if 0 item.tag.pid = pid; #endif - + if (!(result = (XIDLookupEnt *) - hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) || !found) + hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) || !found) { elog(NOTICE, "LockAcquire: xid table corrupted"); return true; } MyNHolding = result->nHolding; - } + } if (SHMQueueEmpty(lockQueue)) return false; @@ -1487,19 +1489,19 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) /* * This is our only check to see if we found the lock we want. * - * The lock we are waiting for is already in MyProc->lockQueue - * so we need to skip it here. We are trying to find it in - * someone else's lockQueue. + * The lock we are waiting for is already in MyProc->lockQueue so we + * need to skip it here. We are trying to find it in someone + * else's lockQueue. */ if (lock == findlock && !skip_check) return true; - { - PROC_QUEUE *waitQueue = &(lock->waitProcs); - PROC *proc; + { + PROC_QUEUE *waitQueue = &(lock->waitProcs); + PROC *proc; int i; int j; - + proc = (PROC *) MAKE_PTR(waitQueue->links.prev); for (i = 0; i < waitQueue->size; i++) { @@ -1507,23 +1509,24 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) lock == findlock && /* skip_check also true */ MyNHolding) /* I already hold some lock on it */ { + /* - * For findlock's wait queue, we are interested in - * procs who are blocked waiting for a write-lock on the - * table we are waiting on, and already hold a lock on it. - * We first check to see if there is an escalation - * deadlock, where we hold a readlock and want a - * writelock, and someone else holds readlock on - * the same table, and wants a writelock. + * For findlock's wait queue, we are interested in + * procs who are blocked waiting for a write-lock on + * the table we are waiting on, and already hold a + * lock on it. We first check to see if there is an + * escalation deadlock, where we hold a readlock and + * want a writelock, and someone else holds readlock + * on the same table, and wants a writelock. * - * Basically, the test is, "Do we both hold some lock - * on findlock, and we are both waiting in the lock - * queue?" + * Basically, the test is, "Do we both hold some lock on + * findlock, and we are both waiting in the lock + * queue?" */ Assert(skip_check); Assert(MyProc->prio == 2); - + ltable = AllTables[1]; xidTable = ltable->xidHash; @@ -1533,9 +1536,9 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) #if 0 item.tag.pid = pid; #endif - + if (!(result = (XIDLookupEnt *) - hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) || !found) + hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) || !found) { elog(NOTICE, "LockAcquire: xid table corrupted"); return true; @@ -1543,11 +1546,11 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) if (result->nHolding) return true; } + /* - * No sense in looking at the wait queue of the lock we are - * looking for. - * If lock == findlock, and I got here, skip_check must be - * true too. + * No sense in looking at the wait queue of the lock we + * are looking for. If lock == findlock, and I got here, + * skip_check must be true too. */ if (lock != findlock) { @@ -1558,13 +1561,14 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) { checked_procs[nprocs++] = proc; Assert(nprocs <= MaxBackendId); + /* - * For non-MyProc entries, we are looking only waiters, - * not necessarily people who already hold locks and are - * waiting. - * Now we check for cases where we have two or more - * tables in a deadlock. We do this by continuing - * to search for someone holding a lock + * For non-MyProc entries, we are looking only + * waiters, not necessarily people who already + * hold locks and are waiting. Now we check for + * cases where we have two or more tables in a + * deadlock. We do this by continuing to search + * for someone holding a lock */ if (DeadLockCheck(&(proc->lockQueue), findlock, false)) return true; @@ -1573,7 +1577,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) proc = (PROC *) MAKE_PTR(proc->links.prev); } } - + if (done) break; SHMQueueFirst(&xidLook->queue, (Pointer *) &tmp, &tmp->queue); @@ -1601,7 +1605,8 @@ DumpLocks() SPINLOCK masterLock; int nLockTypes; LOCK *lock; - count; + + count; int tableId = 1; LOCKTAB *ltable; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index e232020597..be91266cf6 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.33 1998/02/25 00:31:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.34 1998/02/26 04:36:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.33 1998/02/25 00:31:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.34 1998/02/26 04:36:12 momjian Exp $ */ #include <sys/time.h> #include <unistd.h> @@ -457,25 +457,22 @@ ProcSleep(PROC_QUEUE *waitQueue, dummy; /* - * If the first entries in the waitQueue have a greater priority than - * we have, we must be a reader, and they must be a writers, and we - * must be here because the current holder is a writer or a - * reader but we don't share shared locks if a writer is waiting. - * We put ourselves after the writers. This way, we have a FIFO, but - * keep the readers together to give them decent priority, and no one - * starves. Because we group all readers together, a non-empty queue - * only has a few possible configurations: + * If the first entries in the waitQueue have a greater priority than + * we have, we must be a reader, and they must be a writers, and we + * must be here because the current holder is a writer or a reader but + * we don't share shared locks if a writer is waiting. We put + * ourselves after the writers. This way, we have a FIFO, but keep + * the readers together to give them decent priority, and no one + * starves. Because we group all readers together, a non-empty queue + * only has a few possible configurations: * - * [readers] - * [writers] - * [readers][writers] - * [writers][readers] - * [writers][readers][writers] + * [readers] [writers] [readers][writers] [writers][readers] + * [writers][readers][writers] * - * In a full queue, we would have a reader holding a lock, then a - * writer gets the lock, then a bunch of readers, made up of readers - * who could not share the first readlock because a writer was waiting, - * and new readers arriving while the writer had the lock. + * In a full queue, we would have a reader holding a lock, then a writer + * gets the lock, then a bunch of readers, made up of readers who + * could not share the first readlock because a writer was waiting, + * and new readers arriving while the writer had the lock. * */ proc = (PROC *) MAKE_PTR(waitQueue->links.prev); @@ -486,13 +483,13 @@ ProcSleep(PROC_QUEUE *waitQueue, proc = (PROC *) MAKE_PTR(proc->links.prev); /* The rest of the queue is FIFO, with readers first, writers last */ - for ( ; i < waitQueue->size && proc->prio <= prio; i++) + for (; i < waitQueue->size && proc->prio <= prio; i++) proc = (PROC *) MAKE_PTR(proc->links.prev); MyProc->prio = prio; MyProc->token = token; MyProc->waitLock = lock; - + /* ------------------- * currently, we only need this for the ProcWakeup routines * ------------------- @@ -523,7 +520,7 @@ ProcSleep(PROC_QUEUE *waitQueue, do { - MyProc->errType = NO_ERROR; /* reset flag after deadlock check */ + MyProc->errType = NO_ERROR; /* reset flag after deadlock check */ if (setitimer(ITIMER_REAL, &timeval, &dummy)) elog(FATAL, "ProcSleep: Unable to set timer for process wakeup"); @@ -535,8 +532,9 @@ ProcSleep(PROC_QUEUE *waitQueue, * -------------- */ IpcSemaphoreLock(MyProc->sem.semId, MyProc->sem.semNum, IpcExclusiveLock); - } while (MyProc->errType == STATUS_NOT_FOUND); /* sleep after deadlock check */ - + } while (MyProc->errType == STATUS_NOT_FOUND); /* sleep after deadlock + * check */ + /* --------------- * We were awoken before a timeout - now disable the timer * --------------- diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 5e4c493201..e470fa34f1 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.28 1998/02/23 13:58:04 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.29 1998/02/26 04:36:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,7 +67,7 @@ static MemoryContext MdCxt; * The number needs to be (2 ** 31) / BLCKSZ, but to be keep * the math under MAXINT, pre-divide by 256 and use ... * - * (((2 ** 23) / BLCKSZ) * (2 ** 8)) + * (((2 ** 23) / BLCKSZ) * (2 ** 8)) * * 07 Jan 98 darrenk */ @@ -505,33 +505,35 @@ mdblindwrt(char *dbstr, /* user table? then put in user database area... */ else if (dbid == MyDatabaseId) { - extern char *DatabasePath; - + extern char *DatabasePath; + path = (char *) palloc(strlen(DatabasePath) + 2 * sizeof(NameData) + 2 + nchars); if (segno == 0) sprintf(path, "%s%c%s", DatabasePath, SEP_CHAR, relstr); else sprintf(path, "%s%c%s.%d", DatabasePath, SEP_CHAR, relstr, segno); } - else /* this is work arround only !!! */ + else +/* this is work arround only !!! */ { - char dbpath[MAXPGPATH+1]; - Oid owner, id; - char *tmpPath; - + char dbpath[MAXPGPATH + 1]; + Oid owner, + id; + char *tmpPath; + GetRawDatabaseInfo(dbstr, &owner, &id, dbpath); - + if (id != dbid) - elog (FATAL, "mdblindwrt: oid of db %s is not %u", dbstr, dbid); + elog(FATAL, "mdblindwrt: oid of db %s is not %u", dbstr, dbid); tmpPath = ExpandDatabasePath(dbpath); if (tmpPath == NULL) - elog (FATAL, "mdblindwrt: can't expand path for db %s", dbstr); + elog(FATAL, "mdblindwrt: can't expand path for db %s", dbstr); path = (char *) palloc(strlen(tmpPath) + 2 * sizeof(NameData) + 2 + nchars); if (segno == 0) sprintf(path, "%s%c%s", tmpPath, SEP_CHAR, relstr); else sprintf(path, "%s%c%s.%d", tmpPath, SEP_CHAR, relstr, segno); - pfree (tmpPath); + pfree(tmpPath); } if ((fd = open(path, O_RDWR, 0600)) < 0) @@ -635,7 +637,7 @@ mdtruncate(Relation reln, int nblocks) return (nblocks); -} /* mdtruncate */ +} /* mdtruncate */ /* * mdcommit() -- Commit a transaction. diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c index a2003c18e3..df8381cdb6 100644 --- a/src/backend/storage/smgr/smgrtype.c +++ b/src/backend/storage/smgr/smgrtype.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.7 1998/01/07 21:05:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.8 1998/02/26 04:36:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ smgrin(char *s) return 0; } -char * +char * smgrout(int2 i) { char *s; diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 25b8ad984c..94d9eaad62 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.16 1998/01/26 01:41:23 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.17 1998/02/26 04:36:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,7 +61,7 @@ void (* { switch (dest) { - case RemoteInternal: + case RemoteInternal: return printtup_internal; break; diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 1f2bd4b92f..bf799d5025 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.12 1998/01/26 01:41:28 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.13 1998/02/26 04:36:26 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -326,7 +326,9 @@ HandleFunctionRequest() { /* by-reference ... */ if (fip->arglen[i] < 0) { /* ... varlena */ - if (!(p = palloc(argsize + VARHDRSZ + 1))) /* Added +1 to solve memory leak - Peter 98 Jan 6 */ + if (!(p = palloc(argsize + VARHDRSZ + 1))) /* Added +1 to solve + * memory leak - Peter + * 98 Jan 6 */ { elog(ERROR, "HandleFunctionRequest: palloc failed"); } diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index b981dcb125..efba35f240 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.66 1998/02/24 15:19:23 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.67 1998/02/26 04:36:31 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -371,12 +371,13 @@ ReadCommand(char *inBuf) return InteractiveBackend(inBuf); } -List * -pg_parse_and_plan(char *query_string, /* string to execute */ - Oid *typev, /* argument types */ - int nargs, /* number of arguments */ - QueryTreeList **queryListP, /* pointer to the parse trees */ - CommandDest dest) /* where results should go */ +List * +pg_parse_and_plan(char *query_string, /* string to execute */ + Oid *typev, /* argument types */ + int nargs, /* number of arguments */ + QueryTreeList **queryListP, /* pointer to the parse + * trees */ + CommandDest dest) /* where results should go */ { QueryTreeList *querytree_list; int i; @@ -416,8 +417,10 @@ pg_parse_and_plan(char *query_string, /* string to execute */ * rewrites */ for (i = 0; i < querytree_list->len; i++) { - List *union_result, *union_list, *rewritten_list; - + List *union_result, + *union_list, + *rewritten_list; + querytree = querytree_list->qtrees[i]; @@ -446,14 +449,15 @@ pg_parse_and_plan(char *query_string, /* string to execute */ rewritten = QueryRewrite(querytree); /* - * Rewrite the UNIONS. + * Rewrite the UNIONS. */ foreach(rewritten_list, rewritten) { - Query *qry = (Query *)lfirst(rewritten_list); + Query *qry = (Query *) lfirst(rewritten_list); + union_result = NIL; foreach(union_list, qry->unionClause) - union_result = nconc(union_result, QueryRewrite((Query *)lfirst(union_list))); + union_result = nconc(union_result, QueryRewrite((Query *) lfirst(union_list))); qry->unionClause = union_result; } @@ -598,11 +602,11 @@ pg_exec_query(char *query_string, char **argv, Oid *typev, int nargs) } void -pg_exec_query_dest(char *query_string,/* string to execute */ - char **argv, /* arguments */ - Oid *typev, /* argument types */ - int nargs, /* number of arguments */ - CommandDest dest) /* where results should go */ +pg_exec_query_dest(char *query_string, /* string to execute */ + char **argv, /* arguments */ + Oid *typev, /* argument types */ + int nargs, /* number of arguments */ + CommandDest dest) /* where results should go */ { List *plan_list; Plan *plan; @@ -740,11 +744,11 @@ static void quickdie(SIGNAL_ARGS) { elog(NOTICE, "Message from PostgreSQL backend:" - "\n\tThe Postmaster has informed me that some other backend" - " died abnormally and possibly corrupted shared memory." - "\n\tI have rolled back the current transaction and am" - " going to terminate your database system connection and exit." - "\n\tPlease reconnect to the database system and repeat your query."); + "\n\tThe Postmaster has informed me that some other backend" + " died abnormally and possibly corrupted shared memory." + "\n\tI have rolled back the current transaction and am" + " going to terminate your database system connection and exit." + "\n\tPlease reconnect to the database system and repeat your query."); /* @@ -767,8 +771,8 @@ static void FloatExceptionHandler(SIGNAL_ARGS) { elog(ERROR, "floating point exception!" - " The last floating point operation either exceeded legal ranges" - " or was a divide by zero"); + " The last floating point operation either exceeded legal ranges" + " or was a divide by zero"); } @@ -868,14 +872,15 @@ PostgresMain(int argc, char *argv[]) #endif /* - * get hostname is either the environment variable PGHOST or NULL - * NULL means Unix-socket only + * get hostname is either the environment variable PGHOST or NULL NULL + * means Unix-socket only */ DataDir = getenv("PGDATA"); + /* - * Try to get initial values for date styles and formats. - * Does not do a complete job, but should be good enough for backend. - * Cannot call parse_date() since palloc/pfree memory is not set up yet. + * Try to get initial values for date styles and formats. Does not do + * a complete job, but should be good enough for backend. Cannot call + * parse_date() since palloc/pfree memory is not set up yet. */ DBDate = getenv("PGDATESTYLE"); if (DBDate != NULL) @@ -1068,10 +1073,10 @@ PostgresMain(int argc, char *argv[]) * ---------------- */ { - int S; - + int S; + S = atoi(optarg); - if ( S >= 4*BLCKSZ/1024 ) + if (S >= 4 * BLCKSZ / 1024) SortMem = S; } break; @@ -1117,7 +1122,7 @@ PostgresMain(int argc, char *argv[]) break; case 'v': - FrontendProtocol = (ProtocolVersion)atoi(optarg); + FrontendProtocol = (ProtocolVersion) atoi(optarg); break; case 'x': @@ -1169,7 +1174,7 @@ PostgresMain(int argc, char *argv[]) userName = GetPgUserName(); #ifdef CYR_RECODE - SetCharSet(); + SetCharSet(); #endif if (FindBackend(pg_pathname, argv[0]) < 0) @@ -1297,7 +1302,7 @@ PostgresMain(int argc, char *argv[]) if (IsUnderPostmaster == false) { puts("\nPOSTGRES backend interactive interface"); - puts("$Revision: 1.66 $ $Date: 1998/02/24 15:19:23 $"); + puts("$Revision: 1.67 $ $Date: 1998/02/26 04:36:31 $"); } /* ---------------- diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 6721e3f963..d836262fdf 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.14 1998/02/13 03:42:32 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.15 1998/02/26 04:36:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,7 @@ CreateQueryDesc(Query *parsetree, * Note: this may someday take parameters -cim 9/18/89 * ---------------------------------------------------------------- */ -EState * +EState * CreateExecutorState(void) { EState *state; diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 28858cf628..65ce9d7e03 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.37 1998/01/25 05:14:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.38 1998/02/26 04:36:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,9 +56,9 @@ #include "utils/syscache.h" #endif -void DefineUser(CreateUserStmt *stmt); -void AlterUser(AlterUserStmt *stmt); -void RemoveUser(char *username); +void DefineUser(CreateUserStmt *stmt); +void AlterUser(AlterUserStmt *stmt); +void RemoveUser(char *username); /* ---------------- * CHECK_IF_ABORTED() is used to avoid doing unnecessary @@ -78,7 +78,7 @@ void RemoveUser(char *username); * ---------------- */ void -ProcessUtility(Node * parsetree, +ProcessUtility(Node *parsetree, CommandDest dest) { char *commandTag = NULL; @@ -242,12 +242,13 @@ ProcessUtility(Node * parsetree, CHECK_IF_ABORTED(); /* - * owner checking done in PerformAddAttribute (now recursive) + * owner checking done in PerformAddAttribute (now + * recursive) */ PerformAddAttribute(stmt->relname, userName, stmt->inh, - (ColumnDef *)stmt->colDef); + (ColumnDef *) stmt->colDef); } break; @@ -723,30 +724,30 @@ ProcessUtility(Node * parsetree, DropProceduralLanguage((DropPLangStmt *) parsetree); break; - /* - * ******************************** USER statements **** - * - */ - case T_CreateUserStmt: - commandTag = "CREATE USER"; - CHECK_IF_ABORTED(); + /* + * ******************************** USER statements **** + * + */ + case T_CreateUserStmt: + commandTag = "CREATE USER"; + CHECK_IF_ABORTED(); - DefineUser((CreateUserStmt*)parsetree); - break; + DefineUser((CreateUserStmt *) parsetree); + break; - case T_AlterUserStmt: - commandTag = "ALTER USER"; - CHECK_IF_ABORTED(); + case T_AlterUserStmt: + commandTag = "ALTER USER"; + CHECK_IF_ABORTED(); - AlterUser((AlterUserStmt*)parsetree); - break; + AlterUser((AlterUserStmt *) parsetree); + break; - case T_DropUserStmt: - commandTag = "DROP USER"; - CHECK_IF_ABORTED(); + case T_DropUserStmt: + commandTag = "DROP USER"; + CHECK_IF_ABORTED(); - RemoveUser(((DropUserStmt*)parsetree)->user); - break; + RemoveUser(((DropUserStmt *) parsetree)->user); + break; /* diff --git a/src/backend/tioga/Varray.c b/src/backend/tioga/Varray.c index 20f9b7d6e9..d5258cb540 100644 --- a/src/backend/tioga/Varray.c +++ b/src/backend/tioga/Varray.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include "Varray.h" -Varray * +Varray * NewVarray(size_t nobj, size_t size) /* * NewVarray -- allocate a Varray to contain an array of val each of which diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c index fd45f489f1..94caf287d4 100644 --- a/src/backend/tioga/tgRecipe.c +++ b/src/backend/tioga/tgRecipe.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.7 1997/10/25 01:10:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.8 1998/02/26 04:36:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ findNodeInRecipe() XXX Currently, this is done by linear search. Change to using a hash table. -------------------------------------- */ -TgNode * +TgNode * findNodeInRecipe(TgRecipe * r, char *nodeName) { int i; diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h index 47e1bbb8f6..9ffbf20d33 100644 --- a/src/backend/tioga/tgRecipe.h +++ b/src/backend/tioga/tgRecipe.h @@ -11,7 +11,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tgRecipe.h,v 1.5 1997/09/08 21:48:03 momjian Exp $ + * $Id: tgRecipe.h,v 1.6 1998/02/26 04:36:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,6 +32,7 @@ typedef struct * * * + * * geo-decls.h */ #endif /* TIOGA_FRONTEND */ diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 62a977b3fe..aff5abb504 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.26 1998/02/25 13:07:43 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.27 1998/02/26 04:36:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -182,7 +182,7 @@ aclparse(char *s, AclItem *aip, unsigned *modechg) * RETURNS: * the new Acl */ -Acl * +Acl * makeacl(int n) { Acl *new_acl; @@ -240,10 +240,10 @@ aclitemin(char *s) * RETURNS: * the new string */ -char * +char * aclitemout(AclItem *aip) { - char *p; + char *p; char *out; HeapTuple htp; unsigned i; @@ -272,12 +272,13 @@ aclitemout(AclItem *aip) #ifdef NOT_USED - When this elog(NOTICE) goes to the libpq client, it crashes the - client because the NOTICE protocol is coming right in the middle - of a request for a field value. We skip the NOTICE for now. + When this elog(NOTICE) goes to the libpq client, + it crashes the + client because the NOTICE protocol is coming right in the middle + of a request for a field value.We skip the NOTICE for now. - elog(NOTICE, "aclitemout: usesysid %d not found", - aip->ai_id); + elog(NOTICE, "aclitemout: usesysid %d not found", + aip->ai_id); #endif @@ -342,7 +343,7 @@ aclitemgt(AclItem *a1, AclItem *a2) (a1->ai_idtype == a2->ai_idtype && a1->ai_id > a2->ai_id)); } -Acl * +Acl * aclownerdefault(char *relname, AclId ownerid) { Acl *acl; @@ -359,7 +360,7 @@ aclownerdefault(char *relname, AclId ownerid) return (acl); } -Acl * +Acl * acldefault(char *relname) { Acl *acl; @@ -373,7 +374,7 @@ acldefault(char *relname) return (acl); } -Acl * +Acl * aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg) { Acl *new_acl; @@ -490,13 +491,13 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg) * aclinsert * */ -Acl * +Acl * aclinsert(Acl *old_acl, AclItem *mod_aip) { return (aclinsert3(old_acl, mod_aip, ACL_MODECHG_EQL)); } -Acl * +Acl * aclremove(Acl *old_acl, AclItem *mod_aip) { Acl *new_acl; @@ -583,7 +584,7 @@ aclcontains(Acl *acl, AclItem *aip) * */ -char * +char * aclmakepriv(char *old_privlist, char new_priv) { char *priv; @@ -636,7 +637,7 @@ aclmakepriv(char *old_privlist, char new_priv) * */ -char * +char * aclmakeuser(char *user_type, char *user) { char *user_list; diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index a04a3b6174..50c42c1120 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.26 1998/02/14 18:00:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.27 1998/02/26 04:36:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,8 @@ /*-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-*/ static int _ArrayCount(char *str, int dim[], int typdelim); -static char *_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[], +static char * +_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[], FmgrInfo *inputproc, Oid typelem, int16 typmod, char typdelim, int typlen, bool typbyval, char typalign, int *nbytes); @@ -90,7 +91,7 @@ static char *array_seek(char *ptr, int eltsize, int nitems); * the internal representation of the input array *-------------------------------------------------------------------- */ -char * +char * array_in(char *string, /* input array in external form */ Oid element_type, /* type OID of an array element */ int16 typmod) @@ -208,7 +209,7 @@ array_in(char *string, /* input array in external form */ /* array not a large object */ dataPtr = (char *) _ReadArrayStr(p, nitems, ndim, dim, &inputproc, typelem, - typmod, typdelim, typlen, typbyval, typalign, + typmod, typdelim, typlen, typbyval, typalign, &nbytes); nbytes += ARR_OVERHEAD(ndim); retval = (ArrayType *) palloc(nbytes); @@ -612,7 +613,7 @@ _CopyArrayEls(char **values, * containing the array in its external format. *------------------------------------------------------------------------- */ -char * +char * array_out(ArrayType *v, Oid element_type) { int typlen; @@ -769,7 +770,7 @@ array_out(ArrayType *v, Oid element_type) * returns the dimension of the array pointed to by "v" *---------------------------------------------------------------------------- */ -char * +char * array_dims(ArrayType *v, bool *isNull) { char *p, @@ -1071,7 +1072,7 @@ array_clip(ArrayType *array, * returns a pointer to the modified array. *----------------------------------------------------------------------------- */ -char * +char * array_set(ArrayType *array, int n, int indx[], @@ -1206,7 +1207,7 @@ array_set(ArrayType *array, * returns a pointer to the modified array. *---------------------------------------------------------------------------- */ -char * +char * array_assgn(ArrayType *array, int n, int upperIndx[], @@ -1722,7 +1723,7 @@ _LOtransfer(char **destfd, #undef MAX_READ } -char * +char * _array_newLO(int *fd, int flag) { char *p; diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index fbfaa6973d..e781dbe59f 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.13 1998/01/05 16:39:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.14 1998/02/26 04:36:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,9 +33,10 @@ bool boolin(char *b) { - switch(*b) { - case 't': - case 'T': + switch (*b) + { + case 't': + case 'T': if (strncasecmp(b, "true", strlen(b)) == 0) return (TRUE); break; @@ -72,10 +73,10 @@ boolin(char *b) break; } - elog(ERROR,"Bad boolean external representation '%s'", b); + elog(ERROR, "Bad boolean external representation '%s'", b); /* not reached */ return (FALSE); -} /* boolin() */ +} /* boolin() */ /* * boolout - converts 1 or 0 to "t" or "f" @@ -88,7 +89,7 @@ boolout(bool b) *result = (b) ? 't' : 'f'; result[1] = '\0'; return (result); -} /* boolout() */ +} /* boolout() */ /***************************************************************************** @@ -122,11 +123,11 @@ boolgt(bool arg1, bool arg2) bool istrue(bool arg1) { - return(arg1 == TRUE); -} /* istrue() */ + return (arg1 == TRUE); +} /* istrue() */ bool isfalse(bool arg1) { - return(arg1 != TRUE); -} /* isfalse() */ + return (arg1 != TRUE); +} /* isfalse() */ diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index 7d2f7b937c..e9e3a971b4 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.21 1998/01/07 18:46:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.22 1998/02/26 04:36:53 momjian Exp $ */ #include <stdio.h> @@ -34,6 +34,7 @@ static const char *num_word(Cash value); #ifdef USE_LOCALE static struct lconv *lconvert = NULL; + #endif /* cash_in() @@ -46,7 +47,7 @@ static struct lconv *lconvert = NULL; * monetary values returned by localeconv() can be multiple * bytes/characters. This code assumes one byte only. - tgl 97/04/14 */ -Cash * +Cash * cash_in(const char *str) { Cash *result; @@ -73,7 +74,7 @@ cash_in(const char *str) /* frac_digits in the C locale seems to return CHAR_MAX */ /* best guess is 2 in this case I think */ - fpoint = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2); /* int_frac_digits? */ + fpoint = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2); /* int_frac_digits? */ dsymbol = *lconvert->mon_decimal_point; ssymbol = *lconvert->mon_thousands_sep; @@ -90,8 +91,8 @@ cash_in(const char *str) #endif #ifdef CASHDEBUG -printf( "cashin- precision %d; decimal %c; thousands %c; currency %c; positive %c; negative %c\n", - fpoint, dsymbol, ssymbol, csymbol, psymbol, nsymbol); + printf("cashin- precision %d; decimal %c; thousands %c; currency %c; positive %c; negative %c\n", + fpoint, dsymbol, ssymbol, csymbol, psymbol, nsymbol); #endif /* we need to add all sorts of checking here. For now just */ @@ -164,7 +165,7 @@ printf( "cashin- precision %d; decimal %c; thousands %c; currency %c; positive % *result = (value * sgn); return (result); -} /* cash_in() */ +} /* cash_in() */ /* cash_out() @@ -201,7 +202,7 @@ cash_out(Cash *in_value) nsymbol = lconvert->negative_sign; /* frac_digits in the C locale seems to return CHAR_MAX */ /* best guess is 2 in this case I think */ - points = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2); /* int_frac_digits? */ + points = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2); /* int_frac_digits? */ convention = lconvert->n_sign_posn; #else mon_group = 3; @@ -276,7 +277,7 @@ cash_out(Cash *in_value) } return (result); -} /* cash_out() */ +} /* cash_out() */ bool @@ -286,7 +287,7 @@ cash_eq(Cash *c1, Cash *c2) return (FALSE); return (*c1 == *c2); -} /* cash_eq() */ +} /* cash_eq() */ bool cash_ne(Cash *c1, Cash *c2) @@ -295,7 +296,7 @@ cash_ne(Cash *c1, Cash *c2) return (FALSE); return (*c1 != *c2); -} /* cash_ne() */ +} /* cash_ne() */ bool cash_lt(Cash *c1, Cash *c2) @@ -304,7 +305,7 @@ cash_lt(Cash *c1, Cash *c2) return (FALSE); return (*c1 < *c2); -} /* cash_lt() */ +} /* cash_lt() */ bool cash_le(Cash *c1, Cash *c2) @@ -313,7 +314,7 @@ cash_le(Cash *c1, Cash *c2) return (FALSE); return (*c1 <= *c2); -} /* cash_le() */ +} /* cash_le() */ bool cash_gt(Cash *c1, Cash *c2) @@ -322,7 +323,7 @@ cash_gt(Cash *c1, Cash *c2) return (FALSE); return (*c1 > *c2); -} /* cash_gt() */ +} /* cash_gt() */ bool cash_ge(Cash *c1, Cash *c2) @@ -331,13 +332,13 @@ cash_ge(Cash *c1, Cash *c2) return (FALSE); return (*c1 >= *c2); -} /* cash_ge() */ +} /* cash_ge() */ /* cash_pl() * Add two cash values. */ -Cash * +Cash * cash_pl(Cash *c1, Cash *c2) { Cash *result; @@ -351,13 +352,13 @@ cash_pl(Cash *c1, Cash *c2) *result = (*c1 + *c2); return (result); -} /* cash_pl() */ +} /* cash_pl() */ /* cash_mi() * Subtract two cash values. */ -Cash * +Cash * cash_mi(Cash *c1, Cash *c2) { Cash *result; @@ -371,13 +372,13 @@ cash_mi(Cash *c1, Cash *c2) *result = (*c1 - *c2); return (result); -} /* cash_mi() */ +} /* cash_mi() */ /* cash_mul_flt8() * Multiply cash by float8. */ -Cash * +Cash * cash_mul_flt8(Cash *c, float8 *f) { Cash *result; @@ -391,17 +392,17 @@ cash_mul_flt8(Cash *c, float8 *f) *result = ((*f) * (*c)); return (result); -} /* cash_mul_flt8() */ +} /* cash_mul_flt8() */ /* flt8_mul_cash() * Multiply float8 by cash. */ -Cash * +Cash * flt8_mul_cash(float8 *f, Cash *c) { return (cash_mul_flt8(c, f)); -} /* flt8_mul_cash() */ +} /* flt8_mul_cash() */ /* cash_div_flt8() @@ -410,7 +411,7 @@ flt8_mul_cash(float8 *f, Cash *c) * XXX Don't know if rounding or truncating is correct behavior. * Round for now. - tgl 97/04/15 */ -Cash * +Cash * cash_div_flt8(Cash *c, float8 *f) { Cash *result; @@ -427,12 +428,12 @@ cash_div_flt8(Cash *c, float8 *f) *result = rint(*c / *f); return (result); -} /* cash_div_flt8() */ +} /* cash_div_flt8() */ /* cash_mul_flt4() * Multiply cash by float4. */ -Cash * +Cash * cash_mul_flt4(Cash *c, float4 *f) { Cash *result; @@ -446,17 +447,17 @@ cash_mul_flt4(Cash *c, float4 *f) *result = ((*f) * (*c)); return (result); -} /* cash_mul_flt4() */ +} /* cash_mul_flt4() */ /* flt4_mul_cash() * Multiply float4 by float4. */ -Cash * +Cash * flt4_mul_cash(float4 *f, Cash *c) { return (cash_mul_flt4(c, f)); -} /* flt4_mul_cash() */ +} /* flt4_mul_cash() */ /* cash_div_flt4() @@ -465,7 +466,7 @@ flt4_mul_cash(float4 *f, Cash *c) * XXX Don't know if rounding or truncating is correct behavior. * Round for now. - tgl 97/04/15 */ -Cash * +Cash * cash_div_flt4(Cash *c, float4 *f) { Cash *result; @@ -482,13 +483,13 @@ cash_div_flt4(Cash *c, float4 *f) *result = rint(*c / *f); return (result); -} /* cash_div_flt4() */ +} /* cash_div_flt4() */ /* cash_mul_int4() * Multiply cash by int4. */ -Cash * +Cash * cash_mul_int4(Cash *c, int4 i) { Cash *result; @@ -502,17 +503,17 @@ cash_mul_int4(Cash *c, int4 i) *result = ((i) * (*c)); return (result); -} /* cash_mul_int4() */ +} /* cash_mul_int4() */ /* int4_mul_cash() * Multiply int4 by cash. */ -Cash * +Cash * int4_mul_cash(int4 i, Cash *c) { return (cash_mul_int4(c, i)); -} /* int4_mul_cash() */ +} /* int4_mul_cash() */ /* cash_div_int4() @@ -521,7 +522,7 @@ int4_mul_cash(int4 i, Cash *c) * XXX Don't know if rounding or truncating is correct behavior. * Round for now. - tgl 97/04/15 */ -Cash * +Cash * cash_div_int4(Cash *c, int4 i) { Cash *result; @@ -538,13 +539,13 @@ cash_div_int4(Cash *c, int4 i) *result = rint(*c / i); return (result); -} /* cash_div_int4() */ +} /* cash_div_int4() */ /* cash_mul_int2() * Multiply cash by int2. */ -Cash * +Cash * cash_mul_int2(Cash *c, int2 s) { Cash *result; @@ -558,17 +559,17 @@ cash_mul_int2(Cash *c, int2 s) *result = ((s) * (*c)); return (result); -} /* cash_mul_int2() */ +} /* cash_mul_int2() */ /* int2_mul_cash() * Multiply int2 by cash. */ -Cash * +Cash * int2_mul_cash(int2 s, Cash *c) { return (cash_mul_int2(c, s)); -} /* int2_mul_cash() */ +} /* int2_mul_cash() */ /* cash_div_int2() @@ -577,7 +578,7 @@ int2_mul_cash(int2 s, Cash *c) * XXX Don't know if rounding or truncating is correct behavior. * Round for now. - tgl 97/04/15 */ -Cash * +Cash * cash_div_int2(Cash *c, int2 s) { Cash *result; @@ -594,13 +595,13 @@ cash_div_int2(Cash *c, int2 s) *result = rint(*c / s); return (result); -} /* cash_div_int2() */ +} /* cash_div_int2() */ /* cashlarger() * Return larger of two cash values. */ -Cash * +Cash * cashlarger(Cash *c1, Cash *c2) { Cash *result; @@ -614,13 +615,13 @@ cashlarger(Cash *c1, Cash *c2) *result = ((*c1 > *c2) ? *c1 : *c2); return (result); -} /* cashlarger() */ +} /* cashlarger() */ /* cashsmaller() * Return smaller of two cash values. */ -Cash * +Cash * cashsmaller(Cash *c1, Cash *c2) { Cash *result; @@ -634,7 +635,7 @@ cashsmaller(Cash *c1, Cash *c2) *result = ((*c1 < *c2) ? *c1 : *c2); return (result); -} /* cashsmaller() */ +} /* cashsmaller() */ /* cash_words_out() @@ -691,7 +692,7 @@ cash_words_out(Cash *value) strcat(buf, m0 == 1 ? " cent" : " cents"); *buf = toupper(*buf); return (buf); -} /* cash_words_out() */ +} /* cash_words_out() */ /************************************************************************* @@ -749,4 +750,4 @@ num_word(Cash value) } return (buf); -} /* num_word() */ +} /* num_word() */ diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index cb715cd7c7..23bfd4c20b 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.14 1997/11/02 15:25:57 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.15 1998/02/26 04:36:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ charin(char *ch) /* * charout - converts 'x' to "x" */ -char * +char * charout(int32 ch) { char *result = (char *) palloc(2); @@ -75,7 +75,7 @@ cidin(char *s) * NOTE: we must no use 'charout' because cid might be a non * printable character... */ -char * +char * cidout(int32 c) { char *result; @@ -93,7 +93,7 @@ cidout(int32 c) * Note: * Currently if strlen(s) < 14, the extra chars are nulls */ -char * +char * char16in(char *s) { char *result; @@ -108,7 +108,7 @@ char16in(char *s) /* * char16out - converts internal reprsentation to "..." */ -char * +char * char16out(char *s) { char *result = (char *) palloc(17); @@ -272,7 +272,7 @@ char2in(char *s) return (res); } -char * +char * char2out(uint16 s) { char *result = (char *) palloc(3); @@ -338,7 +338,7 @@ char4in(char *s) return (res); } -char * +char * char4out(s) uint32 s; { @@ -392,7 +392,7 @@ char4cmp(uint32 a, uint32 b) } /* ============================== char8 ============================== */ -char * +char * char8in(char *s) { char *result; @@ -405,7 +405,7 @@ char8in(char *s) return (result); } -char * +char * char8out(char *s) { char *result = (char *) palloc(9); diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c index 9f38f5caad..2eeebfb12d 100644 --- a/src/backend/utils/adt/chunk.c +++ b/src/backend/utils/adt/chunk.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.15 1998/02/11 19:12:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.16 1998/02/26 04:36:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,7 +70,7 @@ GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], int baseSize, * information about the chunked file *----------------------------------------------------------------------- */ -char * +char * _ChunkArray(int fd, FILE *afd, int ndim, @@ -191,7 +191,7 @@ _FindBestChunk(int size, * compute the number of page fetches for a given chunk size (d[]) * and access pattern (A[][]) */ - int i, + int i, j, nc; @@ -224,7 +224,7 @@ _FindBestChunk(int size, static int get_next(int d[], int k, int C, int dmax[]) { - int i, + int i, j, temp; @@ -266,7 +266,8 @@ get_next(int d[], int k, int C, int dmax[]) } #ifdef LOARRAY -static char a_chunk[BLCKSZ + VARHDRSZ];/* VARHDRSZ since a_chunk is in varlena format */ +static char a_chunk[BLCKSZ + VARHDRSZ]; /* VARHDRSZ since a_chunk is in + * varlena format */ #endif diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index e3dadad0f9..6b7c24c548 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.23 1998/02/11 19:12:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.24 1998/02/26 04:36:57 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -155,13 +155,13 @@ reltimein(char *str) elog(ERROR, "Bad reltime (internal coding error) '%s'", str); return (INVALID_RELTIME); -} /* reltimein() */ +} /* reltimein() */ /* * reltimeout - converts the internal format to a reltime string */ -char * +char * reltimeout(int32 time) { char *result; @@ -184,7 +184,7 @@ reltimeout(int32 time) strcpy(result, buf); return (result); -} /* reltimeout() */ +} /* reltimeout() */ #define TMODULO(t,q,u) {q = (t / u); \ @@ -201,12 +201,12 @@ reltime2tm(int32 time, struct tm * tm) TMODULO(time, tm->tm_sec, 1); return; -} /* reltime2tm() */ +} /* reltime2tm() */ #if FALSE char *timestring; long quantity; -int i; +int i; int unitnr; timestring = (char *) palloc(Max(strlen(INVALID_RELTIME_STR), @@ -274,7 +274,7 @@ tintervalin(char *intervalstr) * tintervalout - converts an internal interval format to a string * */ -char * +char * tintervalout(TimeInterval interval) { char *i_str, @@ -350,7 +350,7 @@ timespan_reltime(TimeSpan *timespan) } return (time); -} /* timespan_reltime() */ +} /* timespan_reltime() */ TimeSpan * @@ -378,7 +378,7 @@ reltime_timespan(RelativeTime reltime) } return (result); -} /* reltime_timespan() */ +} /* reltime_timespan() */ /* @@ -575,7 +575,7 @@ intervalsame(TimeInterval i1, TimeInterval i2) return (FALSE); /* invalid interval */ return (abstimeeq(i1->data[0], i2->data[0]) && abstimeeq(i1->data[1], i2->data[1])); -} /* intervalsame() */ +} /* intervalsame() */ /* @@ -585,7 +585,10 @@ intervalsame(TimeInterval i1, TimeInterval i2) bool intervaleq(TimeInterval i1, TimeInterval i2) { - AbsoluteTime t10, t11, t20, t21; + AbsoluteTime t10, + t11, + t20, + t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) return (FALSE); /* invalid interval */ @@ -596,7 +599,7 @@ intervaleq(TimeInterval i1, TimeInterval i2) t21 = i2->data[1]; if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) - || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) + || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) return (FALSE); if (t10 == CURRENT_ABSTIME) @@ -608,8 +611,8 @@ intervaleq(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11-t10) == (t21-t20)); -} /* intervaleq() */ + return ((t11 - t10) == (t21 - t20)); +} /* intervaleq() */ /* * intervalne - returns 1, iff interval i1 is not equal to interval i2 @@ -618,7 +621,10 @@ intervaleq(TimeInterval i1, TimeInterval i2) bool intervalne(TimeInterval i1, TimeInterval i2) { - AbsoluteTime t10, t11, t20, t21; + AbsoluteTime t10, + t11, + t20, + t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) return (FALSE); /* invalid interval */ @@ -629,7 +635,7 @@ intervalne(TimeInterval i1, TimeInterval i2) t21 = i2->data[1]; if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) - || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) + || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) return (FALSE); if (t10 == CURRENT_ABSTIME) @@ -641,8 +647,8 @@ intervalne(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11-t10) != (t21-t20)); -} /* intervalne() */ + return ((t11 - t10) != (t21 - t20)); +} /* intervalne() */ /* * intervallt - returns TRUE, iff interval i1 is less than interval i2 @@ -651,7 +657,10 @@ intervalne(TimeInterval i1, TimeInterval i2) bool intervallt(TimeInterval i1, TimeInterval i2) { - AbsoluteTime t10, t11, t20, t21; + AbsoluteTime t10, + t11, + t20, + t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) return (FALSE); /* invalid interval */ @@ -662,7 +671,7 @@ intervallt(TimeInterval i1, TimeInterval i2) t21 = i2->data[1]; if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) - || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) + || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) return (FALSE); if (t10 == CURRENT_ABSTIME) @@ -674,8 +683,8 @@ intervallt(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11-t10) < (t21-t20)); -} /* intervallt() */ + return ((t11 - t10) < (t21 - t20)); +} /* intervallt() */ /* * intervalle - returns TRUE, iff interval i1 is less than or equal to interval i2 @@ -684,7 +693,10 @@ intervallt(TimeInterval i1, TimeInterval i2) bool intervalle(TimeInterval i1, TimeInterval i2) { - AbsoluteTime t10, t11, t20, t21; + AbsoluteTime t10, + t11, + t20, + t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) return (FALSE); /* invalid interval */ @@ -695,7 +707,7 @@ intervalle(TimeInterval i1, TimeInterval i2) t21 = i2->data[1]; if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) - || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) + || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) return (FALSE); if (t10 == CURRENT_ABSTIME) @@ -707,8 +719,8 @@ intervalle(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11-t10) <= (t21-t20)); -} /* intervalle() */ + return ((t11 - t10) <= (t21 - t20)); +} /* intervalle() */ /* * intervalgt - returns TRUE, iff interval i1 is less than interval i2 @@ -717,7 +729,10 @@ intervalle(TimeInterval i1, TimeInterval i2) bool intervalgt(TimeInterval i1, TimeInterval i2) { - AbsoluteTime t10, t11, t20, t21; + AbsoluteTime t10, + t11, + t20, + t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) return (FALSE); /* invalid interval */ @@ -728,7 +743,7 @@ intervalgt(TimeInterval i1, TimeInterval i2) t21 = i2->data[1]; if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) - || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) + || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) return (FALSE); if (t10 == CURRENT_ABSTIME) @@ -740,8 +755,8 @@ intervalgt(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11-t10) > (t21-t20)); -} /* intervalgt() */ + return ((t11 - t10) > (t21 - t20)); +} /* intervalgt() */ /* * intervalge - returns TRUE, iff interval i1 is less than or equal to interval i2 @@ -750,7 +765,10 @@ intervalgt(TimeInterval i1, TimeInterval i2) bool intervalge(TimeInterval i1, TimeInterval i2) { - AbsoluteTime t10, t11, t20, t21; + AbsoluteTime t10, + t11, + t20, + t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) return (FALSE); /* invalid interval */ @@ -761,7 +779,7 @@ intervalge(TimeInterval i1, TimeInterval i2) t21 = i2->data[1]; if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) - || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) + || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) return (FALSE); if (t10 == CURRENT_ABSTIME) @@ -773,8 +791,8 @@ intervalge(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11-t10) >= (t21-t20)); -} /* intervalge() */ + return ((t11 - t10) >= (t21 - t20)); +} /* intervalge() */ /* @@ -963,11 +981,11 @@ isreltime(char *str) } return 0; -} /* isreltime() */ +} /* isreltime() */ #if FALSE -char *p; -char c; +char *p; +char c; int i; char unit[UNITMAXLEN]; char direction[DIRMAXLEN]; @@ -1156,9 +1174,9 @@ istinterval(char *i_string, AbsoluteTime *i_start, AbsoluteTime *i_end) { - char *p, + char *p, *p1; - char c; + char c; p = i_string; /* skip leading blanks up to '[' */ @@ -1259,7 +1277,7 @@ istinterval(char *i_string, * the Wisconsin benchmark with Illustra whose TimeNow() shows current * time with precision up to microsecs.) - ay 3/95 */ -text * +text * timeofday(void) { diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 4e6cea8db5..2acf11e50b 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.21 1998/01/07 18:46:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.22 1998/02/26 04:36:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -110,7 +110,7 @@ date_in(char *str) date = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1)); return (date); -} /* date_in() */ +} /* date_in() */ /* date_out() * Given internal format date, convert to text string. @@ -133,7 +133,7 @@ date_out(DateADT date) strcpy(result, buf); return (result); -} /* date_out() */ +} /* date_out() */ bool date_eq(DateADT dateVal1, DateADT dateVal2) @@ -151,25 +151,25 @@ bool date_lt(DateADT dateVal1, DateADT dateVal2) { return (dateVal1 < dateVal2); -} /* date_lt() */ +} /* date_lt() */ bool date_le(DateADT dateVal1, DateADT dateVal2) { return (dateVal1 <= dateVal2); -} /* date_le() */ +} /* date_le() */ bool date_gt(DateADT dateVal1, DateADT dateVal2) { return (dateVal1 > dateVal2); -} /* date_gt() */ +} /* date_gt() */ bool date_ge(DateADT dateVal1, DateADT dateVal2) { return (dateVal1 >= dateVal2); -} /* date_ge() */ +} /* date_ge() */ int date_cmp(DateADT dateVal1, DateADT dateVal2) @@ -183,19 +183,19 @@ date_cmp(DateADT dateVal1, DateADT dateVal2) return 1; } return 0; -} /* date_cmp() */ +} /* date_cmp() */ DateADT date_larger(DateADT dateVal1, DateADT dateVal2) { return (date_gt(dateVal1, dateVal2) ? dateVal1 : dateVal2); -} /* date_larger() */ +} /* date_larger() */ DateADT date_smaller(DateADT dateVal1, DateADT dateVal2) { return (date_lt(dateVal1, dateVal2) ? dateVal1 : dateVal2); -} /* date_smaller() */ +} /* date_smaller() */ /* Compute difference between two dates in days. */ @@ -203,7 +203,7 @@ int4 date_mi(DateADT dateVal1, DateADT dateVal2) { return (dateVal1 - dateVal2); -} /* date_mi() */ +} /* date_mi() */ /* Add a number of days to a date, giving a new date. * Must handle both positive and negative numbers of days. @@ -212,7 +212,7 @@ DateADT date_pli(DateADT dateVal, int4 days) { return (dateVal + days); -} /* date_pli() */ +} /* date_pli() */ /* Subtract a number of days from a date, giving a new date. */ @@ -220,13 +220,13 @@ DateADT date_mii(DateADT dateVal, int4 days) { return (date_pli(dateVal, -days)); -} /* date_mii() */ +} /* date_mii() */ /* date_datetime() * Convert date to datetime data type. */ -DateTime * +DateTime * date_datetime(DateADT dateVal) { DateTime *result; @@ -250,7 +250,7 @@ date_datetime(DateADT dateVal) elog(ERROR, "Datetime out of range", NULL); return (result); -} /* date_datetime() */ +} /* date_datetime() */ /* datetime_date() @@ -291,7 +291,7 @@ datetime_date(DateTime *datetime) result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1)); return (result); -} /* datetime_date() */ +} /* datetime_date() */ /* abstime_date() @@ -333,7 +333,7 @@ abstime_date(AbsoluteTime abstime) } return (result); -} /* abstime_date() */ +} /* abstime_date() */ /* date2tm() @@ -416,7 +416,7 @@ date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn) } return 0; -} /* date2tm() */ +} /* date2tm() */ /***************************************************************************** @@ -424,7 +424,7 @@ date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn) *****************************************************************************/ -TimeADT * +TimeADT * time_in(char *str) { TimeADT *time; @@ -458,7 +458,7 @@ time_in(char *str) *time = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); return (time); -} /* time_in() */ +} /* time_in() */ char * @@ -487,7 +487,7 @@ time_out(TimeADT *time) strcpy(result, buf); return (result); -} /* time_out() */ +} /* time_out() */ bool @@ -497,7 +497,7 @@ time_eq(TimeADT *time1, TimeADT *time2) return (FALSE); return (*time1 == *time2); -} /* time_eq() */ +} /* time_eq() */ bool time_ne(TimeADT *time1, TimeADT *time2) @@ -506,7 +506,7 @@ time_ne(TimeADT *time1, TimeADT *time2) return (FALSE); return (*time1 != *time2); -} /* time_eq() */ +} /* time_eq() */ bool time_lt(TimeADT *time1, TimeADT *time2) @@ -515,7 +515,7 @@ time_lt(TimeADT *time1, TimeADT *time2) return (FALSE); return (*time1 < *time2); -} /* time_eq() */ +} /* time_eq() */ bool time_le(TimeADT *time1, TimeADT *time2) @@ -524,7 +524,7 @@ time_le(TimeADT *time1, TimeADT *time2) return (FALSE); return (*time1 <= *time2); -} /* time_eq() */ +} /* time_eq() */ bool time_gt(TimeADT *time1, TimeADT *time2) @@ -533,7 +533,7 @@ time_gt(TimeADT *time1, TimeADT *time2) return (FALSE); return (*time1 > *time2); -} /* time_eq() */ +} /* time_eq() */ bool time_ge(TimeADT *time1, TimeADT *time2) @@ -542,22 +542,22 @@ time_ge(TimeADT *time1, TimeADT *time2) return (FALSE); return (*time1 >= *time2); -} /* time_eq() */ +} /* time_eq() */ int time_cmp(TimeADT *time1, TimeADT *time2) { return ((*time1 < *time2) ? -1 : (((*time1 > *time2) ? 1 : 0))); -} /* time_cmp() */ +} /* time_cmp() */ /* datetime_time() * Convert datetime to time data type. */ -TimeADT * +TimeADT * datetime_time(DateTime *datetime) { - TimeADT *result; + TimeADT *result; struct tm tt, *tm = &tt; int tz; @@ -591,13 +591,13 @@ datetime_time(DateTime *datetime) *result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); return (result); -} /* datetime_time() */ +} /* datetime_time() */ /* datetime_datetime() * Convert date and time to datetime data type. */ -DateTime * +DateTime * datetime_datetime(DateADT date, TimeADT *time) { DateTime *result; @@ -606,13 +606,15 @@ datetime_datetime(DateADT date, TimeADT *time) { result = palloc(sizeof(DateTime)); DATETIME_INVALID(*result); - } else { + } + else + { result = date_datetime(date); *result += *time; } return (result); -} /* datetime_datetime() */ +} /* datetime_datetime() */ int32 /* RelativeTime */ diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index b80d08ea9a..9e30ca5bd0 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.51 1998/02/11 19:12:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.52 1998/02/26 04:37:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,24 +31,24 @@ #endif #include "utils/builtins.h" -static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); +static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); static int DecodeNumber(int flen, char *field, int fmask, int *tmask, struct tm * tm, double *fsec); static int DecodeNumberField(int len, char *str, int fmask, int *tmask, struct tm * tm, double *fsec); -static int DecodeSpecial(int field, char *lowtoken, int *val); +static int DecodeSpecial(int field, char *lowtoken, int *val); static int DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec); -static int DecodeTimezone(char *str, int *tzp); -static int DecodeUnits(int field, char *lowtoken, int *val); -static int EncodeSpecialDateTime(DateTime dt, char *str); +static int DecodeTimezone(char *str, int *tzp); +static int DecodeUnits(int field, char *lowtoken, int *val); +static int EncodeSpecialDateTime(DateTime dt, char *str); static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel); static DateTime dt2local(DateTime dt, int timezone); static void dt2time(DateTime dt, int *hour, int *min, double *sec); -static int j2day(int jd); +static int j2day(int jd); #define USE_DATE_CACHE 1 #define ROUND_ALL 0 @@ -154,12 +154,12 @@ datetime_in(char *str) } return (result); -} /* datetime_in() */ +} /* datetime_in() */ /* datetime_out() * Convert a datetime to external form. */ -char * +char * datetime_out(DateTime *dt) { char *result; @@ -193,7 +193,7 @@ datetime_out(DateTime *dt) strcpy(result, buf); return (result); -} /* datetime_out() */ +} /* datetime_out() */ /* timespan_in() @@ -250,12 +250,12 @@ timespan_in(char *str) } return (span); -} /* timespan_in() */ +} /* timespan_in() */ /* timespan_out() * Convert a time span to external form. */ -char * +char * timespan_out(TimeSpan *span) { char *result; @@ -278,7 +278,7 @@ timespan_out(TimeSpan *span) strcpy(result, buf); return (result); -} /* timespan_out() */ +} /* timespan_out() */ /***************************************************************************** @@ -293,7 +293,7 @@ datetime_finite(DateTime *datetime) return FALSE; return (!DATETIME_NOT_FINITE(*datetime)); -} /* datetime_finite() */ +} /* datetime_finite() */ bool timespan_finite(TimeSpan *timespan) @@ -302,7 +302,7 @@ timespan_finite(TimeSpan *timespan) return FALSE; return (!TIMESPAN_NOT_FINITE(*timespan)); -} /* timespan_finite() */ +} /* timespan_finite() */ /*---------------------------------------------------------- @@ -334,7 +334,7 @@ GetEpochTime(struct tm * tm) #endif return; -} /* GetEpochTime() */ +} /* GetEpochTime() */ DateTime SetDateTime(DateTime dt) @@ -361,7 +361,7 @@ SetDateTime(DateTime dt) } return (dt); -} /* SetDateTime() */ +} /* SetDateTime() */ /* datetime_relop - is datetime1 relop datetime2 */ @@ -386,7 +386,7 @@ datetime_eq(DateTime *datetime1, DateTime *datetime2) dt2 = SetDateTime(dt2); return (dt1 == dt2); -} /* datetime_eq() */ |