Reconcile backpatched (PG 15 -> 13) features with the code of PG13.

a.pervushina · danolivo · commit 9c1bede2f166 · 2022-10-14T10:37:00.000+05:00
diff --git a/aqo.c b/aqo.c
@@ -247,7 +247,7 @@ _PG_init(void)
 	RegisterResourceReleaseCallback(aqo_free_callback, NULL);
 	RegisterAQOPlanNodeMethods();
 
-	MarkGUCPrefixReserved("aqo");
+	EmitWarningsOnPlaceholders("aqo");
 	RequestAddinShmemSpace(aqo_memsize());
 }
 
diff --git a/cardinality_estimation.c b/cardinality_estimation.c
@@ -45,8 +45,8 @@ predict_debug_output(List *clauses, List *selectivities,
 	appendStringInfoString(&debug_str, "}, relnames: { ");
 	foreach(lc, relnames)
 	{
-		String *relname = lfirst_node(String, lc);
-		appendStringInfo(&debug_str, "%s ", relname->sval);
+		Value *relname = lfirst_node(String, lc);
+		appendStringInfo(&debug_str, "%s ", valStr(relname));
 	}
 
 	appendStringInfo(&debug_str, "}, result: %lf", result);
diff --git a/cardinality_hooks.c b/cardinality_hooks.c
@@ -164,12 +164,9 @@ aqo_set_baserel_rows_estimate(PlannerInfo *root, RelOptInfo *rel)
 	rte = planner_rt_fetch(rel->relid, root);
 	if (rte && OidIsValid(rte->relid))
 	{
-		String *s = makeNode(String);
-
 		/* Predict for a plane table. */
 		Assert(rte->eref && rte->eref->aliasname);
-		s->sval = pstrdup(rte->eref->aliasname);
-		relnames = list_make1(s);
+		relnames = list_make1(makeString(pstrdup(rte->eref->aliasname)));
 	}
 
 	clauses = aqo_get_clauses(root, rel->baserestrictinfo);
@@ -276,12 +273,9 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,
 
 	if (rte && OidIsValid(rte->relid))
 	{
-		String *s = makeNode(String);
-
 		/* Predict for a plane table. */
 		Assert(rte->eref && rte->eref->aliasname);
-		s->sval = pstrdup(rte->eref->aliasname);
-		relnames = list_make1(s);
+		relnames = list_make1(makeString(pstrdup(rte->eref->aliasname)));
 	}
 
 	predicted = predict_for_relation(allclauses, selectivities, relnames, &fss);
diff --git a/expected/gucs.out b/expected/gucs.out
@@ -34,7 +34,7 @@ EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
 
 -- Check existence of the interface functions.
 SELECT obj_description('public.show_cardinality_errors'::regproc::oid);
-                                     obj_description
+                                     obj_description                                     
 -----------------------------------------------------------------------------------------
  Get cardinality error of last query execution. Return queries having the largest error.
 (1 row)
diff --git a/expected/unsupported.out b/expected/unsupported.out
@@ -582,7 +582,8 @@ NOTICE:  Cleaning aqo_data records
 -- TODO: figure out with remaining queries in the ML storage.
 SELECT num, to_char(error, '9.99EEEE')::text AS error, query_text
 FROM public.show_cardinality_errors() cef, aqo_query_texts aqt
-WHERE aqt.query_hash = cef.id;
+WHERE aqt.query_hash = cef.id
+ORDER BY (error, md5(query_text)) DESC;
  num |   error   |                                        query_text
 -----+-----------+-------------------------------------------------------------------------------------------
    1 |  9.69e+02 | SELECT str FROM expln('                                                                  +
@@ -598,9 +599,9 @@ WHERE aqt.query_hash = cef.id;
      |           |   to_char(error, '9.99EEEE')::text AS error                                              +
      |           | FROM public.show_cardinality_errors()                                                    +
      |           | WHERE error > 0.;
-   3 |  0.00e+00 | CREATE TABLE t AS SELECT (gs.* / 50) AS x FROM generate_series(1,1000) AS gs;
+   5 |  0.00e+00 | CREATE TABLE t AS SELECT (gs.* / 50) AS x FROM generate_series(1,1000) AS gs;
    4 |  0.00e+00 | SELECT public.clean_aqo_data();
-   5 |  0.00e+00 | CREATE TABLE t1 AS SELECT mod(gs,10) AS x, mod(gs+1,10) AS y                             +
+   3 |  0.00e+00 | CREATE TABLE t1 AS SELECT mod(gs,10) AS x, mod(gs+1,10) AS y                             +
      |           |         FROM generate_series(1,1000) AS gs;
 (5 rows)
 
diff --git a/hash.c b/hash.c
@@ -449,11 +449,11 @@ get_relations_hash(List *relnames)
 	/* generate array of hashes. */
 	foreach(lc, relnames)
 	{
-		String *relname = lfirst_node(String, lc);
+		Value *relname = (Value *) lfirst(lc);
 
 		hashes[i++] = DatumGetInt64(hash_any_extended(
-												(unsigned char *) relname->sval,
-												strlen(relname->sval), 0));
+											(unsigned char *) strVal(relname),
+											strlen(strVal(relname)), 0));
 	}
 
 	/* Sort the array to make query insensitive to input order of relations. */
