fix change of interface

pull/5273/head
Nils Dijk 2021-09-09 17:26:02 +02:00
parent 7fc322e0d3
commit 782b5cdd29
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 5 additions and 8 deletions

View File

@ -2110,8 +2110,6 @@ columnar_bitmap_next_tuple(TableScanDesc scan, TBMIterateResult *tbmres,
/* initialize read state for the first row */ /* initialize read state for the first row */
if (cscan->cs_readState == NULL) if (cscan->cs_readState == NULL)
{ {
MemoryContext oldContext = MemoryContextSwitchTo(cscan->scanContext);
/* we need all columns */ /* we need all columns */
int natts = rel->rd_att->natts; int natts = rel->rd_att->natts;
Bitmapset *attr_needed = bms_add_range(NULL, 0, natts - 1); Bitmapset *attr_needed = bms_add_range(NULL, 0, natts - 1);
@ -2119,16 +2117,15 @@ columnar_bitmap_next_tuple(TableScanDesc scan, TBMIterateResult *tbmres,
/* no quals for index scan */ /* no quals for index scan */
List *scanQual = NIL; List *scanQual = NIL;
cscan->cs_readState = init_columnar_read_state(rel, cscan->cs_readState = init_columnar_read_state(rel, slot->tts_tupleDescriptor,
slot->tts_tupleDescriptor, attr_needed, scanQual,
attr_needed, scanQual); cscan->scanContext,
MemoryContextSwitchTo(oldContext); cscan->cs_base.rs_snapshot);
} }
uint64 rowNumber = tid_to_row_number(tid); uint64 rowNumber = tid_to_row_number(tid);
if (!ColumnarReadRowByRowNumber(cscan->cs_readState, rowNumber, if (!ColumnarReadRowByRowNumber(cscan->cs_readState, rowNumber,
slot->tts_values, slot->tts_isnull, slot->tts_values, slot->tts_isnull))
cscan->cs_base.rs_snapshot))
{ {
return false; return false;
} }