Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 89a4862

Browse files
committed
Merge branch 'master' into python_wrapper
2 parents 80d5922 + 3fba6c9 commit 89a4862

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

readme.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ successfully and some failed.
9999
Currently cmd_log can be seen and commands issued only on the shardlord, but
100100
that's easy to change.
101101

102-
Let's get to the actual commands.
102+
Let's get to the actual commands, which are implemented as functions in
103+
the extension's schema.
103104

104105
add_node(connstring text)
105106
Add node with given libpq connstring to the cluster. Node is assigned unique

shard.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ CREATE FUNCTION remove_sync_standby_c(standby text) RETURNS text
806806

807807
CREATE FUNCTION set_sync_standbys(standby text) RETURNS void AS $$
808808
BEGIN
809-
PERFORM pg_reload_conf();
810809
PERFORM shardman.alter_system_c('synchronous_standby_names', standby);
810+
PERFORM pg_reload_conf();
811811
RAISE DEBUG '[SHMN] sync_standbys set to %', standby;
812812
END $$ LANGUAGE plpgsql STRICT;

src/udf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ gen_create_table_sql(PG_FUNCTION_ARGS)
107107
SPI_getvalue(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1));
108108
SPI_finish();
109109
join_path_components(pg_dump_path, pg_dump_path, "pg_dump");
110+
canonicalize_path(pg_dump_path);
110111

111112
cmd = psprintf("%s -t '%s' --schema-only --dbname='%s' 2>&1",
112113
pg_dump_path, relation, connstring);

0 commit comments

Comments
 (0)