This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 463f2fdb8d2a729b90b1d83f9560d8d0501d3a42 Author: David Kimura <[email protected]> AuthorDate: Wed Aug 31 18:15:27 2022 +0000 Remove unused GUC optimizer_enable_partial_index After partitioning rework absorbed in Postgres 12 merge, this GUC became dead code as demonstrated in commit baad02398c14. --- src/backend/gpopt/config/CConfigParamMapping.cpp | 5 ----- src/backend/utils/misc/guc_gp.c | 12 ------------ src/include/utils/guc.h | 1 - src/include/utils/unsync_guc_name.h | 1 - src/test/regress/expected/gporca.out | 6 ------ src/test/regress/expected/gporca_optimizer.out | 6 ------ src/test/regress/sql/gporca.sql | 6 ------ 7 files changed, 37 deletions(-) diff --git a/src/backend/gpopt/config/CConfigParamMapping.cpp b/src/backend/gpopt/config/CConfigParamMapping.cpp index 8d490444e8..48061c9e56 100644 --- a/src/backend/gpopt/config/CConfigParamMapping.cpp +++ b/src/backend/gpopt/config/CConfigParamMapping.cpp @@ -384,11 +384,6 @@ CConfigParamMapping::PackConfigParamInBitset( GPOPT_DISABLE_XFORM_TF(CXform::ExfMaxOneRow2Assert)); } - if (!optimizer_enable_partial_index) - { - // GPDB_12_MERGE_FIXME: Remove this GUC - } - if (!optimizer_enable_hashjoin) { // disable hash-join if the corresponding GUC is turned off diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c index d68c9b291f..3c8d8e1881 100644 --- a/src/backend/utils/misc/guc_gp.c +++ b/src/backend/utils/misc/guc_gp.c @@ -336,7 +336,6 @@ bool optimizer_enable_constant_expression_evaluation; bool optimizer_enable_bitmapscan; bool optimizer_enable_outerjoin_to_unionall_rewrite; bool optimizer_enable_ctas; -bool optimizer_enable_partial_index; bool optimizer_enable_dml; bool optimizer_enable_dml_constraints; bool optimizer_enable_master_only_queries; @@ -2648,17 +2647,6 @@ struct config_bool ConfigureNamesBool_gp[] = NULL, NULL, NULL }, - { - {"optimizer_enable_partial_index", PGC_USERSET, DEVELOPER_OPTIONS, - gettext_noop("Enable heterogeneous index plans."), - NULL, - GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE - }, - &optimizer_enable_partial_index, - true, - NULL, NULL, NULL - }, - { {"optimizer_enable_dml", PGC_USERSET, DEVELOPER_OPTIONS, gettext_noop("Enable DML plans in Pivotal Optimizer (GPORCA)."), diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 512b43b065..1b41d47e99 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -514,7 +514,6 @@ extern bool optimizer_enable_constant_expression_evaluation; extern bool optimizer_enable_bitmapscan; extern bool optimizer_enable_outerjoin_to_unionall_rewrite; extern bool optimizer_enable_ctas; -extern bool optimizer_enable_partial_index; extern bool optimizer_enable_dml; extern bool optimizer_enable_dml_constraints; extern bool optimizer_enable_direct_dispatch; diff --git a/src/include/utils/unsync_guc_name.h b/src/include/utils/unsync_guc_name.h index 4f23d394e1..00733b0e55 100644 --- a/src/include/utils/unsync_guc_name.h +++ b/src/include/utils/unsync_guc_name.h @@ -419,7 +419,6 @@ "optimizer_enable_nljoin", "optimizer_enable_outerjoin_rewrite", "optimizer_enable_outerjoin_to_unionall_rewrite", - "optimizer_enable_partial_index", "optimizer_enable_partition_propagation", "optimizer_enable_partition_selection", "optimizer_enable_range_predicate_dpe", diff --git a/src/test/regress/expected/gporca.out b/src/test/regress/expected/gporca.out index a11be3c6f5..c8f00b52d5 100644 --- a/src/test/regress/expected/gporca.out +++ b/src/test/regress/expected/gporca.out @@ -8334,7 +8334,6 @@ insert into orca.t_date values('01-03-2012'::date,6,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,7,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,8,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,9,'tag1','tag2'); -set optimizer_enable_partial_index=on; set optimizer_enable_space_pruning=off; set optimizer_enable_constant_expression_evaluation=on; explain select * from orca.t_date where user_id=9; @@ -8413,7 +8412,6 @@ select * from orca.t_text where user_id=9; reset optimizer_enable_space_pruning; set optimizer_enumerate_plans=off; reset optimizer_enable_constant_expression_evaluation; -reset optimizer_enable_partial_index; -- test that constant expression evaluation works with integers drop table if exists orca.t_ceeval_ints; NOTICE: table "t_ceeval_ints" does not exist, skipping @@ -8427,7 +8425,6 @@ insert into orca.t_ceeval_ints values(2, 100, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(3, 100, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(4, 101, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(5, 102, 'tag1', 'tag2'); -set optimizer_enable_partial_index=on; set optimizer_enable_space_pruning=off; set optimizer_enable_constant_expression_evaluation=on; set optimizer_use_external_constant_expression_evaluation_for_ints = on; @@ -8455,7 +8452,6 @@ reset optimizer_enable_space_pruning; reset optimizer_enumerate_plans; reset optimizer_use_external_constant_expression_evaluation_for_ints; reset optimizer_enable_constant_expression_evaluation; -reset optimizer_enable_partial_index; -- test project elements in TVF CREATE FUNCTION orca.csq_f(a int) RETURNS int AS $$ select $1 $$ LANGUAGE SQL; CREATE TABLE orca.csq_r(a int); @@ -10309,7 +10305,6 @@ select disable_xform('CXformInnerJoin2NLJoin'); CXformInnerJoin2NLJoin is disabled (1 row) -- end_ignore -set optimizer_enable_partial_index=on; set optimizer_enable_indexjoin=on; -- force_explain set optimizer_segments = 3; @@ -10350,7 +10345,6 @@ ORDER BY 1 asc ; reset optimizer_segments; reset optimizer_enable_constant_expression_evaluation; reset optimizer_enable_indexjoin; -reset optimizer_enable_partial_index; -- start_ignore select enable_xform('CXformInnerJoin2DynamicIndexGetApply'); enable_xform diff --git a/src/test/regress/expected/gporca_optimizer.out b/src/test/regress/expected/gporca_optimizer.out index 1b2d0a2e0d..7f563be102 100644 --- a/src/test/regress/expected/gporca_optimizer.out +++ b/src/test/regress/expected/gporca_optimizer.out @@ -8365,7 +8365,6 @@ insert into orca.t_date values('01-03-2012'::date,6,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,7,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,8,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,9,'tag1','tag2'); -set optimizer_enable_partial_index=on; set optimizer_enable_space_pruning=off; set optimizer_enable_constant_expression_evaluation=on; explain select * from orca.t_date where user_id=9; @@ -8430,7 +8429,6 @@ select * from orca.t_text where user_id=9; reset optimizer_enable_space_pruning; set optimizer_enumerate_plans=off; reset optimizer_enable_constant_expression_evaluation; -reset optimizer_enable_partial_index; -- test that constant expression evaluation works with integers drop table if exists orca.t_ceeval_ints; NOTICE: table "t_ceeval_ints" does not exist, skipping @@ -8444,7 +8442,6 @@ insert into orca.t_ceeval_ints values(2, 100, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(3, 100, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(4, 101, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(5, 102, 'tag1', 'tag2'); -set optimizer_enable_partial_index=on; set optimizer_enable_space_pruning=off; set optimizer_enable_constant_expression_evaluation=on; set optimizer_use_external_constant_expression_evaluation_for_ints = on; @@ -8468,7 +8465,6 @@ reset optimizer_enable_space_pruning; reset optimizer_enumerate_plans; reset optimizer_use_external_constant_expression_evaluation_for_ints; reset optimizer_enable_constant_expression_evaluation; -reset optimizer_enable_partial_index; -- test project elements in TVF CREATE FUNCTION orca.csq_f(a int) RETURNS int AS $$ select $1 $$ LANGUAGE SQL; CREATE TABLE orca.csq_r(a int); @@ -10347,7 +10343,6 @@ select disable_xform('CXformInnerJoin2NLJoin'); (1 row) -- end_ignore -set optimizer_enable_partial_index=on; set optimizer_enable_indexjoin=on; -- force_explain set optimizer_segments = 3; @@ -10390,7 +10385,6 @@ DETAIL: No plan has been computed for required properties reset optimizer_segments; reset optimizer_enable_constant_expression_evaluation; reset optimizer_enable_indexjoin; -reset optimizer_enable_partial_index; -- start_ignore select enable_xform('CXformInnerJoin2DynamicIndexGetApply'); enable_xform diff --git a/src/test/regress/sql/gporca.sql b/src/test/regress/sql/gporca.sql index d71be9baf3..ae5ada7b5d 100644 --- a/src/test/regress/sql/gporca.sql +++ b/src/test/regress/sql/gporca.sql @@ -543,7 +543,6 @@ insert into orca.t_date values('01-03-2012'::date,7,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,8,'tag1','tag2'); insert into orca.t_date values('01-03-2012'::date,9,'tag1','tag2'); -set optimizer_enable_partial_index=on; set optimizer_enable_space_pruning=off; set optimizer_enable_constant_expression_evaluation=on; -- start_ignore @@ -592,7 +591,6 @@ select * from orca.t_text where user_id=9; reset optimizer_enable_space_pruning; set optimizer_enumerate_plans=off; reset optimizer_enable_constant_expression_evaluation; -reset optimizer_enable_partial_index; -- test that constant expression evaluation works with integers drop table if exists orca.t_ceeval_ints; @@ -609,7 +607,6 @@ insert into orca.t_ceeval_ints values(3, 100, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(4, 101, 'tag1', 'tag2'); insert into orca.t_ceeval_ints values(5, 102, 'tag1', 'tag2'); -set optimizer_enable_partial_index=on; set optimizer_enable_space_pruning=off; set optimizer_enable_constant_expression_evaluation=on; set optimizer_use_external_constant_expression_evaluation_for_ints = on; @@ -623,7 +620,6 @@ reset optimizer_enable_space_pruning; reset optimizer_enumerate_plans; reset optimizer_use_external_constant_expression_evaluation_for_ints; reset optimizer_enable_constant_expression_evaluation; -reset optimizer_enable_partial_index; -- test project elements in TVF @@ -1790,7 +1786,6 @@ select disable_xform('CXformInnerJoin2IndexGetApply'); select disable_xform('CXformInnerJoin2NLJoin'); -- end_ignore -set optimizer_enable_partial_index=on; set optimizer_enable_indexjoin=on; -- force_explain @@ -1807,7 +1802,6 @@ ORDER BY 1 asc ; reset optimizer_segments; reset optimizer_enable_constant_expression_evaluation; reset optimizer_enable_indexjoin; -reset optimizer_enable_partial_index; -- start_ignore select enable_xform('CXformInnerJoin2DynamicIndexGetApply'); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
