rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SET_ARGS cleanup

This commit is contained in:
Bruce Momjian 1999-02-02 23:53:26 +00:00
parent f1b7823471
commit 4090d17fee
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/nodes/equalfuncs.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.20 1998/09/01 04:29:03 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.21 1999/02/02 23:53:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -422,11 +422,11 @@ _equalMergePath(MergePath *a, MergePath *b)
if (!_equalJoinPath((JoinPath *) a, (JoinPath *) b)) if (!_equalJoinPath((JoinPath *) a, (JoinPath *) b))
return false; return false;
if (!equal((a->path_mergeclauses), (b->path_mergeclauses))) if (!equal(a->path_mergeclauses, b->path_mergeclauses))
return false; return false;
if (!equal((a->outersortkeys), (b->outersortkeys))) if (!equal(a->outersortkeys, b->outersortkeys))
return false; return false;
if (!equal((a->innersortkeys), (b->innersortkeys))) if (!equal(a->innersortkeys, b->innersortkeys))
return false; return false;
return true; return true;
} }

13
src/backend/optimizer/util/pathnode.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.13 1998/09/21 15:41:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.14 1999/02/02 23:53:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -157,18 +157,13 @@ better_path(Path *new_path, List *unique_paths, bool *noOther)
List *temp = NIL; List *temp = NIL;
Path *retval = NULL; Path *retval = NULL;
/*
* XXX - added the following two lines which weren't int the lisp
* planner, but otherwise, doesn't seem to work for the case where
* new_path is 'nil
*/
foreach(temp, unique_paths) foreach(temp, unique_paths)
{ {
path = (Path *) lfirst(temp); path = (Path *) lfirst(temp);
if ((equal_path_path_ordering(&new_path->p_ordering, if (samekeys(path->keys, new_path->keys) &&
&path->p_ordering) && equal_path_path_ordering(&path->p_ordering,
samekeys(new_path->keys, path->keys))) &new_path->p_ordering))
{ {
old_path = path; old_path = path;
break; break;

3
src/include/utils/ps_status.h
View File

@ -31,6 +31,7 @@ char *ps_status_buffer = NULL;
ps_status_buffer = (argv)[0]; \ ps_status_buffer = (argv)[0]; \
sprintf(ps_status_buffer, "%s %s %s %s ", execname, username, hostname, dbname); \ sprintf(ps_status_buffer, "%s %s %s %s ", execname, username, hostname, dbname); \
ps_status_buffer += strlen(ps_status_buffer); \ ps_status_buffer += strlen(ps_status_buffer); \
ps_status_buffer[0] = '\0'; \
} }
#define PS_CLEAR_STATUS() \ #define PS_CLEAR_STATUS() \
@ -41,7 +42,7 @@ char *ps_status_buffer = NULL;
if (ps_status_buffer) \ if (ps_status_buffer) \
{ \ { \
PS_CLEAR_STATUS(); \ PS_CLEAR_STATUS(); \
strcat(ps_status_buffer, status); \ strcpy(ps_status_buffer, status); \
} \ } \
} }