diff options
Diffstat (limited to 'src/backend/parser/gram.y')
| -rw-r--r-- | src/backend/parser/gram.y | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 149962035dc..82405b9d26f 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -9034,12 +9034,10 @@ VacuumStmt: VACUUM opt_full opt_freeze opt_verbose n->options = VACOPT_VACUUM; if ($2) n->options |= VACOPT_FULL; + if ($3) + n->options |= VACOPT_FREEZE; if ($4) n->options |= VACOPT_VERBOSE; - n->freeze_min_age = $3 ? 0 : -1; - n->freeze_table_age = $3 ? 0 : -1; - n->multixact_freeze_min_age = $3 ? 0 : -1; - n->multixact_freeze_table_age = $3 ? 0 : -1; n->relation = NULL; n->va_cols = NIL; $$ = (Node *)n; @@ -9050,12 +9048,10 @@ VacuumStmt: VACUUM opt_full opt_freeze opt_verbose n->options = VACOPT_VACUUM; if ($2) n->options |= VACOPT_FULL; + if ($3) + n->options |= VACOPT_FREEZE; if ($4) n->options |= VACOPT_VERBOSE; - n->freeze_min_age = $3 ? 0 : -1; - n->freeze_table_age = $3 ? 0 : -1; - n->multixact_freeze_min_age = $3 ? 0 : -1; - n->multixact_freeze_table_age = $3 ? 0 : -1; n->relation = $5; n->va_cols = NIL; $$ = (Node *)n; @@ -9066,30 +9062,16 @@ VacuumStmt: VACUUM opt_full opt_freeze opt_verbose n->options |= VACOPT_VACUUM; if ($2) n->options |= VACOPT_FULL; + if ($3) + n->options |= VACOPT_FREEZE; if ($4) n->options |= VACOPT_VERBOSE; - n->freeze_min_age = $3 ? 0 : -1; - n->freeze_table_age = $3 ? 0 : -1; - n->multixact_freeze_min_age = $3 ? 0 : -1; - n->multixact_freeze_table_age = $3 ? 0 : -1; $$ = (Node *)n; } | VACUUM '(' vacuum_option_list ')' { VacuumStmt *n = makeNode(VacuumStmt); n->options = VACOPT_VACUUM | $3; - if (n->options & VACOPT_FREEZE) - { - n->freeze_min_age = n->freeze_table_age = 0; - n->multixact_freeze_min_age = 0; - n->multixact_freeze_table_age = 0; - } - else - { - n->freeze_min_age = n->freeze_table_age = -1; - n->multixact_freeze_min_age = -1; - n->multixact_freeze_table_age = -1; - } n->relation = NULL; n->va_cols = NIL; $$ = (Node *) n; @@ -9098,18 +9080,6 @@ VacuumStmt: VACUUM opt_full opt_freeze opt_verbose { VacuumStmt *n = makeNode(VacuumStmt); n->options = VACOPT_VACUUM | $3; - if (n->options & VACOPT_FREEZE) - { - n->freeze_min_age = n->freeze_table_age = 0; - n->multixact_freeze_min_age = 0; - n->multixact_freeze_table_age = 0; - } - else - { - n->freeze_min_age = n->freeze_table_age = -1; - n->multixact_freeze_min_age = -1; - n->multixact_freeze_table_age = -1; - } n->relation = $5; n->va_cols = $6; if (n->va_cols != NIL) /* implies analyze */ @@ -9137,10 +9107,6 @@ AnalyzeStmt: n->options = VACOPT_ANALYZE; if ($2) n->options |= VACOPT_VERBOSE; - n->freeze_min_age = -1; - n->freeze_table_age = -1; - n->multixact_freeze_min_age = -1; - n->multixact_freeze_table_age = -1; n->relation = NULL; n->va_cols = NIL; $$ = (Node *)n; @@ -9151,10 +9117,6 @@ AnalyzeStmt: n->options = VACOPT_ANALYZE; if ($2) n->options |= VACOPT_VERBOSE; - n->freeze_min_age = -1; - n->freeze_table_age = -1; - n->multixact_freeze_min_age = -1; - n->multixact_freeze_table_age = -1; n->relation = $3; n->va_cols = $4; $$ = (Node *)n; |