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

Be more explicit when doing ordered scan on columnar cat. tables (#5026) 

systable_getnext already uses ForwardScanDirection if relation has any
open indexes, but let's be more explicit doing ordered scan on columnar
catalog tables.
pull/5032/head
Onur Tirtir 2021-07-09 13:24:27 +03:00 committed by GitHub
parent ab873c6b58
commit ea5fe022a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/columnar/columnar_metadata.c
View File

@ -270,7 +270,7 @@ WriteColumnarOptions(Oid regclass, ColumnarOptions *options, bool overwrite)
SysScanDesc scanDescriptor = systable_beginscan_ordered(columnarOptions, index, NULL, SysScanDesc scanDescriptor = systable_beginscan_ordered(columnarOptions, index, NULL,
1, scanKey); 1, scanKey);
HeapTuple heapTuple = systable_getnext(scanDescriptor); HeapTuple heapTuple = systable_getnext_ordered(scanDescriptor, ForwardScanDirection);
if (HeapTupleIsValid(heapTuple)) if (HeapTupleIsValid(heapTuple))
{ {
if (overwrite) if (overwrite)
@ -340,7 +340,7 @@ DeleteColumnarTableOptions(Oid regclass, bool missingOk)
SysScanDesc scanDescriptor = systable_beginscan_ordered(columnarOptions, index, NULL, SysScanDesc scanDescriptor = systable_beginscan_ordered(columnarOptions, index, NULL,
1, scanKey); 1, scanKey);
HeapTuple heapTuple = systable_getnext(scanDescriptor); HeapTuple heapTuple = systable_getnext_ordered(scanDescriptor, ForwardScanDirection);
if (HeapTupleIsValid(heapTuple)) if (HeapTupleIsValid(heapTuple))
{ {
CatalogTupleDelete(columnarOptions, &heapTuple->t_self); CatalogTupleDelete(columnarOptions, &heapTuple->t_self);
@ -393,7 +393,7 @@ ReadColumnarOptions(Oid regclass, ColumnarOptions *options)
SysScanDesc scanDescriptor = systable_beginscan_ordered(columnarOptions, index, NULL, SysScanDesc scanDescriptor = systable_beginscan_ordered(columnarOptions, index, NULL,
1, scanKey); 1, scanKey);
HeapTuple heapTuple = systable_getnext(scanDescriptor); HeapTuple heapTuple = systable_getnext_ordered(scanDescriptor, ForwardScanDirection);
if (HeapTupleIsValid(heapTuple)) if (HeapTupleIsValid(heapTuple))
{ {
Form_columnar_options tupOptions = (Form_columnar_options) GETSTRUCT(heapTuple); Form_columnar_options tupOptions = (Form_columnar_options) GETSTRUCT(heapTuple);
@ -563,7 +563,8 @@ ReadStripeSkipList(RelFileNode relfilenode, uint64 stripe, TupleDesc tupleDescri
palloc0(chunkCount * sizeof(ColumnChunkSkipNode)); palloc0(chunkCount * sizeof(ColumnChunkSkipNode));
} }
while (HeapTupleIsValid(heapTuple = systable_getnext(scanDescriptor))) while (HeapTupleIsValid(heapTuple = systable_getnext_ordered(scanDescriptor,
ForwardScanDirection)))
{ {
Datum datumArray[Natts_columnar_chunk]; Datum datumArray[Natts_columnar_chunk];
bool isNullArray[Natts_columnar_chunk]; bool isNullArray[Natts_columnar_chunk];
@ -821,7 +822,8 @@ ReadChunkGroupRowCounts(uint64 storageId, uint64 stripe, uint32 chunkGroupCount)
HeapTuple heapTuple = NULL; HeapTuple heapTuple = NULL;
uint32 *chunkGroupRowCounts = palloc0(chunkGroupCount * sizeof(uint32)); uint32 *chunkGroupRowCounts = palloc0(chunkGroupCount * sizeof(uint32));
while (HeapTupleIsValid(heapTuple = systable_getnext(scanDescriptor))) while (HeapTupleIsValid(heapTuple = systable_getnext_ordered(scanDescriptor,
ForwardScanDirection)))
{ {
Datum datumArray[Natts_columnar_chunkgroup]; Datum datumArray[Natts_columnar_chunkgroup];
bool isNullArray[Natts_columnar_chunkgroup]; bool isNullArray[Natts_columnar_chunkgroup];
@ -1013,7 +1015,8 @@ ReadDataFileStripeList(uint64 storageId, Snapshot snapshot)
snapshot, 1, snapshot, 1,
scanKey); scanKey);
while (HeapTupleIsValid(heapTuple = systable_getnext(scanDescriptor))) while (HeapTupleIsValid(heapTuple = systable_getnext_ordered(scanDescriptor,
ForwardScanDirection)))
{ {
Datum datumArray[Natts_columnar_stripe]; Datum datumArray[Natts_columnar_stripe];
bool isNullArray[Natts_columnar_stripe]; bool isNullArray[Natts_columnar_stripe];
@ -1117,11 +1120,11 @@ DeleteStorageFromColumnarMetadataTable(Oid metadataTableId,
ModifyState *modifyState = StartModifyRelation(metadataTable); ModifyState *modifyState = StartModifyRelation(metadataTable);
HeapTuple heapTuple = systable_getnext(scanDescriptor); HeapTuple heapTuple;
while (HeapTupleIsValid(heapTuple)) while (HeapTupleIsValid(heapTuple = systable_getnext_ordered(scanDescriptor,
ForwardScanDirection)))
{ {
DeleteTupleAndEnforceConstraints(modifyState, heapTuple); DeleteTupleAndEnforceConstraints(modifyState, heapTuple);
heapTuple = systable_getnext(scanDescriptor);
} }
systable_endscan_ordered(scanDescriptor); systable_endscan_ordered(scanDescriptor);