From f68cac7e87949120aa1879650b196ea67348388b Mon Sep 17 00:00:00 2001
From: Wen Lin <wlin@pivotal.io>
Date: Wed, 18 Apr 2018 11:57:25 +0800
Subject: [PATCH] HAWQ-1606. Fix "make unittest-check" error and set GUC error

---
 src/backend/utils/hash/bloomfilter.c | 3 +--
 src/backend/utils/misc/guc.c         | 7 ++++---
 src/include/utils/guc.h              | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/backend/utils/hash/bloomfilter.c b/src/backend/utils/hash/bloomfilter.c
index 3d1bd8593e..7d71ad55a2 100644
--- a/src/backend/utils/hash/bloomfilter.c
+++ b/src/backend/utils/hash/bloomfilter.c
@@ -22,9 +22,8 @@
 #include "utils/palloc.h"
 #include "lib/stringinfo.h"
 #include <assert.h>
-#include <math.h>
 
-uint32_t HASH_SEEDS[8] __attribute__((aligned(32))) = { 0x14EBCDFFU,
+const static uint32_t HASH_SEEDS[8] = { 0x14EBCDFFU,
         0x2A1C1A99U, 0x85CB78FBU, 0x6E8F82DDU, 0xF8464DFFU, 0x1028FEADU,
         0x74F04A4DU, 0x1832DB75U };
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 718a8b68ea..7ff338bd8b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -7126,7 +7126,7 @@ static struct config_real ConfigureNamesReal[] =
 	},
 
 	{
-		{"hawq_hashjoin_bloomfilter_ratio", PGC_USERSET, PRESET_OPTIONS,
+		{"hawq_hashjoin_bloomfilter_ratio", PGC_USERSET, GP_ARRAY_TUNING,
 			gettext_noop("Sets the ratio for hash join Bloom filter."),
 			NULL,
 			GUC_NO_SHOW_ALL
@@ -8327,12 +8327,13 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"hawq_hashjoin_bloomfilter_max_memory_size", PGC_USERSET, PRESET_OPTIONS,
+		{"hawq_hashjoin_bloomfilter_max_memory_size", PGC_USERSET, GP_ARRAY_TUNING,
 			gettext_noop("The maximum memory size for bloom filter in hash join, with KB or MB"),
+			NULL,
 			GUC_NO_SHOW_ALL
 		},
 		&hawq_hashjoin_bloomfilter_max_memory_size,
-		"2MB", NULL, NULL
+		"2mb", NULL, NULL
 	},
 
 	{
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 922fe0cab1..38b217af93 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -412,6 +412,7 @@ extern double optimizer_nestloop_factor;
 extern double locality_upper_bound;
 extern bool optimizer_cte_inlining;
 extern double net_disk_ratio;
+extern double hawq_hashjoin_bloomfilter_ratio;
 extern int optimizer_cte_inlining_bound;
 extern double optimizer_damping_factor_filter;
 extern double optimizer_damping_factor_join;