From 0311dd49d89d222e5db0c818b9d0ad081de636ad Mon Sep 17 00:00:00 2001 From: EmelSimsek Date: Mon, 4 Sep 2023 15:16:08 +0300 Subject: [PATCH] Review feedback --- src/backend/distributed/metadata/metadata_cache.c | 1 - src/backend/distributed/shared_library_init.c | 2 -- src/include/distributed/metadata_cache.h | 2 ++ src/test/regress/citus_tests/test/test_extension.py | 7 +++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c index 644cde6b2f4..55d0f11c57f 100644 --- a/src/backend/distributed/metadata/metadata_cache.c +++ b/src/backend/distributed/metadata/metadata_cache.c @@ -301,7 +301,6 @@ static void CreateDistTableCache(void); static void CreateShardIdCache(void); static void CreateDistObjectCache(void); static void InvalidateForeignRelationGraphCacheCallback(Datum argument, Oid relationId); -void InvalidateDistRelationCacheCallback(Datum argument, Oid relationId); static void InvalidateNodeRelationCacheCallback(Datum argument, Oid relationId); static void InvalidateLocalGroupIdRelationCacheCallback(Datum argument, Oid relationId); static void InvalidateConnParamsCacheCallback(Datum argument, Oid relationId); diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c index a94c042a48d..e5d593295a3 100644 --- a/src/backend/distributed/shared_library_init.c +++ b/src/backend/distributed/shared_library_init.c @@ -124,8 +124,6 @@ CompressionTypeStr_type extern_CompressionTypeStr = NULL; IsColumnarTableAmTable_type extern_IsColumnarTableAmTable = NULL; ReadColumnarOptions_type extern_ReadColumnarOptions = NULL; -void InvalidateDistRelationCacheCallback(Datum argument, Oid relationId); - /* * Define "pass-through" functions so that a SQL function defined as one of * these symbols in the citus module can use the definition in the columnar diff --git a/src/include/distributed/metadata_cache.h b/src/include/distributed/metadata_cache.h index 4e918ecf7eb..34b95b859e4 100644 --- a/src/include/distributed/metadata_cache.h +++ b/src/include/distributed/metadata_cache.h @@ -137,6 +137,8 @@ typedef enum ANY_CITUS_TABLE_TYPE } CitusTableType; +void InvalidateDistRelationCacheCallback(Datum argument, Oid relationId); + extern List * AllCitusTableIds(void); extern bool IsCitusTableType(Oid relationId, CitusTableType tableType); extern CitusTableType GetCitusTableType(CitusTableCacheEntry *tableEntry); diff --git a/src/test/regress/citus_tests/test/test_extension.py b/src/test/regress/citus_tests/test/test_extension.py index b5fe89a1f87..e9b90f1157e 100644 --- a/src/test/regress/citus_tests/test/test_extension.py +++ b/src/test/regress/citus_tests/test/test_extension.py @@ -1,4 +1,5 @@ import psycopg +import pytest def test_create_drop_citus(coord): @@ -8,13 +9,11 @@ def test_create_drop_citus(coord): # and Conn2 cannot use it. cur1.execute("DROP EXTENSION citus") - try: - cur2.execute("SELECT citus_version();") + with pytest.raises(psycopg.errors.UndefinedFunction): # Conn1 dropped the extension. citus_version udf # cannot be found.sycopg.errors.UndefinedFunction # is expected here. - except psycopg.errors.UndefinedFunction: - cur2.execute("SELECT 1;") + cur2.execute("SELECT citus_version();") # Conn2 creates the extension, # Conn1 is able to use it immediadtely.