Skip to content

Commit ba2883b

Browse files
committed
Remove duplicate geqo functions, and more optimizer cleanup
1 parent 944d3c3 commit ba2883b

26 files changed

+188
-810
lines changed

src/backend/nodes/copyfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.70 1999/02/13 23:15:53 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.71 1999/02/15 03:21:58 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1420,7 +1420,7 @@ _copyMergeInfo(MergeInfo *from)
14201420
* ----------------
14211421
*/
14221422
static JoinInfo *
1423-
_copyJoinInfo(JoinInfo * from)
1423+
_copyJoinInfo(JoinInfo *from)
14241424
{
14251425
JoinInfo *newnode = makeNode(JoinInfo);
14261426

@@ -1433,7 +1433,7 @@ _copyJoinInfo(JoinInfo * from)
14331433

14341434
newnode->mergejoinable = from->mergejoinable;
14351435
newnode->hashjoinable = from->hashjoinable;
1436-
newnode->inactive = from->inactive;
1436+
newnode->bushy_inactive = from->bushy_inactive;
14371437

14381438
return newnode;
14391439
}

src/backend/nodes/equalfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.32 1999/02/13 23:15:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.33 1999/02/15 03:21:59 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -522,7 +522,7 @@ _equalSubPlan(SubPlan *a, SubPlan *b)
522522
}
523523

524524
static bool
525-
_equalJoinInfo(JoinInfo * a, JoinInfo * b)
525+
_equalJoinInfo(JoinInfo *a, JoinInfo *b)
526526
{
527527
Assert(IsA(a, JoinInfo));
528528
Assert(IsA(b, JoinInfo));

src/backend/nodes/freefuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.10 1999/02/13 23:15:56 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.11 1999/02/15 03:21:59 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1018,7 +1018,7 @@ _freeMergeInfo(MergeInfo *node)
10181018
* ----------------
10191019
*/
10201020
static void
1021-
_freeJoinInfo(JoinInfo * node)
1021+
_freeJoinInfo(JoinInfo *node)
10221022
{
10231023
/* ----------------
10241024
* free remainder of node

src/backend/nodes/outfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: outfuncs.c,v 1.72 1999/02/13 23:15:59 momjian Exp $
8+
* $Id: outfuncs.c,v 1.73 1999/02/15 03:21:59 momjian Exp $
99
*
1010
* NOTES
1111
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -1196,7 +1196,7 @@ _outHashInfo(StringInfo str, HashInfo *node)
11961196
* JoinInfo is a subclass of Node.
11971197
*/
11981198
static void
1199-
_outJoinInfo(StringInfo str, JoinInfo * node)
1199+
_outJoinInfo(StringInfo str, JoinInfo *node)
12001200
{
12011201
appendStringInfo(str, " JINFO :otherrels ");
12021202
_outIntList(str, node->otherrels);

src/backend/optimizer/geqo/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Copyright (c) 1994, Regents of the University of California
77
#
8-
# $Id: Makefile,v 1.10 1998/04/06 00:23:07 momjian Exp $
8+
# $Id: Makefile,v 1.11 1999/02/15 03:22:00 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -19,7 +19,7 @@ CFLAGS+= -Wno-error
1919
endif
2020

2121
OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
22-
geqo_params.o geqo_paths.o geqo_pool.o geqo_recombination.o \
22+
geqo_params.o geqo_pool.o geqo_recombination.o \
2323
geqo_selection.o \
2424
geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o
2525

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy