Commit0e21179

Arthur Zakirov

committed

Some comments

1 parent7135b63 commit0e21179Copy full SHA for 0e21179

File tree

+17

-10

lines changed

+17

-10

lines changed

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -682,21 +682,25 @@ typedef enum`
`682`	`682`
`683`	`683`	`typedefstructRumScanOpaqueData`
`684`	`684`	`{`
	`685`	`+/* tempCtx is used to hold consistent and ordering functions data */`
`685`	`686`	`MemoryContexttempCtx;`
`686`		`-MemoryContextkeyCtx;/* used to hold key and entry data */`
	`687`	`+/* keyCtx is used to hold key and entry data */`
	`688`	`+MemoryContextkeyCtx;`
`687`	`689`	`RumStaterumstate;`
`688`	`690`
`689`		`-RumScanKeykeys;/ one per scan qualifier expr */`
	`691`	`+RumScanKeykeys;/ one per scan qualifier expr */`
`690`	`692`	`uint32nkeys;`
`691`		`-intnorderbys;`
`692`	`693`
`693`		`-RumScanEntryentries;/ one per index search condition */`
`694`		`-RumScanEntrysortedEntries;/one per index search condition */`
`695`		`-intentriesIncrIndex;`
	`694`	`+RumScanEntryentries;/ one per index search condition */`
	`695`	`+RumScanEntrysortedEntries;/Sorted entries. Used in fast scan */`
	`696`	`+intentriesIncrIndex;/* used in fast scan */`
`696`	`697`	`uint32totalentries;`
`697`		`-uint32allocentries;/* allocated length of entries[] */`
	`698`	`+uint32allocentries;/* allocated length of entries[] and`
	`699`	`+ sortedEntries[] */`
`698`	`700`
`699`	`701`	`Tuplesortstate*sortstate;`
	`702`	`+intnorderbys;/* Number of columns in ordering.`
	`703`	`+ Will be assigned to sortstate->nKeys */`
`700`	`704`
`701`	`705`	`RumKeykey;`
`702`	`706`	`boolfirstCall;`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2033,6 +2033,7 @@ rumgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)`
`2033`	`2033`	`RumScanOpaqueso= (RumScanOpaque)scan->opaque;`
`2034`	`2034`	`int64ntids=0;`
`2035`	`2035`	`boolrecheck;`
	`2036`	`+RumKeykey;`
`2036`	`2037`
`2037`	`2038`	`/*`
`2038`	`2039`	`* Set up the scan keys, and check for unsatisfiable query.`
`@@ -2063,14 +2064,16 @@ rumgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)`
`2063`	`2064`	`*/`
`2064`	`2065`	`startScan(scan);`
`2065`	`2066`
	`2067`	`+ItemPointerSetInvalid(&key.iptr);`
	`2068`	`+`
`2066`	`2069`	`for (;;)`
`2067`	`2070`	`{`
`2068`	`2071`	`CHECK_FOR_INTERRUPTS();`
`2069`	`2072`
`2070`		`-if (!scanGetItem(scan,&so->key,&so->key,&recheck))`
	`2073`	`+if (!scanGetItem(scan,&key,&key,&recheck))`
`2071`	`2074`	`break;`
`2072`	`2075`
`2073`		`-tbm_add_tuples(tbm,&so->key.iptr,1,recheck);`
	`2076`	`+tbm_add_tuples(tbm,&key.iptr,1,recheck);`
`2074`	`2077`	`ntids++;`
`2075`	`2078`	`}`
`2076`	`2079`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ rumNewScanKey(IndexScanDesc scan)`
`547`	`547`	`oldCtx=MemoryContextSwitchTo(so->keyCtx);`
`548`	`548`
`549`	`549`	`/* if no scan keys provided, allocate extra EVERYTHING RumScanKey */`
`550`		`-so->keys= (RumScanKey*)`
	`550`	`+so->keys= (RumScanKey*)`
`551`	`551`	`palloc((Max(scan->numberOfKeys,1)+scan->numberOfOrderBys)*`
`552`	`552`	`sizeof(*so->keys));`
`553`	`553`	`so->nkeys=0;`

Comments

(0)