Commit0892ebc

committed

repair rungettuple. But tests still crash

1 parentc89451e commit0892ebcCopy full SHA for 0892ebc

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ extern void rumNewScanKey(IndexScanDesc scan);`
`662`	`662`
`663`	`663`	`/* rumget.c */`
`664`	`664`	`externint64rumgetbitmap(IndexScanDescscan,TIDBitmap*tbm);`
`665`		`-externDatumrumgettuple(PG_FUNCTION_ARGS);`
	`665`	`+externboolrumgettuple(IndexScanDescscan,ScanDirectiondirection);`
`666`	`666`
`667`	`667`	`/* rumvacuum.c */`
`668`	`668`	`externIndexBulkDeleteResultrumbulkdelete(IndexVacuumInfoinfo,`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2178,10 +2178,9 @@ insertScanItem(RumScanOpaque so, bool recheck)`
`2178`	`2178`	`tuplesort_putrum(so->sortstate,item);`
`2179`	`2179`	`}`
`2180`	`2180`
`2181`		`-Datum`
`2182`		`-rumgettuple(PG_FUNCTION_ARGS)`
	`2181`	`+bool`
	`2182`	`+rumgettuple(IndexScanDescscan,ScanDirectiondirection)`
`2183`	`2183`	`{`
`2184`		`-IndexScanDescscan= (IndexScanDesc)PG_GETARG_POINTER(0);`
`2185`	`2184`	`boolrecheck;`
`2186`	`2185`	`RumScanOpaqueso= (RumScanOpaque)scan->opaque;`
`2187`	`2186`	`RumSortItem*item;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,10 @@ rumhandler(PG_FUNCTION_ARGS)`
`77`	`77`	`amroutine->amcanreturn=NULL;`
`78`	`78`	`amroutine->amcostestimate=gincostestimate;`
`79`	`79`	`amroutine->amoptions=rumoptions;`
`80`		`-amroutine->amvalidate=rumvalidate;`
	`80`	`+amroutine->amvalidate=rumvalidate;`
`81`	`81`	`amroutine->ambeginscan=rumbeginscan;`
`82`	`82`	`amroutine->amrescan=rumrescan;`
`83`		`-amroutine->amgettuple=NULL;`
	`83`	`+amroutine->amgettuple=rumgettuple;`
`84`	`84`	`amroutine->amgetbitmap=rumgetbitmap;`
`85`	`85`	`amroutine->amendscan=rumendscan;`
`86`	`86`	`amroutine->ammarkpos=NULL;`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ SET enable_seqscan=off;`
`14`	`14`
`15`	`15`	`explain (costs off)`
`16`	`16`	`SELECTcount(*)FROM test_rumWHERE a @@ to_tsquery('pg_catalog.english','ever\|wrote');`
	`17`	`+explain (costs off)`
	`18`	`+SELECT*FROM test_rumWHERE a @@ to_tsquery('pg_catalog.english','ever\|wrote')`
	`19`	`+ORDER BY a>< to_tsquery('pg_catalog.english','ever\|wrote');`
`17`	`20`
`18`	`21`	`SELECTcount(*)FROM test_rumWHERE a @@ to_tsquery('pg_catalog.english','ever\|wrote');`
`19`	`22`	`SELECTcount(*)FROM test_rumWHERE a @@ to_tsquery('pg_catalog.english','have&wish');`

Comments

(0)