Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32394/runtime
Modified Files:
Makefile.ag levelsteps.mx ll_staircasejoin.mx ll_upwards.mx
pathfinder.mx shredder.mx
Log Message:
moved all serialization into a library libserialize
moved ll_* into library libpf
this is needed as this introduces the second (very very small) part of
the m5 runtime.
xquery.mx now has the functions
xquery.doc
( lookup rootid(s) as needed by the bind function)
xquery.print
( print function, still requires the m4 ws)
xquery.ll_child
(simple wrapper of the m4 version)
xquery.bind (bind a column using a document_idx (rootid) and
table and column names)
(this needs more work, but nayden needs it and I'm on holiday the coming
week)
(beware this probably breaks windows compilation as some export's are missing)
Index: levelsteps.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/levelsteps.mx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- levelsteps.mx 3 Jan 2007 12:33:09 -0000 1.12
+++ levelsteps.mx 23 Feb 2007 12:51:41 -0000 1.13
@@ -27,6 +27,13 @@
@a Henning Rode
@t levelsteps
[EMAIL PROTECTED]
+#ifndef _LEVELSTEPS_H_
+#define _LEVELSTEPS_H_
+
+#define XML_DEPTH_MAX 128
+
+#endif /* _LEVELSTEPS_H_ */
@c
/*******************************************
@@ -34,8 +41,8 @@
*
*/
#include "pf_config.h"
+#include "levelsteps.h"
#include <gdk.h>
-#include "pathfinder.h"
/**
* This file contains all axis step algoritms that work mainly on the
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- pathfinder.mx 22 Feb 2007 11:34:44 -0000 1.297
+++ pathfinder.mx 23 Feb 2007 12:51:42 -0000 1.298
@@ -3348,8 +3348,6 @@
#ifndef PATHFINDER_H
#define PATHFINDER_H
-#define XML_DEPTH_MAX 128
-
#include <monet.h>
#include <monettime.h>
#include <lock.h>
Index: ll_upwards.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/ll_upwards.mx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ll_upwards.mx 3 Jan 2007 12:33:10 -0000 1.19
+++ ll_upwards.mx 23 Feb 2007 12:51:42 -0000 1.20
@@ -91,7 +91,7 @@
@c
#include "pf_config.h"
#include <gdk.h>
-#include "pathfinder.h"
+#include "levelsteps.h"
static char LL_UPWARDS_PARENT[] = "parent";
static char LL_UPWARDS_ANCESTOR[] = "ancestor";
Index: ll_staircasejoin.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/ll_staircasejoin.mx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ll_staircasejoin.mx 3 Jan 2007 12:33:10 -0000 1.52
+++ ll_staircasejoin.mx 23 Feb 2007 12:51:42 -0000 1.53
@@ -36,8 +36,8 @@
*/
#include "pf_config.h"
+#include "levelsteps.h"
#include <gdk.h>
-#include "pathfinder.h"
#if 0
#define prefetch_loc(addr) \
Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- shredder.mx 9 Feb 2007 23:41:16 -0000 1.116
+++ shredder.mx 23 Feb 2007 12:51:42 -0000 1.117
@@ -62,6 +62,7 @@
#include <gdk.h>
#include <monet.h>
+#include "levelsteps.h"
#include "pathfinder.h"
#include "pf_support.h"
#include "shredder.h"
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Makefile.ag,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- Makefile.ag 21 Feb 2007 14:26:01 -0000 1.70
+++ Makefile.ag 23 Feb 2007 12:51:41 -0000 1.71
@@ -33,9 +33,20 @@
# these defines are needed to get shttpd to compile in the right way
CFLAGS = -DEMBEDDED -DMT -DNO_CGI -DNO_AUTH -DIO_MAX=10240
-lib_serialize_null = {
+lib_serialize = {
NOINST
- SOURCES = serialize_null.mx
+ SOURCES = serialize_null.mx \
+ serialize.mx \
+ serialize_dflt.mx \
+ serialize_sax.mx
+}
+
+lib_pf = {
+ NOINST
+ SOURCES = \
+ levelsteps.mx \
+ ll_staircasejoin.mx \
+ ll_upwards.mx
}
lib__pf_support = {
@@ -43,17 +54,10 @@
SOURCES = \
pf_support.mx \
staircasejoin.mx \
- ll_staircasejoin.mx \
- ll_upwards.mx \
prec_foll.mx \
- levelsteps.mx \
- shredder.mx \
- serialize.mx \
- serialize_dflt.mx \
- serialize_sax.mx
-
+ shredder.mx
LIBS = \
- libserialize_null $(PF_LIBS) \
+ libserialize libpf $(PF_LIBS) \
$(MONETDB_LIBS) -lbat -lstream $(MONETDB4_LIBS) -lmonet
$(PTHREAD_LIBS) \
$(MONETDB4_MODS) -l_lock -l_monettime -l_streams -l_builtin
-l_ascii_io -l_algebra -l_constant
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
