PGCRYPTO env bool

Author: pmp-p

ci-alpine-proot.sh

@@ -16,6 +16,7 @@ export WORKSPACE=$(pwd)
 
 export WASI=${WASI:-false}
 
+export PGCRYPTO=${PGCRYPTO:-false}
 
 if $WASI
 then
@@ -64,7 +65,7 @@ fi
 
 mkdir -p $CONTAINER_PATH/tmp
 
-#TODO: pglite has .buildconfig in postgres source dir instead.
+#TODO: pglite has .buildconfig in postgres-pglite source dir instead.
     cat > $CONTAINER_PATH/tmp/portable.opts <<END
 export PG_VERSION=${PG_VERSION}
 export PG_BRANCH=${PG_BRANCH}
@@ -78,6 +79,7 @@ export WASI=${WASI}
 export NATIVE=${NATIVE}
 
 export PGROOT=/tmp/pglite
+export PGCRYPTO=${PGCRYPTO}
 export USE_ICU=${USE_ICU}
 export GETZIC=${GETZIC}
 export ZIC=${ZIC}

patches-REL_17_5_WASM/postgresql-emscripten/src-Makefile.shlib.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/Makefile.shlib
-+++ pglite-REL_17_5_WASM/src/Makefile.shlib
++++ REL_17_5_WASM-pglite/src/Makefile.shlib
 @@ -224,6 +224,33 @@
    override CXXFLAGS += $(CXXFLAGS_SL_MODULE)
  endif

patches-REL_17_5_WASM/postgresql-emscripten/src-backend-commands-async.c.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/backend/commands/async.c
-+++ pglite-REL_17_5_WASM/src/backend/commands/async.c
++++ REL_17_5_WASM-pglite/src/backend/commands/async.c
 @@ -1651,8 +1651,12 @@
  		 * NotifyQueueLock; which is unlikely but certainly possible. So we
  		 * just log a low-level debug message if it happens.

patches-REL_17_5_WASM/postgresql-emscripten/src-backend-storage-ipc-sinvaladt.c.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/backend/storage/ipc/sinvaladt.c
-+++ pglite-REL_17_5_WASM/src/backend/storage/ipc/sinvaladt.c
++++ REL_17_5_WASM-pglite/src/backend/storage/ipc/sinvaladt.c
 @@ -289,6 +289,7 @@
  	 */
  	LWLockAcquire(SInvalWriteLock, LW_EXCLUSIVE);

patches-REL_17_5_WASM/postgresql-pglite/src-backend-libpq-pqcomm.c.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/backend/libpq/pqcomm.c
-+++ pglite-REL_17_5_WASM/src/backend/libpq/pqcomm.c
++++ REL_17_5_WASM-pglite/src/backend/libpq/pqcomm.c
 @@ -131,8 +131,15 @@
  static char *PqRecvBuffer;
  static int	PqRecvPointer;
@@ -16,15 +16,6 @@
  /*
   * Message status
   */
-@@ -282,7 +289,7 @@
- 		(void) pq_settcpusertimeout(tcp_user_timeout, port);
- 	}
- #endif /* WASM */
--PDEBUG("# 285:" __FILE__);
-+PDEBUG("# 287:" __FILE__);
- 	/* initialize state variables */
- 	PqSendBufferSize = PQ_SEND_BUFFER_SIZE;
- 	PqSendBuffer = MemoryContextAlloc(TopMemoryContext, PqSendBufferSize);
 @@ -320,9 +327,7 @@
  	AddWaitEventToSet(FeBeWaitSet, WL_POSTMASTER_DEATH, PGINVALID_SOCKET,
  					  NULL, NULL);

patches-REL_17_5_WASM/postgresql-pglite/src-backend-utils-error-elog.c.diff

@@ -1,16 +1,61 @@
 --- REL_17_5_WASM/src/backend/utils/error/elog.c
