Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove TTSOps pointer macros #3298

Merged
merged 1 commit into from Jun 3, 2021
Merged

Remove TTSOps pointer macros #3298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/compat.h
View file
Open in desktop
Expand Up @@ -66,11 +66,6 @@
ExecComputeStoredGenerated(estate, slot)
#endif

#define TTSOpsVirtualP (&TTSOpsVirtual)
#define TTSOpsHeapTupleP (&TTSOpsHeapTuple)
#define TTSOpsMinimalTupleP (&TTSOpsMinimalTuple)
#define TTSOpsBufferHeapTupleP (&TTSOpsBufferHeapTuple)

/* fmgr
* In a9c35cf postgres changed how it calls SQL functions so that the number of
* argument-slots allocated is chosen dynamically, instead of being fixed. This
Expand Down
4 changes: 2 additions & 2 deletions src/event_trigger.c
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ ts_event_trigger_ddl_commands(void)

FunctionCallInvoke(fcinfo);

slot = MakeSingleTupleTableSlot(rsinfo.setDesc, TTSOpsMinimalTupleP);
slot = MakeSingleTupleTableSlot(rsinfo.setDesc, &TTSOpsMinimalTuple);

while (tuplestore_gettupleslot(rsinfo.setResult, true, false, slot))
{
Expand Down Expand Up @@ -238,7 +238,7 @@ ts_event_trigger_dropped_objects(void)

FunctionCallInvoke(fcinfo);

slot = MakeSingleTupleTableSlot(rsinfo.setDesc, TTSOpsMinimalTupleP);
slot = MakeSingleTupleTableSlot(rsinfo.setDesc, &TTSOpsMinimalTuple);

while (tuplestore_gettupleslot(rsinfo.setResult, true, false, slot))
{
Expand Down
4 changes: 2 additions & 2 deletions tsl/src/compression/compression.c
View file
Open in desktop
Expand Up @@ -374,7 +374,7 @@ compress_chunk_sort_relation(Relation in_rel, int n_keys, const ColumnCompressio
Tuplesortstate *tuplesortstate;
HeapTuple tuple;
TableScanDesc heapScan;
TupleTableSlot *heap_tuple_slot = MakeTupleTableSlot(tupDesc, TTSOpsHeapTupleP);
TupleTableSlot *heap_tuple_slot = MakeTupleTableSlot(tupDesc, &TTSOpsHeapTuple);
AttrNumber *sort_keys = palloc(sizeof(*sort_keys) * n_keys);
Oid *sort_operators = palloc(sizeof(*sort_operators) * n_keys);
Oid *sort_collations = palloc(sizeof(*sort_collations) * n_keys);
Expand Down Expand Up @@ -602,7 +602,7 @@ row_compressor_append_sorted_rows(RowCompressor *row_compressor, Tuplesortstate
TupleDesc sorted_desc)
{
CommandId mycid = GetCurrentCommandId(true);
TupleTableSlot *slot = MakeTupleTableSlot(sorted_desc, TTSOpsMinimalTupleP);
TupleTableSlot *slot = MakeTupleTableSlot(sorted_desc, &TTSOpsMinimalTuple);
bool got_tuple;
bool first_iteration = true;

Expand Down
7 changes: 3 additions & 4 deletions tsl/src/nodes/gapfill/exec.c
View file
Open in desktop
Expand Up @@ -29,7 +29,6 @@
#include "nodes/gapfill/interpolate.h"
#include "nodes/gapfill/exec.h"
#include "time_bucket.h"
#include "compat.h"

typedef enum GapFillBoundary
{
Expand Down Expand Up @@ -609,8 +608,8 @@ gapfill_begin(CustomScanState *node, EState *estate, int eflags)

state->gapfill_typid = func->funcresulttype;
state->state = FETCHED_NONE;
state->subslot = MakeSingleTupleTableSlot(tupledesc, TTSOpsVirtualP);
state->scanslot = MakeSingleTupleTableSlot(tupledesc, TTSOpsVirtualP);
state->subslot = MakeSingleTupleTableSlot(tupledesc, &TTSOpsVirtual);
state->scanslot = MakeSingleTupleTableSlot(tupledesc, &TTSOpsVirtual);

/* bucket_width */
if (!is_simple_expr(linitial(args)))
Expand Down Expand Up @@ -707,7 +706,7 @@ gapfill_begin(CustomScanState *node, EState *estate, int eflags)
}
state->pi = ExecBuildProjectionInfo(targetlist,
state->csstate.ss.ps.ps_ExprContext,
MakeSingleTupleTableSlot(tupledesc, TTSOpsVirtualP),
MakeSingleTupleTableSlot(tupledesc, &TTSOpsVirtual),
&state->csstate.ss.ps,
NULL);

Expand Down