Changeset: 0aad07b0a36d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0aad07b0a36d
Added Files:
monetdb5/scheduler/run_adder.include
monetdb5/scheduler/run_isolate.include
monetdb5/scheduler/run_memo.include
Modified Files:
monetdb5/mal/mal_embedded.c
monetdb5/scheduler/Makefile.ag
Branch: mdbl-mal
Log Message:
Move scheduler API into the embedded framework
diffs (88 lines):
diff --git a/monetdb5/mal/mal_embedded.c b/monetdb5/mal/mal_embedded.c
--- a/monetdb5/mal/mal_embedded.c
+++ b/monetdb5/mal/mal_embedded.c
@@ -117,6 +117,10 @@ static struct{
#include "../modules/mal/language.include"
#include "../modules/mal/01_batcalc.include"
#include "../modules/mal/01_calc.include"
+
+#include "../scheduler/run_adder.include"
+#include "../scheduler/run_isolate.include"
+#include "../scheduler/run_memo.include"
{ 0, 0}
}
;
diff --git a/monetdb5/scheduler/Makefile.ag b/monetdb5/scheduler/Makefile.ag
--- a/monetdb5/scheduler/Makefile.ag
+++ b/monetdb5/scheduler/Makefile.ag
@@ -23,10 +23,4 @@ lib_scheduler = {
run_pipeline.c run_pipeline.h
}
-headers_mal = {
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = run_adder.mal run_isolate.mal run_memo.mal
-}
-
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/scheduler/run_adder.include
b/monetdb5/scheduler/run_adder.include
new file mode 100644
--- /dev/null
+++ b/monetdb5/scheduler/run_adder.include
@@ -0,0 +1,11 @@
+{ "run_adder",
+"# This Source Code Form is subject to the terms of the Mozilla Public \n"
+"# License, v. 2.0. If a copy of the MPL was not distributed with this \n"
+"# file, You can obtain one at http://mozilla.org/MPL/2.0/. \n"
+"# \n"
+"# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. \n"
+"module adder; \n"
+"pattern adder.generate(target:int, batch:int):int \n"
+"address RUNadder \n"
+"comment \"Generate some statements to add more integers\"; \n"
+},
diff --git a/monetdb5/scheduler/run_isolate.include
b/monetdb5/scheduler/run_isolate.include
new file mode 100644
--- /dev/null
+++ b/monetdb5/scheduler/run_isolate.include
@@ -0,0 +1,11 @@
+{ "run_isolate",
+"# This Source Code Form is subject to the terms of the Mozilla Public \n"
+"# License, v. 2.0. If a copy of the MPL was not distributed with this \n"
+"# file, You can obtain one at http://mozilla.org/MPL/2.0/. \n"
+"# \n"
+"# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. \n"
+"module scheduler; \n"
+"pattern isolation():void \n"
+"address RUNisolation \n"
+"comment \"Run a private copy of the MAL program\"; \n"
+},
diff --git a/monetdb5/scheduler/run_memo.include
b/monetdb5/scheduler/run_memo.include
new file mode 100644
--- /dev/null
+++ b/monetdb5/scheduler/run_memo.include
@@ -0,0 +1,23 @@
+{ "run_memo",
+"# This Source Code Form is subject to the terms of the Mozilla Public \n"
+"# License, v. 2.0. If a copy of the MPL was not distributed with this \n"
+"# file, You can obtain one at http://mozilla.org/MPL/2.0/. \n"
+"# \n"
+"# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. \n"
+"module scheduler; \n"
+"pattern scheduler.choice():void \n"
+"address RUNchoice \n"
+"comment \"Select the next step in a query memo plan\"; \n"
+"pattern scheduler.choice(arg:any...):void \n"
+"address RUNchoice \n"
+"comment \"Select the next step in a query memo plan\"; \n"
+"pattern scheduler.pick(arg:any_1...):any_1 \n"
+"address RUNpickResult \n"
+"comment \"Pick up the first result\"; \n"
+"pattern scheduler.volumeCost(a:any):lng \n"
+"address RUNvolumeCost \n"
+"comment \"A sample cost function based on materialized results\"; \n"
+"pattern scheduler.costPrediction(a:any):lng \n"
+"address RUNcostPrediction \n"
+"comment \"A sample cost prediction function\"; \n"
+},
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
