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

Improve heap access methods 

This commit improves heap access methods for reference table
upgrade and colocation group modifications.
pull/1148/head
Onder Kalaci 2017-01-20 14:48:48 +02:00
parent ac7235bfaa
commit bd825be340
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/distributed/master/master_metadata_utility.c
View File

@ -900,6 +900,7 @@ UpdateColocationGroupReplicationFactor(uint32 colocationId, int replicationFacto
int scanKeyCount = 1; int scanKeyCount = 1;
bool indexOK = true; bool indexOK = true;
HeapTuple heapTuple = NULL; HeapTuple heapTuple = NULL;
HeapTuple newHeapTuple = NULL;
TupleDesc tupleDescriptor = NULL; TupleDesc tupleDescriptor = NULL;
Datum values[Natts_pg_dist_colocation]; Datum values[Natts_pg_dist_colocation];
@ -925,17 +926,22 @@ UpdateColocationGroupReplicationFactor(uint32 colocationId, int replicationFacto
} }
/* after we find colocation group, we update it with new values */ /* after we find colocation group, we update it with new values */
memset(replace, 0, sizeof(replace)); memset(replace, false, sizeof(replace));
memset(isnull, false, sizeof(isnull));
memset(values, 0, sizeof(values));
values[Anum_pg_dist_colocation_replicationfactor - 1] = Int32GetDatum( values[Anum_pg_dist_colocation_replicationfactor - 1] = Int32GetDatum(
replicationFactor); replicationFactor);
isnull[Anum_pg_dist_colocation_replicationfactor - 1] = false;
replace[Anum_pg_dist_colocation_replicationfactor - 1] = true; replace[Anum_pg_dist_colocation_replicationfactor - 1] = true;
heapTuple = heap_modify_tuple(heapTuple, tupleDescriptor, values, isnull, replace); newHeapTuple = heap_modify_tuple(heapTuple, tupleDescriptor, values, isnull, replace);
simple_heap_update(pgDistColocation, &heapTuple->t_self, heapTuple); simple_heap_update(pgDistColocation, &newHeapTuple->t_self, newHeapTuple);
CatalogUpdateIndexes(pgDistColocation, heapTuple); CatalogUpdateIndexes(pgDistColocation, newHeapTuple);
CommandCounterIncrement();
heap_freetuple(newHeapTuple);
systable_endscan(scanDescriptor); systable_endscan(scanDescriptor);
heap_close(pgDistColocation, NoLock); heap_close(pgDistColocation, NoLock);

1
src/backend/distributed/utils/colocation_utils.c
View File

@ -988,7 +988,6 @@ DeleteColocationGroup(uint32 colocationId)
{ {
simple_heap_delete(pgDistColocation, &(heapTuple->t_self)); simple_heap_delete(pgDistColocation, &(heapTuple->t_self));
CatalogUpdateIndexes(pgDistColocation, heapTuple);
CitusInvalidateRelcacheByRelid(DistColocationRelationId()); CitusInvalidateRelcacheByRelid(DistColocationRelationId());
CommandCounterIncrement(); CommandCounterIncrement();
} }

3
src/test/regress/expected/multi_upgrade_reference_table.out
View File

@ -650,9 +650,6 @@ WHERE
1360013 | f | f 1360013 | f | f
(1 row) (1 row)
-- eliminate the duplicate intermediate duplicate rows in pg_dist_colocation
VACUUM ANALYZE pg_dist_colocation;
SELECT * SELECT *
FROM pg_dist_colocation FROM pg_dist_colocation
WHERE colocationid IN WHERE colocationid IN

3
src/test/regress/sql/multi_upgrade_reference_table.sql
View File

@ -423,9 +423,6 @@ FROM
WHERE WHERE
logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass; logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass;
-- eliminate the duplicate intermediate duplicate rows in pg_dist_colocation
VACUUM ANALYZE pg_dist_colocation;
SELECT * SELECT *
FROM pg_dist_colocation FROM pg_dist_colocation
WHERE colocationid IN WHERE colocationid IN