Add type checking for populate function

Author: knizhnik

deparse.c

@@ -40,7 +40,11 @@
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
 #include "optimizer/tlist.h"
+#if PG_VERSION_NUM>=120000
+#include "optimizer/optimizer.h"
+#else
 #include "optimizer/var.h"
+#endif
 #include "parser/parsetree.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
@@ -110,7 +114,7 @@ static void deparseExpr(Expr *expr, deparse_expr_cxt *context);
 static void deparseVar(Var *node, deparse_expr_cxt *context);
 static void deparseConst(Const *node, deparse_expr_cxt *context, int showtype);
 static void deparseParam(Param *node, deparse_expr_cxt *context);
-static void deparseArrayRef(ArrayRef *node, deparse_expr_cxt *context);
+static void deparseSubscriptingRef(SubscriptingRef *node, deparse_expr_cxt *context);
 static void deparseFuncExpr(FuncExpr *node, deparse_expr_cxt *context);
 static void deparseOpExpr(OpExpr *node, deparse_expr_cxt *context);
 static void deparseOperatorName(StringInfo buf, Form_pg_operator opform);
@@ -242,9 +246,9 @@ foreign_expr_walker(Node *node,
 		case T_Const:
 		case T_Param:
 			break;
-		case T_ArrayRef:
+		case T_SubscriptingRef:
 			{
-				ArrayRef   *ar = (ArrayRef *) node;
+				SubscriptingRef   *ar = (SubscriptingRef *) node;
 
 				/* Assignment should not be in restrictions. */
 				if (ar->refassgnexpr != NULL)
@@ -1486,8 +1490,8 @@ deparseExpr(Expr *node, deparse_expr_cxt *context)
 		case T_Param:
 			deparseParam((Param *) node, context);
 			break;
-		case T_ArrayRef:
-			deparseArrayRef((ArrayRef *) node, context);
+		case T_SubscriptingRef:
+			deparseSubscriptingRef((SubscriptingRef *) node, context);
 			break;
 		case T_FuncExpr:
 			deparseFuncExpr((FuncExpr *) node, context);
@@ -1721,7 +1725,7 @@ deparseParam(Param *node, deparse_expr_cxt *context)
  * Deparse an array subscript expression.
  */
 static void
-deparseArrayRef(ArrayRef *node, deparse_expr_cxt *context)
+deparseSubscriptingRef(SubscriptingRef *node, deparse_expr_cxt *context)
 {
 	StringInfo	buf = context->buf;
 	ListCell   *lowlist_item;

expected/test.out

@@ -1,4 +1,5 @@
 create extension vops;
+set extra_float_digits=0;
 create table s(x real);
 create table v(x vops_float4);
 insert into s values(1.0),(2.0),(null),(3.0),(null),(4.0);

sql/test.sql

@@ -1,4 +1,5 @@
 create extension vops;
+set extra_float_digits=0;
 create table s(x real);
 create table v(x vops_float4);
 insert into s values(1.0),(2.0),(null),(3.0),(null),(4.0);

vops.c

@@ -26,10 +26,12 @@
 #include "tcop/utility.h"
 
 #include "utils/array.h"
-#include "utils/tqual.h"
 #include "utils/datum.h"
 #if PG_VERSION_NUM>=120000
+#include "access/heapam.h"
 #include "utils/float.h"
+#else
+#include "utils/tqual.h"
 #endif
 #include "utils/builtins.h"
 #include "utils/datetime.h"
@@ -1137,9 +1139,10 @@ UserTableUpdateOpenIndexes()
 	if (estate->es_result_relation_info->ri_NumIndices > 0)
 	{
 		recheckIndexes = ExecInsertIndexTuples(slot,
+#if PG_VERSION_NUM<120000
 											   &tuple->t_self,
+#endif
 											   estate, false, NULL, NIL);
-
 		if (recheckIndexes != NIL)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1182,7 +1185,7 @@ static void insert_tuple(Datum* values, bool* nulls)
 	HeapTuple tup = heap_form_tuple(RelationGetDescr(rel), values, nulls);
 #if PG_VERSION_NUM>=120000
 	ExecStoreHeapTuple(tup, slot, true);
-	simple_heap_insert(rel, ExecFetchSlotHeapTuple(slot, true, NULL));
+	simple_table_insert(rel, slot);
 #else
 	ExecStoreTuple(tup, slot, InvalidBuffer, true);
 	simple_heap_insert(rel, slot->tts_tuple);
@@ -2224,6 +2227,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)
 	int rc;
 	bool is_null;
 	int64 loaded;
+	bool type_checked = false;
 	static Oid self_oid = InvalidOid;
     char stmt[MAX_SQL_STMT_LEN];
 
@@ -2257,6 +2261,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)
         HeapTuple spi_tuple = SPI_tuptable->vals[i];
         char const* name = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
         Oid type_id = DatumGetObjectId(SPI_getbinval(spi_tuple, spi_tupdesc, 2, &is_null));
+		types[i].dst_type = type_id;
 		types[i].tid = vops_get_type(type_id);
 		get_typlenbyvalalign(type_id, &types[i].len, &types[i].byval, &types[i].align);
 		if (types[i].tid != VOPS_LAST && types[i].len < 0) { /* varying length type: extract size from atttypmod */
@@ -2294,6 +2299,26 @@ Datum vops_populate(PG_FUNCTION_ARGS)
         if (SPI_processed) {
             HeapTuple spi_tuple = SPI_tuptable->vals[0];
             spi_tupdesc = SPI_tuptable->tupdesc;
+			if (!type_checked)
+			{
+				for (i = 0; i < n_attrs; i++)
+				{
+					Oid dst_type = types[i].dst_type;
+					Oid src_type = SPI_gettypeid(spi_tupdesc, i+1);
+					types[i].src_type = src_type;
+					if (types[i].tid != VOPS_LAST)
+						dst_type = vops_map_tid[types[i].tid];
+					if (!(dst_type == src_type ||
+						  (dst_type == CHAROID && src_type == TEXTOID) ||
+						  (dst_type == TEXTOID && src_type == VARCHAROID) ||
+						  (dst_type == TEXTOID && src_type == BPCHAROID)))
+					{
+						elog(ERROR, "Incompatible type of attribute %d: %s vs. %s",
+							 i+1, format_type_be(dst_type), format_type_be(src_type));
+					}
+				}
+				type_checked = true;
+			}
 			if (j == TILE_SIZE) {
 				for (i = 0; i < n_attrs; i++) {
 					if (types[i].tid != VOPS_LAST) {
@@ -2343,7 +2368,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)
 						((vops_bool*)tile)->payload |= (uint64)DatumGetBool(val) << j;
 						break;
 					  case VOPS_CHAR:
-						((vops_char*)tile)->payload[j] = SPI_gettypeid(spi_tupdesc, i+1) == CHAROID
+						((vops_char*)tile)->payload[j] = types[i].src_type == CHAROID
 							? DatumGetChar(val)
 							: *VARDATA(DatumGetTextP(val));
 						break;

vops.h

@@ -144,6 +144,8 @@ typedef struct {
 	char      align;
 	FmgrInfo  inproc;
 	Oid       inproc_param_oid;
+	Oid       src_type;
+	Oid       dst_type;
 } vops_type_info;
 
 typedef struct {

vops_fdw.c

@@ -36,7 +36,13 @@
 #include "optimizer/planmain.h"
 #include "optimizer/plancat.h"
 #include "optimizer/restrictinfo.h"
+#if PG_VERSION_NUM>=120000
+#include "access/table.h"
+#include "nodes/primnodes.h"
+#include "optimizer/optimizer.h"
+#else
 #include "optimizer/var.h"
+#endif
 #include "optimizer/tlist.h"
 #include "parser/parsetree.h"
 #include "utils/builtins.h"
@@ -1031,7 +1037,7 @@ estimate_path_cost_size(PlannerInfo *root,
 		 *-----
 		 */
 		run_cost = ofpinfo->rel_total_cost - ofpinfo->rel_startup_cost;
-		run_cost += aggcosts.finalCost * numGroups;
+		run_cost += aggcosts.finalCost.per_tuple * numGroups;
 		run_cost += cpu_tuple_cost * numGroups;
 		run_cost += ptarget->cost.per_tuple * numGroups;
 	}

vops_fdw.h

@@ -15,7 +15,11 @@
 
 #include "foreign/foreign.h"
 #include "lib/stringinfo.h"
+#if PG_VERSION_NUM>=120000
+#include "nodes/pathnodes.h"
+#else
 #include "nodes/relation.h"
+#endif
 #include "utils/relcache.h"
 
 #include "libpq-fe.h"