diff --git a/learn_cache.c b/learn_cache.c
@@ -56,7 +56,7 @@ calculate_size(int cols, List *relnames)
 	/* Calculate memory size needed to store relation names */
 	foreach(lc, relnames)
 	{
-		size += strlen(lfirst_node(String, lc)->sval) + 1;
+		size += strlen(strVal(lfirst(lc))) + 1;
 	}
 
 	return size;
@@ -134,7 +134,7 @@ lc_update_fss(uint64 fs, int fss, OkNNrdata *data, List *relnames)
 	/* store strings of relation names. Each string ends with 0-byte */
 	foreach(lc, relnames)
 	{
-		char *relname = lfirst_node(String, lc)->sval;
+		char *relname = strVal(lfirst(lc));
 		int len = strlen(relname) + 1;
 
 		memcpy(ptr, relname, len);
@@ -245,11 +245,9 @@ init_with_dsm(OkNNrdata *data, dsm_block_hdr *hdr, List **relnames)
 		*relnames = NIL;
 		for (i = 0; i < hdr->nrelids; i++)
 		{
-			String *s = makeNode(String);
 			int		len = strlen(ptr) + 1;
 
-			s->sval = pstrdup(ptr);
-			*relnames = lappend(*relnames, s);
+			*relnames = lappend(*relnames, makeString(pstrdup(ptr)));
 			ptr += len;
 		}
 		return calculate_size(hdr->cols, *relnames);
diff --git a/path_utils.c b/path_utils.c
@@ -148,12 +148,7 @@ get_relnames(PlannerInfo *root, Relids relids)
 	{
 		rte = planner_rt_fetch(i, root);
 		if (OidIsValid(rte->relid))
-		{
-			String *s = makeNode(String);
-
-			s->sval = pstrdup(rte->eref->aliasname);
-			l = lappend(l, s);
-		}
+			l = lappend(l, makeString(pstrdup(rte->eref->aliasname)));
 	}
 	return l;
 }
@@ -648,9 +643,9 @@ aqo_store_upper_signature_hook(PlannerInfo *root,
 	set_cheapest(input_rel);
 	clauses = get_path_clauses(input_rel->cheapest_total_path,
 													root, &selectivities);
-	relids = get_list_of_relids(root, input_rel->relids);
+	relnames = get_relnames(root, input_rel->relids);
 	fss_node->val.type = T_Integer;
 	fss_node->location = -1;
-	fss_node->val.val.ival = get_fss_for_object(relids, clauses, NIL, NULL, NULL);
+	fss_node->val.val.ival = get_fss_for_object(relnames, clauses, NIL, NULL, NULL);
 	output_rel->ext_nodes = lappend(output_rel->ext_nodes, (void *) fss_node);
 }
diff --git a/sql/unsupported.sql b/sql/unsupported.sql
@@ -187,6 +187,7 @@ SELECT public.clean_aqo_data();
 -- TODO: figure out with remaining queries in the ML storage.
 SELECT num, to_char(error, '9.99EEEE')::text AS error, query_text
 FROM public.show_cardinality_errors() cef, aqo_query_texts aqt
-WHERE aqt.query_hash = cef.id;
+WHERE aqt.query_hash = cef.id
+ORDER BY (error, md5(query_text)) DESC;
 
 DROP EXTENSION aqo;
diff --git a/storage.c b/storage.c
@@ -17,6 +17,9 @@
 
 #include "postgres.h"
 
+#include "nodes/value.h"
+#include "postgres.h"
+
 #include "access/heapam.h"
 #include "access/table.h"
 #include "access/tableam.h"
@@ -336,7 +339,7 @@ form_strings_vector(List *relnames)
 
 	foreach(lc, relnames)
 	{
-		char *relname = (lfirst_node(String, lc))->sval;
+		char *relname = strVal(lfirst(lc));
 
 		rels[i++] = CStringGetTextDatum(relname);
 	}
