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

Fix compilation in pg 11

merge-cstore-pykello
Hadi Moshayedi 2020-09-14 13:13:36 -07:00
parent b8b5d3aeee
commit fb110446be
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cstore_metadata_tables.c
View File

@ -14,9 +14,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "access/heapam.h" #include "access/heapam.h"
#include "access/htup_details.h"
#include "access/nbtree.h" #include "access/nbtree.h"
#include "access/table.h"
#include "access/tableam.h"
#include "access/xact.h" #include "access/xact.h"
#include "catalog/indexing.h" #include "catalog/indexing.h"
#include "catalog/pg_namespace.h" #include "catalog/pg_namespace.h"
@ -30,7 +29,6 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "nodes/execnodes.h" #include "nodes/execnodes.h"
#include "lib/stringinfo.h" #include "lib/stringinfo.h"
#include "optimizer/optimizer.h"
#include "port.h" #include "port.h"
#include "storage/fd.h" #include "storage/fd.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
@ -263,7 +261,7 @@ DeleteTableMetadataRowIfExists(Oid relid)
BTEqualStrategyNumber, F_OIDEQ, Int32GetDatum(relid)); BTEqualStrategyNumber, F_OIDEQ, Int32GetDatum(relid));
cstoreTablesOid = CStoreTablesRelationId(); cstoreTablesOid = CStoreTablesRelationId();
cstoreTables = table_open(cstoreTablesOid, AccessShareLock); cstoreTables = heap_open(cstoreTablesOid, AccessShareLock);
index = index_open(CStoreTablesIndexRelationId(), AccessShareLock); index = index_open(CStoreTablesIndexRelationId(), AccessShareLock);
scanDescriptor = systable_beginscan_ordered(cstoreTables, index, NULL, 1, scanKey); scanDescriptor = systable_beginscan_ordered(cstoreTables, index, NULL, 1, scanKey);
@ -278,7 +276,7 @@ DeleteTableMetadataRowIfExists(Oid relid)
systable_endscan_ordered(scanDescriptor); systable_endscan_ordered(scanDescriptor);
index_close(index, NoLock); index_close(index, NoLock);
table_close(cstoreTables, NoLock); heap_close(cstoreTables, NoLock);
} }
@ -412,9 +410,15 @@ InsertTupleAndEnforceConstraints(ModifyState *state, Datum *values, bool *nulls)
{ {
TupleDesc tupleDescriptor = RelationGetDescr(state->rel); TupleDesc tupleDescriptor = RelationGetDescr(state->rel);
HeapTuple tuple = heap_form_tuple(tupleDescriptor, values, nulls); HeapTuple tuple = heap_form_tuple(tupleDescriptor, values, nulls);
#if PG_VERSION_NUM >= 120000
TupleTableSlot *slot = ExecInitExtraTupleSlot(state->estate, tupleDescriptor, TupleTableSlot *slot = ExecInitExtraTupleSlot(state->estate, tupleDescriptor,
&TTSOpsHeapTuple); &TTSOpsHeapTuple);
ExecStoreHeapTuple(tuple, slot, false); ExecStoreHeapTuple(tuple, slot, false);
#else
TupleTableSlot *slot = ExecInitExtraTupleSlot(state->estate, tupleDescriptor);
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
#endif
/* use ExecSimpleRelationInsert to enforce constraints */ /* use ExecSimpleRelationInsert to enforce constraints */
ExecSimpleRelationInsert(state->estate, slot); ExecSimpleRelationInsert(state->estate, slot);
@ -432,7 +436,7 @@ DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple)
ResultRelInfo *resultRelInfo = estate->es_result_relation_info; ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
ItemPointer tid = &(heapTuple->t_self); ItemPointer tid = &(heapTuple->t_self);
simple_table_tuple_delete(state->rel, tid, estate->es_snapshot); simple_heap_delete(state->rel, tid);
/* execute AFTER ROW DELETE Triggers to enforce constraints */ /* execute AFTER ROW DELETE Triggers to enforce constraints */
ExecARDeleteTriggers(estate, resultRelInfo, tid, NULL, NULL); ExecARDeleteTriggers(estate, resultRelInfo, tid, NULL, NULL);
@ -476,8 +480,10 @@ create_estate_for_relation(Relation rel)
rte->rtekind = RTE_RELATION; rte->rtekind = RTE_RELATION;
rte->relid = RelationGetRelid(rel); rte->relid = RelationGetRelid(rel);
rte->relkind = rel->rd_rel->relkind; rte->relkind = rel->rd_rel->relkind;
#if PG_VERSION_NUM >= 120000
rte->rellockmode = AccessShareLock; rte->rellockmode = AccessShareLock;
ExecInitRangeTable(estate, list_make1(rte)); ExecInitRangeTable(estate, list_make1(rte));
#endif
resultRelInfo = makeNode(ResultRelInfo); resultRelInfo = makeNode(ResultRelInfo);
InitResultRelInfo(resultRelInfo, rel, 1, NULL, 0); InitResultRelInfo(resultRelInfo, rel, 1, NULL, 0);
@ -488,6 +494,12 @@ create_estate_for_relation(Relation rel)
estate->es_output_cid = GetCurrentCommandId(true); estate->es_output_cid = GetCurrentCommandId(true);
#if PG_VERSION_NUM < 120000
/* Triggers might need a slot */
if (resultRelInfo->ri_TrigDesc)
estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate, NULL);
#endif
/* Prepare to catch AFTER triggers. */ /* Prepare to catch AFTER triggers. */
AfterTriggerBeginQuery(); AfterTriggerBeginQuery();