This is an automated email from the ASF dual-hosted git repository. reshke pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 85ed090b8f69bab97718461bd76b69455015f894 Author: Chris Hajas <[email protected]> AuthorDate: Thu Aug 10 14:36:43 2023 -0700 Rename GPORCA and planner optimizer in logging and explain output Rename Pivotal Optimizer to "GPORCA", and rename "Postgres query optimizer" to "Postgres based planner". --- src/backend/commands/explain.c | 2 +- src/backend/commands/tablecmds.c | 4 ++-- src/backend/gpopt/CGPOptimizer.cpp | 2 +- src/backend/gporca/libgpopt/src/exception.cpp | 8 ++++---- src/backend/gporca/libnaucrates/src/exception.cpp | 2 +- src/backend/optimizer/plan/orca.c | 4 ++-- src/backend/utils/misc/guc_gp.c | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 80534fea2a..d6e1d3be8f 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -878,7 +878,7 @@ ExplainPrintSettings(ExplainState *es, PlanGenerator planGen) ExplainPropertyStringInfo("Optimizer", es, "Postgres query optimizer"); #ifdef USE_ORCA else - ExplainPropertyStringInfo("Optimizer", es, "Pivotal Optimizer (GPORCA)"); + ExplainPropertyStringInfo("Optimizer", es, "GPORCA"); #endif for (int i = 0; i < num; i++) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 4a7249f9c5..7bac679c8c 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -18618,7 +18618,7 @@ ATExecExpandTableCTAS(AlterTableCmd *rootCmd, Relation rel, AlterTableCmd *cmd, /* Step (a) */ /* - * Force the use of Postgres query optimizer, since Pivotal Optimizer (GPORCA) will not + * Force the use of Postgres based planner, since GPORCA will not * redistribute the tuples if the current and required distributions * are both RANDOM even when reorganize is set to "true" */ @@ -19117,7 +19117,7 @@ ATExecSetDistributedBy(Relation rel, Node *node, AlterTableCmd *cmd) /* * Make sure the redistribution happens for a randomly distributed table. * - * Force the use of Postgres query optimizer, since Pivotal Optimizer (GPORCA) will not + * Force the use of Postgres based planner, since GPORCA will not * redistribute the tuples if the current and required distributions * are both RANDOM even when reorganize is set to "true" * Also set gp_force_random_redistribution to true. diff --git a/src/backend/gpopt/CGPOptimizer.cpp b/src/backend/gpopt/CGPOptimizer.cpp index 88100e9d46..b8a13160f1 100644 --- a/src/backend/gpopt/CGPOptimizer.cpp +++ b/src/backend/gpopt/CGPOptimizer.cpp @@ -87,7 +87,7 @@ CGPOptimizer::GPOPTOptimizedPlan( { errcode(ERRCODE_FEATURE_NOT_SUPPORTED); errmsg( - "GPORCA failed to produce a plan, falling back to planner"); + "GPORCA failed to produce a plan, falling back to Postgres-based planner"); if (serialized_error_msg) { errdetail("%s", serialized_error_msg); diff --git a/src/backend/gporca/libgpopt/src/exception.cpp b/src/backend/gporca/libgpopt/src/exception.cpp index c7840033ea..96c6d751f5 100644 --- a/src/backend/gporca/libgpopt/src/exception.cpp +++ b/src/backend/gporca/libgpopt/src/exception.cpp @@ -68,20 +68,20 @@ gpopt::EresExceptionInit(CMemoryPool *mp) gpopt::ExmiUnsupportedCompositePartKey), CException::ExsevNotice, GPOS_WSZ_WSZLEN( - "Feature not supported by the Pivotal Query Optimizer: composite partitioning keys"), + "Feature not supported by GPORCA: composite partitioning keys"), 0, GPOS_WSZ_WSZLEN( - "Feature not supported by the Pivotal Query Optimizer: composite partitioning keys")), + "Feature not supported by GPORCA: composite partitioning keys")), CMessage( CException(gpopt::ExmaGPOPT, gpopt::ExmiUnsupportedNonDeterministicUpdate), CException::ExsevNotice, GPOS_WSZ_WSZLEN( - "Feature not supported by the Pivotal Query Optimizer: non-deterministic DML statements"), + "Feature not supported by GPORCA: non-deterministic DML statements"), 0, GPOS_WSZ_WSZLEN( - "Feature not supported by the Pivotal Query Optimizer: non-deterministic DML statements")), + "Feature not supported by GPORCA: non-deterministic DML statements")), CMessage(CException(gpopt::ExmaGPOPT, gpopt::ExmiUnsatisfiedRequiredProperties), diff --git a/src/backend/gporca/libnaucrates/src/exception.cpp b/src/backend/gporca/libnaucrates/src/exception.cpp index 0360ac7990..5c7e016c02 100644 --- a/src/backend/gporca/libnaucrates/src/exception.cpp +++ b/src/backend/gporca/libnaucrates/src/exception.cpp @@ -153,7 +153,7 @@ gpdxl::EresExceptionInit(CMemoryPool *mp) CMessage( CException(gpdxl::ExmaDXL, gpdxl::ExmiExpr2DXLUnsupportedFeature), - CException::ExsevError, + CException::ExsevNotice, GPOS_WSZ_WSZLEN("Feature not supported: %ls"), 1, // feature name GPOS_WSZ_WSZLEN("Feature not supported")), diff --git a/src/backend/optimizer/plan/orca.c b/src/backend/optimizer/plan/orca.c index bd7757da3a..acdb99e0c4 100644 --- a/src/backend/optimizer/plan/orca.c +++ b/src/backend/optimizer/plan/orca.c @@ -73,11 +73,11 @@ log_optimizer(PlannedStmt *plan, bool fUnexpectedFailure) { if (fUnexpectedFailure) { - elog(LOG, "Pivotal Optimizer (GPORCA) failed to produce plan (unexpected)"); + elog(LOG, "GPORCA failed to produce plan (unexpected)"); } else { - elog(LOG, "Pivotal Optimizer (GPORCA) failed to produce plan"); + elog(LOG, "GPORCA failed to produce plan"); } return; } diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c index 01e16076cf..b50f55d102 100644 --- a/src/backend/utils/misc/guc_gp.c +++ b/src/backend/utils/misc/guc_gp.c @@ -2341,7 +2341,7 @@ struct config_bool ConfigureNamesBool_gp[] = { {"optimizer_enable_hashagg", PGC_USERSET, DEVELOPER_OPTIONS, - gettext_noop("Enables Pivotal Optimizer (GPORCA) to use hash aggregates."), + gettext_noop("Enables GPORCA to use hash aggregates."), NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE }, @@ -2352,7 +2352,7 @@ struct config_bool ConfigureNamesBool_gp[] = { {"optimizer_enable_groupagg", PGC_USERSET, DEVELOPER_OPTIONS, - gettext_noop("Enables Pivotal Optimizer (GPORCA) to use group aggregates."), + gettext_noop("Enables GPORCA to use group aggregates."), NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE }, @@ -2693,7 +2693,7 @@ struct config_bool ConfigureNamesBool_gp[] = { {"optimizer_enable_dml", PGC_USERSET, DEVELOPER_OPTIONS, - gettext_noop("Enable DML plans in Pivotal Optimizer (GPORCA)."), + gettext_noop("Enable DML plans in GPORCA."), NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE }, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
