toast_delete_external_datum Relation pass

Relation passed to toast_delete_external_datum to work with multiple TOAST
tables.

Author: Teodor Sigaev <teodor@sigaev.ru>
Author: Oleg Bartunov <obartunov@postgrespro.ru>
Author: Nikita Glukhov <n.gluhov@postgrespro.ru>
Author: Nikita Malakhov <n.malakhov@postgrespro.ru>

Author: Nikita Malakhov

contrib/bytea_toaster/bytea_toaster.c

@@ -159,7 +159,7 @@ bytea_toaster_check_visibility(void *pcxt, char **chunkdata,
 }
 
 static void
-bytea_toaster_delete_toast(Datum oldval, bool is_speculative)
+bytea_toaster_delete_toast(Relation rel, Datum oldval, bool is_speculative)
 {
 	if (VARATT_IS_CUSTOM(oldval))
 	{
@@ -251,7 +251,7 @@ bytea_toaster_update_toast(Relation rel, Oid toasterid,
 	}
 
 	if (VARATT_IS_CUSTOM(oldval))
-		bytea_toaster_delete_toast(oldval, is_speculative);
+		bytea_toaster_delete_toast(rel, oldval, is_speculative);
 	else if (VARATT_IS_EXTERNAL_ONDISK(oldval))
 		toast_delete_datum(oldval, is_speculative);
 

contrib/dummy_toaster/dummy_toaster.c

@@ -117,7 +117,7 @@ dummy_toast(Relation toast_rel, Oid toasterid,
  * Dummy delete function
  */
 static void
-dummy_delete(Datum value, bool is_speculative)
+dummy_delete(Relation rel, Datum value, bool is_speculative)
 {
 }
 

src/backend/access/table/toast_helper.c

@@ -355,11 +355,11 @@ toast_tuple_externalize(ToastTupleContext *ttc, int attribute, int maxDataLen,
 }
 
 static void
-toast_delete_external_datum(Datum value, bool is_speculative)
+toast_delete_external_datum(Relation rel, Datum value, bool is_speculative)
 {
 	Oid			toasterid;
 
-	if (VARATT_IS_EXTERNAL(value))
+	if (VARATT_IS_EXTERNAL_ONDISK(value))
 		toasterid = DEFAULT_TOASTER_OID;
 	else if (VARATT_IS_CUSTOM(value))
 		toasterid = VARATT_CUSTOM_GET_TOASTERID(value);
@@ -369,7 +369,7 @@ toast_delete_external_datum(Datum value, bool is_speculative)
 	if (toasterid != InvalidOid)
 	{
 		TsrRoutine *toaster = SearchTsrCache(toasterid);
-		toaster->deltoast(value, is_speculative);
+		toaster->deltoast(rel, value, is_speculative);
 	}
 }
 
@@ -410,7 +410,9 @@ toast_tuple_cleanup(ToastTupleContext *ttc)
 			ToastAttrInfo *attr = &ttc->ttc_attr[i];
 
 			if ((attr->tai_colflags & TOASTCOL_NEEDS_DELETE_OLD) != 0)
-				toast_delete_external_datum((Datum)(ttc->ttc_oldvalues[i]), false);
+            toast_delete_external_datum(ttc->ttc_rel,
+                                        (Datum)(ttc->ttc_oldvalues[i]),
+                                        false);
 		}
 	}
 }
@@ -430,7 +432,7 @@ toast_delete_external(Relation rel, Datum *values, bool *isnull,
 	for (i = 0; i < numAttrs; i++)
 	{
 		if (TupleDescAttr(tupleDesc, i)->attlen == -1 && !isnull[i])
-			toast_delete_external_datum((Datum)(values[i]),
+			toast_delete_external_datum(rel, (Datum)(values[i]),
 										is_speculative);
 	}
 }

src/backend/access/toast/generic_toaster.c

@@ -119,7 +119,7 @@ generic_detoast(Datum toast_ptr, int offset, int length)
  * (marks as dead)
  */
 static void
-generic_delete_toast(Datum value, bool is_speculative)
+generic_delete_toast(Relation rel, Datum value, bool is_speculative)
 {
 	toast_delete_datum(value, is_speculative);
 }

src/include/access/toasterapi.h

@@ -82,7 +82,7 @@ typedef Datum (*detoast_function) (Datum toast_ptr,
 											 int offset, int length);
 
 /* Delete toast function */
-typedef void (*del_toast_function) (Datum value, bool is_speculative);
+typedef void (*del_toast_function) (Relation rel, Datum value, bool is_speculative);
 
 /* Reconstruct function necessary for replication */
 typedef Datum (*reconstruct_toast_function) (Relation toastrel,