Support PostgreSQL 13.0 and Bug fixes

GridDB FDW v1.3
Support PostgreSQL 13.0
Bug fixes
- Fix GridDB return fail when executing IN clause
- Fix error hash table corrupted
- Fix griddb GetForeignPlan failed
- Fix row-key update

Author: khieuvm

Jenkinsfile

@@ -1,6 +1,6 @@
 GridDB Foreign Data Wrapper for PostgreSQL
 
-Copyright (c) 2018, TOSHIBA Corporation
+Copyright (c) 2020, TOSHIBA Corporation
 Copyright (c) 2011 - 2016, EnterpriseDB Corporation
 
 Permission to use, copy, modify, and distribute this software and its

LICENSE

@@ -13,7 +13,7 @@ SHLIB_LINK = $(libpq) -L$(GRIDDB_LIBRARY) -lgridstore
 EXTENSION = griddb_fdw
 DATA = griddb_fdw--1.0.sql
 
-REGRESS = griddb_fdw griddb_fdw_data_type
+REGRESS = griddb_fdw griddb_fdw_data_type float4 float8 int4 int8 numeric join limit aggregates prepare select_having select insert update griddb_fdw_post 
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config

Makefile

@@ -1,8 +1,7 @@
 # GridDB Foreign Data Wrapper for PostgreSQL
 
 This PostgreSQL extension is a Foreign Data Wrapper (FDW) for [GridDB][1].  
-This version of griddb_fdw can work for PostgreSQL 9.6, 10 and 11, 12.  
-
+This version of griddb_fdw can work for PostgreSQL 9.6, 10, 11, 12 and 13. It is confirmed in GridDB 4.5.
 
 ## 1. Installation
 griddb_fdw requires GridDB's C client library. This library can be downloaded from the [GridDB][1] website on github[1].

README.md

@@ -1,7 +1,7 @@
 /*
  * GridDB Foreign Data Wrapper
  *
- * Portions Copyright (c) 2019, TOSHIBA CORPORATION
+ * Portions Copyright (c) 2020, TOSHIBA CORPORATION
  *
  * IDENTIFICATION
  *		  compare.c

compare.c

@@ -1,7 +1,7 @@
 /*
  * GridDB Foreign Data Wrapper
  *
- * Portions Copyright (c) 2018, TOSHIBA CORPORATION
+ * Portions Copyright (c) 2020, TOSHIBA CORPORATION
  *
  * IDENTIFICATION
  *		  connection.c
@@ -49,7 +49,7 @@ typedef Oid ContCacheKey;
  */
 typedef struct ContCacheEntry
 {
-	ConnCacheKey key;			/* hash key (must be first) */
+	ContCacheKey key;			/* hash key (must be first) */
 	GSContainer *cont;
 }			ContCacheEntry;
 
@@ -264,7 +264,7 @@ griddb_get_container(UserMapping *user, Oid relid, GSGridStore * store)
 		HASHCTL		ctl;
 
 		MemSet(&ctl, 0, sizeof(ctl));
-		ctl.keysize = sizeof(ConnCacheKey);
+		ctl.keysize = sizeof(ContCacheKey);
 		ctl.entrysize = sizeof(ContCacheEntry);
 		conn_entry->cont_hash = hash_create("griddb_fdw containers", 8,
 											&ctl,
@@ -432,17 +432,26 @@ griddb_end_xact(ConnCacheEntry *entry, bool isCommit, GSGridStore * store)
 		GSResult	ret;
 		GSContainer *cont = cont_entry->cont;
 
-		if (isCommit)
-			ret = gsCommit(cont);
-		else
-			ret = gsAbort(cont);
-		if (!GS_SUCCEEDED(ret))
-			griddb_REPORT_ERROR(ERROR, ret, cont);
+		if (cont_entry->cont != NULL)
+		{
+
+			if (isCommit)
+				ret = gsCommit(cont);
+			else
+				ret = gsAbort(cont);
+			if (!GS_SUCCEEDED(ret))
+				griddb_REPORT_ERROR(ERROR, ret, cont);
 
-		gsCloseContainer(&cont, true);
-		if (hash_search(entry->cont_hash, &cont_entry->key, HASH_REMOVE, NULL) == NULL)
-			elog(ERROR, "hash table corrupted");
+			gsCloseContainer(&cont, true);
+		}
+		
+		/* Remove container from the hash list even if it is NULL or not */
+		hash_search(entry->cont_hash, &cont_entry->key, HASH_REMOVE, NULL);
 	}