@@ -359,9 +362,9 @@ deform_strings_vector(Datum datum)
 					  &values, NULL, &nelems);
 	for (i = 0; i < nelems; ++i)
 	{
-		String *s = makeNode(String);
+		Value *s;
 
-		s->sval = pstrdup(TextDatumGetCString(values[i]));
+		s = makeString(pstrdup(TextDatumGetCString(values[i])));
 		relnames = lappend(relnames, s);
 	}
 
@@ -448,7 +451,7 @@ load_fss(uint64 fs, int fss, OkNNrdata *data, List **relnames)
 			elog(ERROR, "unexpected number of features for hash (" \
 						UINT64_FORMAT", %d):\
 						expected %d features, obtained %d",
-						fs, fss, ncols, DatumGetInt32(values[2]));
+						fs, fss, data->cols, DatumGetInt32(values[2]));
 	}
 	else
 		success = false;
@@ -583,7 +586,7 @@ update_fss(uint64 fs, int fss, OkNNrdata *data, List *relnames)
 			 */
 			elog(ERROR, "AQO data piece ("UINT64_FORMAT" %d) concurrently"
 				 " updated by a stranger backend.",
-				 fhash, fsshash);
+				 fs, fss);
 			result = false;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ _PG_init(void)`
`247`	`247`	`RegisterResourceReleaseCallback(aqo_free_callback, NULL);`
`248`	`248`	`RegisterAQOPlanNodeMethods();`
`249`	`249`
`250`		`- MarkGUCPrefixReserved("aqo");`
	`250`	`+ EmitWarningsOnPlaceholders("aqo");`
`251`	`251`	`RequestAddinShmemSpace(aqo_memsize());`
`252`	`252`	`}`
`253`	`253`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ predict_debug_output(List clauses, List selectivities,`
`45`	`45`	`appendStringInfoString(&debug_str, "}, relnames: { ");`
`46`	`46`	`foreach(lc, relnames)`
`47`	`47`	`{`
`48`		`- String *relname = lfirst_node(String, lc);`
`49`		`- appendStringInfo(&debug_str, "%s ", relname->sval);`
	`48`	`+ Value *relname = lfirst_node(String, lc);`
	`49`	`+ appendStringInfo(&debug_str, "%s ", valStr(relname));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`appendStringInfo(&debug_str, "}, result: %lf", result);`
Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,9 @@ aqo_set_baserel_rows_estimate(PlannerInfo root, RelOptInfo rel)`
`164`	`164`	`rte = planner_rt_fetch(rel->relid, root);`
`165`	`165`	`if (rte && OidIsValid(rte->relid))`
`166`	`166`	`{`
`167`		`- String *s = makeNode(String);`
`168`		`-`
`169`	`167`	`/* Predict for a plane table. */`
`170`	`168`	`Assert(rte->eref && rte->eref->aliasname);`
`171`		`- s->sval = pstrdup(rte->eref->aliasname);`
`172`		`- relnames = list_make1(s);`
	`169`	`+ relnames = list_make1(makeString(pstrdup(rte->eref->aliasname)));`
`173`	`170`	`}`
`174`	`171`
`175`	`172`	`clauses = aqo_get_clauses(root, rel->baserestrictinfo);`
`@@ -276,12 +273,9 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,`
`276`	`273`
`277`	`274`	`if (rte && OidIsValid(rte->relid))`
`278`	`275`	`{`
`279`		`- String *s = makeNode(String);`
`280`		`-`
`281`	`276`	`/* Predict for a plane table. */`
`282`	`277`	`Assert(rte->eref && rte->eref->aliasname);`
`283`		`- s->sval = pstrdup(rte->eref->aliasname);`
`284`		`- relnames = list_make1(s);`
	`278`	`+ relnames = list_make1(makeString(pstrdup(rte->eref->aliasname)));`
`285`	`279`	`}`
`286`	`280`
`287`	`281`	`predicted = predict_for_relation(allclauses, selectivities, relnames, &fss);`
Original file line number	Diff line number	Diff line change
`@@ -449,11 +449,11 @@ get_relations_hash(List *relnames)`
`449`	`449`	`/* generate array of hashes. */`
`450`	`450`	`foreach(lc, relnames)`
`451`	`451`	`{`
`452`		`- String *relname = lfirst_node(String, lc);`
	`452`	`+ Value relname = (Value ) lfirst(lc);`
