Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17007
Modified Files:
merovingian_controlrunner.c monetdb_get.c
Log Message:
first, inefficient implementation of remote get (refetching for every single
attribute)
U merovingian_controlrunner.c
Index: merovingian_controlrunner.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_controlrunner.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- merovingian_controlrunner.c 17 Sep 2009 20:02:53 -0000 1.16
+++ merovingian_controlrunner.c 18 Sep 2009 12:21:04 -0000 1.17
@@ -324,6 +324,7 @@
Mfprintf(_mero_ctlout, "served property
list for "
"database '%s'\n", q);
+ break;
} else if (strncmp(p, "share=",
strlen("share=")) == 0) {
sabdb *stats;
err e;
U monetdb_get.c
Index: monetdb_get.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb_get.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- monetdb_get.c 17 Sep 2009 20:07:37 -0000 1.6
+++ monetdb_get.c 18 Sep 2009 12:21:04 -0000 1.7
@@ -130,7 +130,19 @@
source = "-";
value = stats->dbname;
} else {
- readProps(props, stats->path);
+ if (mero_running == 1) {
+ char *buf;
+ e = control_send(&buf, mero_control,
-1, stats->dbname, "get", 1);
+ if (e != NULL) {
+ fprintf(stderr, "get: internal
error: %s\n", e);
+ free(e);
+ exit(2);
+ }
+ readPropsBuf(props, buf);
+ free(buf);
+ } else {
+ readProps(props, stats->path);
+ }
kv = findConfKey(props, p);
if (kv == NULL) {
fprintf(stderr, "get: no such property:
%s\n", p);
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
