From c5449d53549282f1317d6780f1f22c9f93848624 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 15 Feb 1999 05:21:12 +0000 Subject: otherrels is now unjoined_rels --- src/backend/nodes/copyfuncs.c | 4 ++-- src/backend/nodes/equalfuncs.c | 4 ++-- src/backend/nodes/freefuncs.c | 4 ++-- src/backend/nodes/outfuncs.c | 6 +++--- src/backend/nodes/readfuncs.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/backend/nodes') diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index ea60d4a7d7a..71b1c9269da 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.71 1999/02/15 03:21:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.72 1999/02/15 05:21:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1428,7 +1428,7 @@ _copyJoinInfo(JoinInfo *from) * copy remainder of node * ---------------- */ - newnode->otherrels = listCopy(from->otherrels); + newnode->unjoined_rels = listCopy(from->unjoined_rels); Node_Copy(from, newnode, jinfo_restrictinfo); newnode->mergejoinable = from->mergejoinable; diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 5f24da3f34b..d2a4389734b 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.33 1999/02/15 03:21:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.34 1999/02/15 05:21:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -526,7 +526,7 @@ _equalJoinInfo(JoinInfo *a, JoinInfo *b) { Assert(IsA(a, JoinInfo)); Assert(IsA(b, JoinInfo)); - if (!equal(a->otherrels, b->otherrels)) + if (!equal(a->unjoined_rels, b->unjoined_rels)) return false; if (!equal(a->jinfo_restrictinfo, b->jinfo_restrictinfo)) return false; diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c index b533ee3d719..05e221951e6 100644 --- a/src/backend/nodes/freefuncs.c +++ b/src/backend/nodes/freefuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.11 1999/02/15 03:21:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.12 1999/02/15 05:21:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1024,7 +1024,7 @@ _freeJoinInfo(JoinInfo *node) * free remainder of node * ---------------- */ - freeList(node->otherrels); + freeList(node->unjoined_rels); freeObject(node->jinfo_restrictinfo); pfree(node); diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index c39d4c6672c..8d168e88915 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: outfuncs.c,v 1.73 1999/02/15 03:21:59 momjian Exp $ + * $Id: outfuncs.c,v 1.74 1999/02/15 05:21:02 momjian Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -1198,8 +1198,8 @@ _outHashInfo(StringInfo str, HashInfo *node) static void _outJoinInfo(StringInfo str, JoinInfo *node) { - appendStringInfo(str, " JINFO :otherrels "); - _outIntList(str, node->otherrels); + appendStringInfo(str, " JINFO :unjoined_rels "); + _outIntList(str, node->unjoined_rels); appendStringInfo(str, " :jinfo_restrictinfo "); _outNode(str, node->jinfo_restrictinfo); diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index d8db9ed34bd..6f252b70e37 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.57 1999/02/13 23:16:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.58 1999/02/15 05:21:03 momjian Exp $ * * NOTES * Most of the read functions for plan nodes are tested. (In fact, they @@ -1982,8 +1982,8 @@ _readJoinInfo() local_node = makeNode(JoinInfo); - token = lsptok(NULL, &length); /* get :otherrels */ - local_node->otherrels = toIntList(nodeRead(true)); /* now read it */ + token = lsptok(NULL, &length); /* get :unjoined_rels */ + local_node->unjoined_rels = toIntList(nodeRead(true)); /* now read it */ token = lsptok(NULL, &length); /* get :jinfo_restrictinfo */ local_node->jinfo_restrictinfo = nodeRead(true); /* now read it */ -- cgit v1.2.3