Second stage of branches arrangement. Now: from master to the stable

Author: danolivo

aqo.c

@@ -33,7 +33,7 @@ void _PG_init(void);
 #define AQO_MODULE_MAGIC	(1234)
 
 /* Strategy of determining feature space for new queries. */
-int aqo_mode;
+int aqo_mode = AQO_MODE_CONTROLLED;
 bool	force_collect_stat;
 
 /*

aqo_shared.c

@@ -26,8 +26,8 @@ shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 AQOSharedState *aqo_state = NULL;
 HTAB *fss_htab = NULL;
 static int aqo_htab_max_items = 1000;
-int fs_max_items = 1; /* Max number of different feature spaces in ML model */
-int fss_max_items = 1; /* Max number of different feature subspaces in ML model */
+int fs_max_items = 10000; /* Max number of different feature spaces in ML model */
+int fss_max_items = 100000; /* Max number of different feature subspaces in ML model */
 static uint32 temp_storage_size = 1024 * 1024 * 10; /* Storage size, in bytes */
 static dsm_segment *seg = NULL;
 

aqo_shared.h

@@ -1,12 +1,11 @@
 #ifndef AQO_SHARED_H
 #define AQO_SHARED_H
 
-
+#include "lib/dshash.h"
 #include "storage/dsm.h"
 #include "storage/ipc.h"
 #include "storage/lwlock.h"
 #include "utils/dsa.h"
-#include "lib/dshash.h"
 
 #define AQO_SHARED_MAGIC	0x053163
 

auto_tuning.c

@@ -42,7 +42,7 @@ get_mean(double *elems, int nelems)
 double	sum = 0;
 int i;
 
-AssertArg(nelems > 0);
+Assert(nelems > 0);
 
 for (i = 0; i < nelems; ++i)
 sum += elems[i];
@@ -58,7 +58,7 @@ get_estimation(double *elems, int nelems)
 {
 int start;
 
-AssertArg(nelems > 0);
+Assert(nelems > 0);
 
 if (nelems > auto_tuning_window_size)
 start = nelems - auto_tuning_window_size;
@@ -77,7 +77,7 @@ is_stable(double *elems, int nelems)
 double	est,
 last;
 
-AssertArg(nelems > 1);
+Assert(nelems > 1);
 
 est = get_mean(elems, nelems - 1);
 last = elems[nelems - 1];