Changeset: 8a15be2dc349 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a15be2dc349
Modified Files:
monetdb5/mal/CMakeLists.txt
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_session.h
monetdb5/modules/kernel/alarm.c
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batMask.c
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/projectionpath.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/tracer.c
monetdb5/modules/mal/wlc.c
monetdb5/scheduler/run_isolate.c
monetdb5/scheduler/run_memo.c
sql/server/rel_schema.c
Branch: default
Log Message:
improve the set of included headers
diffs (268 lines):
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -15,6 +15,7 @@ set(mal_public_headers
${CMAKE_CURRENT_SOURCE_DIR}/mal_import.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_instruction.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_linker.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_module.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_namespace.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_stack.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h
@@ -42,7 +43,7 @@ target_sources(mal
mal_dataflow.c mal_dataflow.h
mal_linker.c mal_linker.h
mal_listing.c mal_listing.h
- mal_module.c mal_module.h
+ mal_module.c
mal_namespace.c
mal_parser.c mal_parser.h
mal_profiler.c mal_profiler.h
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -11,7 +11,7 @@
#include "mal.h"
-#include "mal_resolve.h"
+#include "mal_module.h"
#define SCENARIO_PROPERTIES 8
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -31,6 +31,8 @@
#include "mal_internal.h"
#include "mal_runtime.h"
#include "mal_resource.h"
+#include "mal_exception.h"
+#include "mal_function.h"
#define DFLOWpending 0 /* runnable */
#define DFLOWrunning 1 /* currently in progress */
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -19,6 +19,7 @@
#include "mal_type.h"
#include "mal_private.h"
#include "mal_internal.h"
+#include "mal_function.h"
static lng qptimeout = 0; /* how often we print still running queries (usec) */
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -11,6 +11,7 @@
#include "monetdb_config.h"
#include "mal_resource.h"
#include "mal_private.h"
+#include "mal_instruction.h"
/* Memory based admission does not seem to have a major impact so far. */
static lng memorypool = 0; /* memory claimed by concurrent threads */
diff --git a/monetdb5/mal/mal_session.h b/monetdb5/mal/mal_session.h
--- a/monetdb5/mal/mal_session.h
+++ b/monetdb5/mal/mal_session.h
@@ -10,6 +10,7 @@
#define _MAL_SESSION_H
#include "mal_scenario.h"
+#include "mal_resolve.h"
mal_export str malBootstrap(char *modules[], int embedded);
mal_export str MSserveClient(Client cntxt);
diff --git a/monetdb5/modules/kernel/alarm.c b/monetdb5/modules/kernel/alarm.c
--- a/monetdb5/modules/kernel/alarm.c
+++ b/monetdb5/modules/kernel/alarm.c
@@ -25,6 +25,7 @@
#include "mal_client.h"
#include "mal_interpreter.h"
#include <time.h>
+#include "mal_exception.h"
static str
ALARMusec(lng *ret)
diff --git a/monetdb5/modules/mal/batExtensions.c
b/monetdb5/modules/mal/batExtensions.c
--- a/monetdb5/modules/mal/batExtensions.c
+++ b/monetdb5/modules/mal/batExtensions.c
@@ -25,6 +25,8 @@
#include "mal_interpreter.h"
#include "bat5.h"
#include "gdk_time.h"
+#include "mal_instruction.h"
+#include "mal_exception.h"
/*
* BAT enhancements
diff --git a/monetdb5/modules/mal/batMask.c b/monetdb5/modules/mal/batMask.c
--- a/monetdb5/modules/mal/batMask.c
+++ b/monetdb5/modules/mal/batMask.c
@@ -16,6 +16,7 @@
#include "mal_interpreter.h"
#include "bat5.h"
#include "gdk_time.h"
+#include "mal_exception.h"
/*
* BAT bitvector enhancements
diff --git a/monetdb5/modules/mal/factories.c b/monetdb5/modules/mal/factories.c
--- a/monetdb5/modules/mal/factories.c
+++ b/monetdb5/modules/mal/factories.c
@@ -15,6 +15,7 @@
#include "mal.h"
#include "mal_interpreter.h"
#include "mal_namespace.h"
+#include "mal_exception.h"
static str
FCTgetPlants(bat *ret, bat *ret2)
diff --git a/monetdb5/modules/mal/groupby.c b/monetdb5/modules/mal/groupby.c
--- a/monetdb5/modules/mal/groupby.c
+++ b/monetdb5/modules/mal/groupby.c
@@ -44,6 +44,7 @@
#include "mal.h"
#include "mal_interpreter.h"
#include "group.h"
+#include "mal_exception.h"
/*
* The implementation is based on a two-phase process. In phase 1, we estimate
diff --git a/monetdb5/modules/mal/iterator.c b/monetdb5/modules/mal/iterator.c
--- a/monetdb5/modules/mal/iterator.c
+++ b/monetdb5/modules/mal/iterator.c
@@ -37,6 +37,7 @@
#include "monetdb_config.h"
#include "mal.h"
#include "mal_interpreter.h"
+#include "mal_exception.h"
/*
* We start with the large chunk iterator.
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -43,6 +43,7 @@
#include "mal_instruction.h"
#include "mal_interpreter.h"
#include "mutils.h"
+#include "mal_exception.h"
#define MAXFORMAT 64*1024
diff --git a/monetdb5/modules/mal/orderidx.c b/monetdb5/modules/mal/orderidx.c
--- a/monetdb5/modules/mal/orderidx.c
+++ b/monetdb5/modules/mal/orderidx.c
@@ -13,6 +13,8 @@
#include "monetdb_config.h"
#include "orderidx.h"
#include "gdk.h"
+#include "mal_exception.h"
+#include "mal_function.h"
#define MIN_PIECE ((BUN) 1000) /* TODO use realistic size in
production */
diff --git a/monetdb5/modules/mal/projectionpath.c
b/monetdb5/modules/mal/projectionpath.c
--- a/monetdb5/modules/mal/projectionpath.c
+++ b/monetdb5/modules/mal/projectionpath.c
@@ -9,6 +9,7 @@
#include "monetdb_config.h"
#include "mal_client.h"
#include "mal_interpreter.h"
+#include "mal_exception.h"
static str
ALGprojectionpath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -26,6 +26,7 @@
#include "monetdb_config.h"
#include "querylog.h"
#include "gdk_time.h"
+#include "mal_exception.h"
/* (c) M.L. Kersten
* The query logger facility is hardwired to avoid interference
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -13,6 +13,7 @@
#include "mal_client.h"
#include "mal_runtime.h"
#include "gdk_time.h"
+#include "mal_exception.h"
/* (c) M.L. Kersten
* The queries currently in execution are returned to the front-end for
managing expensive ones.
diff --git a/monetdb5/modules/mal/tokenizer.c b/monetdb5/modules/mal/tokenizer.c
--- a/monetdb5/modules/mal/tokenizer.c
+++ b/monetdb5/modules/mal/tokenizer.c
@@ -43,6 +43,7 @@
#include "mal_client.h"
#include "mal_interpreter.h"
#include "mal_linker.h"
+#include "mal_exception.h"
#define MAX_TKNZR_DEPTH 256
#define INDEX MAX_TKNZR_DEPTH
diff --git a/monetdb5/modules/mal/tracer.c b/monetdb5/modules/mal/tracer.c
--- a/monetdb5/modules/mal/tracer.c
+++ b/monetdb5/modules/mal/tracer.c
@@ -16,7 +16,7 @@
#include "monetdb_config.h"
#include "mal.h"
#include "mal_interpreter.h"
-
+#include "mal_exception.h"
static str
TRACERflush_buffer(void *ret)
diff --git a/monetdb5/modules/mal/wlc.c b/monetdb5/modules/mal/wlc.c
--- a/monetdb5/modules/mal/wlc.c
+++ b/monetdb5/modules/mal/wlc.c
@@ -164,6 +164,7 @@
#include "wlc.h"
#include "gdk_time.h"
#include "mutils.h"
+#include "mal_function.h"
static MT_Lock wlc_lock = MT_LOCK_INITIALIZER(wlc_lock);
diff --git a/monetdb5/scheduler/run_isolate.c b/monetdb5/scheduler/run_isolate.c
--- a/monetdb5/scheduler/run_isolate.c
+++ b/monetdb5/scheduler/run_isolate.c
@@ -34,6 +34,7 @@
#include "mal.h"
#include "mal_instruction.h"
#include "mal_client.h"
+#include "mal_exception.h"
#ifndef WIN32
#define __declspec(x)
diff --git a/monetdb5/scheduler/run_memo.c b/monetdb5/scheduler/run_memo.c
--- a/monetdb5/scheduler/run_memo.c
+++ b/monetdb5/scheduler/run_memo.c
@@ -99,6 +99,8 @@
#include "mal_linker.h"
#include "mal_client.h"
#include "mal_runtime.h"
+#include "mal_exception.h"
+#include "mal_function.h"
#ifndef WIN32
#define __declspec(x)
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -22,6 +22,7 @@
#include "sql_partition.h"
#include "mal_authorize.h"
+#include "mal_exception.h"
sql_rel *
rel_table(mvc *sql, int cat_type, const char *sname, sql_table *t, int nr)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
