Massive renames.

Preparing for replica addition and move.

Author: arssher

bin/common.sh

@@ -57,10 +57,10 @@ function restart_nodes()
 
 function run_demo()
 {
-    psql -p 5433 -c "drop table if exists partitioned_table cascade;"
-    psql -p 5433 -c "CREATE TABLE partitioned_table(id INT NOT NULL, payload REAL);"
-    psql -p 5433 -c "INSERT INTO partitioned_table SELECT generate_series(1, 1000), random();"
+    psql -p 5433 -c "drop table if exists pt cascade;"
+    psql -p 5433 -c "CREATE TABLE pt(id INT NOT NULL, payload REAL);"
+    psql -p 5433 -c "INSERT INTO pt SELECT generate_series(1, 1000), random();"
     psql -c "select shardman.add_node('port=5433');"
     psql -c "select shardman.add_node('port=5434');"
-    psql -c "select shardman.create_hash_partitions(2, 'partitioned_table', 'id', 2);"
+    psql -c "select shardman.create_hash_partitions(2, 'pt', 'id', 2);"
 }

pg_shardman--0.0.1.sql

@@ -306,7 +306,7 @@ INSERT INTO @extschema@.local_meta VALUES ('node_id', NULL);
 
 -- available commands
 CREATE TYPE cmd AS ENUM ('add_node', 'rm_node', 'create_hash_partitions',
-						 'move_mpart');
+						 'move_primary');
 -- command status
 CREATE TYPE cmd_status AS ENUM ('waiting', 'canceled', 'failed', 'in progress',
 								'success');
@@ -673,11 +673,11 @@ $$ LANGUAGE plpgsql;
 -- Move master partition to another node. Params:
 -- 'part_name' is name of the partition to move
 -- 'dest' is id of the destination node
-CREATE FUNCTION move_mpart(part_name text, dest int) RETURNS int AS $$
+CREATE FUNCTION move_primary(part_name text, dest int) RETURNS int AS $$
 DECLARE
 	c_id int;
 BEGIN
-	INSERT INTO @extschema@.cmd_log VALUES (DEFAULT, 'move_mpart')
+	INSERT INTO @extschema@.cmd_log VALUES (DEFAULT, 'move_primary')
 										   RETURNING id INTO c_id;
 	INSERT INTO @extschema@.cmd_opts VALUES (DEFAULT, c_id, part_name);
 	INSERT INTO @extschema@.cmd_opts VALUES (DEFAULT, c_id, dest);

src/include/shard.h

@@ -4,6 +4,6 @@
 #include "pg_shardman.h"
 
 extern void create_hash_partitions(Cmd *cmd);
-extern void move_mpart(Cmd *cmd);
+extern void move_primary(Cmd *cmd);
 
 #endif							/* SHARD_H */

src/pg_shardman.c

@@ -194,8 +194,8 @@ shardmaster_main(Datum main_arg)
 				rm_node(cmd);
 			else if (strcmp(cmd->cmd_type, "create_hash_partitions") == 0)
 				create_hash_partitions(cmd);
-			else if (strcmp(cmd->cmd_type, "move_mpart") == 0)
-				move_mpart(cmd);
+			else if (strcmp(cmd->cmd_type, "move_primary") == 0)
+				move_primary(cmd);
 			else
 				shmn_elog(FATAL, "Unknown cmd type %s", cmd->cmd_type);
 		}