Commit241b198

committed

Merge branch 'master' of git.postgrespro.ru:pgpro-dev/rum

2 parents063ca03 +d9607bf commit241b198Copy full SHA for 241b198

File tree

+19

-8

lines changed

+19

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ pre_checkcondition_rum(void checkval, QueryOperand val, ExecPhraseData *data)`
`216`	`216`	`j=gcv->map_item_operand[((QueryItem*)val)-gcv->first_item];`
`217`	`217`	`/* return presence of current entry in indexed value */`
`218`	`218`	`#ifPG_VERSION_NUM >=130000`
`219`		`-return (*(gcv->need_recheck) ?TS_MAYBE :gcv->check[j] );`
	`219`	`+return (*(gcv->need_recheck) ?TS_MAYBE :(gcv->check[j] ?TS_YES :TS_NO) );`
`220`	`220`	`#else`
`221`	`221`	`returngcv->check[j];`
`222`	`222`	`#endif`
`@@ -228,7 +228,7 @@ rum_tsquery_pre_consistent(PG_FUNCTION_ARGS)`
`228`	`228`	`boolcheck= (bool)PG_GETARG_POINTER(0);`
`229`	`229`	`TSQueryquery=PG_GETARG_TSQUERY(2);`
`230`	`230`	`Pointerextra_data= (Pointer)PG_GETARG_POINTER(4);`
`231`		`-boolrecheck;`
	`231`	`+boolrecheck= false;`
`232`	`232`	`boolres= false;`
`233`	`233`
`234`	`234`	`if (query->size>0)`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -703,9 +703,12 @@ rumNewScanKey(IndexScanDesc scan)`
`703`	`703`	`repalloc(so->entries,so->allocentries*sizeof(RumScanEntry));`
`704`	`704`	`}`
`705`	`705`
`706`		`-memcpy(so->entries+so->totalentries,`
`707`		`-key->scanEntry,sizeof(key->scanEntry)key->nentries);`
`708`		`-so->totalentries+=key->nentries;`
	`706`	`+if (key->scanEntry!=NULL )`
	`707`	`+{`
	`708`	`+memcpy(so->entries+so->totalentries,`
	`709`	`+key->scanEntry,sizeof(key->scanEntry)key->nentries);`
	`710`	`+so->totalentries+=key->nentries;`
	`711`	`+}`
`709`	`712`	`}`
`710`	`713`
`711`	`714`	`/*`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`
`22`	`22`	`#include"commands/tablespace.h"`
`23`	`23`	`#include"executor/executor.h"`
`24`		`-#include"utils/guc.h"`
`25`	`24`	`#include"utils/logtape.h"`
`26`	`25`	`#include"utils/pg_rusage.h"`
`27`	`26`
`@@ -52,9 +51,18 @@`
`52`	`51`	`* Below are copied definitions from src/backend/utils/sort/tuplesort.c.`
`53`	`52`	`*/`
`54`	`53`
`55`		`-/* GUC variables */`
	`54`	`+/* For PGPRO since v.13 trace_sort is imported from backend by including its`
	`55`	`+ * declaration in guc.h (guc.h contains added Windows export/import magic to be done`
	`56`	`+ * during postgres.exe compilation).`
	`57`	`+ * For older or non-PGPRO versions on Windows platform trace_sort is not exported by`
	`58`	`+ * backend so it is declared local for this case.`
	`59`	`+ */`
`56`	`60`	`#ifdefTRACE_SORT`
`57`		`-booltrace_sort= false;`
	`61`	`+#if ( !defined (_MSC_VER)\|\| (PG_VERSION_NUM >=130000&& defined (PGPRO_VERSION)) )`
	`62`	`+#include"utils/guc.h"`
	`63`	`+#else`
	`64`	`+booltrace_sort= false;`
	`65`	`+#endif`
`58`	`66`	`#endif`
`59`	`67`
`60`	`68`	`typedefstruct`

Comments

(0)