Changeset: e2665a0215a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2665a0215a1
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_batop.c
gdk/gdk_cand.c
gdk/gdk_cross.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_posix.c
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_tm.c
gdk/gdk_tracer.c
gdk/gdk_utils.c
geom/monetdb5/geom.c
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_function.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_listing.h
monetdb5/mal/mal_module.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tracer.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_pipes.c
monetdb5/scheduler/run_memo.c
monetdb5/scheduler/run_pipeline.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_orderidx.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.c
sql/include/sql_mem.h
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_privileges.c
sql/server/sql_symbol.c
sql/storage/bat/bat_table.c
sql/storage/store.c
Branch: gdk_tracer
Log Message:
Removed unnecessary includes of gdk_tracer
diffs (truncated from 887 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -10,7 +10,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_calc_private.h"
-#include "gdk_tracer.h"
#include <math.h>
/* grouped aggregates
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -48,7 +48,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
/* Return TRUE if the two BATs are aligned (same size, same
* hseqbase). */
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -17,7 +17,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
gdk_return
unshare_string_heap(BAT *b)
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -10,7 +10,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_cand.h"
-#include "gdk_tracer.h"
/* create a new, dense candidate list with values from `first' up to,
* but not including, `last' */
diff --git a/gdk/gdk_cross.c b/gdk/gdk_cross.c
--- a/gdk/gdk_cross.c
+++ b/gdk/gdk_cross.c
@@ -9,7 +9,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
/* Calculate a cross product between bats l and r with optional
* candidate lists sl for l and sr for r.
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -10,7 +10,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_cand.h"
-#include "gdk_tracer.h"
/* how much to extend the extent and histo bats when we run out of space */
#define GROUPBATINCR 8192
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -35,7 +35,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
static int
HASHwidth(BUN hashsize)
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -17,7 +17,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_imprints.h"
-#include "gdk_tracer.h"
#define IMPRINTS_VERSION 2
#define IMPRINTS_HEADER_SIZE 4 /* nr of size_t fields in header */
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -10,7 +10,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_calc_private.h"
-#include "gdk_tracer.h"
/*
* All join variants produce some sort of join on two input BATs,
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -9,7 +9,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
#define ORDERIDX_VERSION ((oid) 3)
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -19,7 +19,6 @@
#include "gdk.h" /* includes gdk_posix.h */
#include "gdk_private.h"
#include "mutils.h"
-#include "gdk_tracer.h"
#include <unistd.h>
#include <string.h> /* strncpy */
diff --git a/gdk/gdk_sample.c b/gdk/gdk_sample.c
--- a/gdk/gdk_sample.c
+++ b/gdk/gdk_sample.c
@@ -27,7 +27,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "xoshiro256starstar.h"
-#include "gdk_tracer.h"
/* this is a straightforward implementation of a binary tree */
struct oidtreenode {
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -9,7 +9,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
#include <math.h>
/* auxiliary functions and structs for imprints */
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -27,7 +27,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_storage.h"
-#include "gdk_tracer.h"
#include "mutils.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -10,7 +10,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_cand.h"
-#include "gdk_tracer.h"
/* String Atom Implementation
*
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -33,7 +33,6 @@
#include "gdk.h"
#include "gdk_system.h"
#include "gdk_system_private.h"
-#include "gdk_tracer.h"
#include <time.h>
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -20,7 +20,6 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_tm.h"
-#include "gdk_tracer.h"
/*
* The physical (disk) commit protocol is handled mostly by
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -27,7 +27,6 @@
#include "monetdb_config.h"
#include "gdk.h"
-#include "gdk_tracer.h"
// We need to get rid of macros defined in gdk.h. Those are using GDKtracer in
order to produce
// messages. At the point malloc is called in gdk_tracer.c (in function
_GDKtracer_fill_tracer)
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -19,7 +19,6 @@
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_tracer.h"
#include "mutils.h"
static BAT *GDKkey = NULL;
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -13,7 +13,6 @@
#include "geom.h"
#include "mal_exception.h"
-#include "gdk_tracer.h"
int TYPE_mbr;
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -9,7 +9,6 @@
/* (author) M. Kersten */
#include "monetdb_config.h"
#include "mal.h"
-#include "gdk_tracer.h"
char monet_cwd[FILENAME_MAX] = { 0 };
char monet_characteristics[4096];
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -46,7 +46,6 @@
#include "mal_private.h"
#include "mal_runtime.h"
#include "mal_authorize.h"
-#include "gdk_tracer.h"
int MAL_MAXCLIENTS = 0;
ClientRec *mal_clients;
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
@@ -30,7 +30,6 @@
#include "mal_private.h"
#include "mal_runtime.h"
#include "mal_resource.h"
-#include "gdk_tracer.h"
#define DFLOWpending 0 /* runnable */
#define DFLOWrunning 1 /* currently in progress */
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -20,7 +20,6 @@
#include "mal_parser.h"
#include "mal_namespace.h"
#include "mal_private.h"
-#include "gdk_tracer.h"
typedef struct {
MalBlkPtr brkBlock[MAXBREAKS];
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -13,7 +13,6 @@
#include "monetdb_config.h"
#include "mal_exception.h"
#include "mal_private.h"
-#include "gdk_tracer.h"
static char *exceptionNames[] = {
/* 0 */ "MALException",
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -19,7 +19,6 @@
#include "mal_session.h"
#include "mal_namespace.h"
#include "mal_private.h"
-#include "gdk_tracer.h"
typedef struct {
int id; /* unique plant number */
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -17,7 +17,6 @@
#include "mal_listing.h"
#include "mal_namespace.h"
#include "mal_private.h"
-#include "gdk_tracer.h"
Symbol newFunction(str mod, str nme,int kind){
Symbol s;
diff --git a/monetdb5/mal/mal_function.h b/monetdb5/mal/mal_function.h
--- a/monetdb5/mal/mal_function.h
+++ b/monetdb5/mal/mal_function.h
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
