Changeset: 515dc01b53a0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=515dc01b53a0 Modified Files: sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 sql/src/backends/monet5/merovingian/merovingian.c sql/src/backends/monet5/merovingian/merovingian_forkmserver.c sql/src/backends/monet5/merovingian/monetdb.1.in sql/src/backends/monet5/merovingian/properties.c Branch: Jun2010 Log Message:
Remove references to master/slave settings, since replication isn't yet fully implemented in Jun2010 branch. diffs (118 lines): diff -r d4f1540f7046 -r 515dc01b53a0 sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 --- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Fri Jul 16 13:04:00 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Fri Jul 16 13:11:02 2010 +0200 @@ -1,6 +1,13 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog + 16 Jul 2010; Fabian Groffen <[email protected]> merovingian.c, + merovingian_forkmserver.c, monetdb.1.in, properties.c: + Remove references to master/slave settings, since replication isn't yet + fully implemented in Jun2010 branch. + +*Jun2010-SP1 + 01 Jul 2010; Fabian Groffen <[email protected]> merovingian.c: When a startup failure causes a shutdown, make sure we log this incident in the logfile, together with a message that the deamon was diff -r d4f1540f7046 -r 515dc01b53a0 sql/src/backends/monet5/merovingian/merovingian.c --- a/sql/src/backends/monet5/merovingian/merovingian.c Fri Jul 16 13:04:00 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian.c Fri Jul 16 13:11:02 2010 +0200 @@ -617,10 +617,6 @@ snprintf(buf, sizeof(buf), "%d", ret); kv->val = GDKstrdup(buf); } - kv = findConfKey(_mero_props, "master"); - kv->val = GDKstrdup("no"); - kv = findConfKey(_mero_props, "slave"); - kv->val = NULL; /* MURI */ kv = findConfKey(ckv, "sql_optimizer"); p = kv->val; if (p != NULL) { diff -r d4f1540f7046 -r 515dc01b53a0 sql/src/backends/monet5/merovingian/merovingian_forkmserver.c --- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul 16 13:04:00 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul 16 13:11:02 2010 +0200 @@ -223,10 +223,8 @@ str usock = alloca(sizeof(char) * 512); char mydoproxy; str nthreads = NULL; - str master = NULL; - str slave = NULL; str pipeline = NULL; - str argv[26]; /* for the exec arguments */ + str argv[22]; /* for the exec arguments */ confkeyval *ckv, *kv; int c = 0; @@ -254,22 +252,6 @@ snprintf(pipeline, 512, "sql_optimizer=%s", kv->val); } - kv = findConfKey(ckv, "master"); - /* can't have master configured by default */ - if (kv->val != NULL && strcmp(kv->val, "no") != 0) { - size_t len = 24 + strlen(kv->val); - master = alloca(sizeof(char) * len); - snprintf(master, len, "replication_master=%s", kv->val); - } - - kv = findConfKey(ckv, "slave"); - /* can't have slave configured by default */ - if (kv->val != NULL) { - size_t len = 24 + strlen(kv->val); - slave = alloca(sizeof(char) * len); - snprintf(slave, len, "replication_slave=%s", kv->val); - } - freeConfFile(ckv); GDKfree(ckv); /* can make ckv static and reuse it all the time */ @@ -318,12 +300,6 @@ if (pipeline != NULL) { argv[c++] = "--set"; argv[c++] = pipeline; } - if (master != NULL) { - argv[c++] = "--set"; argv[c++] = master; - } - if (slave != NULL) { - argv[c++] = "--set"; argv[c++] = slave; - } /* keep this one last for easy copy/paste with gdb */ argv[c++] = "--set"; argv[c++] = "monet_daemon=yes"; argv[c++] = NULL; diff -r d4f1540f7046 -r 515dc01b53a0 sql/src/backends/monet5/merovingian/monetdb.1.in --- a/sql/src/backends/monet5/merovingian/monetdb.1.in Fri Jul 16 13:04:00 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/monetdb.1.in Fri Jul 16 13:11:02 2010 +0200 @@ -195,20 +195,6 @@ .BR merovingian (1) manpage. Note that this property can be set for a running database, and that a change takes immediate effect in the network. -.IP " master=<yes|no|id>" -Defines if the database is to be started as a replication master -.RI ( yes ", " id "), or not (" no ). -Replication masters are identified by slaves by their -.IR id . -When no -.I id -is given (when -.I yes -is given as argument), a UUID is generated for the master. Note that -the -.I id -is not required to be in the format of a UUID (see -.BR uuid_generate (3)). .IP "inherit property database [database ...]" Like set, but unsets the database-local value, and reverts to inherit from the default again. diff -r d4f1540f7046 -r 515dc01b53a0 sql/src/backends/monet5/merovingian/properties.c --- a/sql/src/backends/monet5/merovingian/properties.c Fri Jul 16 13:04:00 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/properties.c Fri Jul 16 13:11:02 2010 +0200 @@ -39,8 +39,6 @@ {"shared", NULL, STR}, {"nthreads", NULL, INT}, {"optpipe", NULL, STR}, - {"master", NULL, STR}, - {"slave", NULL, MURI}, { NULL, NULL, INVALID} }; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
