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

address review comments

merge-cstore-pykello
Jeff Davis 2020-09-18 08:43:33 -07:00
parent b9f2b410b5
commit d7f40f3be6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cstore_tableam.c
View File

@ -145,13 +145,16 @@ cstore_beginscan(Relation relation, Snapshot snapshot,
int32 vartypmod = 0; int32 vartypmod = 0;
Oid varcollid = 0; Oid varcollid = 0;
Index varlevelsup = 0; Index varlevelsup = 0;
Var *var = makeVar(varno, varattno, vartype, vartypmod, Var *var;
varcollid, varlevelsup);
if (!tupdesc->attrs[i].attisdropped) if (!tupdesc->attrs[i].attisdropped)
{ {
columnList = lappend(columnList, var); continue;
} }
var = makeVar(varno, varattno, vartype, vartypmod,
varcollid, varlevelsup);
columnList = lappend(columnList, var);
} }
readState = CStoreBeginRead(relid, tupdesc, columnList, NULL); readState = CStoreBeginRead(relid, tupdesc, columnList, NULL);
@ -183,13 +186,9 @@ static bool
cstore_getnextslot(TableScanDesc sscan, ScanDirection direction, TupleTableSlot *slot) cstore_getnextslot(TableScanDesc sscan, ScanDirection direction, TupleTableSlot *slot)
{ {
CStoreScanDesc scan = (CStoreScanDesc) sscan; CStoreScanDesc scan = (CStoreScanDesc) sscan;
TupleDesc tupdesc = slot->tts_tupleDescriptor;
int natts = tupdesc->natts;
bool nextRowFound; bool nextRowFound;
ExecClearTuple(slot); ExecClearTuple(slot);
memset(slot->tts_values, 0, sizeof(Datum) * natts);
memset(slot->tts_isnull, true, sizeof(bool) * natts);
nextRowFound = CStoreReadNextRow(scan->cs_readState, slot->tts_values, nextRowFound = CStoreReadNextRow(scan->cs_readState, slot->tts_values,
slot->tts_isnull); slot->tts_isnull);
@ -537,6 +536,7 @@ cstore_estimate_rel_size(Relation rel, int32 *attr_widths,
BlockNumber *pages, double *tuples, BlockNumber *pages, double *tuples,
double *allvisfrac) double *allvisfrac)
{ {
/* TODO */
*attr_widths = 12; *attr_widths = 12;
*tuples = 100; *tuples = 100;
*pages = 10; *pages = 10;