git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index 2ba6050bceb2b89909fb3d9afe67136affdf630f..fb41c024e21a04ecacc8332ef28f455a6a763eda 100755 (executable)

--- a/configure

+++ b/configure

fi

-# Cygwin's erand48 sometimes hangs, so force use of ours

+# Cygwin's erand48() is broken (always returns zero) in some releases,

+# so force use of ours.

if test "$PORTNAME" = "cygwin"; then

case " $LIBOBJS " in

*" erand48.$ac_objext "* ) ;;

diff --git a/configure.in b/configure.in

index 6b663c1d75a8a75ead8a2b5b64b062ea16d4a13c..79e1541e25b1fb0f433adc5fea843329dd565017 100644 (file)

--- a/configure.in

+++ b/configure.in

dnl Process this file with autoconf to produce a configure script.

-dnl $PostgreSQL: pgsql/configure.in,v 1.606 2009年07月23日 23:50:29 adunstan Exp $

+dnl $PostgreSQL: pgsql/configure.in,v 1.607 2009年07月24日 15:03:07 tgl Exp $

dnl

dnl Developers, please strive to achieve this order:

dnl

AC_LIBOBJ(getopt)

fi

-# Cygwin's erand48 sometimes hangs, so force use of ours

+# Cygwin's erand48() is broken (always returns zero) in some releases,

+# so force use of ours.

if test "$PORTNAME" = "cygwin"; then

AC_LIBOBJ(erand48)

fi

diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c

index 0ba8941c22e05818bc5c36dc28f18299cf0f2aa3..be92bb459e0a7193ea32ef00dacacaa5d0fc6a02 100644 (file)

--- a/src/backend/optimizer/geqo/geqo_selection.c

+++ b/src/backend/optimizer/geqo/geqo_selection.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_selection.c,v 1.25 2009年07月16日 20:55:44 tgl Exp $

+ * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_selection.c,v 1.26 2009年07月24日 15:03:07 tgl Exp $

*

*-------------------------------------------------------------------------

*/

#include "optimizer/geqo_random.h"

#include "optimizer/geqo_selection.h"

-static int linear(PlannerInfo *root, int max, double bias);

+static int linear_rand(PlannerInfo *root, int max, double bias);

/*

int first,

second;

- first = linear(root, pool->size, bias);

- second = linear(root, pool->size, bias);

+ first = linear_rand(root, pool->size, bias);

+ second = linear_rand(root, pool->size, bias);

+ /*

+ * Ensure we have selected different genes, except if pool size is only

+ * one, when we can't.

+ *

+ * This code has been observed to hang up in an infinite loop when the

+ * platform's implementation of erand48() is broken. We consider that a

+ * feature: it lets you know you'd better fix the random-number generator.

+ */

if (pool->size > 1)

{

while (first == second)

- second = linear(root, pool->size, bias);

+ second = linear_rand(root, pool->size, bias);

}

geqo_copy(root, momma, &pool->data[first], pool->string_length);

}

/*

- * linear

+ * linear_rand

* generates random integer between 0 and input max number

* using input linear bias

*

* bias = (prob of first rule) / (prob of middle rule)

*/

static int

-linear(PlannerInfo *root, int pool_size, double bias)

+linear_rand(PlannerInfo *root, int pool_size, double bias)

{

double index; /* index between 0 and pop_size */

double max = (double) pool_size;