-+++ pglite-REL_17_5_WASM/src/backend/utils/error/elog.c
-@@ -543,13 +543,8 @@
++++ REL_17_5_WASM-pglite/src/backend/utils/error/elog.c
+@@ -348,12 +348,16 @@
+ 	ErrorData  *edata;
+ 	bool		output_to_server;
+ 	bool		output_to_client = false;
++#if defined(__EMSCRIPTEN__) || defined(__wasi__)
++#   warning "FIXME: error levels"
++#else
+ 	int			i;
+ 
+ 	/*
+ 	 * Check some cases in which we want to promote an error into a more
+ 	 * severe error.  None of this logic applies for non-error messages.
+ 	 */
++
+ 	if (elevel >= ERROR)
+ 	{
+ 		/*
+@@ -394,7 +398,7 @@
+ 		for (i = 0; i <= errordata_stack_depth; i++)
+ 			elevel = Max(elevel, errordata[i].elevel);
+ 	}
+-
++#endif
+ 	/*
+ 	 * Now decide whether we need to process this report at all; if it's
+ 	 * warning or less and not enabled for logging, just return false without
+@@ -539,7 +543,12 @@
  		 */
 
  		recursion_depth--;
--#if 0 //defined(__EMSCRIPTEN__) || defined(__wasi__)
--        fprintf(stderr, "# 547: PG_RE_THROW(ERROR : %d) ignored\n", recursion_depth);
--        trap();
--#else
-         fprintf(stderr, "# 549: PG_RE_THROW(ERROR : %d)\n", recursion_depth);
++#if defined(__wasi__)
++        fprintf(stderr, "# 547: PG_RE_THROW(ERROR : %d) ignored\r\n", recursion_depth);
++        abort();
++#else
  		PG_RE_THROW();
--#endif
++#endif
  	}
 
  	/* Emit the message to the right places */
+@@ -587,7 +596,11 @@
+ 		 * FATAL termination.  The postmaster may or may not consider this
+ 		 * worthy of panic, depending on which subprocess returns it.
+ 		 */
++#if defined(__EMSCRIPTEN__) || defined(__wasi__)
++        puts("# 600: proc_exit(FATAL) ignored\r\n");
++#else
+ 		proc_exit(1);
++#endif
+ 	}
+ 
+ 	if (elevel >= PANIC)
+@@ -697,6 +710,7 @@
+ 	 */
+ 	if (edata->elevel >= ERROR)
+ 	{
++puts("#712");
+ 		errfinish(filename, lineno, funcname);
+ 		pg_unreachable();
+ 	}

patches-REL_17_5_WASM/postgresql-pglite/src-bin-initdb-initdb.c.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/bin/initdb/initdb.c
-+++ pglite-REL_17_5_WASM/src/bin/initdb/initdb.c
++++ REL_17_5_WASM-pglite/src/bin/initdb/initdb.c
 @@ -171,7 +171,11 @@
 
 
@@ -41,7 +41,7 @@
  #if defined(HAVE_SHM_OPEN) && !defined(__sun__)
  	int			ntries = 10;
  	pg_prng_state prng_state;
-@@ -1608,10 +1620,9 @@
+@@ -1608,10 +1620,8 @@
  	}
 
  	PG_CMD_CLOSE();
@@ -50,11 +50,10 @@
 +    termPQExpBuffer(&cmd);
  	free(bki_lines);
 -
-+PDEBUG("# 1624: BOOT pipe complete");
  	check_ok();
  }
 
-@@ -1711,16 +1722,16 @@
+@@ -1711,16 +1721,16 @@
  setup_run_file(FILE *cmdfd, const char *filename)
  {
  	char	  **lines;
@@ -74,7 +73,7 @@
 
  	free(lines);
  }
-@@ -2636,8 +2647,13 @@
+@@ -2636,8 +2646,13 @@
  			strlcpy(full_path, progname, sizeof(full_path));
 
  		if (ret == -1)
@@ -88,21 +87,7 @@
  		else
  			pg_fatal("program \"%s\" was found by \"%s\" but was not the same version as %s",
  					 "postgres", full_path, progname);
-@@ -3096,7 +3112,7 @@
- 	initPQExpBuffer(&cmd);
- 	printfPQExpBuffer(&cmd, "\"%s\" %s %s template1 >%s",
- 					  backend_exec, backend_options, extra_options, DEVNULL);
--
-+PDEBUG("# 3115: post-bootstrap sql begin");
- 	PG_CMD_OPEN(cmd.data);
- 
- 	setup_auth(cmdfd);
-@@ -3134,14 +3150,53 @@
- 
- 	PG_CMD_CLOSE();
- 	termPQExpBuffer(&cmd);
--
-+PDEBUG("# 3115: post-bootstrap sql end");
+@@ -3138,10 +3153,49 @@
  	check_ok();
  }
 
