Release 2.4.0

Author: bichht0608

README.md

@@ -2,8 +2,7 @@ GridDB Foreign Data Wrapper for PostgreSQL
 ==========================================
 
 This is a foreign data wrapper (FDW) to connect [PostgreSQL](https://www.postgresql.org/)
-to [GridDB](https://github.com/griddb). This FDW works with PostgreSQL 12, 13, 14, 15, 16 and confirmed with GridDB 5.1.0.
-
+to [GridDB](https://github.com/griddb). This FDW works with PostgreSQL 13, 14, 15, 16, 17 and confirmed with GridDB 5.5.0.
 
 <img src="https://upload.wikimedia.org/wikipedia/commons/2/29/Postgresql_elephant.svg" align="center" height="100" alt="PostgreSQL"/>	+	<img src="https://docs.griddb.net/logo.png" align="center" height="100" alt="GridDB"/>
 
@@ -39,6 +38,9 @@ For PostgreSQL version 14 or later:
 - Support discard cached connections to foreign servers by using function `griddb_disconnect('server_name')`, `griddb_disconnect_all()`.
 - Support deparse `ANY`/`ALL ARRAY` with the argument is constant.
 
+For PostgreSQL version 16 or later:
+- Support Bulk INSERT with COPY command
+
 ### Pushdowning
 
 - Support function push down in `WHERE` clause: 
@@ -448,7 +450,7 @@ Reference FDW realisation, `postgres_fdw`
 
 License
 -------
-Copyright (c) 2018, TOSHIBA CORPORATION  
+Copyright (c) 2018, TOSHIBA CORPORATION
 Copyright (c) 2011-2016, EnterpriseDB Corporation
 
 Permission to use, copy, modify, and distribute this software and its
@@ -458,4 +460,4 @@ the following two paragraphs appear in all copies.
 
 See the [`LICENSE`][1] file for full details.
 
-[1]: LICENSE
+[1]: LICENSE

compare.c

@@ -123,10 +123,12 @@ int			(*griddb_get_comparator_tuplekey(GSType gs_type)) (const void *, const voi
 /*
  * Comparison functions for hash key.
  * Arguments are a pointer of Datum.
+ * 		keysize is not used but is needed because of the signature of HashCompareFunc
+ * 		to avoid warnings when build source code.
  */
 
 static int
-griddb_compare_datum_string(const void *a, const void *b)
+griddb_compare_datum_string(const void *a, const void *b, Size keysize)
 {
 	Datum		val1 = *(Datum *) a;
 	Datum		val2 = *(Datum *) b;
@@ -143,7 +145,7 @@ griddb_compare_datum_string(const void *a, const void *b)
 }
 
 static int
-griddb_compare_datum_integer(const void *a, const void *b)
+griddb_compare_datum_integer(const void *a, const void *b, Size keysize)
 {
 	Datum		val1 = *(Datum *) a;
 	Datum		val2 = *(Datum *) b;
@@ -154,7 +156,7 @@ griddb_compare_datum_integer(const void *a, const void *b)
 }
 
 static int
-griddb_compare_datum_long(const void *a, const void *b)
+griddb_compare_datum_long(const void *a, const void *b, Size keysize)
 {
 	Datum		val1 = *(Datum *) a;
 	Datum		val2 = *(Datum *) b;
@@ -165,7 +167,7 @@ griddb_compare_datum_long(const void *a, const void *b)
 }
 
 static int
-griddb_compare_datum_timestamp(const void *a, const void *b)
+griddb_compare_datum_timestamp(const void *a, const void *b, Size keysize)
 {
 	Datum		val1 = *(Datum *) a;
 	Datum		val2 = *(Datum *) b;
@@ -176,7 +178,7 @@ griddb_compare_datum_timestamp(const void *a, const void *b)
 }
 
 /* Return comparator based on gs_type for hash used in griddb_fdw. */
-int			(*griddb_get_comparator_datum(GSType gs_type)) (const void *, const void *)
+int			(*griddb_get_comparator_datum(GSType gs_type)) (const void *, const void *, Size keysize)
 {
 	switch (gs_type)
 	{

connection.c

@@ -88,7 +88,8 @@ static GSGridStore * griddb_connect_server(char *address, char *port,
 										   char *passwd);
 static void make_new_connection(ConnCacheEntry *entry,
 								UserMapping *user,
-								Oid foreigntableid);
+								Oid foreigntableid,
+								Oid userid);
 static void griddb_begin_xact(ConnCacheEntry *entry);
 static void griddb_end_xact(ConnCacheEntry *entry, bool isCommit,
 							GSGridStore * store);
@@ -109,7 +110,7 @@ static bool disconnect_cached_connections(Oid serverid);
  * is established if we don't already have a suitable one.
  */
 GSGridStore *
-griddb_get_connection(UserMapping *user, bool will_prep_stmt, Oid foreigntableid)
+griddb_get_connection(UserMapping *user, bool will_prep_stmt, Oid foreigntableid, Oid userid)
 {
 	bool		found;
 	ConnCacheEntry *entry;
@@ -182,7 +183,7 @@ griddb_get_connection(UserMapping *user, bool will_prep_stmt, Oid foreigntableid
 	 * connection.
 	 */
 	if (entry->store == NULL)
-		make_new_connection(entry, user, foreigntableid);
+		make_new_connection(entry, user, foreigntableid, userid);
 
 	/*
 	 * Start a new transaction if needed.
@@ -197,12 +198,12 @@ griddb_get_connection(UserMapping *user, bool will_prep_stmt, Oid foreigntableid
  * establish new connection to the remote server.
  */
 static void
-make_new_connection(ConnCacheEntry *entry, UserMapping *user, Oid foreigntableid)
+make_new_connection(ConnCacheEntry *entry, UserMapping *user, Oid foreigntableid, Oid userid)
 {
 	ForeignServer *server = GetForeignServer(user->serverid);
 
 	/* Fetch the options */
-	griddb_opt *opt = griddb_get_options(foreigntableid);
+	griddb_opt *opt = griddb_get_options(foreigntableid, userid);
 
 	/*
 	 * Determine whether to keep the connection that we're about to make here

deparse.c

@@ -59,7 +59,7 @@ typedef enum
 {
 	FDW_COLLATE_NONE,			/* expression is of a noncollatable type */
 	FDW_COLLATE_SAFE,			/* collation derives from a foreign Var */
-	FDW_COLLATE_UNSAFE			/* collation derives from something else */
+	FDW_COLLATE_UNSAFE,			/* collation derives from something else */
 } FDWCollateState;
 
 typedef struct foreign_loc_cxt
@@ -1423,7 +1423,6 @@ foreign_expr_walker(Node *node,
 		case T_Const:
 			{
 				Const	   *c = (Const *) node;
-				HeapTuple	tuple;
 
 				if (c->consttype == INTERVALOID ||
 					c->consttype == BITOID ||
@@ -2910,6 +2909,7 @@ griddb_set_container_info(GSContainerInfo containerinfo, Relation rel)
 	GSColumnInfo *columnInfoList;
 
 	container_info = (GSContainerInfo) GS_CONTAINER_INFO_INITIALIZER;
+	columnInfo = (GSColumnInfo) GS_COLUMN_INFO_INITIALIZER;
 
 	/* count number of columns */
 	for (i = 0; i < tupdesc->natts; i++)