Add commit for smooth transition to file-based AQO storage.

danolivo · danolivo · commit 95de10e2d66d · 2022-06-27T16:06:01.000+05:00
diff --git a/aqo.c b/aqo.c
@@ -23,6 +23,7 @@
 #include "path_utils.h"
 #include "preprocessing.h"
 #include "learn_cache.h"
+#include "storage.h"
 
 
 PG_MODULE_MAGIC;
@@ -199,6 +200,18 @@ _PG_init(void)
 							 NULL
 	);
 
+	DefineCustomBoolVariable(
+							 "aqo.use_file_storage",
+							 "Used for smooth transition from table storage",
+							 NULL,
+							 &aqo_use_file_storage,
+							 false,
+							 PGC_USERSET,
+							 0,
+							 NULL,
+							 NULL,
+							 NULL
+	);
 	DefineCustomIntVariable("aqo.join_threshold",
 							"Sets the threshold of number of JOINs in query beyond which AQO is used.",
 							NULL,
diff --git a/postprocessing.c b/postprocessing.c
@@ -29,6 +29,7 @@
 #include "machine_learning.h"
 #include "preprocessing.h"
 #include "learn_cache.h"
+#include "storage.h"
 
 
 typedef struct
@@ -823,7 +824,12 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 	}
 
 	if (query_context.collect_stat)
-		stat = get_aqo_stat(query_context.query_hash);
+	{
+		if (!aqo_use_file_storage)
+			stat = get_aqo_stat(query_context.query_hash);
+		else
+			stat = aqo_load_stat(query_context.query_hash);
+	}
 
 	{
 		/* Calculate execution time. */
@@ -873,7 +879,10 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 				automatical_query_tuning(query_context.query_hash, stat);
 
 			/* Write AQO statistics to the aqo_query_stat table */
-			update_aqo_stat(query_context.query_hash, stat);
+			if (!aqo_use_file_storage)
+				update_aqo_stat(query_context.query_hash, stat);
+			else
+				aqo_store_stat(query_context.query_hash, stat);
 			pfree_query_stat(stat);
 		}
 
diff --git a/preprocessing.c b/preprocessing.c
@@ -65,6 +65,7 @@
 #include "aqo.h"
 #include "hash.h"
 #include "preprocessing.h"
+#include "storage.h"
 
 
 /* List of feature spaces, that are processing in this backend. */
diff --git a/storage.c b/storage.c
@@ -28,6 +28,7 @@
 #include "machine_learning.h"
 #include "preprocessing.h"
 #include "learn_cache.h"
+#include "storage.h"
 
 #define AQO_DATA_COLUMNS	(7)
 HTAB *deactivated_queries = NULL;
@@ -1104,3 +1105,22 @@ add_deactivated_query(uint64 query_hash)
 {
 	hash_search(deactivated_queries, &query_hash, HASH_ENTER, NULL);
 }
+
+/* *****************************************************************************
+ *
+ * Implement AQO file storage below
+ *
+ **************************************************************************** */
+
+bool aqo_use_file_storage;
+
+void
+aqo_store_stat(uint64 queryid, QueryStat * stat)
+{
+}
+
+QueryStat *
+aqo_load_stat(uint64 queryid)
+{
+	return NULL;
+}
diff --git a/storage.h b/storage.h
@@ -0,0 +1,10 @@
+#ifndef STORAGE_H
+#define STORAGE_H
+
+#include "aqo.h"
+
+extern bool aqo_use_file_storage;
+
+extern void aqo_store_stat(uint64 queryid, QueryStat * stat);
+extern QueryStat *aqo_load_stat(uint64 queryid);
+#endif /* STORAGE_H */
