MonetDB: default - datacell: undo accidential commit

[Fabian Groffen]

Changeset: 478ccbad0b97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=478ccbad0b97
Modified Files:
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/datacell/50_datacell.mal
        sql/backends/monet5/datacell/Makefile.ag
        sql/backends/monet5/datacell/datacell.c
        sql/backends/monet5/datacell/datacell.mal
Branch: default
Log Message:

datacell: undo accidential commit


diffs (93 lines):

diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -50,7 +50,6 @@ lib__sql = {
                   ../../storage/restrict/librestrictstore \
                   ../../common/libsqlcommon \
                   HAVE_RAPTOR?../../../monetdb5/extras/rdf/librdf \
-                  ENABLE_DATACELL?./datacell/lib_datacell \
                   ../../../monetdb5/tools/libmonetdb5 \
                   ../../../gdk/libbat \
                   ../../../common/stream/libstream \
diff --git a/sql/backends/monet5/datacell/50_datacell.mal 
b/sql/backends/monet5/datacell/50_datacell.mal
--- a/sql/backends/monet5/datacell/50_datacell.mal
+++ b/sql/backends/monet5/datacell/50_datacell.mal
@@ -21,3 +21,4 @@ include datacell;
 include basket;
 include receptor;
 include emitter;
+
diff --git a/sql/backends/monet5/datacell/Makefile.ag 
b/sql/backends/monet5/datacell/Makefile.ag
--- a/sql/backends/monet5/datacell/Makefile.ag
+++ b/sql/backends/monet5/datacell/Makefile.ag
@@ -32,7 +32,7 @@ INCLUDES = .. \
        ../../../../gdk
 
 lib__datacell = {
-       NOINST
+       MODULE
        DIR = libdir/monetdb5
        SEP = _
        SOURCES = basket.c \
@@ -43,6 +43,9 @@ lib__datacell = {
                  opt_datacell.c \
                  datacell.c \
                  emitter.c 
+
+       LIBS = ../../../../monetdb5/tools/libmonetdb5 \
+               ../../../../gdk/libbat 
 }
 
 bin_actuator = {
diff --git a/sql/backends/monet5/datacell/datacell.c 
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -87,10 +87,14 @@ DCprelude(Client cntxt, MalBlkPtr mb, Ma
        sql_func *f;
        sql_trans *tr;
 
-       if (msg)
-               return msg;
+       if (msg) {
+               GDKfree(msg);
+               return MAL_SUCCEED;
+       }
+       assert(m != NULL);
 
-       assert(m != NULL);
+       fprintf(stdout, "# MonetDB/DataCell module loaded\n");
+       fflush(stdout); /* make merovingian see this *now* */
 
        s = mvc_bind_schema(m, schema_default);
        if (s == NULL)
diff --git a/sql/backends/monet5/datacell/datacell.mal 
b/sql/backends/monet5/datacell/datacell.mal
--- a/sql/backends/monet5/datacell/datacell.mal
+++ b/sql/backends/monet5/datacell/datacell.mal
@@ -17,6 +17,10 @@
 
 module datacell;
 
+pattern prelude()
+address DCprelude
+comment "Convert the datacell schema to a stream processing infrastructure";
+
 pattern basket(tab:str):void
 address DCregister
 comment "Initialize a new basket based on a specific table definition in the 
datacell schema");
@@ -57,10 +61,6 @@ pattern query(name:str):void
 address DCquery
 comment "Add a new continuous query procedure.";
 
-pattern prelude()
-address DCprelude
-comment "Convert the datacell schema to a stream processing infrastructure";
-
 pattern pause()
 address DCpauseScheduler
 comment "(Re)start the petrinet scheduler.";
@@ -106,4 +106,4 @@ command errors()(nme:bat[:oid,:str],erro
 address BSKTtableerrors
 comment "Return a table the erroneous events";
 
-io.printf("# MonetDB/DataCell loaded\n");
+datacell.prelude();
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list