Merge remote-tracking branch 'origin/PGPRO-6780' into stable

Marina Polyakova · Marina Polyakova · commit 4b8da393f21e · 2022-09-29T17:11:05.000+03:00
Conflicts: src/rumsort.c Caused by the following commits: - 6530adc [PGPRO-6780] Fix Windows warnings - 5719f28 Refactoring to be pg16 ready. - db8b9d6 Add support for pg16. Thanks to Koval Dmitry for the review of conflict resolution.
diff --git a/src/rum.h b/src/rum.h
@@ -868,9 +868,9 @@ extern Datum rum_anyarray_distance(PG_FUNCTION_ARGS);
 
 
 /* GUC parameters */
-extern PGDLLIMPORT int		RumFuzzySearchLimit;
-extern PGDLLIMPORT float8	RumArraySimilarityThreshold;
-extern PGDLLIMPORT int		RumArraySimilarityFunction;
+extern int		RumFuzzySearchLimit;
+extern float8	RumArraySimilarityThreshold;
+extern int		RumArraySimilarityFunction;
 
 
 /*
diff --git a/src/rum_ts_utils.c b/src/rum_ts_utils.c
@@ -172,7 +172,7 @@ typedef struct
 	DocRepresentation *end;
 } Extention;
 
-static float weights[] = {1.0/0.1f, 1.0/0.2f, 1.0/0.4f, 1.0/1.0f};
+static float weights[] = {1.0f/0.1f, 1.0f/0.2f, 1.0f/0.4f, 1.0f/1.0f};
 
 /* A dummy WordEntryPos array to use when haspos is false */
 static WordEntryPosVector POSNULL = {
