Commit81631ac

committed

Fixes for intagg regression tests to match new array internal handling.

mlw

1 parentf68fe67 commit81631acCopy full SHA for 81631ac

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`* This file is the property of the Digital Music Network (DMN).`
`12`	`12`	`* It is being made available to users of the PostgreSQL system`
`13`	`13`	`* under the BSD license.`
`14`		`- *`
	`14`	`+ *`
	`15`	`+ * NOTE: This module requires sizeof(void *) to be the same as sizeof(int)`
`15`	`16`	`*/`
`16`	`17`	`#include"postgres.h"`
`17`	`18`
`@@ -37,6 +38,9 @@`
`37`	`38`	`#include"utils/lsyscache.h"`
`38`	`39`
`39`	`40`
	`41`	`+/* Uncomment this define if you are compiling for postgres 7.2.x */`
	`42`	`+/* #define PG_7_2 */`
	`43`	`+`
`40`	`44`	`/* This is actually a postgres version of a one dimensional array */`
`41`	`45`
`42`	`46`	`typedefstruct`
`@@ -96,7 +100,9 @@ static PGARRAY * GetPGArray(int4 state, int fAdd)`
`96`	`100`	`p->a.size=cb;`
`97`	`101`	`p->a.ndim=0;`
`98`	`102`	`p->a.flags=0;`
	`103`	`+#ifndefPG_7_2`
`99`	`104`	`p->a.elemtype=INT4OID;`
	`105`	`+#endif`
`100`	`106`	`p->items=0;`
`101`	`107`	`p->lower=START_NUM;`
`102`	`108`	`}`
`@@ -149,7 +155,9 @@ static PGARRAY ShrinkPGArray(PGARRAY p)`
`149`	`155`	`pnew->a.size=cb;`
`150`	`156`	`pnew->a.ndim=1;`
`151`	`157`	`pnew->a.flags=0;`
	`158`	`+#ifndefPG_7_2`
`152`	`159`	`pnew->a.elemtype=INT4OID;`
	`160`	`+#endif`
`153`	`161`	`pnew->lower=0;`
`154`	`162`	`}`
`155`	`163`	`else`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,22 @@`
`1`	`1`	`-- Drop functions`
	`2`	`+drop aggregate int_array_aggregate(int4);`
`2`	`3`	`drop function int_agg_state (int4, int4);`
`3`	`4`	`drop function int_agg_final_array (int4);`
`4`		`-drop aggregate int_array_aggregate(int4);`
`5`	`5`	`drop function int_array_enum (int4[]);`
`6`	`6`
`7`	`7`
`8`	`8`	`-- Internal function for the aggregate`
`9`	`9`	`-- Is called for each item in an aggregation`
`10`	`10`	`create function int_agg_state (int4, int4)`
`11`	`11`	`returns int4`
`12`		`-as 'MODULE_FILENAME','int_agg_state'`
	`12`	`+as 'MODULE_PATHNAME','int_agg_state'`
`13`	`13`	`language 'c';`
`14`	`14`
`15`	`15`	`-- Internal function for the aggregate`
`16`	`16`	`-- Is called at the end of the aggregation, and returns an array.`
`17`	`17`	`create function int_agg_final_array (int4)`
`18`	`18`	`returns int4[]`
`19`		`-as 'MODULE_FILENAME','int_agg_final_array'`
	`19`	`+as 'MODULE_PATHNAME','int_agg_final_array'`
`20`	`20`	`language 'c';`
`21`	`21`
`22`	`22`	`-- The aggration funcion.`
`@@ -35,6 +35,6 @@ create aggregate int_array_aggregate`
`35`	`35`	`-- as a row.`
`36`	`36`	`create function int_array_enum(int4[])`
`37`	`37`	`returns setof integer`
`38`		`-as 'MODULE_FILENAME','int_enum'`
	`38`	`+as 'MODULE_PATHNAME','int_enum'`
`39`	`39`	`language 'c';`
`40`	`40`

Comments

(0)