Changeset: 08645e622cc2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08645e622cc2
Modified Files:
sql/server/rel_distribute.c
sql/server/rel_optimizer.c
sql/server/rel_partition.c
sql/server/rel_unnest.c
sql/server/sql_env.c
Branch: tracer
Log Message:
Removed unused DEBUG directive & restored sql_env.c
diffs (89 lines):
diff --git a/sql/server/rel_distribute.c b/sql/server/rel_distribute.c
--- a/sql/server/rel_distribute.c
+++ b/sql/server/rel_distribute.c
@@ -6,8 +6,6 @@
* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
*/
-/*#define DEBUG*/
-
#include "monetdb_config.h"
#include "rel_distribute.h"
#include "rel_rel.h"
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -6,8 +6,6 @@
* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
*/
-/*#define DEBUG*/
-
#include "monetdb_config.h"
#include "rel_optimizer.h"
#include "rel_rel.h"
@@ -9024,15 +9022,12 @@ optimize_rel(mvc *sql, sql_rel *rel, int
gp = (global_props) {.cnt = {0},};
rel_properties(sql, &gp, rel);
-#ifdef DEBUG
-{
int i;
for (i = 0; i < ddl_maxops; i++) {
if (gp.cnt[i]> 0)
- printf("%s %d\n", op2string((operator_type)i),
gp.cnt[i]);
- }
-}
-#endif
+ DEBUG(SQL_OPTIMIZER, "%s %d\n",
op2string((operator_type)i), gp.cnt[i]);
+ }
+
if (level <= 0 && gp.cnt[op_select])
rel = rel_split_select(&changes, sql, rel, 1);
diff --git a/sql/server/rel_partition.c b/sql/server/rel_partition.c
--- a/sql/server/rel_partition.c
+++ b/sql/server/rel_partition.c
@@ -6,8 +6,6 @@
* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
*/
-/*#define DEBUG*/
-
#include "monetdb_config.h"
#include "sql_query.h"
#include "rel_partition.h"
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -6,8 +6,6 @@
* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
*/
-/*#define DEBUG*/
-
#include "monetdb_config.h"
#include "rel_unnest.h"
#include "rel_optimizer.h"
diff --git a/sql/server/sql_env.c b/sql/server/sql_env.c
--- a/sql/server/sql_env.c
+++ b/sql/server/sql_env.c
@@ -50,16 +50,14 @@ sql_update_var(mvc *m, const char *name,
sql_update_var(mvc *m, const char *name, char *sval, lng sgn)
#endif
{
-/* CHECK */
-/* if (strcmp(name, "debug") == 0) {
+if (strcmp(name, "debug") == 0) {
#ifdef HAVE_HGE
assert((hge) GDK_int_min <= sgn && sgn <= (hge) GDK_int_max);
#else
assert((lng) GDK_int_min <= sgn && sgn <= (lng) GDK_int_max);
#endif
m->debug = (int) sgn;
- } else if (strcmp(name, "current_schema") == 0) { */
- if (strcmp(name, "current_schema") == 0) {
+ } else if (strcmp(name, "current_schema") == 0) {
if (!mvc_set_schema(m, sval)) {
throw(SQL,"sql.update_var", SQLSTATE(3F000) "Schema
(%s) missing\n", sval);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
