Bugfix. Do not try to open an AQO heap relation if an index does not exists.

danolivo · danolivo · commit 8615038a2b2d · 2022-04-20T15:29:39.000+05:00
diff --git a/aqo--1.2--1.3.sql b/aqo--1.2--1.3.sql
@@ -29,7 +29,7 @@ BEGIN
       END LOOP;
     END IF;
 
-    FOR aqo_queries_row IN (SELECT * FROM aqo_queries)
+    FOR aqo_queries_row IN (SELECT * FROM public.aqo_queries)
     LOOP
       IF (delete_row = true AND fspace_hash_var <> 0 AND
           fspace_hash_var = aqo_queries_row.fspace_hash AND
@@ -103,7 +103,7 @@ BEGIN
            aqo_queries.query_hash,
            to_char(array_avg(execution_time_without_aqo), '9.99EEEE')::float,
            to_char(array_mse(execution_time_without_aqo), '9.99EEEE')::float
-    FROM aqo_queries INNER JOIN aqo_query_stat
+    FROM public.aqo_queries INNER JOIN aqo_query_stat
     ON aqo_queries.query_hash = aqo_query_stat.query_hash
     GROUP BY (execution_time_without_aqo, aqo_queries.fspace_hash, aqo_queries.query_hash)
     ORDER BY execution_time DESC LIMIT n;
@@ -129,7 +129,7 @@ BEGIN
            aqo_queries.query_hash,
            to_char(array_avg(cardinality_error_without_aqo), '9.99EEEE')::float,
            to_char(array_mse(cardinality_error_without_aqo), '9.99EEEE')::float
-    FROM aqo_queries INNER JOIN aqo_query_stat
+    FROM public.aqo_queries INNER JOIN aqo_query_stat
     ON aqo_queries.query_hash = aqo_query_stat.query_hash
     GROUP BY (cardinality_error_without_aqo, aqo_queries.fspace_hash, aqo_queries.query_hash)
     ORDER BY error DESC LIMIT n;
diff --git a/storage.c b/storage.c
@@ -56,26 +56,30 @@ open_aqo_relation(char *heaprelnspname, char *heaprelname,
 	RangeVar *rv;
 
 	reloid = RelnameGetRelid(indrelname);
+	if (!OidIsValid(reloid))
+		goto cleanup;
+
 	rv = makeRangeVar(heaprelnspname, heaprelname, -1);
 	*hrel = table_openrv_extended(rv,  lockmode, true);
-	if (!OidIsValid(reloid) || *hrel == NULL)
-	{
-		/*
-		 * Absence of any AQO-related table tell us that someone executed
-		 * a 'DROP EXTENSION aqo' command. We disable AQO for all future queries
-		 * in this backend. For performance reasons we do it locally.
-		 * Clear profiling hash table.
-		 * Also, we gently disable AQO for the rest of the current query
-		 * execution process.
-		 */
-		aqo_enabled = false;
-		disable_aqo_for_query();
-
-		return false;
-	}
+	if (*hrel == NULL)
+		goto cleanup;
 
 	*irel = index_open(reloid,  lockmode);
 	return true;
+
+cleanup:
+	/*
+	 * Absence of any AQO-related table tell us that someone executed
+	 * a 'DROP EXTENSION aqo' command. We disable AQO for all future queries
+	 * in this backend. For performance reasons we do it locally.
+	 * Clear profiling hash table.
+	 * Also, we gently disable AQO for the rest of the current query
+	 * execution process.
+	 */
+	aqo_enabled = false;
+	disable_aqo_for_query();
+	return false;
+
 }
 
 /*
