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

feodor · feodor · commit 241b19805d20 · 2020-10-13T11:10:18.000+03:00
diff --git a/src/rum_ts_utils.c b/src/rum_ts_utils.c
@@ -216,7 +216,7 @@ pre_checkcondition_rum(void *checkval, QueryOperand *val, ExecPhraseData *data)
 	j = gcv->map_item_operand[((QueryItem *) val) - gcv->first_item];
 	/* return presence of current entry in indexed value */
 	#if PG_VERSION_NUM >= 130000
-	return ( *(gcv->need_recheck) ? TS_MAYBE : gcv->check[j] );
+	return ( *(gcv->need_recheck) ? TS_MAYBE : (gcv->check[j] ? TS_YES : TS_NO) );
 	#else
 	return gcv->check[j];
 	#endif
@@ -228,7 +228,7 @@ rum_tsquery_pre_consistent(PG_FUNCTION_ARGS)
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 	TSQuery		query = PG_GETARG_TSQUERY(2);
 	Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4);
-	bool		recheck;
+	bool		recheck = false;
 	bool		res = false;
 
 	if (query->size > 0)
diff --git a/src/rumscan.c b/src/rumscan.c
@@ -703,9 +703,12 @@ rumNewScanKey(IndexScanDesc scan)
 				repalloc(so->entries, so->allocentries * sizeof(RumScanEntry));
 		}
 
-		memcpy(so->entries + so->totalentries,
-			   key->scanEntry, sizeof(*key->scanEntry) * key->nentries);
-		so->totalentries += key->nentries;
+		if ( key->scanEntry != NULL )
+		{
+			memcpy(so->entries + so->totalentries,
+				   key->scanEntry, sizeof(*key->scanEntry) * key->nentries);
+			so->totalentries += key->nentries;
+		}
 	}
 
 	/*
diff --git a/src/rumsort.c b/src/rumsort.c
@@ -21,7 +21,6 @@
 
 #include "commands/tablespace.h"
 #include "executor/executor.h"
-#include "utils/guc.h"
 #include "utils/logtape.h"
 #include "utils/pg_rusage.h"
 
@@ -52,9 +51,18 @@
  * Below are copied definitions from src/backend/utils/sort/tuplesort.c.
  */
 
-/* GUC variables */
+/* For PGPRO since v.13 trace_sort is imported from backend by including its
+ * declaration in guc.h (guc.h contains added Windows export/import magic to be done
+ * during postgres.exe compilation).
+ * For older or non-PGPRO versions on Windows platform trace_sort is not exported by
+ * backend so it is declared local for this case.
+ */
 #ifdef TRACE_SORT
-bool		trace_sort = false;
+#if ( !defined (_MSC_VER) || (PG_VERSION_NUM >= 130000 && defined (PGPRO_VERSION)) )
+#include "utils/guc.h"
+#else
+bool	trace_sort = false;
+#endif
 #endif
 
 typedef struct

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`	`/*`