+
+	/* Destroy container hash list after use to avoid memory leak. */
+	hash_destroy(entry->cont_hash);
+	entry->cont_hash = NULL;
 }
 
 /*

connection.c

@@ -1,7 +1,7 @@
 /*
  * GridDB Foreign Data Wrapper
  *
- * Portions Copyright (c) 2018, TOSHIBA CORPORATION
+ * Portions Copyright (c) 2020, TOSHIBA CORPORATION
  *
  * IDENTIFICATION
  *		  deparse.c
@@ -32,6 +32,7 @@
 #include "utils/rel.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
+#include "time.h"
 
 /*
  * Global context for foreign_expr_walker's search of an expression tree.
@@ -180,7 +181,7 @@ griddb_deparse_select(StringInfo buf,
 	 * Core code already has some lock on each rel being planned, so we can
 	 * use NoLock here.
 	 */
-	rel = heap_open(rte->relid, NoLock);
+	rel = table_open(rte->relid, NoLock);
 
 	appendStringInfoString(buf, "SELECT ");
 	griddb_deparse_target_list(buf, root, baserel->relid, rel,
@@ -202,7 +203,7 @@ griddb_deparse_select(StringInfo buf,
 	if (pathkeys)
 		griddb_append_order_by_clause(pathkeys, &context);
 
-	heap_close(rel, NoLock);
+	table_close(rel, NoLock);
 }
 
 /*
@@ -582,7 +583,11 @@ griddb_deparse_func_expr(FuncExpr *node, deparse_expr_cxt *context)
 	{
 		if (!first)
 			appendStringInfoString(buf, ", ");
+#if (PG_VERSION_NUM >= 130000)
+		if (use_variadic && lnext(node->args, arg) == NULL)
+#else
 		if (use_variadic && lnext(arg) == NULL)
+#endif
 			elog(ERROR, "VARIADIC is not supported");
 		deparseExpr((Expr *) lfirst(arg), context);
 		first = false;
@@ -747,16 +752,31 @@ griddb_deparse_scalar_array_op_expr(ScalarArrayOpExpr *node, deparse_expr_cxt *c
 	if (strcmp(opname, "<>") == 0)
 		notIn = true;
 
+	arg1 = linitial(node->args);
 	arg2 = lsecond(node->args);
 	c = (Const *) arg2;
 	Assert(nodeTag((Node *) arg2) == T_Const || c->constisnull);
 
 	getTypeOutputInfo(c->consttype,
 					  &typoutput, &typIsVarlena);
 	extval = OidOutputFunctionCall(typoutput, c->constvalue);
-	isstr = true;
-	if (c->consttype == INT4ARRAYOID || c->consttype == OIDARRAYOID)
-		isstr = false;
+	switch (c->consttype)
+	{
+		case BOOLARRAYOID:
+		case INT8ARRAYOID:
+		case INT2ARRAYOID:
+		case INT4ARRAYOID:
+		case OIDARRAYOID:
+		case FLOAT4ARRAYOID:
+		case FLOAT8ARRAYOID:
+		case TIMESTAMPARRAYOID:
+		case TIMESTAMPTZARRAYOID:
+			isstr = false;
+			break;
+		default:
+			isstr = true;
+			break;
+	}
 
 	/* Deparse right operand. */
 	deparseLeft = true;
@@ -772,7 +792,12 @@ griddb_deparse_scalar_array_op_expr(ScalarArrayOpExpr *node, deparse_expr_cxt *c
 		/* Deparse left operand. */
 		if (deparseLeft)
 		{
-			arg1 = linitial(node->args);
+			/* No need deparse bool column */
+			if (c->consttype == BOOLARRAYOID)
+			{
+				deparseLeft = false;
+				continue;
+			}
 			deparseExpr(arg1, context);
 			if (notIn)
 				appendStringInfo(buf, " <> ");
@@ -812,9 +837,62 @@ griddb_deparse_scalar_array_op_expr(ScalarArrayOpExpr *node, deparse_expr_cxt *c
 				appendStringInfo(buf, "  AND ");
 			else
 				appendStringInfo(buf, "  OR ");
+
+			/* No need deparse bool column */
+			if (c->consttype == BOOLARRAYOID)
+			{
+				deparseLeft = false;
+				continue;
+			}
+
 			deparseLeft = true;
 			continue;
 		}
+
+		/* When compare with timestamp column, need to convert and cast to TIMESTAMP */
+		if (c->consttype == TIMESTAMPARRAYOID || c->consttype == TIMESTAMPTZARRAYOID)
+		{
+			char		timestamp[MAXDATELEN + 1];
+			char		chtime[MAXDATELEN + 1] = {0};
+			struct tm	tm;
+			int 		j = 0;
+
+			for (;; valptr++)
+			{
+				if (*valptr == '\"' && !isEscape)
+				{
+					inString = !inString;
+					break;
+				}
+				chtime[j] = *valptr;
+				j++;
+			}
+			i += j;
+
+			/* Format of chtime is YYYY-MM-DD HH:MM:SS */
+			strptime(chtime, "%Y-%m-%d %H:%M:%S", &tm);
+			griddb_convert_pg2gs_timestamp_string(time_t_to_timestamptz(timegm(&tm)), timestamp);
+			appendStringInfoString(buf, "TIMESTAMP(");
+			griddb_deparse_string_literal(buf, timestamp);
+			appendStringInfoString(buf, ")");
+			continue;
+		}
+
+		/*
+		 * GridDB not support compare bool column with true, false.
+		 * Only support column or NOT column
+		 */
+		if (c->consttype == BOOLARRAYOID)
+		{
+			appendStringInfoChar(buf, '(');
+			if (ch == 'f')
+				appendStringInfoString(buf, "NOT ");
+
+			deparseExpr(arg1, context);
+			appendStringInfoChar(buf, ')');
+			continue;
+		}
+
 		appendStringInfoChar(buf, ch);
 	}
 	if (isstr)
@@ -1355,7 +1433,7 @@ foreign_expr_walker(Node *node,
  * Returns true if given expr is safe to evaluate on the foreign server.
  */
 bool
-is_foreign_expr(PlannerInfo *root,
+griddb_is_foreign_expr(PlannerInfo *root,
 				RelOptInfo *baserel,
 				Expr *expr)
 {
@@ -1414,7 +1492,7 @@ griddb_append_order_by_clause(List *pathkeys, deparse_expr_cxt *context)
 		PathKey    *pathkey = (PathKey *) lfirst(lcell);
 		Expr	   *em_expr;
 
-		em_expr = find_em_expr_for_rel(pathkey->pk_eclass, baserel);
+		em_expr = griddb_find_em_expr_for_rel(pathkey->pk_eclass, baserel);
 		Assert(em_expr != NULL);
 
 		appendStringInfoString(buf, delim);
@@ -1518,7 +1596,7 @@ griddb_classify_conditions(PlannerInfo *root,
 	{
 		RestrictInfo *ri = (RestrictInfo *) lfirst(lc);
 
-		if (is_foreign_expr(root, baserel, ri->clause))
+		if (griddb_is_foreign_expr(root, baserel, ri->clause))
 			*remote_conds = lappend(*remote_conds, ri);
 		else
 			*local_conds = lappend(*local_conds, ri);