@@ -154,7 +139,7 @@
  	static struct option long_options[] = {
  		{"pgdata", required_argument, NULL, 'D'},
  		{"encoding", required_argument, NULL, 'E'},
-@@ -3201,9 +3256,15 @@
+@@ -3201,9 +3255,15 @@
  	 * POSIX says we must do this before any other usage of these files.
  	 */
  	setvbuf(stdout, NULL, PG_IOLBF, 0);
@@ -171,32 +156,28 @@
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("initdb"));
 
  	if (argc > 1)
-@@ -3409,7 +3470,7 @@
+@@ -3409,7 +3469,10 @@
  	if (icu_rules && locale_provider != COLLPROVIDER_ICU)
  		pg_fatal("%s cannot be specified unless locale provider \"%s\" is chosen",
  				 "--icu-rules", "icu");
 -
-+PDEBUG("# 3463:"__FILE__ " TODO: atexit(cleanup_directories_atexit)");
++#if defined(__wasi__) || defined(__EMSCRIPTEN__)
++#pragma message "#TODO: atexit(cleanup_directories_atexit)"
++PDEBUG("# 3472:"__FILE__ "#TODO: atexit(cleanup_directories_atexit)");
++#endif
  	atexit(cleanup_directories_atexit);
 
  	/* If we only need to sync, just do it and exit */
-@@ -3445,13 +3506,13 @@
+@@ -3445,9 +3508,7 @@
  	get_restricted_token();
 
  	setup_pgdata();
 -
-+PDEBUG("# 3493:pgl_initdb_main " __FILE__);
  	setup_bin_paths(argv[0]);
 -
-+PDEBUG("# 3495:pgl_initdb_main " __FILE__);
  	effective_user = get_id();
  	if (!username)
  		username = effective_user;
--
-+PDEBUG("# 3514:pgl_initdb_main " __FILE__);
- 	if (strncmp(username, "pg_", 3) == 0)
- 		pg_fatal("superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"", username);
- 
 @@ -3479,7 +3540,7 @@
  		get_su_pwd();
 
@@ -206,12 +187,11 @@
  	initialize_data_directory();
 
  	if (do_sync)
-@@ -3535,7 +3596,7 @@
+@@ -3535,7 +3596,6 @@
  		destroyPQExpBuffer(start_db_cmd);
  	}
 
 -
-+PDEBUG("# 3583");
  	success = true;
  	return 0;
  }

patches-REL_17_5_WASM/postgresql-pglite/src-interfaces-libpq-fe-auth.c.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/interfaces/libpq/fe-auth.c
-+++ pglite-REL_17_5_WASM/src/interfaces/libpq/fe-auth.c
++++ REL_17_5_WASM-pglite/src/interfaces/libpq/fe-auth.c
 @@ -1169,6 +1169,7 @@
  pg_fe_getusername(uid_t user_id, PQExpBuffer errorMessage)
  {

patches-REL_17_5_WASM/postgresql-pglite/src-port-pqsignal.c.diff

@@ -1,12 +1,9 @@
 --- REL_17_5_WASM/src/port/pqsignal.c
-+++ pglite-REL_17_5_WASM/src/port/pqsignal.c
-@@ -174,7 +174,13 @@
++++ REL_17_5_WASM-pglite/src/port/pqsignal.c
+@@ -174,3 +174,13 @@
  #endif
  }
 
--/* sneak stubs into libpgport */
--#if defined(__wasi__)
--#   include "../../../patches/wasi_port.c"
 +/* sneak emsdk or wasi wasm port support into libpgport */
 +#if defined(SDK_PORT)
 +#   if defined(__wasi__)
@@ -15,5 +12,5 @@
 +#   if defined(__EMSCRIPTEN__)
 +// #       include "sdk_port-emscripten.c"
 +#   endif
- #endif
++#endif
 +

