Changeset: c2dc5fc5840e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2dc5fc5840e
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/optimizer.mal
Branch: headless
Log Message:
Moving things out of the way
diffs (110 lines):
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -97,8 +97,8 @@
unix.mal
}
-EXTRA_DIST = aggr_ri.mx lock.mal lock.h sema.mal unix.mal alarm.h alarm.mal\
+EXTRA_DIST = aggr_ri.mx colcolor.mal lock.mal lock.h sema.mal unix.mal alarm.h
alarm.mal\
+ microbenchmark.mal microbenchmark.h
# logger.h \
- microbenchmark.mal microbenchmark.h
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -61,7 +61,7 @@
HEADERS = mal
DIR = libdir/monetdb5
SOURCES = language.mal mal_init.mal cbp.mal \
- profiler.c attach.mal extensions.mal \
+ profiler.mal attach.mal extensions.mal \
inspect.mal manual.mal inout.mal pqueue.mx mkey.mx \
clients.mal \
factories.mal groupby.mal mdb.mal pcrelib.mal tablet.mal \
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -23,8 +23,8 @@
# They are listed below.
#
# Beware, since libraries are loaded dynamically, there is an implicit
-# dependency. For example, the mapi module initializer uses the bat module.
-# It should be loaded after the bat module.
+# dependency. For example, the mapi module initializer uses the column module.
+# It should be loaded after the column module.
#
# The negative effect is that this module is inspected as part of
# the function resolution scheme.
@@ -63,16 +63,16 @@
include inet;
include identifier;
include xml;
-include batxml;
+include colxml;
# The hardwired multiplex extensions
-include colmmath;
+include colmath;
include colcalc;
include colcast;
include colifthen;
include colmtime;
include colstr;
-include colcolor;
+#include colcolor;
# MAL related extensions
include sabaoth;
@@ -80,20 +80,18 @@
include clients;
include attach;
include cbp;
-include box;
include inout;
include tablet;
include factories;
include recycle;
-include remote;
+#include remote;
include trader;
-include mat;
+#include mat;
include histogram;
include inspect;
include manual;
include language;
-include mal_mapi;
include profiler;
@@ -101,12 +99,12 @@
#include txtsim;
#include tokenizer;
-include zorder;
+#include zorder;
# scheduler components
include run_isolate;
include run_memo;
-include run_octopus;
+#include run_octopus;
#include run_tarantula;
# Cracker schemes, disabled by default
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -17,8 +17,6 @@
module optimizer;
-#opt_accumulators.mal
-
pattern optimizer.accumulators():str
address OPTwrapper;
pattern optimizer.accumulators(mod:str, fcn:str):str
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
