Changeset: 65a443566467 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a443566467
Modified Files:
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.mal
Branch: default
Log Message:
datacell: avoid useless prelude call
diffs (53 lines):
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,15 +87,11 @@ DCprelude(Client cntxt, MalBlkPtr mb, Ma
sql_func *f;
sql_trans *tr;
- if (msg) {
- GDKfree(msg);
- return MAL_SUCCEED;
- }
+ if (msg)
+ return msg;
+
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)
throw(SQL, "datacell.prelude", "Schema missing");
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,10 +17,6 @@
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");
@@ -61,6 +57,10 @@ 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";
-datacell.prelude();
+io.printf("# MonetDB/DataCell loaded\n");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
