Commit59bb147

committed

Update random() usage so ranges are inclusive/exclusive as required.

1 parenteb7bd06 commit59bb147Copy full SHA for 59bb147

File tree

+10

-17

lines changed

+10

-17

lines changed

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.90 2005/11/22 18:17:08 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.91 2006/02/03 12:45:47 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -927,18 +927,11 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,`
`927`	`927`	`returnnumrows;`
`928`	`928`	`}`
`929`	`929`
`930`		`-/* Select a random value R uniformly distributed in0 < R < 1 */`
	`930`	`+/* Select a random value R uniformly distributed in(0 - 1) */`
`931`	`931`	`staticdouble`
`932`	`932`	`random_fract(void)`
`933`	`933`	`{`
`934`		`-longz;`
`935`		`-`
`936`		`-/* random() can produce endpoint values, try again if so */`
`937`		`-do`
`938`		`-{`
`939`		`-z=random();`
`940`		`-}while (z <=0\|\|z >=MAX_RANDOM_VALUE);`
`941`		`-return (double)z / (double)MAX_RANDOM_VALUE;`
	`934`	`+return ((double)random()+1) / ((double)MAX_RANDOM_VALUE+2);`
`942`	`935`	`}`
`943`	`936`
`944`	`937`	`/*`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.41 2005/11/22 18:17:21 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.42 2006/02/03 12:45:47 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -120,7 +120,7 @@ s_lock(volatile slock_t lock, const char file, int line)`
`120`	`120`
`121`	`121`	`/* increase delay by a random fraction between 1X and 2X */`
`122`	`122`	`cur_delay+= (int) (cur_delay*`
`123`		`- (((double)random()) / ((double)MAX_RANDOM_VALUE))+0.5);`
	`123`	`+ ((double)random() / (double)MAX_RANDOM_VALUE)+0.5);`
`124`	`124`	`/* wrap back to minimum delay when max is exceeded */`
`125`	`125`	`if (cur_delay>MAX_DELAY_MSEC)`
`126`	`126`	`cur_delay=MIN_DELAY_MSEC;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.119 2005/12/02 02:49:11 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.120 2006/02/03 12:45:47 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1833,8 +1833,8 @@ drandom(PG_FUNCTION_ARGS)`
`1833`	`1833`	`{`
`1834`	`1834`	`float8result;`
`1835`	`1835`
`1836`		`-/* result 0.0-1.0 */`
`1837`		`-result= ((double)random()) / ((double)MAX_RANDOM_VALUE);`
	`1836`	`+/* result[0.0 -1.0) */`
	`1837`	`+result= (double)random() / ((double)MAX_RANDOM_VALUE+1);`
`1838`	`1838`
`1839`	`1839`	`PG_RETURN_FLOAT8(result);`
`1840`	`1840`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/optimizer/geqo_random.h,v 1.16 2004/12/31 22:03:36 pgsql Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/optimizer/geqo_random.h,v 1.17 2006/02/03 12:45:47 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`/* geqo_rand returns a random float value between 0 and 1 inclusive */`
`30`	`30`
`31`		`-#definegeqo_rand() (((double) random()) / ((double) MAX_RANDOM_VALUE))`
	`31`	`+#definegeqo_rand() ((double) random() / (double) MAX_RANDOM_VALUE)`
`32`	`32`
`33`	`33`	`/* geqo_randint returns integer value between lower and upper inclusive */`
`34`	`34`

Comments

(0)