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

update based on Onur's changes

pull/5273/head
Nils Dijk 2021-07-29 12:54:30 +02:00
parent 5fe4c06284
commit dc633136b8
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/columnar/columnar_tableam.c
View File

@ -2086,7 +2086,7 @@ columnar_bitmap_next_tuple(TableScanDesc scan, TBMIterateResult *tbmres,
ColumnarScanDesc cscan = (ColumnarScanDesc) scan; ColumnarScanDesc cscan = (ColumnarScanDesc) scan;
/**/ /**/
if (cscan->tupleindex >= tbmres->ntuples || cscan->tupleindex > 0 || tbmres->blockno != 0) if (cscan->tupleindex >= tbmres->ntuples)
{ {
return false; return false;
} }
@ -2100,12 +2100,31 @@ columnar_bitmap_next_tuple(TableScanDesc scan, TBMIterateResult *tbmres,
/* we need all columns */ /* we need all columns */
Relation rel = cscan->cs_base.rs_rd; Relation rel = cscan->cs_base.rs_rd;
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);
TupleDesc relationTupleDesc = RelationGetDescr(rel); // TupleDesc relationTupleDesc = RelationGetDescr(rel);
List *relationColumnList = NeededColumnsList(relationTupleDesc, attr_needed); // List *relationColumnList = NeededColumnsList(relationTupleDesc, attr_needed);
/* initialize read state for the first row */
if (cscan->cs_readState == NULL)
{
MemoryContext oldContext = MemoryContextSwitchTo(cscan->scanContext);
/* we need all columns */
int natts = rel->rd_att->natts;
Bitmapset *attr_needed = bms_add_range(NULL, 0, natts - 1);
/* no quals for index scan */
List *scanQual = NIL;
cscan->cs_readState = init_columnar_read_state(rel,
slot->tts_tupleDescriptor,
attr_needed, scanQual);
MemoryContextSwitchTo(oldContext);
}
uint64 rowNumber = tid_to_row_number(tid); uint64 rowNumber = tid_to_row_number(tid);
if (!ColumnarReadRowByRowNumber(rel, rowNumber, relationColumnList, if (!ColumnarReadRowByRowNumber(cscan->cs_readState, rowNumber,
slot->tts_values, slot->tts_isnull, slot->tts_values, slot->tts_isnull,
cscan->cs_base.rs_snapshot)) cscan->cs_base.rs_snapshot))
{ {