NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitf368c94

committed

1. Fixed error with empty array ( '{}' ),

test data changed to include such data2. Test a dimension of an array ( we support only one-dimension)Oleg Bartunov

1 parentf8683e8 commitf368c94Copy full SHA for f368c94

File tree

2 files changed

+36

-21

lines changed

contrib/intarray
- _int.c
- data
  - test__int.data

2 files changed

+36

-21

lines changed

`‎contrib/intarray/_int.c`

Lines changed: 27 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@`
`36`	`36`	`#defineARRPTR(x) ( (int4 *) ARR_DATA_PTR(x) )`
`37`	`37`	`#defineARRNELEMS(x) ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))`
`38`	`38`
`39`		`-#defineARRISNULL(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : 1 ) : 1 )`
	`39`	`+#defineARRISNULL(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : ( ( ARR_NDIM(x) ) ? (elog(ERROR,"Array is not one-dimentional: %d dimentions", ARR_NDIM(x)),1) : 1 ) ) : 1 )`
	`40`	`+#defineARRISVOID(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : 1 ) : 0 )`
`40`	`41`
`41`	`42`	`#defineSORT(x) \`
`42`	`43`	`do { \`
`@@ -300,15 +301,16 @@ g_int_compress(PG_FUNCTION_ARGS)`
`300`	`301`
`301`	`302`	`if (ARRISNULL(r))`
`302`	`303`	`{`
`303`		`-#ifdefGIST_DEBUG`
`304`		`-elog(NOTICE,"COMP IN: NULL");`
`305`		`-#endif`
`306`		`-if (r)`
`307`		`-if (r!= (ArrayType*)DatumGetPointer(entry->key))`
`308`		`-pfree(r);`
`309`		`-`
`310`		`-gistentryinit(*retval, (Datum)0,entry->rel,entry->page,entry->offset,`
	`304`	`+if (ARRISVOID(r) ) {`
	`305`	`+ArrayType*out=new_intArrayType(0 );`
	`306`	`+gistentryinit(*retval,PointerGetDatum(out),`
	`307`	`+entry->rel,entry->page,entry->offset,VARSIZE(out), FALSE);`
	`308`	`+}else {`
	`309`	`+gistentryinit(*retval, (Datum)0,entry->rel,entry->page,entry->offset,`
`311`	`310`	`0, FALSE);`
	`311`	`+}`
	`312`	`+if (r)pfree(r);`
	`313`	`+`
`312`	`314`	`PG_RETURN_POINTER(retval);`
`313`	`315`	`}`
`314`	`316`
`@@ -371,14 +373,20 @@ g_int_decompress(PG_FUNCTION_ARGS)`
`371`	`373`	`else`
`372`	`374`	`in=NULL;`
`373`	`375`
`374`		`-if (entry->bytes<ARR_OVERHEAD(NDIM)\|\|ARRISNULL(in))`
	`376`	`+if (ARRISNULL(in))`
`375`	`377`	`{`
`376`	`378`	`retval=palloc(sizeof(GISTENTRY));`
`377`	`379`
	`380`	`+if (ARRISVOID(in) ) {`
	`381`	`+r=new_intArrayType(0 );`
	`382`	`+gistentryinit(*retval,PointerGetDatum(r),`
	`383`	`+entry->rel,entry->page,entry->offset,VARSIZE(r), FALSE);`
	`384`	`+}else {`
	`385`	`+gistentryinit(*retval, (Datum)0,entry->rel,entry->page,entry->offset,0, FALSE);`
	`386`	`+}`
`378`	`387`	`if (in)`
`379`	`388`	`if (in!= (ArrayType*)DatumGetPointer(entry->key))`
`380`	`389`	`pfree(in);`
`381`		`-gistentryinit(*retval, (Datum)0,entry->rel,entry->page,entry->offset,0, FALSE);`
`382`	`390`	`#ifdefGIST_DEBUG`
`383`	`391`	`elog(NOTICE,"DECOMP IN: NULL");`
`384`	`392`	`#endif`
`@@ -1137,10 +1145,17 @@ g_intbig_compress(PG_FUNCTION_ARGS)`
`1137`	`1145`
`1138`	`1146`	`if (ARRISNULL(in))`
`1139`	`1147`	`{`
	`1148`	`+if (ARRISVOID(in) ) {`
	`1149`	`+r=new_intArrayType(SIGLENINT );`
	`1150`	`+gistentryinit(*retval,PointerGetDatum(r),`
	`1151`	`+entry->rel,entry->page,entry->offset,VARSIZE(r), FALSE);`
	`1152`	`+}else {`
	`1153`	`+gistentryinit(*retval, (Datum)0,entry->rel,entry->page,entry->offset,`
	`1154`	`+0, FALSE);`
	`1155`	`+}`
`1140`	`1156`	`if (in)`
`1141`	`1157`	`if (in!= (ArrayType*)DatumGetPointer(entry->key))`
`1142`	`1158`	`pfree(in);`
`1143`		`-gistentryinit(*retval, (Datum)0,entry->rel,entry->page,entry->offset,0, FALSE);`
`1144`	`1159`	`PG_RETURN_POINTER (retval);`
`1145`	`1160`	`}`
`1146`	`1161`

`‎contrib/intarray/data/test__int.data`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`{79,83,16,63,32}`
`5`	`5`	`{52,41,61,79,94,87}`
`6`	`6`	`{76,59,39,36,21}`
`7`		`-\N`
	`7`	`+{}`
`8`	`8`	`{41,79,76,96,3}`
`9`	`9`	`{25,59,5,96,32}`
`10`	`10`	`{92,58,12,57}`
`@@ -57,7 +57,7 @@`
`57`	`57`	`{58,1,39,48}`
`58`	`58`	`{78,36,70,92}`
`59`	`59`	`{43,3,22,95,51}`
`60`		`-\N`
	`60`	`+{}`
`61`	`61`	`{88,64,25,64,86}`
`62`	`62`	`{34,6,49,90,25}`
`63`	`63`	`{86,35,13,22}`
`@@ -76,12 +76,12 @@`
`76`	`76`	`{89,11,67,55,73}`
`77`	`77`	`{78,39,84,63,62,45}`
`78`	`78`	`{50,63,8}`
`79`		`-\N`
	`79`	`+{}`
`80`	`80`	`{96,36,58,65,96}`
`81`	`81`	`{59,86,41,30}`
`82`	`82`	`{90,60,39,47,19}`
`83`	`83`	`{70,100,73,99}`
`84`		`-\N`
	`84`	`+{}`
`85`	`85`	`{85,14,39}`
`86`	`86`	`{76,53}`
`87`	`87`	`{96,38,52,13,87,85}`
`@@ -95,7 +95,7 @@`
`95`	`95`	`{84,93,36,95,34,69}`
`96`	`96`	`{66,25,5,40}`
`97`	`97`	`{77,6,57,42}`
`98`		`-\N`
	`98`	`+{}`
`99`	`99`	`{88,81,85,37,12}`
`100`	`100`	`{56,73,38}`
`101`	`101`	`{70,70,6,19}`
`@@ -176,7 +176,7 @@`
`176`	`176`	`{31,48}`
`177`	`177`	`{28,35,18}`
`178`	`178`	`{77,55,100,73,57,62}`
`179`		`-\N`
	`179`	`+{}`
`180`	`180`	`{14,59,53}`
`181`	`181`	`{98,3}`
`182`	`182`	`{13,56}`
`@@ -188,7 +188,7 @@`
`188`	`188`	`{41,76,39,84,32}`
`189`	`189`	`{94,66,47}`
`190`	`190`	`{55,28}`
`191`		`-\N`
	`191`	`+{}`
`192`	`192`	`{94,65,59,20}`
`193`	`193`	`{55,50,56,14,58}`
`194`	`194`	`{14,94,52,25,69,95}`
`@@ -203,7 +203,7 @@`
`203`	`203`	`{46,69}`
`204`	`204`	`{35,54}`
`205`	`205`	`{36,79,54}`
`206`		`-\N`
	`206`	`+{}`
`207`	`207`	`{63,78}`
`208`	`208`	`{12,86,52,29,60,30}`
`209`	`209`	`{29,27,58,86,42,62}`
`@@ -215,7 +215,7 @@`
`215`	`215`	`{14,85,14,26,3}`
`216`	`216`	`{46,71,10,16}`
`217`	`217`	`{30,63}`
`218`		`-\N`
	`218`	`+{}`
`219`	`219`	`{91,30,56}`
`220`	`220`	`{46,36,68,91,36,88}`
`221`	`221`	`{24,61}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf368c94

File tree

2 files changed

2 files changed

`‎contrib/intarray/_int.c`

`‎contrib/intarray/data/test__int.data`

0 commit comments