`453`	`453`
`454`	`454`	`hashes[i++] = DatumGetInt64(hash_any_extended(`
`455`		`- (unsigned char *) relname->sval,`
`456`		`- strlen(relname->sval), 0));`
	`455`	`+ (unsigned char *) strVal(relname),`
	`456`	`+ strlen(strVal(relname)), 0));`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`/* Sort the array to make query insensitive to input order of relations. */`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ calculate_size(int cols, List *relnames)`
`56`	`56`	`/* Calculate memory size needed to store relation names */`
`57`	`57`	`foreach(lc, relnames)`
`58`	`58`	`{`
`59`		`- size += strlen(lfirst_node(String, lc)->sval) + 1;`
	`59`	`+ size += strlen(strVal(lfirst(lc))) + 1;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return size;`
`@@ -134,7 +134,7 @@ lc_update_fss(uint64 fs, int fss, OkNNrdata data, List relnames)`
`134`	`134`	`/* store strings of relation names. Each string ends with 0-byte */`
`135`	`135`	`foreach(lc, relnames)`
`136`	`136`	`{`
`137`		`- char *relname = lfirst_node(String, lc)->sval;`
	`137`	`+ char *relname = strVal(lfirst(lc));`
`138`	`138`	`int len = strlen(relname) + 1;`
`139`	`139`
`140`	`140`	`memcpy(ptr, relname, len);`
`@@ -245,11 +245,9 @@ init_with_dsm(OkNNrdata data, dsm_block_hdr hdr, List **relnames)`
`245`	`245`	`*relnames = NIL;`
`246`	`246`	`for (i = 0; i < hdr->nrelids; i++)`
`247`	`247`	`{`
`248`		`- String *s = makeNode(String);`
`249`	`248`	`int len = strlen(ptr) + 1;`
`250`	`249`
`251`		`- s->sval = pstrdup(ptr);`
`252`		`- relnames = lappend(relnames, s);`
	`250`	`+ relnames = lappend(relnames, makeString(pstrdup(ptr)));`
`253`	`251`	`ptr += len;`
`254`	`252`	`}`
`255`	`253`	`return calculate_size(hdr->cols, *relnames);`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@`
`17`	`17`
`18`	`18`	`#include "postgres.h"`
`19`	`19`
	`20`	`+#include "nodes/value.h"`
	`21`	`+#include "postgres.h"`
	`22`	`+`
`20`	`23`	`#include "access/heapam.h"`
`21`	`24`	`#include "access/table.h"`
`22`	`25`	`#include "access/tableam.h"`
`@@ -336,7 +339,7 @@ form_strings_vector(List *relnames)`
`336`	`339`
`337`	`340`	`foreach(lc, relnames)`
`338`	`341`	`{`
`339`		`- char *relname = (lfirst_node(String, lc))->sval;`
	`342`	`+ char *relname = strVal(lfirst(lc));`
`340`	`343`
`341`	`344`	`rels[i++] = CStringGetTextDatum(relname);`
`342`	`345`	`}`
`@@ -359,9 +362,9 @@ deform_strings_vector(Datum datum)`
`359`	`362`	`&values, NULL, &nelems);`
`360`	`363`	`for (i = 0; i < nelems; ++i)`
`361`	`364`	`{`
`362`		`- String *s = makeNode(String);`
	`365`	`+ Value *s;`
`363`	`366`
`364`		`- s->sval = pstrdup(TextDatumGetCString(values[i]));`
	`367`	`+ s = makeString(pstrdup(TextDatumGetCString(values[i])));`
`365`	`368`	`relnames = lappend(relnames, s);`
`366`	`369`	`}`
`367`	`370`
`@@ -448,7 +451,7 @@ load_fss(uint64 fs, int fss, OkNNrdata data, List *relnames)`
`448`	`451`	`elog(ERROR, "unexpected number of features for hash (" \`
`449`	`452`	`UINT64_FORMAT", %d):\`
`450`	`453`	`expected %d features, obtained %d",`
`451`		`- fs, fss, ncols, DatumGetInt32(values[2]));`
	`454`	`+ fs, fss, data->cols, DatumGetInt32(values[2]));`
`452`	`455`	`}`
`453`	`456`	`else`
`454`	`457`	`success = false;`
`@@ -583,7 +586,7 @@ update_fss(uint64 fs, int fss, OkNNrdata data, List relnames)`
`583`	`586`	`*/`
`584`	`587`	`elog(ERROR, "AQO data piece ("UINT64_FORMAT" %d) concurrently"`
`585`	`588`	`" updated by a stranger backend.",`
`586`		`- fhash, fsshash);`
	`589`	`+ fs, fss);`
`587`	`590`	`result = false;`
`588`	`591`	`}`
`589`	`592`	`}`