MonetDB: Mar2011 - replication: finish removal

[Fabian Groffen]

Changeset: dc7d4ced4465 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc7d4ced4465
Modified Files:
        sql/backends/monet5/sql.mx
        sql/backends/monet5/sql_optimizer.mx
        sql/backends/monet5/sql_scenario.mx
Branch: Mar2011
Log Message:

replication: finish removal


diffs (105 lines):

diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -477,10 +477,6 @@
 address dump_trace
 comment "dump the trace statistics";
 
-pattern dump_slave() :bat[:str,:bat]
-address dump_slave
-comment "Dump the status of the slave synchronization";
-
 pattern storage():bat[:str,:bat]
 address sql_storage
 comment "return a table with storage information ";
@@ -1148,7 +1144,6 @@
 sql5_export str dump_cache(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 sql5_export str dump_opt_stats(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 sql5_export str dump_trace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
-sql5_export str dump_slave(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 sql5_export str sql_rowid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 sql5_export str sql_rank_grp(bat *rid, bat *bid, bat *gid, bat *gpe);
 sql5_export str sql_rank(bat *rid, bat *bid);
@@ -1312,7 +1307,6 @@
 #include <math.h>
 #include <bbp.h>
 #include <cluster.h>
-#include <replication.h>
 #include <opt_dictionary.h>
 #ifdef HAVE_RAPTOR
 # include <rdf.h>
@@ -4903,25 +4897,6 @@
        return MAL_SUCCEED;
 }
 
-/* str slave(int *r); */
-str
-dump_slave(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
-       mvc *m = NULL;
-       str msg = getContext(cntxt,mb, &m, NULL);
-       BAT *t;
-       int *r = (int *) getArgReference(stk, pci, 0);
-
-       if (msg)
-               return msg;
-       t= SLAVEtable();
-       if ( t == NULL || BATcount(t) == 0)
-               throw(ILLARG, "sql.slavelog","tables not initialized");
-
-       *r = t->batCacheid;
-       BBPkeepref(*r);
-       return MAL_SUCCEED;
-}
 
 /* str sql_rowid(oid *rid, ptr v, str *sname, str *tname); */
 str 
diff --git a/sql/backends/monet5/sql_optimizer.mx 
b/sql/backends/monet5/sql_optimizer.mx
--- a/sql/backends/monet5/sql_optimizer.mx
+++ b/sql/backends/monet5/sql_optimizer.mx
@@ -164,7 +164,6 @@
 #include "sql_scenario.h"
 #include "sql_gencode.h"
 #include "bpm/bpm_storage.h"
-#include "replication.h"
 
 #define TOSMALL 10
 
@@ -538,15 +537,6 @@
                mal_unset_lock(sql_contextLock,"SQL optimizer");
                throw(SQL,"optimizer"," 'garbageCollector' should be used as 
the last one\n");
        }
-@-
-For replicated databases we need to ensure that the corresponding optimizer
-is enabled.
-@c
-       if ( MASTERroleEnabled() && replication == FALSE){
-               mal_unset_lock(sql_contextLock,"SQL optimizer");
-               throw(SQL,"optimizer"," 'replication' should be part of the 
pipeline\n");
-       }
-
        mal_unset_lock(sql_contextLock,"SQL optimizer");
        return MAL_SUCCEED;
 }
diff --git a/sql/backends/monet5/sql_scenario.mx 
b/sql/backends/monet5/sql_scenario.mx
--- a/sql/backends/monet5/sql_scenario.mx
+++ b/sql/backends/monet5/sql_scenario.mx
@@ -89,7 +89,6 @@
 #include "optimizer.h"
 #include "opt_statistics.h"
 #include "opt_prelude.h"
-#include "replication.h"
 #include <unistd.h>
 
 static int SQLinitialized = 0;
@@ -211,10 +210,6 @@
                return(tmp);
        ms->name = "msql";
        tmp = SABAOTHmarchScenario(&res, &ms->name);
-       /* if we are a slave, then inform the master to forward
-          any pending updates. */
-       if (tmp == MAL_SUCCEED && GDKgetenv("replication_slave"))
-               return SLAVEsyncDefault(&res);
        return tmp;
 }
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list