MonetDB: default - Add get/set database readonly to monetdb/mero...
Changeset: c5792c4f88a6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5792c4f88a6
Modified Files:
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
sql/src/backends/monet5/merovingian/properties.c
Branch: default
Log Message:
Add get/set database readonly to monetdb/merovingian
diffs (50 lines):
diff -r 0874779b1d56 -r c5792c4f88a6
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
--- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Thu Jul
15 19:24:53 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul
16 10:16:33 2010 +0200
@@ -226,7 +226,8 @@
str master = NULL;
str slave = NULL;
str pipeline = NULL;
- str argv[26]; /* for the exec arguments */
+ str readonly = NULL;
+ str argv[27]; /* for the exec arguments */
confkeyval *ckv, *kv;
int c = 0;
@@ -270,6 +271,13 @@
snprintf(slave, len, replication_slave=%s, kv-val);
}
+ kv = findConfKey(ckv, readonly);
+ if (kv-val != NULL strcmp(kv-val, no) != 0) {
+ size_t len = 11;
+ readonly = alloca(sizeof(char) * len);
+ snprintf(readonly, len, --readonly);
+ }
+
freeConfFile(ckv);
GDKfree(ckv); /* can make ckv static and reuse it all the time
*/
@@ -292,6 +300,11 @@
argv[c++] = _mero_mserver;
argv[c++] = conffile;
argv[c++] = dbname;
+
+ if (readonly != NULL) {
+ argv[c++] = readonly;
+ }
+
argv[c++] = --set; argv[c++] = muri;
if (mydoproxy == 1) {
argv[c++] = --set; argv[c++] = mapi_open=false;
diff -r 0874779b1d56 -r c5792c4f88a6
sql/src/backends/monet5/merovingian/properties.c
--- a/sql/src/backends/monet5/merovingian/properties.c Thu Jul 15 19:24:53
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/properties.c Fri Jul 16 10:16:33
2010 +0200
@@ -41,6 +41,7 @@
{optpipe, NULL, STR},
{master, NULL, STR},
{slave,NULL, MURI},
+ {readonly, NULL, BOOL},
{ NULL, NULL, INVALID}
};
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - just use a static string, instead of an alloc...
Changeset: c34cb7a301ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c34cb7a301ca
Modified Files:
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
Branch: default
Log Message:
just use a static string, instead of an alloca-ed one
diffs (39 lines):
diff -r c5792c4f88a6 -r c34cb7a301ca
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
--- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul
16 10:16:33 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Fri Jul
16 10:47:22 2010 +0200
@@ -272,11 +272,8 @@
}
kv = findConfKey(ckv, readonly);
- if (kv-val != NULL strcmp(kv-val, no) != 0) {
- size_t len = 11;
- readonly = alloca(sizeof(char) * len);
- snprintf(readonly, len, --readonly);
- }
+ if (kv-val != NULL strcmp(kv-val, no) != 0)
+ readonly = --readonly;
freeConfFile(ckv);
GDKfree(ckv); /* can make ckv static and reuse it all the time
*/
@@ -300,11 +297,6 @@
argv[c++] = _mero_mserver;
argv[c++] = conffile;
argv[c++] = dbname;
-
- if (readonly != NULL) {
- argv[c++] = readonly;
- }
-
argv[c++] = --set; argv[c++] = muri;
if (mydoproxy == 1) {
argv[c++] = --set; argv[c++] = mapi_open=false;
@@ -337,6 +329,9 @@
if (slave != NULL) {
argv[c++] = --set; argv[c++] = slave;
}
+ if (readonly != NULL) {
+ argv[c++] = readonly;
+ }
/* keep this one last for easy copy/paste with gdb */
argv[c++] = --set; argv[c++] = monet_daemon=yes;
argv[c++] = NULL;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Set default of readonly property to no for mo...
Changeset: b0e876c26a9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0e876c26a9a
Modified Files:
sql/src/backends/monet5/merovingian/ChangeLog
sql/src/backends/monet5/merovingian/merovingian.c
sql/src/backends/monet5/merovingian/monetdb.1.in
Branch: default
Log Message:
Set default of readonly property to no for monetdb/merovingian and change man
page
diffs (34 lines):
diff -r c5792c4f88a6 -r b0e876c26a9a
sql/src/backends/monet5/merovingian/ChangeLog
--- a/sql/src/backends/monet5/merovingian/ChangeLog Fri Jul 16 10:16:33
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog Fri Jul 16 10:48:07
2010 +0200
@@ -1,2 +1,6 @@
+2010-07-16 Arjen de Rijke arjen.de.ri...@cwi.nl
+
+ * merovingian.c (main): Add get/set database readonly for
monetdb/merovingian
+
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
diff -r c5792c4f88a6 -r b0e876c26a9a
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Fri Jul 16 10:16:33
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Fri Jul 16 10:48:07
2010 +0200
@@ -621,6 +621,8 @@
kv-val = GDKstrdup(no);
kv = findConfKey(_mero_props, slave);
kv-val = NULL; /* MURI */
+ kv = findConfKey(_mero_props, readonly);
+ kv-val = GDKstrdup(no);
kv = findConfKey(ckv, sql_optimizer);
p = kv-val;
if (p != NULL) {
diff -r c5792c4f88a6 -r b0e876c26a9a
sql/src/backends/monet5/merovingian/monetdb.1.in
--- a/sql/src/backends/monet5/merovingian/monetdb.1.in Fri Jul 16 10:16:33
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/monetdb.1.in Fri Jul 16 10:48:07
2010 +0200
@@ -209,6 +209,8 @@
.I id
is not required to be in the format of a UUID (see
.BR uuid_generate (3)).
+.IP readonly=yes|no
+Defines if the database has to be started readonly.
.IP inherit property database [database ...]
Like set, but unsets the database-local value, and reverts to inherit
from the default again.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - fix mclient.mx:349: 'initializing' : conversi...
Changeset: 0bd6d5669f01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bd6d5669f01
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
fix mclient.mx:349: 'initializing' : conversion from 'timertype' to 'long',
possible loss of data
Add missing cast
diffs (12 lines):
diff -r 6285c1ab2caf -r 0bd6d5669f01 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Fri Jul 16 10:52:18 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Fri Jul 16 10:52:38 2010 +0200
@@ -346,7 +346,7 @@
static char *
timerHuman()
{
- long t = t1 - t0;
+ long t = (long)(t1 - t0);
if (t / 1000 950) {
snprintf(htimbuf, 32, %ld.%03ldms, t / 1000, t % 1000);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - document slave property
Changeset: 19827c63ba1a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19827c63ba1a Modified Files: sql/src/backends/monet5/merovingian/monetdb.1.in Branch: default Log Message: document slave property diffs (31 lines): diff -r 0bd6d5669f01 -r 19827c63ba1a sql/src/backends/monet5/merovingian/monetdb.1.in --- a/sql/src/backends/monet5/merovingian/monetdb.1.in Fri Jul 16 10:52:38 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/monetdb.1.in Fri Jul 16 11:11:20 2010 +0200 @@ -173,7 +173,9 @@ properties, run .BR monetdb get all . Most properties require the database to be stopped when set. The -following properties have special values. +following properties have special values, or do not have an equivalent +in +.BR monetdb5.conf (5). .IP forward=redirect|proxy When set to redirect, merovingian tells each connecting client to make a new connection directly to the database the client looks for. This @@ -209,8 +211,15 @@ .I id is not required to be in the format of a UUID (see .BR uuid_generate (3)). +.IP slave=uri +Defines if the database is to be started as a replication slave from the +master identified by +.IR uri . +A valid URI looks like +.BI mapi:monetdb:// hostname : port / database +which is a regular mapi URI. .IP readonly=yes|no -Defines if the database has to be started readonly. +Defines if the database has to be started in readonly mode. .IP inherit property database [database ...] Like set, but unsets the database-local value, and reverts to inherit from the default again. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
Re: MonetDB: default - fix mclient.mx:349: 'initializing' : conversi...
On Fri, Jul 16, 2010 at 10:53:09AM +0200, Fabian Groffen wrote:
Changeset: 0bd6d5669f01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bd6d5669f01
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
fix mclient.mx:349: 'initializing' : conversion from 'timertype' to 'long',
possible loss of data
Add missing cast
diffs (12 lines):
diff -r 6285c1ab2caf -r 0bd6d5669f01 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Fri Jul 16 10:52:18 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Fri Jul 16 10:52:38 2010 +0200
@@ -346,7 +346,7 @@
static char *
timerHuman()
{
- long t = t1 - t0;
+ long t = (long)(t1 - t0);
Why do you do this unprotected down-cast from 64-bit to 32-bit
(on systems where long long or _int64 exist as 64-bit types and long is
32-bit)?
Why not use type lng and format LLFMT to avoid potential overflows in
really(?) long (i.e, longer than 36 minutes --- that's not that long ...)
running queries (the 63 vs 64 bit overflow between unsigned timertype and
signed lng does not really hit in practice, I suppose)?
Indeed, the old timer functionallity also uses type long, but only for
printing, i.e., after the devision by 1000 (usec - msec); hence, overflows
would only occur for queries that run longer than 25 days ...
So, my suggestion would by to either make the new code use the some
last-cast approach as the old one, or make both use lng LLFMT.
(yes, mclient.mx alsready includes monet_utils.h and hence knows type lng
and format LLFMT
Stefan
if (t / 1000 950) {
snprintf(htimbuf, 32, %ld.%03ldms, t / 1000, t % 1000);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
--
| Dr. Stefan Manegold | mailto:stefan.maneg...@cwi.nl |
| CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ |
| 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 |
| The Netherlands | Fax : +31 (20) 592-4199 |
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
Re: MonetDB: default - fix mclient.mx:349: 'initializing' : conversi...
On 16-07-2010 11:12:23 +0200, Stefan Manegold wrote: On Fri, Jul 16, 2010 at 10:53:09AM +0200, Fabian Groffen wrote: - long t = t1 - t0; + long t = (long)(t1 - t0); Why do you do this unprotected down-cast from 64-bit to 32-bit (on systems where long long or _int64 exist as 64-bit types and long is 32-bit)? Because it's done everywhere else in the code. Probably someone should go over the timer functionality once, but my guess is that it was never designed to report anything more than a second, certainly not 16 hours. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
Re: MonetDB: default - fix mclient.mx:349: 'initializing' : conversi...
On Fri, Jul 16, 2010 at 12:35:29PM +0200, Fabian Groffen wrote: On 16-07-2010 11:12:23 +0200, Stefan Manegold wrote: On Fri, Jul 16, 2010 at 10:53:09AM +0200, Fabian Groffen wrote: - long t = t1 - t0; + long t = (long)(t1 - t0); Why do you do this unprotected down-cast from 64-bit to 32-bit (on systems where long long or _int64 exist as 64-bit types and long is 32-bit)? Because it's done everywhere else in the code. Probably someone should go over the timer functionality once, but my guess is that it was never designed to report anything more than a second, certainly not 16 hours. I'll take care of it. Stefan ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list -- | Dr. Stefan Manegold | mailto:stefan.maneg...@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4199 | ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Post-release version number update.
Changeset: d4f1540f7046 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4f1540f7046
Modified Files:
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/vertoo.data
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/MonetDB-geom.spec
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/configure.ag
java/vertoo.data
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/configure.ag
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/vertoo.data
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/vertoo.data
template/configure.ag
template/vertoo.data
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: Jun2010
Log Message:
Post-release version number update.
diffs (truncated from 1008 to 300 lines):
diff -r 735b133ade47 -r d4f1540f7046 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Thu Jul 15 19:22:40 2010 +0200
+++ b/MonetDB/MonetDB.spec Fri Jul 16 13:04:00 2010 +0200
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 1.38.3
+%define version 1.38.4
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
diff -r 735b133ade47 -r d4f1540f7046
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Thu Jul 15 19:22:40
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Jul 16 13:04:00
2010 +0200
@@ -550,7 +550,7 @@
RemovePreviousVersions = 11:TRUE
DetectNewerInstalledVersion = 11:TRUE
InstallAllUsers = 11:TRUE
-ProductVersion = 8:1.38.3
+ProductVersion = 8:1.38.4
Manufacturer = 8:MonetDB
ARPHELPTELEPHONE = 8:
ARPHELPLINK = 8:http://monetdb.cwi.nl/;
@@ -619,7 +619,7 @@
Condition = 8:
Transitive = 11:FALSE
ValueTypes = 3:1
-Value = 8:1.38.3
+Value = 8:1.38.4
}
}
}
diff -r 735b133ade47 -r d4f1540f7046
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Thu Jul 15 19:22:40
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Jul 16 13:04:00
2010 +0200
@@ -550,7 +550,7 @@
RemovePreviousVersions = 11:TRUE
DetectNewerInstalledVersion = 11:TRUE
InstallAllUsers = 11:TRUE
-ProductVersion = 8:1.38.3
+ProductVersion = 8:1.38.4
Manufacturer = 8:MonetDB
ARPHELPTELEPHONE = 8:
ARPHELPLINK = 8:http://monetdb.cwi.nl/;
@@ -619,7 +619,7 @@
Condition = 8:
Transitive = 11:FALSE
ValueTypes = 3:1
-Value = 8:1.38.3
+Value = 8:1.38.4
}
MonetDB: default - Fix ChangeLog
Changeset: 0fd046765cf1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fd046765cf1 Modified Files: sql/src/backends/monet5/merovingian/ChangeLog Branch: default Log Message: Fix ChangeLog diffs (14 lines): diff -r 71f8bec5bcae -r 0fd046765cf1 sql/src/backends/monet5/merovingian/ChangeLog --- a/sql/src/backends/monet5/merovingian/ChangeLog Fri Jul 16 13:14:41 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/ChangeLog Fri Jul 16 13:22:17 2010 +0200 @@ -1,6 +1,6 @@ -2010-07-16 Arjen de Rijke arjen.de.ri...@cwi.nl - - * merovingian.c (main): Add get/set database readonly for monetdb/merovingian - # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog + + 16 Jul 2010; Arjen de Rijke arjen.de.ri...@cwi.nl + merovingian_forkmserver.c, properties.c: + Add readonly property for databases to monetdb and merovingian. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - fix new timer functionality also for queries ...
Changeset: 91a33e3cf794 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91a33e3cf794
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
fix new timer functionality also for queries that run longer than 35 minutes
Casting microseconds from 63 bit (64 bit signed) to 31 bit (32 bit signed)
will overflow for values that represent times larger than 35.79 minutes.
Hence, as with the old time code, we only cast to long (which is 32 bit on
many 32 bit systems) only once we have casted microseconds to milliseconds
(devision by 1000) --- then, the overflow only occurs for values that
represent times larger than 24.85 days --- we hope that not single query
will run that long ...
The cast to long is merely used for convenience to use formatting strings
like %7ld.%03ldms without having to care about portability.
diffs (27 lines):
diff -r 71f8bec5bcae -r 91a33e3cf794 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Fri Jul 16 13:14:41 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Fri Jul 16 13:28:44 2010 +0200
@@ -346,19 +346,19 @@
static char *
timerHuman()
{
- long t = (long)(t1 - t0);
+ timertype t = t1 - t0;
if (t / 1000 950) {
- snprintf(htimbuf, 32, %ld.%03ldms, t / 1000, t % 1000);
+ snprintf(htimbuf, 32, %ld.%03ldms, (long) (t / 1000), (long)
(t % 1000));
return(htimbuf);
}
t /= 1000;
if (t / 1000 60) {
- snprintf(htimbuf, 32, %ld.%02lds, t / 1000, t % 1000);
+ snprintf(htimbuf, 32, %ld.%02lds, (long) (t / 1000), (long)
(t % 1000));
return(htimbuf);
}
t /= 1000;
- snprintf(htimbuf, 32, %ldm %lds, t / 60, t % 60);
+ snprintf(htimbuf, 32, %ldm %lds, (long) (t / 60), (long) (t % 60));
return(htimbuf);
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - always use 64-bit type (lng) for timer (micro...
Changeset: 8ec354723426 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ec354723426 Modified Files: clients/src/mapiclient/mclient.mx Branch: default Log Message: always use 64-bit type (lng) for timer (microseconds) diffs (22 lines): diff -r 91a33e3cf794 -r 8ec354723426 clients/src/mapiclient/mclient.mx --- a/clients/src/mapiclient/mclient.mx Fri Jul 16 13:28:44 2010 +0200 +++ b/clients/src/mapiclient/mclient.mx Fri Jul 16 13:29:59 2010 +0200 @@ -188,16 +188,8 @@ #define DEFWIDTH 80 -/* try to use a 64 bit integer for the timer, but fall back to plain long */ -#ifdef HAVE_LONG_LONG -typedef long long timertype; -#else -#ifdef HAVE___INT64 -typedef __int64 timertype; -#else -typedef long timertype; -#endif -#endif +/* use a 64 bit integer for the timer */ +typedef lng timertype; static timertype t0, t1; /* used for timing */ static char *mark, *mark2; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
Re: MonetDB: default - Add get/set database readonly to monetdb/mero...
On Fri, Jul 16, 2010 at 01:46:43PM +0200, Fabian Groffen wrote: On 16-07-2010 13:42:46 +0200, Stefan Manegold wrote: Arjen, could you (or Fabian?) please also add a ChangeLog entry for this new feature? I know, I use(d) to forget about them myself, too ... ;-) he already did in his next commit aha --- sorry, I overlooked the merovingian specific changelog file. Stefan ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list -- | Dr. Stefan Manegold | mailto:stefan.maneg...@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4199 | ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - downgrade upgrading message from error (ERR i...
Changeset: 1839f6c42e03 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1839f6c42e03 Modified Files: sql/src/storage/bat/bat_logger.mx Branch: Jun2010 Log Message: downgrade upgrading message from error (ERR in merovingian.log) to a normal informational message diffs (13 lines): diff -r 515dc01b53a0 -r 1839f6c42e03 sql/src/storage/bat/bat_logger.mx --- a/sql/src/storage/bat/bat_logger.mx Fri Jul 16 13:11:02 2010 +0200 +++ b/sql/src/storage/bat/bat_logger.mx Fri Jul 16 13:58:17 2010 +0200 @@ -58,7 +58,8 @@ size_t i; BAT *o, *b; char *s_nil = ATOMnilptr(TYPE_str); - fprintf(stderr, Upgrading catalog from Feb2010\n); + fprintf(stdout, # upgrading catalog from Feb2010\n); + fflush(stdout); o = temp_descriptor(logger_find_bat(lg, sys__tables_id)); /* no sys tables, easy upgrade */ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - remove out-of-date file
Changeset: 9304e4c298d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9304e4c298d0
Modified Files:
MonetDB5/TODO
Branch: default
Log Message:
remove out-of-date file
diffs (268 lines):
diff -r e92515fcf7b6 -r 9304e4c298d0 MonetDB5/TODO
--- a/MonetDB5/TODO Fri Jul 16 13:58:57 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,264 +0,0 @@
-# TODO for MonetDB Server 5
-# This file is provided AS-IS, no claims can be made based upon this
-# file.
-# Please don't remove entries from this file. It functions as base for
-# a Changelog. It's format is like a Changelog, and the newest items
-# are on top. Please keep the status of items up-to-date, e.g. OPEN,
-# DONE, PARTIAL.
-# Please append the date at each state change.
-deal with the NIL values in url.
-
-*MonetDB 5.8 (Spring 2008)
-
- 23 Jul 2006; Martin Kersten mlkersten; CLOSE
- The X100 subsystem with its buffer manager and
- compression scheme is integrated in the software stack.
- The X100 project has been moved to VectorWise
-
-*MonetDB 5.4 (Spring 2008)
-
- 23 Jul 2006; Martin Kersten mlkersten; OPEN
- XQuery/XUpdate is ported to MonetDB Version 5 using
- Pathfinder compiler and algebraic optimizer.
- The main bottleneck is the translation of the MIL
- procedures into MAL.
-
-*MonetDB 5.2 (May 2007)
-
- 23 Jul 2006; Romulo Concalves romulog; OPEN
- The system supports remote materialized SQL views
- with an efficient push/pull update strategy.
- The MAL plans are translated by the mal_remoteQueries
- optimizer into local/remote calls, minimizing the
- amount of data traffic.
-
- 25 Apr 2007; Martin Kersten mlkersten; CLOSED
- The interpreter has become poluted with extra
- property setting. This should be moved to
- the operations to avoid binding overhead.
- Interpreter is split into a fast/slow mode.
-
- 20 Apr 2007; Martin Kersten mlkersten; OPEN
- The locking information in the kernel can be used
- to make all BATs private to their processing thread.
- This will improve concurrent processing.
-
- 10 Apr 2007; Martin Kersten mlkersten; OPEN
- Implement the remote call scheme using mod@site
- and m...@site.fcn
-
- 10 Apr 2007; Martin Kersten mlkersten; OPEN
- Support module cloning as a basis for better re-use.
-
- 13 Sep 2007; Martin Kersten mlkersten; CLOSED
- Command completion on the server console has been
- completed.
-
- 1 Sep 2007; Martin Kersten mlkersten; CLOSED
- Rendering of output in mclient has been extended
- to include tabular format.
-
- 1 Sep 2007; Martin Kersten mlkersten; CLOSED
- The storage requirements of MAL instructions has been
- reduced.
-
- 8 Apr 2007; Martin Kersten mlkersten; CLOSED
- Continous queries are MAL programs run in parallel
- with the mainstream interface. They share the output
- channel until it is redirected.
-
- 8 Apr 2007; Martin Kersten mlkersten; CLOSED
- Move all sql cached queries into the default session
- container for MAL blocks.
-
- 7 Mar 2007; Martin Kersten mlkersten; CLOSED
- Patterns with a polymorphic argument lists are
- properly resolved now.
-
- 5 Mar 2007; Martin Kersten mlkersten; OPEN
- Make it possible to attach a MAL debugger to
- any running client process. Needs proper switching
- of the IO descriptors (in the context of mclients)
-
- 7 Mar 2007; Martin Kersten mlkersten; OPEN
- Create a java gui version of the stethoscope
- based on tuple streams. Solve filtering.
-
- 3 Mar 2007; Martin Kersten mlkersten; CLOSED
- Extend performance monitoring to capture rd/wr
- descriptors, monitor BBP diskspace, and BAT oriented
- counters. Created stethoscope to monitor a running
- server.
-
- 18 Jan 2007; Martin Kersten mlkersten; OPEN
- Empty set and join select optimizers are disabled
- due to errors in the plan, as signalled by trigger tests.
-
- 12 Jan 2007; Martin Kersten mlkersten; OPEN
- Introduce the notion of module boxes as the equivalent of
- globally scoped variables.
-
- 3 Feb 2007; Martin Kersten mlkersten/Milena Ivanova; OPEN
- The partitioned BATs module is revived to provide
- both range- and hash-based partitioning. The target
- is to adapt while processing using performance data gathered.
-
-*MonetDB 5.0 (Dec 2006)
- 27 Dec 2006; Martin Kersten mlkersten; OPEN
- double check batstr when it produces str results using match.
-
- 21 Dec 2006; Martin Kersten mlkersten; OPEN
- Drop :bat[:void,...] in favor of :bat[:oid{dense,bas...@0},...]
- It dissects type information from runtime properties.
- Change redering of values in GDK to not avoid decimal dots.
-
- 13 Dec 2006; Martin Kersten mlkersten; CLOSED
- Resolved errors in flow checking and the optimizer.
-
- 10 Dec 2006; Fabian Groffen ; CLOSED
- Stratified exception handling syntax.
-
- 9 Dec 2006; Martin Kersten mlkersten; CLOSED
- The SQL optimizer allows for a better control
- over the optimizer sequence.
-
- 4 Dec 2006; Martin Kersten mlkersten; CLOSED
- Removed M4 legacy from
MonetDB: default - properly return the URI instead of immediatel...
Changeset: ccb9216caf82 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccb9216caf82
Modified Files:
MonetDB5/src/modules/mal/replication.mx
Branch: default
Log Message:
properly return the URI instead of immediately printing it (making it
impossible to catch)
diffs (49 lines):
diff -r 9304e4c298d0 -r ccb9216caf82 MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 14:03:56 2010 +0200
+++ b/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 14:17:01 2010 +0200
@@ -263,9 +263,9 @@
address MASTERsync
comment Login to slave with credentials to initiate submission of the log
records;
-pattern getURI():str
+command getURI():str
address MASTERgetURI
-comment Display the URI for the master;
+comment Return the URI for the master;
command getCutOffTag():oid
address MASTERgetCutOffTag
@@ -363,7 +363,7 @@
replication_export str MASTERsync(int *ret, str *uri, str *usr, str *pw, oid
*tag);
replication_export str SLAVEstop(int *ret);
replication_export str MASTERprelude(int *ret);
-replication_export str MASTERgetURI(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+replication_export str MASTERgetURI(str *ret);
replication_export str MASTERgetCutOffTag(int *ret);
replication_export str SLAVEopen(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
@@ -541,16 +541,15 @@
str
-MASTERgetURI(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- str mero;
+MASTERgetURI(str *ret)
+{
+ str mero = GDKgetenv(merovingian_uri);
- (void) mb;
- (void) stk;
- (void) pci;
- mero = GDKgetenv(merovingian_uri);
- if ( ! mero)
- throw(MAL,master.getURI,Database is not reachable);
- stream_printf(cntxt-fdout,%s\n,mero);
+ if (!mero)
+ throw(MAL, master.getURI,
+ this database is not running under
merovingian);
+
+ *ret = GDKstrdup(mero);
return MAL_SUCCEED;
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - update 'one-liner' to get master URI
Changeset: 0aecddfa8e81 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0aecddfa8e81 Modified Files: MonetDB5/src/modules/mal/replication.mx Branch: default Log Message: update 'one-liner' to get master URI diffs (12 lines): diff -r ccb9216caf82 -r 0aecddfa8e81 MonetDB5/src/modules/mal/replication.mx --- a/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 14:17:01 2010 +0200 +++ b/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 14:24:20 2010 +0200 @@ -56,7 +56,7 @@ step 4) Run monetdb(1) to turn the database into a slave by setting its slave property to the URI of the master. The precise URI can be obtained issuing the command -'mclient -lmal -d master -s master.getURI();' . +'mclient -lmal -dmaster -su := master.getURI(); io.printf(\%s\n\, u);' on the master. The slave property is translated by merovingian(1) into the database variable replication_slave and is set upon database (re)start. Note that this setting can not be added to a running database. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: fa6199240d8a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa6199240d8a
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (71 lines):
diff -r 0aecddfa8e81 -r fa6199240d8a java/ChangeLog.Jun2010
--- a/java/ChangeLog.Jun2010Fri Jul 16 14:24:20 2010 +0200
+++ b/java/ChangeLog.Jun2010Fri Jul 16 14:50:13 2010 +0200
@@ -23,3 +23,6 @@
latter clean from files generated during the build.
On Windows, the build directory must be a sibling of ...packageNT .
+* Fri Jul 16 2010 Fabian Groffen fab...@cwi.nl
+- Fix problem when using the MAL language. Any statement would return an
error with a typo that was not typed in by the user, such as ioo.printf when
io.printf was typed.
+
diff -r 0aecddfa8e81 -r fa6199240d8a java/Makefile.ag
--- a/java/Makefile.ag Fri Jul 16 14:24:20 2010 +0200
+++ b/java/Makefile.ag Fri Jul 16 14:50:13 2010 +0200
@@ -30,7 +30,7 @@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-mcl.jar monetdb-1.15-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.6-mcl.jar monetdb-1.16-jdbc.jar jdbcclient.jar
}
ant_distxrpc = {
diff -r 0aecddfa8e81 -r fa6199240d8a java/NT/rules.msc
--- a/java/NT/rules.msc Fri Jul 16 14:24:20 2010 +0200
+++ b/java/NT/rules.msc Fri Jul 16 14:50:13 2010 +0200
@@ -28,6 +28,6 @@
!INCLUDE $(RULESMSC)
pkg = java
-VERSION=20100331
+VERSION=20100716
ODBC_LIBS = odbccp32.lib user32.lib
diff -r 0aecddfa8e81 -r fa6199240d8a java/build.properties
--- a/java/build.properties Fri Jul 16 14:24:20 2010 +0200
+++ b/java/build.properties Fri Jul 16 14:50:13 2010 +0200
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=15
+JDBC_MINOR=16
# an additional identifying string
JDBC_VER_SUFFIX=Magnistipula
# the default port to connect on, if no port given when using SQL
diff -r 0aecddfa8e81 -r fa6199240d8a java/release.txt
--- a/java/release.txt Fri Jul 16 14:24:20 2010 +0200
+++ b/java/release.txt Fri Jul 16 14:50:13 2010 +0200
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.15 (Magnistipula/MCL-1.6)
+MonetDB JDBC driver version 1.16 (Magnistipula/MCL-1.6)
Fabian Groffen fabian.grof...@cwi.nl
-Release date: 2010-03-31
+Release date: 2010-07-16
This JDBC driver is designed for use with MonetDB, a main-memory
diff -r 0aecddfa8e81 -r fa6199240d8a
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java Fri Jul 16 14:24:20
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java Fri Jul 16 14:50:13
2010 +0200
@@ -254,7 +254,7 @@
commandTempl[2] = \nX;// separator
} else if (lang == LANG_MIL || lang == LANG_MAL) {
queryTempl[0] = null;
- queryTempl[1] = ;;
+ queryTempl[1] = ;\n;
queryTempl[2] = ;\n;
commandTempl[0] = null; // pre
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - uncrustify
Changeset: eb4eb664a3ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb4eb664a3ee
Modified Files:
MonetDB5/src/modules/mal/replication.mx
Branch: default
Log Message:
uncrustify
diffs (truncated from 1102 to 300 lines):
diff -r fa6199240d8a -r eb4eb664a3ee MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 14:50:13 2010 +0200
+++ b/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 15:12:07 2010 +0200
@@ -427,8 +427,9 @@
static int acceptLogs = 0;
static void
-SLAVEinitLog(){
- if ( slavecommit == NULL){
+SLAVEinitLog()
+{
+ if (slavecommit == NULL) {
@:createBAT(slavetid,TYPE_oid)@
@:createBAT(slavecommit,TYPE_timestamp)@
@:createBAT(slavevalid,TYPE_timestamp)@
@@ -436,109 +437,109 @@
}
}
-static int
-MASTERfindLogFile(char logFile[PATHLENGTH], oid transactionid){
+static int
+MASTERfindLogFile(char logFile[PATHLENGTH], oid transactionid)
+{
oid btag, etag;
DIR *dirp;
struct dirent *dent;
#ifdef _DEBUG_REPLICATION_
- stream_printf(GDKout,#find the log file containing %d\n,
transactionid);
+ stream_printf(GDKout, #find the log file containing %d\n,
transactionid);
#endif
if (repFile)
stream_close(repFile);
repFile = NULL;
- dirp= opendir(MASTER);
+ dirp = opendir(MASTER);
if (dirp == NULL)
- return -1 ;
- while ((dent = readdir(dirp)) != NULL)
- if ( sscanf(dent-d_name,log OIDFMT- OIDFMT,btag,etag) ==
2 btag = transactionid transactionidetag ){
- snprintf(logFile, PATHLENGTH,%s%s,MASTER,
dent-d_name);
+ return -1;
+ while ((dent = readdir(dirp)) != NULL)
+ if (sscanf(dent-d_name, log OIDFMT - OIDFMT, btag, etag)
== 2 btag = transactionid transactionid etag) {
+ snprintf(logFile, PATHLENGTH, %s%s, MASTER,
dent-d_name);
slash_2_dir_sep(logFile);
- return (int) etag;
+ return (int)etag;
}
return -1;
}
/* The replication log file contains a number of log functions.
- * When the limit is reached, we switch to a new file
-*/
+ * When the limit is reached, we switch to a new file */
static int
MASTERincrement()
{
char buf[PATHLENGTH];
- endTag++; /* assign a new transaction identifier */
+ endTag++; /* assign a new transaction identifier */
snprintf(buf, PATHLENGTH, MASTER REPLICA, startTag, endTag);
slash_2_dir_sep(buf);
- if (strcmp(logFile,buf) )
- rename(logFile,buf);
- strcpy(logFile,buf);
+ if (strcmp(logFile, buf))
+ rename(logFile, buf);
+ strcpy(logFile, buf);
/* once in a while we take a new log file */
- if ( endTag - startTag = REPLICABLOCK){
- if ( repFile)
+ if (endTag - startTag = REPLICABLOCK) {
+ if (repFile)
stream_close(repFile);
repFile = NULL;
}
- if ( repFile == NULL)
+ if (repFile == NULL)
repFile = open_wastream(buf);
return repFile == NULL;
}
str
-MASTERprelude(int *ret){
+MASTERprelude(int *ret)
+{
int master;
oid tag, etag;
DIR *dirp;
struct dirent *dent;
- (void) ret;
- MT_lock_init(repLck, replication); /* we always need this */
+ (void)ret;
+ MT_lock_init(repLck, replication); /* we always need this */
master = GDKgetenv_istrue(replication_master)
GDKgetenv(replication_slave) == NULL;
#ifdef _DEBUG_REPLICATION_
- stream_printf(GDKout,#Initialize the master role?%s\n,
master?yes:no);
+ stream_printf(GDKout, #Initialize the master role?%s\n, master ?
yes : no);
#endif
mal_set_lock(repLck, replication);
- if( !master ){
+ if (!master) {
/* drop all remaining log files if master mode is switched off
*/
GDKremovedir(MASTER);
mal_unset_lock(repLck, replication);
return MAL_SUCCEED;
}
mkdir(MASTER, 0755); /* ensure existance of the replica pool */
- stream_printf(GDKout,# Replication mode enabled\n);
-
+ stream_printf(GDKout, # Replication mode enabled\n);
+
/* find the bounds for the last replication log file */
/* assume directory is sorted */
- dirp= opendir(MASTER);
+ dirp = opendir(MASTER);
if (dirp == NULL) {
mal_unset_lock(repLck, replication);
return MAL_SUCCEED;
}
cutoffTag = INT_MAX;
while ((dent = readdir(dirp)) != NULL) {
- if ( sscanf(dent-d_name,logOIDFMT-OIDFMT,tag,etag) == 2
){
- if ( tag cutoffTag)
+ if
MonetDB: default - consistently use TRUE/FALSE
Changeset: 770810ebef61 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=770810ebef61
Modified Files:
MonetDB5/src/modules/mal/replication.mx
Branch: default
Log Message:
consistently use TRUE/FALSE
diffs (39 lines):
diff -r eb4eb664a3ee -r 770810ebef61 MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 15:12:07 2010 +0200
+++ b/MonetDB5/src/modules/mal/replication.mx Fri Jul 16 15:17:56 2010 +0200
@@ -417,7 +417,7 @@
static oid cutoffTag = 0; /* to signal out of date slaves */
static char logFile[PATHLENGTH]=;
static stream *repFile = 0;
-static int sendLogs = 0; /* permit forwarding of log records */
+static int sendLogs = FALSE; /* permit forwarding of log records */
/* slave synchronisation status */
static BAT *slavetid = 0;
@@ -976,7 +976,7 @@
}
if (mapi_ping(masterstatus[idx].m) != MOK)
break; /* slave is gone */
- if (sendLogs == 0) {
+ if (sendLogs == FALSE) {
/* suspend sending */
MT_sleep_ms(REPLICADELAY);
continue;
@@ -1042,7 +1042,7 @@
MASTERstop(int *ret)
{
(void)ret;
- sendLogs = 0;
+ sendLogs = FALSE;
return MAL_SUCCEED;
}
@@ -1077,7 +1077,7 @@
stream_close(repFile);
repFile = NULL;
- sendLogs = 0;
+ sendLogs = FALSE;
GDKremovedir(MASTER);
mkdir(MASTER, 0755); /* ensure existance of the replica pool */
cutoffTag = startTag = endTag; /* the next one to expect */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - uncrustify
Changeset: fe5e7e1880c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe5e7e1880c3
Modified Files:
MonetDB5/src/optimizer/opt_replication.mx
Branch: default
Log Message:
uncrustify
diffs (29 lines):
diff -r 770810ebef61 -r fe5e7e1880c3 MonetDB5/src/optimizer/opt_replication.mx
--- a/MonetDB5/src/optimizer/opt_replication.mx Fri Jul 16 15:17:56 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_replication.mx Fri Jul 16 15:21:03 2010 +0200
@@ -62,13 +62,13 @@
limit = mb-stop;
slimit = mb-ssize;
- if ( newMalBlkStmt(mb, (int)(mb-ssize * 1.2)) 0 )
+ if (newMalBlkStmt(mb, (int)(mb-ssize * 1.2)) 0)
return 0;
pushInstruction(mb, old[0]);
p = newAssignment(mb);
- p = pushStr(mb,p, GDKgetenv(merovingian_uri));
- getArg(p,0)= newVariable(mb,GDKstrdup(master),TYPE_str);
+ p = pushStr(mb, p, GDKgetenv(merovingian_uri));
+ getArg(p, 0) = newVariable(mb, GDKstrdup(master), TYPE_str);
p = newStmt(mb, putName(master, 6), openRef);
tag = getArg(p, 0);
@@ -116,7 +116,7 @@
}
if (getModuleId(p) == sqlRef
- strcmp(getFunctionId(p) ,copy_from) == 0)
+ strcmp(getFunctionId(p), copy_from) == 0)
{
/* copy into stuff */
q = copyInstruction(p);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Use parameterized perl lib (see TestTools/win...
Changeset: af5253180995 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af5253180995 Modified Files: buildtools/conf/winrules.msc Branch: Jun2010 Log Message: Use parameterized perl lib (see TestTools/winpaths-*.bat). diffs (16 lines): diff -r d4f1540f7046 -r af5253180995 buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Fri Jul 16 13:04:00 2010 +0200 +++ b/buildtools/conf/winrules.msc Fri Jul 16 15:23:42 2010 +0200 @@ -91,8 +91,11 @@ LIBPERL = C:\Perl64 !ENDIF !ENDIF +!IFNDEF PERLLIB +PERLLIB = perl510.lib +!ENDIF PERL_INCS = -I$(LIBPERL)\lib\CORE -DWIN32 -PERL_LIBS = $(LIBPERL)\lib\CORE\perl510.lib +PERL_LIBS = $(LIBPERL)\lib\CORE\$(PERLLIB) PERL_LIBDIR = share\MonetDB\perl !ENDIF ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 02250651bd9b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02250651bd9b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (16 lines): diff -r fe5e7e1880c3 -r 02250651bd9b buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Fri Jul 16 15:21:03 2010 +0200 +++ b/buildtools/conf/winrules.msc Fri Jul 16 15:27:32 2010 +0200 @@ -91,8 +91,11 @@ LIBPERL = C:\Perl64 !ENDIF !ENDIF +!IFNDEF PERLLIB +PERLLIB = perl510.lib +!ENDIF PERL_INCS = -I$(LIBPERL)\lib\CORE -DWIN32 -PERL_LIBS = $(LIBPERL)\lib\CORE\perl510.lib +PERL_LIBS = $(LIBPERL)\lib\CORE\$(PERLLIB) PERL_LIBDIR = share\MonetDB\perl !ENDIF ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - replication_master contains the master (UU)ID...
Changeset: 6aa6236d8343 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6aa6236d8343
Modified Files:
MonetDB5/src/optimizer/opt_replication.mx
Branch: default
Log Message:
replication_master contains the master (UU)ID, not a boolean
diffs (19 lines):
diff -r 02250651bd9b -r 6aa6236d8343 MonetDB5/src/optimizer/opt_replication.mx
--- a/MonetDB5/src/optimizer/opt_replication.mx Fri Jul 16 15:27:32 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_replication.mx Fri Jul 16 15:26:28 2010 +0200
@@ -52,12 +52,14 @@
{
int i, tag, limit, slimit, actions = 0;
InstrPtr q, p = 0, *old = mb-stmt;
+ str masterid = NULL;
(void)pci;
(void)stk; /* to fool compilers */
(void)cntxt;
- if (!GDKgetenv_istrue(replication_master))
+ masterid = GDKgetenv(replication_master);
+ if (masterid == NULL || strcmp(masterid, false) == 0)
return 0;
limit = mb-stop;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Adjust append signature to match the current ...
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
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
