Address review comments

Author: artemgavrilov

contrib/pg_tde/pg_tde--1.0-rc.sql

@@ -263,11 +263,13 @@ CREATE FUNCTION pg_tde_delete_key()
 RETURNS VOID
 LANGUAGE C
 AS 'MODULE_PATHNAME';
+REVOKE ALL ON FUNCTION pg_tde_delete_key() FROM PUBLIC;
 
 CREATE FUNCTION pg_tde_delete_default_key()
 RETURNS VOID
 LANGUAGE C
 AS 'MODULE_PATHNAME';
+REVOKE ALL ON FUNCTION pg_tde_delete_default_key() FROM PUBLIC;
 
 CREATE FUNCTION pg_tde_key_info()
 RETURNS TABLE ( key_name TEXT,

contrib/pg_tde/src/access/pg_tde_tdemap.c

@@ -515,19 +515,16 @@ pg_tde_delete_principal_key_redo(Oid dbOid)
 {
 	char		path[MAXPGPATH];
 
-	LWLockAcquire(tde_lwlock_enc_keys(), LW_EXCLUSIVE);
-
 	pg_tde_set_db_file_path(dbOid, path);
-	durable_unlink(path, WARNING);
 
+	LWLockAcquire(tde_lwlock_enc_keys(), LW_EXCLUSIVE);
+	durable_unlink(path, WARNING);
 	LWLockRelease(tde_lwlock_enc_keys());
 }
 
 /*
  * Deletes the principal key for the database. This fucntion checks if key map
  * file has any entries, and if not, it removes the file. Otherwise raises an error.
- *
- * The caller must hold an exclusive lock on the files before calling this function.
  */
 void
 pg_tde_delete_principal_key(Oid dbOid)
@@ -686,8 +683,6 @@ pg_tde_find_map_entry(const RelFileLocator *rlocator, TDEMapEntryType key_type,
  * positive is more harmful this might not be.
  *
  * Works even if the database has no map file.
- * The caller must hold a shared or exclusive lock on the
- * tde_lwlock_enc_keys() lock.
  */
 int
 pg_tde_count_relations(Oid dbOid)

contrib/pg_tde/src/catalog/tde_principal_key.c

@@ -707,7 +707,6 @@ pg_tde_delete_default_key(PG_FUNCTION_ARGS)
 		pg_tde_delete_principal_key(dbOid);
 		clear_principal_key_cache(dbOid);
 	}
-	list_free(dbs);
 
 	systable_endscan(scan);
 	table_close(rel, RowExclusiveLock);
@@ -717,6 +716,9 @@ pg_tde_delete_default_key(PG_FUNCTION_ARGS)
 	clear_principal_key_cache(DEFAULT_DATA_TDE_OID);
 
 	LWLockRelease(tde_lwlock_enc_keys());
+
+	list_free(dbs);
+
 	PG_RETURN_VOID();
 }
 

contrib/pg_tde/t/expected/basic.out

@@ -12,11 +12,9 @@ CREATE EXTENSION IF NOT EXISTS pg_tde;
 		ORDER BY pg_proc.oid::regprocedure::text;
               oid              
 -------------------------------
- pg_tde_delete_default_key()
- pg_tde_delete_key()
  pg_tde_is_encrypted(regclass)
  pg_tde_version()
-(4 rows)
+(2 rows)
 
 
 SELECT extname, extversion FROM pg_extension WHERE extname = 'pg_tde';