instant minor fixes

funbringer · danolivo · commit 6ee84f468734 · 2019-01-31T15:44:12.000+05:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+results/*
+regression.diffs
+regression.out
+*.o
+*.so
+*.gcda
+*.gcno
+*.gcov
+tags
diff --git a/Makefile b/Makefile
@@ -7,7 +7,9 @@ DATA = aqo--1.0.sql
 OBJS = aqo.o auto_tuning.o cardinality_estimation.o cardinality_hooks.o \
 hash.o machine_learning.o path_utils.o postprocessing.o preprocessing.o \
 selectivity_cache.o storage.o utils.o $(WIN32RES)
+
 REGRESS = aqo_disabled aqo_controlled aqo_intelligent aqo_forced aqo_learn
+EXTRA_REGRESS_OPTS=--temp-config=$(CURDIR)/conf.add
 
 MODULE_big = aqo
 ifdef USE_PGXS
diff --git a/aqo.h b/aqo.h
@@ -113,6 +113,8 @@
 #ifndef __ML_CARD_H__
 #define __ML_CARD_H__
 
+#include <math.h>
+
 #include "postgres.h"
 
 #include "fmgr.h"
diff --git a/cardinality_estimation.c b/cardinality_estimation.c
@@ -23,7 +23,6 @@ predict_for_relation(List *restrict_clauses, List *selectivities, List *relids)
 	double		result;
 	int			rows;
 	int			i;
-	ListCell   *l;
 
 	get_fss_for_object(restrict_clauses, selectivities, relids,
 					   &nfeatures, &fss_hash, &features);
@@ -43,10 +42,8 @@ predict_for_relation(List *restrict_clauses, List *selectivities, List *relids)
 		pfree(matrix[i]);
 	pfree(matrix);
 	pfree(target);
+	list_free_deep(selectivities);
 	list_free(restrict_clauses);
-	foreach(l, selectivities)
-		pfree(lfirst(l));
-	list_free(selectivities);
 	list_free(relids);
 
 	if (result < 0)
diff --git a/cardinality_hooks.c b/cardinality_hooks.c
@@ -127,7 +127,6 @@ aqo_set_baserel_rows_estimate(PlannerInfo *root, RelOptInfo *rel)
 	Oid			relid;
 	List	   *relids;
 	List	   *selectivities;
-	ListCell   *l;
 
 	if (use_aqo || learn_aqo)
 		selectivities = get_selectivities(root, rel->baserestrictinfo, 0,
@@ -136,11 +135,8 @@ aqo_set_baserel_rows_estimate(PlannerInfo *root, RelOptInfo *rel)
 	if (!use_aqo)
 	{
 		if (learn_aqo)
-		{
-			foreach(l, selectivities)
-				pfree(lfirst(l));
-			list_free(selectivities);
-		}
+			list_free_deep(selectivities);
+
 		call_default_set_baserel_rows_estimate(root, rel);
 		return;
 	}
@@ -207,9 +203,7 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,
 	{
 		if (learn_aqo)
 		{
-			foreach(l, selectivities)
-				pfree(lfirst(l));
-			list_free(selectivities);
+			list_free_deep(selectivities);
 			list_free(allclauses);
 		}
 		return call_default_get_parameterized_baserel_size(root, rel,
@@ -248,7 +242,6 @@ aqo_set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 	List	   *inner_selectivities;
 	List	   *outer_selectivities;
 	List	   *current_selectivities;
-	ListCell   *l;
 
 	if (use_aqo || learn_aqo)
 		current_selectivities = get_selectivities(root, restrictlist, 0,
@@ -257,11 +250,8 @@ aqo_set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 	if (!use_aqo)
 	{
 		if (learn_aqo)
-		{
-			foreach(l, current_selectivities)
-				pfree(lfirst(l));
-			list_free(current_selectivities);
-		}
+			list_free_deep(current_selectivities);
+
 		call_default_set_joinrel_size_estimates(root, rel,
 												outer_rel,
 												inner_rel,
@@ -315,7 +305,6 @@ aqo_get_parameterized_joinrel_size(PlannerInfo *root,
 	List	   *inner_selectivities;
 	List	   *outer_selectivities;
 	List	   *current_selectivities;
-	ListCell   *l;
 
 	if (use_aqo || learn_aqo)
 		current_selectivities = get_selectivities(root, restrict_clauses, 0,
@@ -324,11 +313,8 @@ aqo_get_parameterized_joinrel_size(PlannerInfo *root,
 	if (!use_aqo)
 	{
 		if (learn_aqo)
-		{
-			foreach(l, current_selectivities)
-				pfree(lfirst(l));
-			list_free(current_selectivities);
-		}
+			list_free_deep(current_selectivities);
+
 		return call_default_get_parameterized_joinrel_size(root, rel,
 														   outer_path,
 														   inner_path,
diff --git a/conf.add b/conf.add
@@ -0,0 +1 @@
+shared_preload_libraries = 'aqo'
diff --git a/storage.c b/storage.c
@@ -891,7 +891,7 @@ init_deactivated_queries_storage(void)
 	deactivated_queries = hash_create("aqo_deactivated_queries",
 									  128,		/* start small and extend */
 									  &hash_ctl,
-									  HASH_ELEM);
+									  HASH_ELEM | HASH_BLOBS);
 }
 
 /* Destroys the storage for hash of deactivated queries */

Original file line number	Diff line number	Diff line change
`@@ -891,7 +891,7 @@ init_deactivated_queries_storage(void)`
`891`	`891`	`deactivated_queries = hash_create("aqo_deactivated_queries",`
`892`	`892`	`128, /* start small and extend */`
`893`	`893`	`&hash_ctl,`
`894`		`- HASH_ELEM);`
	`894`	`+ HASH_ELEM \| HASH_BLOBS);`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`/* Destroys the storage for hash of deactivated queries */`