Commit5dbdb2f

committed

Make tablesample work with partitioned tables.

This was an oversight in the original partitioning commit.Amit Langote, reviewed by David FetterDiscussion:http://postgr.es/m/59af6590-8ace-04c4-c36c-ea35d435c60e@lab.ntt.co.jp

1 parent6d493e1 commit5dbdb2fCopy full SHA for 5dbdb2f

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,8 @@ transformFromClauseItem(ParseState pstate, Node n,`
`907`	`907`	`rte=rt_fetch(rtr->rtindex,pstate->p_rtable);`
`908`	`908`	`/* We only support this on plain relations and matviews */`
`909`	`909`	`if (rte->relkind!=RELKIND_RELATION&&`
`910`		`-rte->relkind!=RELKIND_MATVIEW)`
	`910`	`+rte->relkind!=RELKIND_MATVIEW&&`
	`911`	`+rte->relkind!=RELKIND_PARTITIONED_TABLE)`
`911`	`912`	`ereport(ERROR,`
`912`	`913`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`913`	`914`	`errmsg("TABLESAMPLE clause can only be applied to tables and materialized views"),`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -313,3 +313,21 @@ SELECT q.* FROM (SELECT * FROM test_tablesample) as q TABLESAMPLE BERNOULLI (5);`
`313`	`313`	`ERROR: syntax error at or near "TABLESAMPLE"`
`314`	`314`	`LINE 1: ...CT q.* FROM (SELECT * FROM test_tablesample) as q TABLESAMPL...`
`315`	`315`	`^`
	`316`	`+-- check partitioned tables support tablesample`
	`317`	`+create table parted_sample (a int) partition by list (a);`
	`318`	`+create table parted_sample_1 partition of parted_sample for values in (1);`
	`319`	`+create table parted_sample_2 partition of parted_sample for values in (2);`
	`320`	`+explain (costs off)`
	`321`	`+ select * from parted_sample tablesample bernoulli (100);`
	`322`	`+ QUERY PLAN`
	`323`	`+-------------------------------------------`
	`324`	`+ Append`
	`325`	`+ -> Sample Scan on parted_sample`
	`326`	`+ Sampling: bernoulli ('100'::real)`
	`327`	`+ -> Sample Scan on parted_sample_1`
	`328`	`+ Sampling: bernoulli ('100'::real)`
	`329`	`+ -> Sample Scan on parted_sample_2`
	`330`	`+ Sampling: bernoulli ('100'::real)`
	`331`	`+(7 rows)`
	`332`	`+`
	`333`	`+drop table parted_sample, parted_sample_1, parted_sample_2;`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,3 +100,11 @@ WITH query_select AS (SELECT * FROM test_tablesample)`
`100`	`100`	`SELECT*FROM query_select TABLESAMPLE BERNOULLI (5.5) REPEATABLE (1);`
`101`	`101`
`102`	`102`	`SELECT q.FROM (SELECTFROM test_tablesample)as q TABLESAMPLE BERNOULLI (5);`
	`103`	`+`
	`104`	`+-- check partitioned tables support tablesample`
	`105`	`+createtableparted_sample (aint) partition by list (a);`
	`106`	`+createtableparted_sample_1 partition of parted_sample forvaluesin (1);`
	`107`	`+createtableparted_sample_2 partition of parted_sample forvaluesin (2);`
	`108`	`+explain (costs off)`
	`109`	`+select*from parted_sample tablesample bernoulli (100);`
	`110`	`+droptable parted_sample, parted_sample_1, parted_sample_2;`

Comments

(0)