diff options
| author | Pavan Deolasee | 2014-10-31 05:15:51 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-04-15 05:46:38 +0000 |
| commit | e8a3eea32e7b353754842100020dde8c244cbb16 (patch) | |
| tree | b403b3923916b1a50a96b524818ec65def0043e5 | |
| parent | 3faf5bbbcbc839a422f9d32def02c5d84c35d136 (diff) | |
Restore some GUCs which are useful in maintenance or special handling
They were taken out in XL. But at least pgxc_clean requires the
xc_maintenance_mode GUC to work properly. The other GUCs are probably not very
important from XL-perspective, but have them anyways unless we have a reason to
remove them
| -rw-r--r-- | src/backend/pgxc/plan/planner.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 6 | ||||
| -rw-r--r-- | src/include/pgxc/planner.h | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c index 7d6692c458..8fa92df5db 100644 --- a/src/backend/pgxc/plan/planner.c +++ b/src/backend/pgxc/plan/planner.c @@ -64,9 +64,9 @@ #include "utils/timestamp.h" #include "utils/date.h" -#ifndef XCP /* Forbid unsafe SQL statements */ bool StrictStatementChecking = true; +#ifndef XCP /* fast query shipping is enabled by default */ bool enable_fast_query_shipping = true; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 429ab9c067..59b38e2b0a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -212,10 +212,8 @@ static bool check_ssl(bool *newval, void **extra, GucSource source); static bool check_stage_log_stats(bool *newval, void **extra, GucSource source); static bool check_log_stats(bool *newval, void **extra, GucSource source); #ifdef PGXC -#ifndef XCP static bool check_pgxc_maintenance_mode(bool *newval, void **extra, GucSource source); #endif -#endif static bool check_canonical_path(char **newval, void **extra, GucSource source); static bool check_timezone_abbreviations(char **newval, void **extra, GucSource source); static void assign_timezone_abbreviations(const char *newval, void *extra); @@ -1541,7 +1539,6 @@ static struct config_bool ConfigureNamesBool[] = NULL, NULL, NULL }, #ifdef PGXC -#ifndef XCP { {"persistent_datanode_connections", PGC_BACKEND, DEVELOPER_OPTIONS, gettext_noop("Session never releases acquired connections."), @@ -1581,7 +1578,6 @@ static struct config_bool ConfigureNamesBool[] = check_pgxc_maintenance_mode, NULL, NULL }, #endif -#endif { {"lo_compat_privileges", PGC_SUSET, COMPAT_OPTIONS_PREVIOUS, @@ -9000,7 +8996,6 @@ check_log_stats(bool *newval, void **extra, GucSource source) } #ifdef PGXC -#ifndef XCP /* * Only a warning is printed to log. * Returning false will cause FATAL error and it will not be good. @@ -9046,7 +9041,6 @@ check_pgxc_maintenance_mode(bool *newval, void **extra, GucSource source) } } #endif -#endif static bool check_canonical_path(char **newval, void **extra, GucSource source) diff --git a/src/include/pgxc/planner.h b/src/include/pgxc/planner.h index 6ee83fb0c0..9ff0de50f4 100644 --- a/src/include/pgxc/planner.h +++ b/src/include/pgxc/planner.h @@ -199,11 +199,12 @@ typedef enum SS_HAS_AGG_EXPR /* it has aggregate expressions */ } ShippabilityStat; +/* forbid SQL if unsafe, useful to turn off for development */ +extern bool StrictStatementChecking; + #ifndef XCP /* global variable corresponding to the GUC with same name */ extern bool enable_fast_query_shipping; -/* forbid SQL if unsafe, useful to turn off for development */ -extern bool StrictStatementChecking; /* forbid SELECT even multi-node ORDER BY */ extern bool StrictSelectChecking; |