Adjust the error, move to later stage

Signed-off-by: Onder KALACI <[email protected]>

Author: sfc-gh-okalaci

pg_lake_iceberg/include/pg_lake/rest_catalog/rest_catalog.h

@@ -34,8 +34,7 @@ extern char *RestCatalogClientSecret;
 #define GET_REST_CATALOG_METADATA_LOCATION "%s/api/catalog/v1/%s/namespaces/%s/tables/%s"
 
 extern PGDLLEXPORT char *RestCatalogFetchAccessToken(void);
-extern PGDLLEXPORT void RegisterNamespaceToRestCatalog(const char *catalogName, const char *namespaceName,
-													   bool hasRestCatalogReadOnlyOption);
+extern PGDLLEXPORT void RegisterNamespaceToRestCatalog(const char *catalogName, const char *namespaceName);
 extern PGDLLEXPORT void ErrorIfRestNamespaceDoesNotExist(const char *catalogName, const char *namespaceName);
 extern PGDLLEXPORT IcebergCatalogType GetIcebergCatalogType(Oid relationId);
 extern PGDLLEXPORT char *GetRestCatalogName(Oid relationId);

pg_lake_iceberg/src/rest_catalog/rest_catalog.c

@@ -57,7 +57,7 @@ static void ReportHTTPError(HttpResult httpResult, int level);
 * allowed locations as part of the namespace.
 */
 void
-RegisterNamespaceToRestCatalog(const char *catalogName, const char *namespaceName, bool hasRestCatalogReadOnlyOption)
+RegisterNamespaceToRestCatalog(const char *catalogName, const char *namespaceName)
 {
 	/*
 	 * First, we need to check if the namespace already exists in Rest Catalog
@@ -107,8 +107,7 @@ RegisterNamespaceToRestCatalog(const char *catalogName, const char *namespaceNam
 				 * might have for internal iceberg tables. For external ones,
 				 * we don't have any control over.
 				 */
-				if (!hasRestCatalogReadOnlyOption &&
-					(strlen(serverAllowedLocation) - strlen(defaultAllowedLocation) > 1 ||
+				if ((strlen(serverAllowedLocation) - strlen(defaultAllowedLocation) > 1 ||
 					 strncmp(serverAllowedLocation, defaultAllowedLocation, strlen(defaultAllowedLocation)) != 0))
 				{
 					ereport(DEBUG1,

pg_lake_iceberg/src/test/rest_catalog.c

@@ -37,6 +37,6 @@ register_namespace_to_rest_catalog(PG_FUNCTION_ARGS)
 	char	   *catalogName = text_to_cstring(PG_GETARG_TEXT_P(0));
 	char	   *namespaceName = text_to_cstring(PG_GETARG_TEXT_P(1));
 
-	RegisterNamespaceToRestCatalog(catalogName, namespaceName, false);
+	RegisterNamespaceToRestCatalog(catalogName, namespaceName);
 	PG_RETURN_VOID();
 }

pg_lake_table/src/ddl/create_table.c

@@ -761,30 +761,6 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 								errmsg("writable %s catalog iceberg tables do not "
 									   "allow explicit catalog options", hasObjectStoreCatalogOption ? "object store" : "REST")));
 			}
-
-			if (hasRestCatalogOption)
-			{
-				/*
-				 * For writable rest catalog iceberg tables, we register the
-				 * namespace in the rest catalog. We do that early in the
-				 * command processing so that any errors in the registration
-				 * are caught before we create the actual table.
-				 *
-				 * Note that registering a namespace is not a transactional
-				 * operation from pg_lake's perspective. If the subsequent
-				 * table creation fails, the namespace registration will
-				 * remain. We accept that tradeoff for simplicity as
-				 * re-registering an existing namespace is a no-op. For a
-				 * writable rest catalog iceberg table, the namespace is
-				 * always the table's schema name. Similarly, the catalog name
-				 * is always the database name. We normally encode that in
-				 * GetRestCatalogName() etc., but here we need to do it early
-				 * before the table is created.
-				 */
-				RegisterNamespaceToRestCatalog(get_database_name(MyDatabaseId),
-											   get_namespace_name(namespaceId),
-											   hasExternalCatalogReadOnlyOption);
-			}
 		}
 		else if (createStmt->base.tableElts == NIL && hasExternalCatalogReadOnlyOption)
 		{
@@ -930,6 +906,31 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 	/* we currently only allow Iceberg tables in the managed storage region */
 	ErrorIfNotInManagedStorageRegion(location);
 
+
+	if (hasRestCatalogOption)
+	{
+		/* here we only deal with writable rest catalog iceberg tables */
+		Assert(!HasReadOnlyOption(createStmt->options));
+
+		/*
+		 * For writable rest catalog iceberg tables, we register the namespace
+		 * in the rest catalog. We do that later in the command processing so
+		 * that any previous errors (e.g., table creation failures) prevents
+		 * us from registering the namespace.
+		 *
+		 * Note that registering a namespace is not a transactional operation
+		 * from pg_lake's perspective. If the subsequent table creation fails,
+		 * the namespace registration will remain. We accept that tradeoff for
+		 * simplicity as re-registering an existing namespace is a no-op. For
+		 * a writable rest catalog iceberg table, the namespace is always the
+		 * table's schema name. Similarly, the catalog name is always the
+		 * database name. We normally encode that in GetRestCatalogName()
+		 * etc., but here we need to do it early before the table is created.
+		 */
+		RegisterNamespaceToRestCatalog(get_database_name(MyDatabaseId),
+									   get_namespace_name(namespaceId));
+	}
+
 	bool		hasRowIds = GetBoolOption(createStmt->options, "row_ids", false);
 
 	/* when a table has row_ids, we need to create a sequence */