Cherry-pick fix: remove gp_appendonly_enable_unique_index GUC

apache · Jan 29, 2025 · c407872 · c407872
1 parent f816e4c
commit c407872
Show file tree

Hide file tree

Showing 8 changed files with 823 additions and 6 deletions.
diff --git a/src/test/isolation2/expected/ao_unique_index.out b/src/test/isolation2/expected/ao_unique_index.out
@@ -571,5 +571,4 @@ DETAIL:  Key (a, b)=(1, 1) already exists.
 ERROR:  duplicate key value violates unique constraint "a_b_unique"
 DROP TABLE unique_index_ao_row;
 DROP
-RESET gp_appendonly_enable_unique_index;
 RESET
diff --git a/src/test/isolation2/expected/aocs_unique_index.out b/src/test/isolation2/expected/aocs_unique_index.out
@@ -571,5 +571,4 @@ DETAIL:  Key (a, b)=(1, 1) already exists.
 ERROR:  duplicate key value violates unique constraint "a_b_unique"
 DROP TABLE unique_index_ao_column;
 DROP
-RESET gp_appendonly_enable_unique_index;
 RESET
diff --git a/src/test/isolation2/sql/ao_unique_index.sql b/src/test/isolation2/sql/ao_unique_index.sql
@@ -377,4 +377,3 @@ INSERT INTO unique_index_ao_row VALUES (1,2);
 -- should conflict
 INSERT INTO unique_index_ao_row VALUES (1,1);
 DROP TABLE unique_index_ao_row;
-RESET gp_appendonly_enable_unique_index;
diff --git a/src/test/isolation2/sql/aocs_unique_index.sql b/src/test/isolation2/sql/aocs_unique_index.sql
@@ -377,4 +377,3 @@ INSERT INTO unique_index_ao_column VALUES (1,2);
 -- should conflict
 INSERT INTO unique_index_ao_column VALUES (1,1);
 DROP TABLE unique_index_ao_column;
-RESET gp_appendonly_enable_unique_index;
diff --git a/src/test/regress/input/uao_dml/ao_unique_index_build.source b/src/test/regress/input/uao_dml/ao_unique_index_build.source
@@ -81,7 +81,6 @@ SELECT * FROM unique_index_build_@amname@ WHERE i = 6;
 
 DROP TABLE unique_index_build_@amname@;
 
-RESET gp_appendonly_enable_unique_index;
 RESET default_table_access_method;
 RESET enable_seqscan;
 RESET optimizer;
diff --git a/src/test/regress/output/uao_dml/ao_unique_index_build.source b/src/test/regress/output/uao_dml/ao_unique_index_build.source
@@ -147,7 +147,6 @@ SELECT * FROM unique_index_build_@amname@ WHERE i = 6;
 (3 rows)
 
 DROP TABLE unique_index_build_@amname@;
-RESET gp_appendonly_enable_unique_index;
 RESET default_table_access_method;
 RESET enable_seqscan;
 RESET optimizer;
diff --git a/src/test/regress/regression.diffs b/src/test/regress/regression.diffs
diff --git a/src/test/regress/regression.out b/src/test/regress/regression.out