Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow use_remote_estimate to be set to 0. #335

Merged
merged 2 commits into from
Jun 23, 2023
Merged

Allow use_remote_estimate to be set to 0. #335

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51a0289
Allow use_remote_estimate to be set to 0.
deathwish Jun 21, 2023
55f74e6
Ensure that FDW option defaults are set in all cases.
deathwish Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ void tdsValidateOptions(List *options_list, Oid context, TdsFdwOptionSet* option
else if (context == ForeignTableRelationId)
{
tdsGetForeignTableOptions(options_list, option_set);
tdsSetDefaultOptions(option_set);
tdsValidateForeignTableOptionSet(option_set);
}

Expand Down Expand Up @@ -502,7 +503,7 @@ void tdsGetForeignServerTableOptions(List *options_list, TdsFdwOptionSet *option

else if (strcmp(def->defname, "use_remote_estimate") == 0)
{
if (option_set->use_remote_estimate)
if (option_set->use_remote_estimate != -1)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("Redundant option: use_remote_estimate (%s)", defGetString(def))
Expand Down Expand Up @@ -776,7 +777,7 @@ void tdsSetDefaultOptions(TdsFdwOptionSet *option_set)
#endif
}

if (!option_set->use_remote_estimate)
if (option_set->use_remote_estimate == -1)
{
option_set->use_remote_estimate = DEFAULT_USE_REMOTE_ESTIMATE;

Expand Down Expand Up @@ -872,6 +873,14 @@ void tdsValidateForeignTableOptionSet(TdsFdwOptionSet *option_set)
));
}

/* Check option ranges */
if (option_set->use_remote_estimate < 0 || option_set->use_remote_estimate > 1)
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("Invalid value for use_remote_estimate: %d", option_set->use_remote_estimate)
));
}
#ifdef DEBUG
ereport(NOTICE,
(errmsg("----> finishing tdsValidateForeignTableOptionSet")
Expand Down Expand Up @@ -931,7 +940,7 @@ void tdsOptionSetInit(TdsFdwOptionSet* option_set)
option_set->table_name = NULL;
option_set->row_estimate_method = NULL;
option_set->match_column_names = DEFAULT_MATCH_COLUMN_NAMES;
option_set->use_remote_estimate = 0;
option_set->use_remote_estimate = -1;
option_set->fdw_startup_cost = 0;
option_set->fdw_tuple_cost = 0;
option_set->local_tuple_estimate = 0;
Expand Down