Changeset: bb78940ba96f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb78940ba96f
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_batop.c
sql/server/rel_optimizer.c
Branch: gdk_tracer
Log Message:
cleanup
diffs (60 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -895,9 +895,6 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
const char *algo = NULL;
lng t0 = GDKusec();
- /* CHECK */
- // This is in ALGODEBUG
-
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
GDKerror("BATgroupsum: %s\n", err);
return NULL;
@@ -969,9 +966,6 @@ BATsum(void *res, int tp, BAT *b, BAT *s
const char *algo = NULL;
lng t0 = GDKusec();
- /* CHECK */
- // This is in ALGODEBUG
-
if ((err = BATgroupaggrinit(b, NULL, NULL, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
GDKerror("BATsum: %s\n", err);
return GDK_FAIL;
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1444,9 +1444,6 @@ BATordered(BAT *b)
{
lng t0 = GDKusec();
- /* CHECK */
- // This is in DEBUGALGO
-
if (b->ttype == TYPE_void)
return true;
/* In order that multiple threads don't scan the same BAT at
@@ -2084,9 +2081,6 @@ BATconstant(oid hseq, int tailtype, cons
BUN i;
lng t0 = GDKusec();
- /* CHECK */
- // This is in DEBUGALGO
-
if (v == NULL)
return NULL;
bn = COLnew(hseq, tailtype, n, role);
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
@@ -8978,9 +8978,7 @@ optimize_rel(mvc *sql, sql_rel *rel, int
gp = (global_props) {.cnt = {0},};
rel_properties(sql, &gp, rel);
- /* CHECK */
- TRC_DEBUG_IF(SQL_OPTIMIZER)
- {
+ TRC_DEBUG_IF(SQL_OPTIMIZER) {
int i;
for (i = 0; i < ddl_maxops; i++) {
if (gp.cnt[i]> 0)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
