Commitba2883b

committed

Remove duplicate geqo functions, and more optimizer cleanup

1 parent944d3c3 commitba2883bCopy full SHA for ba2883b

File tree

+188

-810

lines changed

+188

-810

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* 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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1420,7 +1420,7 @@ _copyMergeInfo(MergeInfo *from)`
`1420`	`1420`	`* ----------------`
`1421`	`1421`	`*/`
`1422`	`1422`	`staticJoinInfo*`
`1423`		`-_copyJoinInfo(JoinInfo*from)`
	`1423`	`+_copyJoinInfo(JoinInfo*from)`
`1424`	`1424`	`{`
`1425`	`1425`	`JoinInfo*newnode=makeNode(JoinInfo);`
`1426`	`1426`
`@@ -1433,7 +1433,7 @@ _copyJoinInfo(JoinInfo * from)`
`1433`	`1433`
`1434`	`1434`	`newnode->mergejoinable=from->mergejoinable;`
`1435`	`1435`	`newnode->hashjoinable=from->hashjoinable;`
`1436`		`-newnode->inactive=from->inactive;`
	`1436`	`+newnode->bushy_inactive=from->bushy_inactive;`
`1437`	`1437`
`1438`	`1438`	`returnnewnode;`
`1439`	`1439`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* 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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -522,7 +522,7 @@ _equalSubPlan(SubPlan a, SubPlan b)`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`staticbool`
`525`		`-_equalJoinInfo(JoinInfoa,JoinInfob)`
	`525`	`+_equalJoinInfo(JoinInfoa,JoinInfob)`
`526`	`526`	`{`
`527`	`527`	`Assert(IsA(a,JoinInfo));`
`528`	`528`	`Assert(IsA(b,JoinInfo));`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* 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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1018,7 +1018,7 @@ _freeMergeInfo(MergeInfo *node)`
`1018`	`1018`	`* ----------------`
`1019`	`1019`	`*/`
`1020`	`1020`	`staticvoid`
`1021`		`-_freeJoinInfo(JoinInfo*node)`
	`1021`	`+_freeJoinInfo(JoinInfo*node)`
`1022`	`1022`	`{`
`1023`	`1023`	`/* ----------------`
`1024`	`1024`	`*free remainder of node`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`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 $`
`9`	`9`	`*`
`10`	`10`	`* NOTES`
`11`	`11`	`* Every (plan) node in POSTGRES has an associated "out" routine which`
`@@ -1196,7 +1196,7 @@ _outHashInfo(StringInfo str, HashInfo *node)`
`1196`	`1196`	`*JoinInfo is a subclass of Node.`
`1197`	`1197`	`*/`
`1198`	`1198`	`staticvoid`
`1199`		`-_outJoinInfo(StringInfostr,JoinInfo*node)`
	`1199`	`+_outJoinInfo(StringInfostr,JoinInfo*node)`
`1200`	`1200`	`{`
`1201`	`1201`	`appendStringInfo(str," JINFO :otherrels ");`
`1202`	`1202`	`_outIntList(str,node->otherrels);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`# Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`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 $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`@@ -19,7 +19,7 @@ CFLAGS+= -Wno-error`
`19`	`19`	`endif`
`20`	`20`
`21`	`21`	`OBJS =geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o\`
`22`		`-geqo_params.ogeqo_paths.ogeqo_pool.o geqo_recombination.o\`
	`22`	`+geqo_params.o geqo_pool.o geqo_recombination.o\`
`23`	`23`	`geqo_selection.o\`
`24`	`24`	`geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o`
`25`	`25`

Comments

(0)