update version aqo up to the current version

Author: Alena0704

aqo.dylib

@@ -282,7 +282,7 @@ extern double predict_for_relation(List *restrict_clauses, List *selectivities,
 								   List *relsigns, int *fss);
 
 /* Query execution statistics collecting hooks */
-bool aqo_ExecutorStart(QueryDesc *queryDesc, int eflags);
+void aqo_ExecutorStart(QueryDesc *queryDesc, int eflags);
 void aqo_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count);
 void aqo_ExecutorEnd(QueryDesc *queryDesc);
 

aqo.h

@@ -43,51 +43,50 @@ aqo_init_shmem(void)
 		aqo_state->qtexts_dsa_handler = DSM_HANDLE_INVALID;
 		aqo_state->data_dsa_handler = DSM_HANDLE_INVALID;
 
-		aqo_state->qtext_trancheid = LWLockNewTrancheId();
+		aqo_state->qtext_trancheid = LWLockNewTrancheId("AQO Query Texts Tranche");
 
 		aqo_state->qtexts_changed = false;
 		aqo_state->stat_changed = false;
 		aqo_state->data_changed = false;
 		aqo_state->queries_changed = false;
 		aqo_state->bgw_handle = NULL;
 
-		LWLockInitialize(&aqo_state->lock, LWLockNewTrancheId());
-		LWLockInitialize(&aqo_state->stat_lock, LWLockNewTrancheId());
-		LWLockInitialize(&aqo_state->qtexts_lock, LWLockNewTrancheId());
-		LWLockInitialize(&aqo_state->data_lock, LWLockNewTrancheId());
-		LWLockInitialize(&aqo_state->queries_lock, LWLockNewTrancheId());
+		LWLockInitialize(&aqo_state->lock,
+						 LWLockNewTrancheId("AQO"));
+		LWLockInitialize(&aqo_state->stat_lock,
+						 LWLockNewTrancheId("AQO Stat Lock Tranche"));
+		LWLockInitialize(&aqo_state->qtexts_lock,
+						 LWLockNewTrancheId("AQO QTexts Lock Tranche"));
+		LWLockInitialize(&aqo_state->data_lock,
+						 LWLockNewTrancheId("AQO Data Lock Tranche"));
+		LWLockInitialize(&aqo_state->queries_lock,
+						 LWLockNewTrancheId("AQO Queries Lock Tranche"));
 	}
 
 	info.keysize = sizeof(((StatEntry *) 0)->queryid);
 	info.entrysize = sizeof(StatEntry);
