external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SnapshotDirty for reading metadata in truncation

merge-cstore-pykello
Hadi Moshayedi 2020-10-05 14:18:29 -07:00
parent 55885c81dd
commit 76a71aa61a
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cstore.h
View File

@ -20,6 +20,7 @@
#include "storage/bufpage.h"
#include "storage/lockdefs.h"
#include "utils/relcache.h"
#include "utils/snapmgr.h"
/* Defines for valid option names */
#define OPTION_NAME_COMPRESSION_TYPE "compression"

3
cstore_metadata_tables.c
View File

@ -377,7 +377,8 @@ ReadDataFileMetadata(Oid relfilenode, bool missingOk)
index = index_open(CStoreStripesIndexRelationId(), AccessShareLock);
tupleDescriptor = RelationGetDescr(cstoreStripes);
scanDescriptor = systable_beginscan_ordered(cstoreStripes, index, NULL, 1, scanKey);
scanDescriptor = systable_beginscan_ordered(cstoreStripes, index, NULL, 1,
scanKey);
while (HeapTupleIsValid(heapTuple = systable_getnext(scanDescriptor)))
{

12
cstore_tableam.c
View File

@ -631,7 +631,7 @@ LogRelationStats(Relation rel, int elevel)
TupleDesc tupdesc = RelationGetDescr(rel);
uint64 droppedBlocksWithData = 0;
datafileMetadata = ReadDataFileMetadata(relfilenode);
datafileMetadata = ReadDataFileMetadata(relfilenode, false);
stripeCount = list_length(datafileMetadata->stripeMetadataList);
foreach(stripeMetadataCell, datafileMetadata->stripeMetadataList)
@ -765,15 +765,7 @@ TruncateCStore(Relation rel, int elevel)
old_rel_pages = smgrnblocks(rel->rd_smgr, MAIN_FORKNUM);
RelationCloseSmgr(rel);
/*
* Get metadata as viewed in latest snapshot. Reading metadata in transaction
* snapshot is not enough, since stripes could have been created between
* current transaction start and lock acquisition time. Ignoring those
* stripes can destory data.
*/
PushActiveSnapshot(GetLatestSnapshot());
metadata = ReadDataFileMetadata(rel->rd_node.relNode);
PopActiveSnapshot();
metadata = ReadDataFileMetadata(rel->rd_node.relNode, false);
/* loop over stripes and find max used block */
foreach(stripeMetadataCell, metadata->stripeMetadataList)