Remove references to node masters in error messages

Master/slave concept in pgxc node management has been removed
with 2a406e56dea3e750e74cc38115e83e30217b4822.

7 files changed, 15 insertions, 15 deletions

diff --git a/doc-xc/src/sgml/ref/create_node.sgmlin b/doc-xc/src/sgml/ref/create_node.sgmlin
index 9916982932..6f9b20bc7d 100644
--- a/doc-xc/src/sgml/ref/create_node.sgmlin
+++ b/doc-xc/src/sgml/ref/create_node.sgmlin
@@ -156,7 +156,7 @@ CREATE NODE node2 WITH (TYPE = 'coordinator', HOST = 'localhost', PORT = 6543);
   </para>
 
   <para>
-   Create a Datanode master which is a preferred and primary node
+   Create a Datanode which is a preferred and primary node
    located on remote machine with IP '192.168.0.3' on port 8888.
 <programlisting>
 CREATE NODE node2 WITH (TYPE = 'datanode', HOST = '192.168.0.3', PORT = 8888, PRIMARY, PREFERRED);
diff --git a/doc-xc/src/sgml/ref/create_nodegroup.sgmlin b/doc-xc/src/sgml/ref/create_nodegroup.sgmlin
index a106539896..00e664831d 100644
--- a/doc-xc/src/sgml/ref/create_nodegroup.sgmlin
+++ b/doc-xc/src/sgml/ref/create_nodegroup.sgmlin
@@ -68,7 +68,7 @@ WITH <replaceable class="parameter">nodename</replaceable> [, ... ]
   <title>Notes</title>
   <para>
    A group of nodes works as an alias for node lists when defining tables
-   on sub-clusters. Only Datanode masters can be included in node groups.
+   on sub-clusters. Only Datanode can be included in node groups.
   </para>
  </refsect1>
 
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 0082b2e233..ed08015d9c 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -1129,8 +1129,8 @@ build_subcluster_data(PGXCSubCluster *subcluster, int *numnodes)
 	if (!subcluster)
 	{
 		/*
-		 * If no subcluster is defined, all the Datanode masters are associated
-		 * to the table. So scan pgxc_node and pick up all the necessary stuff.
+		 * If no subcluster is defined, all the Datanode are associated to the
+		 * table. So scan pgxc_node and pick up all the necessary stuff.
 		 */
 		Relation		rel;
 		HeapScanDesc	scan;
@@ -1143,7 +1143,7 @@ build_subcluster_data(PGXCSubCluster *subcluster, int *numnodes)
 		{
 			Form_pgxc_node  pgxc_node = (Form_pgxc_node) GETSTRUCT(tuple);
 
-			/* Add only Datanode masters */
+			/* Add only Datanodes */
 			if (pgxc_node->node_type != PGXC_NODE_DATANODE)
 				continue;
 
@@ -1162,7 +1162,7 @@ build_subcluster_data(PGXCSubCluster *subcluster, int *numnodes)
 		if (*numnodes == 0)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
-					 errmsg("No PGXC Datanode master defined")));
+					 errmsg("No Datanode defined in cluster")));
 
 		return nodes;
 	}
@@ -1204,7 +1204,7 @@ build_subcluster_data(PGXCSubCluster *subcluster, int *numnodes)
 			if (get_pgxc_nodetype(noid) != PGXC_NODE_DATANODE)
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("PGXC node %s: not a Datanode master",
+						 errmsg("PGXC node %s: not a Datanode",
 								node_name)));
 
 			/* Can be added if necessary */
diff --git a/src/backend/pgxc/nodemgr/groupmgr.c b/src/backend/pgxc/nodemgr/groupmgr.c
index daf41efcb9..1c88a27466 100644
--- a/src/backend/pgxc/nodemgr/groupmgr.c
+++ b/src/backend/pgxc/nodemgr/groupmgr.c
@@ -77,7 +77,7 @@ PgxcGroupCreate(CreateGroupStmt *stmt)
 		if (get_pgxc_nodetype(noid) != PGXC_NODE_DATANODE)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("PGXC node %s: only Datanode master can be a group member",
+					 errmsg("PGXC node %s: only Datanodes can be group members",
 							node_name)));
 
 		/* OK to pick up Oid of this node */
diff --git a/src/backend/pgxc/nodemgr/nodemgr.c b/src/backend/pgxc/nodemgr/nodemgr.c
index fd0b530fdb..7e2470fe89 100644
--- a/src/backend/pgxc/nodemgr/nodemgr.c
+++ b/src/backend/pgxc/nodemgr/nodemgr.c
@@ -374,7 +374,7 @@ PgxcNodeCreate(CreateNodeStmt *stmt)
 		if (node_type != PGXC_NODE_DATANODE)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					errmsg("PGXC node %s: cannot be a primary node, it has to be a master Datanode",
+					errmsg("PGXC node %s: cannot be a primary node, it has to be a Datanode",
 							node_name)));
 
 		if (OidIsValid(primary_data_node))
@@ -390,7 +390,7 @@ PgxcNodeCreate(CreateNodeStmt *stmt)
 		if (node_type != PGXC_NODE_DATANODE)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					errmsg("PGXC node %s: cannot be a preferred node, it has to be a master Datanode",
+					errmsg("PGXC node %s: cannot be a preferred node, it has to be a Datanode",
 							node_name)));
 		nodeis_preferred = true;
 	}
@@ -487,7 +487,7 @@ PgxcNodeAlter(AlterNodeStmt *stmt)
 		if (get_pgxc_nodetype(nodeOid) != PGXC_NODE_DATANODE)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					errmsg("PGXC node %s: cannot be a primary node, it has to be a master Datanode",
+					errmsg("PGXC node %s: cannot be a primary node, it has to be a Datanode",
 							node_name)));
 
 		if (OidIsValid(primary_data_node))
@@ -504,7 +504,7 @@ PgxcNodeAlter(AlterNodeStmt *stmt)
 		if (get_pgxc_nodetype(nodeOid) != PGXC_NODE_DATANODE)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					errmsg("PGXC node %s: cannot be a preferred node, it has to be a master Datanode",
+					errmsg("PGXC node %s: cannot be a preferred node, it has to be a Datanode",
 							node_name)));
 		nodeis_preferred = true;
 	}
diff --git a/src/backend/pgxc/pool/pgxcnode.c b/src/backend/pgxc/pool/pgxcnode.c
index 5d9cc7f799..6cf8d91b69 100644
--- a/src/backend/pgxc/pool/pgxcnode.c
+++ b/src/backend/pgxc/pool/pgxcnode.c
@@ -314,7 +314,7 @@ pgxc_node_all_free(void)
 			default:
 				Assert(0);
 		}
-		/* Coordinator masters */
+
 		for (j = 0; j < num_nodes; j++)
 		{
 			PGXCNodeHandle *handle = &array_handles[j];
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index f1e5c8a89d..ffdef08324 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -2147,8 +2147,8 @@ ExecUtilityStmtOnNodes(const char *queryString, ExecNodes *nodes,
 	if (NumDataNodes == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("No PGXC Datanode master defined in cluster"),
-				 errhint("You need to define at least 1 Datanode master with "
+				 errmsg("No Datanode defined in cluster"),
+				 errhint("You need to define at least 1 Datanode with "
 						 "CREATE NODE.")));
 
 	if (!IsConnFromCoord())