Changeset: 2e0d816d81db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e0d816d81db
Modified Files:
MonetDB5/src/modules/mal/replication.mx
Branch: default
Log Message:
Adjust append signature to match the current one from sql.
diffs (37 lines):
diff -r 6aa6236d8343 -r 2e0d816d81db MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 15:26:28 2010 +0200
+++ b/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 16:00:01 2010 +0200
@@ -238,11 +238,11 @@
address MASTERfreeze
comment "Invalidate all copies maintained at slaves";
-pattern append(s:str, t:str, c:str, :any_1, tag:oid):void
+pattern append(mvc:ptr, s:str, t:str, c:str, :any_1, tag:oid):ptr
address MASTERappendValue
comment "Dump the scalar on the MAL log";
-pattern append(s:str, t:str, c:str, b:bat[:oid,:any_1], tag:oid):void
+pattern append(mvc:ptr, s:str, t:str, c:str, b:bat[:oid,:any_1], tag:oid):ptr
address MASTERappend
comment "Dump the BAT on the MAL log";
@@ -757,7 +757,9 @@
str
MASTERappendValue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- int tag = *(int*)getArgReference(stk, pci, 5);
+ int tag = *(int*)getArgReference(stk, pci, 6);
+ ptr *res = (ptr*)getArgReference(stk, pci, 0);
+ ptr *m = (ptr*)getArgReference(stk, pci, 1);
InstrPtr q;
str val = NULL;
int i, len;
@@ -771,6 +773,8 @@
val = instruction2str(mb, stk, q, LIST_MAL_CALL);
freeInstruction(q);
+ *res = *m;
+
len = master[i].limit - master[i].top - 1;
while (snprintf(master[i].buf + master[i].top, len, "%s\n", val) >=
len) {
master[i].buf = (char*)GDKrealloc(master[i].buf,
master[i].limit + 1024);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