patches-REL_17_5_WASM/postgresql-wasi/src-bin-pg_dump-pg_dump.c.diff

@@ -1,5 +1,5 @@
 --- REL_17_5_WASM/src/bin/pg_dump/pg_dump.c
-+++ pglite-REL_17_5_WASM/src/bin/pg_dump/pg_dump.c
++++ REL_17_5_WASM-pglite/src/bin/pg_dump/pg_dump.c
 @@ -30,13 +30,6 @@
   *-------------------------------------------------------------------------
   */
@@ -14,16 +14,47 @@
 
  #include <unistd.h>
  #include <ctype.h>
-@@ -432,7 +425,7 @@
+@@ -76,6 +69,30 @@
+ #include "pg_dump.h"
+ #include "storage/block.h"
+ 
++#if !defined(__wasi__) && !defined(__EMSCRIPTEN__)
++extern PGDLLIMPORT bool fe_utils_quote_all_identifiers;
++#else
++#if defined(WASM)
++#ifdef errno
++    #undef errno
++    int errno;
++#endif
++
++pid_t fork(void) {
++    return -1;
++}
++
++#   include <wasi/api.h>
++
++__attribute__((export_name("sdk_fd_seek")))
++int sdk_fd_seek(int fd, int  offset,int  whence, unsigned long long *retptr) {
++    puts("sdk_fd_seek called !");
++    return __wasi_fd_seek(fd, offset, whence, retptr);
++}
++
++#endif
++#endif
++
+ typedef struct
+ {
+ 	Oid			roleoid;		/* role's OID */
+@@ -432,7 +449,7 @@
  		{"lock-wait-timeout", required_argument, NULL, 2},
  		{"no-table-access-method", no_argument, &dopt.outputNoTableAm, 1},
  		{"no-tablespaces", no_argument, &dopt.outputNoTablespaces, 1},
--		{"quote-all-identifiers", no_argument, &fe_utils_quote_all_identifiers, true},
-+		{"quote-all-identifiers", no_argument, &fe_utils_quote_all_identifiers, 1},
+-		{"quote-all-identifiers", no_argument, (int *)(&fe_utils_quote_all_identifiers), true},
++		{"quote-all-identifiers", no_argument, (int *)(&fe_utils_quote_all_identifiers), 1},
  		{"load-via-partition-root", no_argument, &dopt.load_via_partition_root, 1},
  		{"role", required_argument, NULL, 3},
  		{"section", required_argument, NULL, 5},
-@@ -459,9 +452,7 @@
+@@ -459,9 +476,7 @@
 
  		{NULL, 0, NULL, 0}
  	};
@@ -34,7 +65,7 @@
  	pg_logging_init(argv[0]);
  	pg_logging_set_level(PG_LOG_WARNING);
  	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_dump"));
-@@ -838,17 +829,15 @@
+@@ -838,12 +853,13 @@
  	fout->maxRemoteVersion = (PG_VERSION_NUM / 100) * 100 + 99;
 
  	fout->numWorkers = numWorkers;
@@ -44,26 +75,8 @@
  	 * Open the database using the Archiver, so it knows about it. Errors mean
  	 * death.
  	 */
--puts("# 813 : " __FILE__ "\r\n");
--    //setup();
  	ConnectDatabase(fout, &dopt.cparams, false);
--puts("# 815 : " __FILE__ "\r\n");
 +puts("# 838:" __FILE__ ": ConnectDatabase->setup_connection\r\n");
  	setup_connection(fout, dumpencoding, dumpsnapshot, use_role);
--puts("# 817 : " __FILE__ "\r\n");
-+
- 	/*
- 	 * On hot standbys, never try to dump unlogged table data, since it will
- 	 * just throw an error.
-@@ -1203,10 +1192,9 @@
- 				 const char *dumpsnapshot, char *use_role)
- {
- 	DumpOptions *dopt = AH->dopt;
--puts("# 1206 : get_connection : "__FILE__);
- 	PGconn	   *conn = GetConnection(AH);
- 	const char *std_strings;
--puts("# 1209 : setup_connection");
-+
- 	PQclear(ExecuteSqlQueryForSingleRow(AH, ALWAYS_SECURE_SEARCH_PATH_SQL));
 
  	/*