Fix crash while using REINDEX TABLE CONCURRENTLY

CHANGELOG.md

@@ -10,6 +10,7 @@ accidentally triggering the load of a previous DB version.**
 * #3101 Use commit date in get_git_commit()
 * #3104 Fix use after free in add_reorder_policy
 * #3106 Fix use after free in chunk_api_get_chunk_stats
+* #3123 Fix crash while using REINDEX TABLE CONCURRENTLY
 
 ## 2.2.0 (2021-04-13)
 

src/process_utility.c

@@ -1478,13 +1478,18 @@ process_reindex(ProcessUtilityArgs *args)
 			{
 				PreventCommandDuringRecovery("REINDEX");
 				ts_hypertable_permissions_check_by_id(ht->fd.id);
-
+#if PG12_GE
+				if (stmt->concurrent)
+					ereport(ERROR,
+							(errmsg("concurrent index creation on hypertables is not supported")));
+#endif
 				if (foreach_chunk(ht, reindex_chunk, args) >= 0)
 					result = DDL_DONE;
 
 				add_hypertable_to_process_args(args, ht);
 			}
 			break;
+
 		case REINDEX_OBJECT_INDEX:
 			ht = ts_hypertable_cache_get_entry(hcache,
 											   IndexGetRelation(relid, true),

test/expected/index.out → test/expected/index-11.out

@@ -595,6 +595,9 @@ INFO:  index "_hyper_12_15_chunk_reindex_test_time_unique_idx" was reindexed
 INFO:  index "16_7_reindex_test_pkey" was reindexed
 INFO:  index "_hyper_12_16_chunk_reindex_test_time_unique_idx" was reindexed
 \set ON_ERROR_STOP 0
+-- REINDEX TABLE CONCURRENTLY is not supported on PG11 (but blocked on PG12+)
+REINDEX TABLE CONCURRENTLY reindex_test;
+ERROR:  syntax error at or near "CONCURRENTLY" at character 15
 -- this one currently doesn't recurse to chunks and instead gives an
 -- error
 REINDEX (VERBOSE) INDEX reindex_test_time_unique_idx;

test/sql/CMakeLists.txt

@@ -20,7 +20,6 @@ set(TEST_FILES
   grant_hypertable.sql
   hash.sql
   histogram_test.sql
-  index.sql
   insert_many.sql
   insert_single.sql
   join.sql
@@ -66,6 +65,7 @@ set(TEST_TEMPLATES
   sort_optimization.sql.in
   sql_query.sql.in
   update.sql.in
+  index.sql.in
 )
 
 # tests that fail or are unreliable when run in parallel
@@ -74,8 +74,11 @@ set(SOLO_TESTS
   alter
   alternate_users
   bgw_launcher
-  chunk_utils.sql
-  index
+  chunk_utils
+  index-11
+  index-12
+  index-13
+  loader
   loader
   net
   pg_dump_unprivileged

test/sql/index.sql → test/sql/index.sql.in

@@ -280,6 +280,10 @@ SELECT * FROM test.show_subtables('reindex_test');
 REINDEX (VERBOSE) TABLE reindex_test;
 
 \set ON_ERROR_STOP 0
+
+-- REINDEX TABLE CONCURRENTLY is not supported on PG11 (but blocked on PG12+)
+REINDEX TABLE CONCURRENTLY reindex_test;
+
 -- this one currently doesn't recurse to chunks and instead gives an
 -- error
 REINDEX (VERBOSE) INDEX reindex_test_time_unique_idx;