-	stat_htab = ShmemInitHash("AQO Stat HTAB", fs_max_items, fs_max_items,
+	stat_htab = ShmemInitHash("AQO Stat HTAB", fs_max_items,
 							  &info, HASH_ELEM | HASH_BLOBS);
 
 	/* Init shared memory table for query texts */
 	info.keysize = sizeof(((QueryTextEntry *) 0)->queryid);
 	info.entrysize = sizeof(QueryTextEntry);
-	qtexts_htab = ShmemInitHash("AQO Query Texts HTAB", fs_max_items, fs_max_items,
+	qtexts_htab = ShmemInitHash("AQO Query Texts HTAB", fs_max_items,
 								&info, HASH_ELEM | HASH_BLOBS);
 
 	/* Shared memory hash table for the data */
 	info.keysize = sizeof(data_key);
 	info.entrysize = sizeof(DataEntry);
-	data_htab = ShmemInitHash("AQO Data HTAB", fss_max_items, fss_max_items,
+	data_htab = ShmemInitHash("AQO Data HTAB", fss_max_items,
 							  &info, HASH_ELEM | HASH_BLOBS);
 
 	/* Shared memory hash table for queries */
 	info.keysize = sizeof(((QueriesEntry *) 0)->queryid);
 	info.entrysize = sizeof(QueriesEntry);
-	queries_htab = ShmemInitHash("AQO Queries HTAB", fs_max_items, fs_max_items,
+	queries_htab = ShmemInitHash("AQO Queries HTAB", fs_max_items,
 								 &info, HASH_ELEM | HASH_BLOBS);
 
 	LWLockRelease(AddinShmemInitLock);
-	LWLockRegisterTranche(aqo_state->lock.tranche, "AQO");
-	LWLockRegisterTranche(aqo_state->stat_lock.tranche, "AQO Stat Lock Tranche");
-	LWLockRegisterTranche(aqo_state->qtexts_lock.tranche, "AQO QTexts Lock Tranche");
-	LWLockRegisterTranche(aqo_state->qtext_trancheid, "AQO Query Texts Tranche");
-	LWLockRegisterTranche(aqo_state->data_lock.tranche, "AQO Data Lock Tranche");
-	LWLockRegisterTranche(aqo_state->queries_lock.tranche, "AQO Queries Lock Tranche");
 
 	if (!IsUnderPostmaster && !found)
 	{

aqo_shared.c

@@ -393,10 +393,6 @@ get_path_clauses(Path *path, PlannerInfo *root, List **selectivities)
 			return get_path_clauses(((GroupPath *) path)->subpath, root,
 									selectivities);
 			break;
-		case T_UpperUniquePath:
-			return get_path_clauses(((UpperUniquePath *) path)->subpath, root,
-									selectivities);
-			break;
 		case T_AggPath:
 			return get_path_clauses(((AggPath *) path)->subpath, root,
 									selectivities);

path_utils.c

@@ -543,12 +543,11 @@ learnOnPlanState(PlanState *p, void *context)
 /*
  * Set up flags to store cardinality statistics.
  */
-bool
+void
 aqo_ExecutorStart(QueryDesc *queryDesc, int eflags)
 {
 	instr_time	now;
 	bool		use_aqo;
-	bool		plan_valid;
 
 	/*
 	 * If the plan pulled from a plan cache, planning don't needed. Restore
@@ -597,14 +596,12 @@ aqo_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	}
 
 	if (prev_ExecutorStart_hook)
-		plan_valid = prev_ExecutorStart_hook(queryDesc, eflags);
+		prev_ExecutorStart_hook(queryDesc, eflags);
 	else
-		plan_valid = standard_ExecutorStart(queryDesc, eflags);
+		standard_ExecutorStart(queryDesc, eflags);
 
 	if (use_aqo)
 		StorePlanInternals(queryDesc);
-
-	return plan_valid;
 }
 
 #include "utils/timeout.h"
@@ -1009,7 +1006,7 @@ print_node_explain(ExplainState *es, PlanState *ps, Plan *plan)
 
 		for (i = 0; i < ps->worker_instrument->num_workers; i++)
 		{
-			Instrumentation *instrument = &ps->worker_instrument->instrument[i];
+			NodeInstrumentation *instrument = &ps->worker_instrument->instrument[i];
 
 			if (instrument->nloops <= 0)
 				continue;

postprocessing.c

@@ -82,18 +82,21 @@ static PlannedStmt *
 call_default_planner(Query *parse,
 					 const char *query_string,
 					 int cursorOptions,
-					 ParamListInfo boundParams)
+					 ParamListInfo boundParams,
+					 ExplainState *es)
 {
 	if (prev_planner_hook)
 		return prev_planner_hook(parse,
 								 query_string,
 								 cursorOptions,
-								 boundParams);
+								 boundParams,
+								 es);
 	else
 		return standard_planner(parse,
 								query_string,
 								cursorOptions,
-								boundParams);
+								boundParams,
+								es);
 }
 
 /*
@@ -123,7 +126,8 @@ PlannedStmt *
 aqo_planner(Query *parse,
 			const char *query_string,
 			int cursorOptions,
-			ParamListInfo boundParams)
+			ParamListInfo boundParams,
+			ExplainState *es)
 {
 	bool			query_is_stored = false;
 	MemoryContext	oldctx;
@@ -149,7 +153,8 @@ aqo_planner(Query *parse,
 		return call_default_planner(parse,
 									query_string,
 									cursorOptions,
-									boundParams);
+									boundParams,
+									es);
 	}
 
 	selectivity_cache_clear();
@@ -178,7 +183,8 @@ aqo_planner(Query *parse,
 		return call_default_planner(parse,
 									query_string,
 									cursorOptions,
-									boundParams);
+									boundParams,
+									es);
 	}
 
 	elog(DEBUG1, "AQO will be used for query '%s', class "UINT64_FORMAT,
@@ -347,7 +353,7 @@ aqo_planner(Query *parse,
 		PlannedStmt *stmt;
 
 		stmt = call_default_planner(parse, query_string,
-												 cursorOptions, boundParams);
+												 cursorOptions, boundParams, es);
 
 		/* Release the memory, allocated for AQO predictions */
 		MemoryContextReset(AQOPredictMemCtx);

preprocessing.c

@@ -6,7 +6,8 @@
 extern PlannedStmt *aqo_planner(Query *parse,
 								const char *query_string,
 								int cursorOptions,
-								ParamListInfo boundParams);
+								ParamListInfo boundParams,
+								struct ExplainState *es);
 extern void disable_aqo_for_query(void);
 
 #endif /* __PREPROCESSING_H__ */

preprocessing.h

@@ -22,6 +22,8 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "storage/fd.h"
+#include "utils/tuplestore.h"
 
 #include "aqo.h"
 #include "aqo_shared.h"