Slightly refactor patch on query max size.

danolivo · Alena Rybakina · commit ff8b8274e254 · 2022-08-17T09:57:40.000+03:00
diff --git a/aqo.c b/aqo.c
@@ -238,10 +238,10 @@ _PG_init(void)
 							NULL
 	);
 
-	DefineCustomIntVariable("aqo.max_size",
+	DefineCustomIntVariable("aqo.querytext_max_size",
 							"Query max size in aqo_query_texts.",
 							NULL,
-							&max_size,
+							&querytext_max_size,
 							1000,
 							0, INT_MAX,
 							PGC_SUSET,
diff --git a/aqo_shared.c b/aqo_shared.c
@@ -28,7 +28,6 @@ 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 max_size = 1000;
 static uint32 temp_storage_size = 1024 * 1024 * 10; /* Storage size, in bytes */
 static dsm_segment *seg = NULL;
 
diff --git a/aqo_shared.h b/aqo_shared.h
@@ -52,7 +52,7 @@ extern HTAB *fss_htab;
 
 extern int fs_max_items; /* Max number of feature spaces that AQO can operate */
 extern int fss_max_items;
-extern int max_size;
+extern int querytext_max_size;
 
 extern Size aqo_memsize(void);
 extern void reset_dsm_cache(void);
diff --git a/storage.c b/storage.c
@@ -64,6 +64,8 @@ typedef void* (*form_record_t) (void *ctx, size_t *size);
 typedef void (*deform_record_t) (void *data, size_t size);
 
 
+int querytext_max_size = 1000;
+
 HTAB *stat_htab = NULL;
 HTAB *queries_htab = NULL;
 HTAB *qtexts_htab = NULL;
@@ -934,7 +936,7 @@ aqo_qtext_store(uint64 queryid, const char *query_string)
 
 	Assert(!LWLockHeldByMe(&aqo_state->qtexts_lock));
 
-	if (query_string == NULL)
+	if (query_string == NULL || querytext_max_size == 0)
 		return false;
 
 	dsa_init();
@@ -969,7 +971,7 @@ aqo_qtext_store(uint64 queryid, const char *query_string)
 		}
 
 		entry->queryid = queryid;
-		size = size > max_size ? max_size : size;
+		size = size > querytext_max_size ? querytext_max_size : size;
 		entry->qtext_dp = dsa_allocate(qtext_dsa, size);
 		Assert(DsaPointerIsValid(entry->qtext_dp));
 		strptr = (char *) dsa_get_address(qtext_dsa, entry->qtext_dp);
@@ -1641,7 +1643,7 @@ aqo_queries(PG_FUNCTION_ARGS)
 	while ((entry = hash_seq_search(&hash_seq)) != NULL)
 	{
 		memset(nulls, 0, AQ_TOTAL_NCOLS + 1);
-		
+
 		values[AQ_QUERYID] = Int64GetDatum(entry->queryid);
 		values[AQ_FS] = Int64GetDatum(entry->fs);
 		values[AQ_LEARN_AQO] = BoolGetDatum(entry->learn_aqo);
diff --git a/storage.h b/storage.h
@@ -82,6 +82,8 @@ typedef struct QueriesEntry
 	bool	auto_tuning;
 } QueriesEntry;
 
+extern int querytext_max_size;
+
 extern HTAB *stat_htab;
 extern HTAB *qtexts_htab;
 extern HTAB *queries_htab; /* TODO */
