Cmd options parsed, include dir

Author: arssher

Makefile

@@ -4,14 +4,16 @@ DATA = pg_shardman--0.0.1.sql  # script files to install with CREATE EXTENSION
 MODULE_big = pg_shardman
 OBJS = src/pg_shardman.o
 
+PG_CPPFLAGS += -Isrc/include
+
 # You can specify path to pg_config in PG_CONFIG var
 ifndef PG_CONFIG
 	PG_CONFIG := pg_config
 endif
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 
 INCLUDEDIR := $(shell $(PG_CONFIG) --includedir)
-PG_CPPFLAGS = -I$(INCLUDEDIR) # add server's include directory for libpq-fe.h
+PG_CPPFLAGS += -I$(INCLUDEDIR) # add server's include directory for libpq-fe.h
 SHLIB_LINK += -lpq # add libpq
 
 include $(PGXS)

pg_shardman--0.0.1.sql

@@ -27,7 +27,9 @@ CREATE TRIGGER cmd_log_inserts
 
 -- probably better to keep opts in an array field, but working with arrays from
 -- libpq is not very handy
+-- opts must be inserted sequentially, we order by them by id
 CREATE TABLE cmd_opts (
+	id bigserial PRIMARY KEY,
 	cmd_id bigint REFERENCES cmd_log(id),
 	opt text NOT NULL
 );
@@ -48,7 +50,7 @@ DECLARE
 BEGIN
 	INSERT INTO @extschema@.cmd_log VALUES (DEFAULT, 'add_node')
 										   RETURNING id INTO c_id;
-	INSERT INTO @extschema@.cmd_opts VALUES (c_id, connstring);
+	INSERT INTO @extschema@.cmd_opts VALUES (DEFAULT, c_id, connstring);
 END
 $$ LANGUAGE plpgsql;
 

src/include/pg_shardman.h

@@ -0,0 +1,7 @@
+#ifndef PG_SHARDMAN_H
+#define PG_SHARDMAN_H
+
+extern void _PG_init(void);
+extern void shardmaster_main(Datum main_arg);
+
+#endif							/* PG_SHARDMAN_H */

src/pg_shardman.c

@@ -26,6 +26,8 @@
 #include "commands/extension.h"
 #include "libpq-fe.h"
 
+#include "pg_shardman.h"
+
 
 /* ensure that extension won't load against incompatible version of Postgres */
 PG_MODULE_MAGIC;
@@ -35,11 +37,9 @@ typedef struct Cmd
 	int64 id;
 	char *cmd_type;
 	char *status;
+	char **opts; /* array of n options, opts[n] is NULL */
 } Cmd;
 
-extern void _PG_init(void);
-extern void shardmaster_main(Datum main_arg);
-
 static Cmd *next_cmd(void);
 static void update_cmd_status(int64 id, const char *new_status);
 static PGconn *listen_cmd_log_inserts(void);
@@ -132,10 +132,13 @@ shardmaster_main(Datum main_arg)
 	/* main loop */
 	while (!got_sigterm)
 	{
+		/* TODO: new mem ctxt for every command */
 		while ((cmd = next_cmd()) != NULL)
 		{
 			update_cmd_status(cmd->id, "in progress");
-			elog(LOG, "Working on command %ld, %s", cmd->id, cmd->cmd_type);
+			elog(LOG, "Working on command %ld, %s, opts are", cmd->id, cmd->cmd_type);
+			for (char **opts = cmd->opts; *opts; opts++)
+				elog(LOG, "%s", *opts);
 			update_cmd_status(cmd->id, "success");
 		}
 		wait_notify(conn);
@@ -239,24 +242,44 @@ next_cmd(void)
 		" status = 'in progress') t2 using (id);";
 	e = SPI_execute(cmd_sql, true, 0);
 	if (e < 0)
-	{
 		elog(FATAL, "Stmt failed: %s", cmd_sql);
-	}
 
 	if (SPI_processed > 0)
 	{
 		HeapTuple tuple = SPI_tuptable->vals[0];
 		TupleDesc rowdesc = SPI_tuptable->tupdesc;
 		bool isnull;
-		const char *cmd_type = (SPI_getvalue(tuple, rowdesc,
-											 SPI_fnumber(rowdesc, "cmd_type")));
+		uint64 i;
 
+		/* copy the command itself to callee context */
 		MemoryContext spicxt = MemoryContextSwitchTo(oldcxt);
 		cmd = palloc(sizeof(Cmd));
 		cmd->id = DatumGetInt64(SPI_getbinval(tuple, rowdesc,
 											  SPI_fnumber(rowdesc, "id"),
 											  &isnull));
-		cmd->cmd_type = pstrdup(cmd_type);
+		cmd->cmd_type = SPI_getvalue(tuple, rowdesc,
+									 SPI_fnumber(rowdesc, "cmd_type"));
+		MemoryContextSwitchTo(spicxt);
+
+		/* Now get options. cmd_sql will be freed by SPI_finish */
+		cmd_sql = psprintf("select opt from shardman.cmd_opts where"
+						   " cmd_id = %ld order by id;", cmd->id);
+		e = SPI_execute(cmd_sql, true, 0);
+		if (e < 0)
+			elog(FATAL, "Stmt failed: %s", cmd_sql);
+
+		MemoryContextSwitchTo(oldcxt);
+		/* +1 for NULL in the end */
+		cmd->opts = palloc((SPI_processed + 1) * sizeof(char*));
+		for (i = 0; i < SPI_processed; i++)
+		{
+			tuple = SPI_tuptable->vals[i];
+			rowdesc = SPI_tuptable->tupdesc;
+			cmd->opts[i] = SPI_getvalue(tuple, rowdesc,
+										SPI_fnumber(rowdesc, "opt"));
+		}
+		cmd->opts[i] = NULL;
+
 		MemoryContextSwitchTo(spicxt);
 	}