Fix erroneous range-union logic for varlena types in contrib/btree_gist.

tglsfdc · tglsfdc · commit 45b315efd835 · 2013-02-07T18:22:38.000-05:00
gbt_var_bin_union() failed to do the right thing when the existing range
needed to be widened at both ends rather than just one end.  This could
result in an invalid index in which keys that are present would not be
found by searches, because the searches would not think they need to
descend to the relevant leaf pages.  This error affected all the varlena
datatypes supported by btree_gist (text, bytea, bit, numeric).

Per investigation of a trouble report from Tomas Vondra.  (There is also
an issue in gbt_var_penalty(), but that should only result in inefficiency
not wrong answers.  I'm committing this separately so that we have a git
state in which it can be tested that bad penalty results don't produce
invalid indexes.)  Back-patch to all supported branches.
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
@@ -233,40 +233,40 @@ gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vin
 void
 gbt_var_bin_union(Datum *u, GBT_VARKEY *e, const gbtree_vinfo *tinfo)
 {
-
-	GBT_VARKEY *nk = NULL;
-	GBT_VARKEY *tmp = NULL;
-	GBT_VARKEY_R nr;
 	GBT_VARKEY_R eo = gbt_var_key_readable(e);
+	GBT_VARKEY_R nr;
 
 	if (eo.lower == eo.upper)	/* leaf */
 	{
+		GBT_VARKEY *tmp;
+
 		tmp = gbt_var_leaf2node(e, tinfo);
 		if (tmp != e)
 			eo = gbt_var_key_readable(tmp);
 	}
 
 	if (DatumGetPointer(*u))
 	{
-
 		GBT_VARKEY_R ro = gbt_var_key_readable((GBT_VARKEY *) DatumGetPointer(*u));
+		bool		update = false;
+
+		nr.lower = ro.lower;
+		nr.upper = ro.upper;
 
 		if ((*tinfo->f_cmp) ((bytea *) ro.lower, (bytea *) eo.lower) > 0)
 		{
 			nr.lower = eo.lower;
-			nr.upper = ro.upper;
-			nk = gbt_var_key_copy(&nr, TRUE);
+			update = true;
 		}
 
 		if ((*tinfo->f_cmp) ((bytea *) ro.upper, (bytea *) eo.upper) < 0)
 		{
 			nr.upper = eo.upper;
-			nr.lower = ro.lower;
-			nk = gbt_var_key_copy(&nr, TRUE);
+			update = true;
 		}
 
-		if (nk)
-			*u = PointerGetDatum(nk);
+		if (update)
+			*u = PointerGetDatum(gbt_var_key_copy(&nr, TRUE));
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -233,40 +233,40 @@ gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vin`
`233`	`233`	`void`
`234`	`234`	`gbt_var_bin_union(Datum u, GBT_VARKEY e, const gbtree_vinfo *tinfo)`
`235`	`235`	`{`
`236`		`-`
`237`		`- GBT_VARKEY *nk = NULL;`
`238`		`- GBT_VARKEY *tmp = NULL;`
`239`		`- GBT_VARKEY_R nr;`
`240`	`236`	`GBT_VARKEY_R eo = gbt_var_key_readable(e);`
	`237`	`+ GBT_VARKEY_R nr;`
`241`	`238`
`242`	`239`	`if (eo.lower == eo.upper) /* leaf */`
`243`	`240`	`{`
	`241`	`+ GBT_VARKEY *tmp;`
	`242`	`+`
`244`	`243`	`tmp = gbt_var_leaf2node(e, tinfo);`
`245`	`244`	`if (tmp != e)`
`246`	`245`	`eo = gbt_var_key_readable(tmp);`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`if (DatumGetPointer(*u))`
`250`	`249`	`{`
`251`		`-`
`252`	`250`	`GBT_VARKEY_R ro = gbt_var_key_readable((GBT_VARKEY ) DatumGetPointer(u));`
	`251`	`+ bool update = false;`
	`252`	`+`
	`253`	`+ nr.lower = ro.lower;`
	`254`	`+ nr.upper = ro.upper;`
`253`	`255`
`254`	`256`	`if ((tinfo->f_cmp) ((bytea ) ro.lower, (bytea *) eo.lower) > 0)`
`255`	`257`	`{`
`256`	`258`	`nr.lower = eo.lower;`
`257`		`- nr.upper = ro.upper;`
`258`		`- nk = gbt_var_key_copy(&nr, TRUE);`
	`259`	`+ update = true;`
`259`	`260`	`}`
`260`	`261`
`261`	`262`	`if ((tinfo->f_cmp) ((bytea ) ro.upper, (bytea *) eo.upper) < 0)`
`262`	`263`	`{`
`263`	`264`	`nr.upper = eo.upper;`
`264`		`- nr.lower = ro.lower;`
`265`		`- nk = gbt_var_key_copy(&nr, TRUE);`
	`265`	`+ update = true;`
`266`	`266`	`}`
`267`	`267`
`268`		`- if (nk)`
`269`		`- *u = PointerGetDatum(nk);`
	`268`	`+ if (update)`
	`269`	`+ *u = PointerGetDatum(gbt_var_key_copy(&nr, TRUE));`
`270`	`270`	`}`
`271`	`271`	`else`
`272`	`272`	`{`