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

fix v11 tests

merge-cstore-pykello
Jeff Davis 2020-09-15 12:39:51 -07:00
parent d69bff7621
commit f7f59933f8
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cstore_fdw.c
View File

@ -129,7 +129,7 @@ static void CStoreProcessAlterTableCommand(AlterTableStmt *alterStatement);
static List * DroppedCStoreRelidList(DropStmt *dropStatement); static List * DroppedCStoreRelidList(DropStmt *dropStatement);
static List * FindCStoreTables(List *tableList); static List * FindCStoreTables(List *tableList);
static List * OpenRelationsForTruncate(List *cstoreTableList); static List * OpenRelationsForTruncate(List *cstoreTableList);
static void InitializeRelFileNode(Relation relation, bool force); static void FdwNewRelFileNode(Relation relation);
static void TruncateCStoreTables(List *cstoreRelationList); static void TruncateCStoreTables(List *cstoreRelationList);
static bool CStoreTable(Oid relationId); static bool CStoreTable(Oid relationId);
static bool CStoreServer(ForeignServer *server); static bool CStoreServer(ForeignServer *server);
@ -828,26 +828,22 @@ TruncateCStoreTables(List *cstoreRelationList)
Assert(CStoreTable(relationId)); Assert(CStoreTable(relationId));
InitializeRelFileNode(relation, true); FdwNewRelFileNode(relation);
InitializeCStoreTableFile(relationId, relation, CStoreGetOptions(relationId)); InitializeCStoreTableFile(relationId, relation, CStoreGetOptions(relationId));
} }
} }
/* /*
* Version 11 and earlier already create a relfilenode for foreign * Version 11 and earlier already assign a relfilenode for foreign
* tables. Version 12 and later do not, so we need to create one manually. * tables. Version 12 and later do not, so we need to create one manually.
*/ */
static void static void
InitializeRelFileNode(Relation relation, bool force) FdwNewRelFileNode(Relation relation)
{ {
#if PG_VERSION_NUM >= 120000
Relation pg_class; Relation pg_class;
HeapTuple tuple; HeapTuple tuple;
Form_pg_class classform; Form_pg_class classform;
/*
* Get a writable copy of the pg_class tuple for the given relation.
*/
pg_class = heap_open(RelationRelationId, RowExclusiveLock); pg_class = heap_open(RelationRelationId, RowExclusiveLock);
tuple = SearchSysCacheCopy1(RELOID, tuple = SearchSysCacheCopy1(RELOID,
@ -857,14 +853,13 @@ InitializeRelFileNode(Relation relation, bool force)
RelationGetRelid(relation)); RelationGetRelid(relation));
classform = (Form_pg_class) GETSTRUCT(tuple); classform = (Form_pg_class) GETSTRUCT(tuple);
if (!OidIsValid(classform->relfilenode) || force) if (true)
{ {
char persistence = relation->rd_rel->relpersistence; char persistence = relation->rd_rel->relpersistence;
Relation tmprel; Relation tmprel;
Oid tablespace; Oid tablespace;
Oid filenode; Oid filenode;
RelFileNode newrnode; RelFileNode newrnode;
SMgrRelation srel;
/* /*
* Upgrade to AccessExclusiveLock, and hold until the end of the * Upgrade to AccessExclusiveLock, and hold until the end of the
@ -874,6 +869,9 @@ InitializeRelFileNode(Relation relation, bool force)
tmprel = heap_open(relation->rd_id, AccessExclusiveLock); tmprel = heap_open(relation->rd_id, AccessExclusiveLock);
heap_close(tmprel, NoLock); heap_close(tmprel, NoLock);
if (OidIsValid(relation->rd_rel->relfilenode))
RelationDropStorage(relation);
if (OidIsValid(relation->rd_rel->reltablespace)) if (OidIsValid(relation->rd_rel->reltablespace))
tablespace = relation->rd_rel->reltablespace; tablespace = relation->rd_rel->reltablespace;
else else
@ -885,9 +883,6 @@ InitializeRelFileNode(Relation relation, bool force)
newrnode.dbNode = MyDatabaseId; newrnode.dbNode = MyDatabaseId;
newrnode.relNode = filenode; newrnode.relNode = filenode;
srel = RelationCreateStorage(newrnode, persistence);
smgrclose(srel);
classform->relfilenode = filenode; classform->relfilenode = filenode;
classform->relpages = 0; /* it's empty until further notice */ classform->relpages = 0; /* it's empty until further notice */
classform->reltuples = 0; classform->reltuples = 0;
@ -901,7 +896,25 @@ InitializeRelFileNode(Relation relation, bool force)
heap_freetuple(tuple); heap_freetuple(tuple);
heap_close(pg_class, RowExclusiveLock); heap_close(pg_class, RowExclusiveLock);
}
static void
FdwCreateStorage(Relation relation)
{
Assert(OidIsValid(relation->rd_rel->relfilenode));
RelationOpenSmgr(relation);
if (!smgrexists(relation->rd_smgr, MAIN_FORKNUM))
{
#if PG_VERSION_NUM >= 120000
SMgrRelation srel;
srel = RelationCreateStorage(relation->rd_node,
relation->rd_rel->relpersistence);
smgrclose(srel);
#else
RelationCreateStorage(relation->rd_node,
relation->rd_rel->relpersistence);
#endif #endif
}
} }
@ -2174,7 +2187,7 @@ cstore_fdw_initrel(Relation rel)
{ {
#if PG_VERSION_NUM >= 120000 #if PG_VERSION_NUM >= 120000
if (rel->rd_rel->relfilenode == InvalidOid) if (rel->rd_rel->relfilenode == InvalidOid)
InitializeRelFileNode(rel, false); FdwNewRelFileNode(rel);
/* /*
* Copied code from RelationInitPhysicalAddr(), which doesn't * Copied code from RelationInitPhysicalAddr(), which doesn't
@ -2188,6 +2201,7 @@ cstore_fdw_initrel(Relation rel)
rel->rd_node.dbNode = MyDatabaseId; rel->rd_node.dbNode = MyDatabaseId;
rel->rd_node.relNode = rel->rd_rel->relfilenode; rel->rd_node.relNode = rel->rd_rel->relfilenode;
#endif #endif
FdwCreateStorage(rel);
} }
static Relation static Relation