Commitec40a7c

committed

fix interval validation for negative values

1 parent52375ca commitec40a7cCopy full SHA for ec40a7c

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ ERROR: cannot find appropriate partition for key '250'`
`20`	`20`	`/* Set a trivial interval */`
`21`	`21`	`SELECT set_interval('abc', 0);`
`22`	`22`	`ERROR: interval must not be trivial`
	`23`	`+/* Set a negative interval */`
	`24`	`+SELECT set_interval('abc', -100);`
	`25`	`+ERROR: interval must not be negative`
`23`	`26`	`/* We also shouldn't be able to set a trivial interval directly in pathman_config table */`
`24`	`27`	`UPDATE pathman_config SET range_interval = '0' WHERE partrel = 'abc'::REGCLASS;`
`25`	`28`	`ERROR: interval must not be trivial`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ SELECT set_interval('abc', NULL::INTEGER);`
`9`	`9`	`INSERT INTO abcVALUES (250);`
`10`	`10`	`/* Set a trivial interval*/`
`11`	`11`	`SELECT set_interval('abc',0);`
	`12`	`+/* Set a negative interval*/`
	`13`	`+SELECT set_interval('abc',-100);`
`12`	`14`	`/* We also shouldn't be able to set a trivial interval directly in pathman_config table*/`
`13`	`15`	`UPDATE pathman_configSET range_interval='0'WHERE partrel='abc'::REGCLASS;`
`14`	`16`	`/* Set a normal interval*/`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -684,6 +684,7 @@ interval_is_trivial(Oid atttype, Datum interval, Oid interval_type)`
`684`	`684`	`Operatorop;`
`685`	`685`	`Oidop_func;`
`686`	`686`	`FmgrInfocmp_func;`
	`687`	`+int32cmp_result;`
`687`	`688`
`688`	`689`	`/* Generate default value */`
`689`	`690`	`switch(atttype)`
`@@ -754,8 +755,13 @@ interval_is_trivial(Oid atttype, Datum interval, Oid interval_type)`
`754`	`755`	`fill_type_cmp_fmgr_info(&cmp_func,`
`755`	`756`	`getBaseType(atttype),`
`756`	`757`	`getBaseType(op_result_type));`
`757`		`-if (DatumGetInt32(FunctionCall2(&cmp_func,default_value,op_result))==0)`
	`758`	`+cmp_result=DatumGetInt32(FunctionCall2(&cmp_func,`
	`759`	`+default_value,`
	`760`	`+op_result));`
	`761`	`+if (cmp_result==0)`
`758`	`762`	`return true;`
	`763`	`+elseif (cmp_result>0)/* Negative interval? */`
	`764`	`+elog(ERROR,"interval must not be negative");`
`759`	`765`
`760`	`766`	`return false;`
`761`	`767`	`}`

Comments

(0)