Commitb1ecb9b

committed

Fix interaction of partitioned tables with BulkInsertState.

When copying into a partitioned table, the target heap may change fromone tuple to next. We must ask ReadBufferBI() to get a new bufferevery time such change occurs. To do that, use new functionReleaseBulkInsertStatePin(). This fixes the bug that tuples ended upbeing inserted into the wrong partition, which occurred exactlybecause the wrong buffer was used.Amit Langote, per a suggestion from Robert Haas. Some cosmeticadjustments by me.Reports by 高增琦 (Gao Zengqi), Venkata B Nagothi, andRagnar Ouchterlony.Discussion:http://postgr.es/m/CAFmBtr32FDOqofo8yG-4mjzL1HnYHxXK5S9OGFJ%3D%3DcJpgEW4vA%40mail.gmail.comDiscussion:http://postgr.es/m/CAEyp7J9WiX0L3DoiNcRrY-9iyw%3DqP%2Bj%3DDLsAnNFF1xT2J1ggfQ%40mail.gmail.comDiscussion:http://postgr.es/m/16d73804-c9cd-14c5-463e-5caad563ff77%40agama.tvDiscussion:http://postgr.es/m/CA+TgmoaiZpDVUUN8LZ4jv1qFE_QyR+H9ec+79f5vNczYarg5Zg@mail.gmail.com

1 parent3eaf03b commitb1ecb9bCopy full SHA for b1ecb9b

File tree

+24

-0

lines changed

+24

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2324,6 +2324,17 @@ FreeBulkInsertState(BulkInsertState bistate)`
`2324`	`2324`	`pfree(bistate);`
`2325`	`2325`	`}`
`2326`	`2326`
	`2327`	`+/*`
	`2328`	`+ * ReleaseBulkInsertStatePin - release a buffer currently held in bistate`
	`2329`	`+ */`
	`2330`	`+void`
	`2331`	`+ReleaseBulkInsertStatePin(BulkInsertStatebistate)`
	`2332`	`+{`
	`2333`	`+if (bistate->current_buf!=InvalidBuffer)`
	`2334`	`+ReleaseBuffer(bistate->current_buf);`
	`2335`	`+bistate->current_buf=InvalidBuffer;`
	`2336`	`+}`
	`2337`	`+`
`2327`	`2338`
`2328`	`2339`	`/*`
`2329`	`2340`	`*heap_insert- insert tuple into a heap`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2307,6 +2307,7 @@ CopyFrom(CopyState cstate)`
`2307`	`2307`	`uint64processed=0;`
`2308`	`2308`	`booluseHeapMultiInsert;`
`2309`	`2309`	`intnBufferedTuples=0;`
	`2310`	`+intprev_leaf_part_index=-1;`
`2310`	`2311`
`2311`	`2312`	`#defineMAX_BUFFERED_TUPLES 1000`
`2312`	`2313`	`HeapTuplebufferedTuples=NULL;/ initialize to silence warning */`
`@@ -2561,6 +2562,17 @@ CopyFrom(CopyState cstate)`
`2561`	`2562`	`Assert(leaf_part_index >=0&&`
`2562`	`2563`	`leaf_part_index<cstate->num_partitions);`
`2563`	`2564`
	`2565`	`+/*`
	`2566`	`+ * If this tuple is mapped to a partition that is not same as the`
	`2567`	`+ * previous one, we'd better make the bulk insert mechanism gets a`
	`2568`	`+ * new buffer.`
	`2569`	`+ */`
	`2570`	`+if (prev_leaf_part_index!=leaf_part_index)`
	`2571`	`+{`
	`2572`	`+ReleaseBulkInsertStatePin(bistate);`
	`2573`	`+prev_leaf_part_index=leaf_part_index;`
	`2574`	`+}`
	`2575`	`+`
`2564`	`2576`	`/*`
`2565`	`2577`	`* Save the old ResultRelInfo and switch to the one corresponding`
`2566`	`2578`	`* to the selected partition.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ extern void setLastTid(const ItemPointer tid);`
`147`	`147`
`148`	`148`	`externBulkInsertStateGetBulkInsertState(void);`
`149`	`149`	`externvoidFreeBulkInsertState(BulkInsertState);`
	`150`	`+externvoidReleaseBulkInsertStatePin(BulkInsertStatebistate);`
`150`	`151`
`151`	`152`	`externOidheap_insert(Relationrelation,HeapTupletup,CommandIdcid,`
`152`	`153`	`intoptions,BulkInsertStatebistate);`

Comments

(0)