Remove option strict_statement_checking

This option was used in XC planner to enforce an error in case
other queries than SELECT, INSERT, UPDATE and DELETE went through
XC planner. This was particularly useful for debugging but as now
XC is far more integrated with Postgres code, such options are no
more necessary. We need to rely on vanilla for such things on a
local node.

4 files changed, 0 insertions, 29 deletions

diff --git a/src/backend/optimizer/util/pgxcship.c b/src/backend/optimizer/util/pgxcship.c
index 56d5bb43ae..e71e7359db 100644
--- a/src/backend/optimizer/util/pgxcship.c
+++ b/src/backend/optimizer/util/pgxcship.c
@@ -31,8 +31,6 @@
 #include "pgxc/pgxcnode.h"
 #include "utils/lsyscache.h"
 
-/* Forbid unsafe SQL statements */
-bool        StrictStatementChecking = true;
 
 /*
  * Shippability_context
@@ -983,20 +981,6 @@ pgxc_query_needs_coord(Query *query)
 	if (pgxc_query_contains_only_pg_catalog(query->rtable))
 		return true;
 
-	/* Allow for override */
-	if (query->commandType != CMD_SELECT &&
-			query->commandType != CMD_INSERT &&
-			query->commandType != CMD_UPDATE &&
-		query->commandType != CMD_DELETE)
-	{
-		if (StrictStatementChecking)
-			ereport(ERROR,
-					(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
-					 (errmsg("This command is not yet supported."))));
-
-		return true;
-	}
-
 	return false;
 }
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 316804dbc8..9fba429984 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1509,15 +1509,6 @@ static struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 	{
-		{"strict_statement_checking", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Forbid statements that are not safe for the cluster"),
-			NULL
-		},
-		&StrictStatementChecking,
-		true,
-		NULL, NULL, NULL
-	},
-	{
 		{"enforce_two_phase_commit", PGC_SUSET, XC_HOUSEKEEPING_OPTIONS,
 			gettext_noop("Enforce the use of two-phase commit on transactions that"
 					"made use of temporary objects"),
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 97bf9006a1..42c514c452 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -598,8 +598,6 @@
 ##------------------------------------------------------------------------------
 # OTHER PG-XC OPTIONS
 #------------------------------------------------------------------------------
-#strict_statement_checking = on		# Forbid PG-XC-unsafe SQL
-					# Enabling is useful for development
 #enforce_two_phase_commit = on		# Enforce the usage of two-phase commit on transactions
 					# where temporary objects are used or ON COMMIT actions
 					# are pending.
diff --git a/src/include/optimizer/pgxcship.h b/src/include/optimizer/pgxcship.h
index a0f860daf1..0f960e1a5a 100644
--- a/src/include/optimizer/pgxcship.h
+++ b/src/include/optimizer/pgxcship.h
@@ -20,8 +20,6 @@
 #include "nodes/relation.h"
 #include "pgxc/locator.h"
 
-/* Forbid SQL if unsafe, useful to turn off for development */
-extern bool StrictStatementChecking;
 
 /* Determine if query is shippable */
 extern ExecNodes *pgxc_is_query_shippable(Query *query, int query_level);