Changeset: adab7a31d802 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adab7a31d802
Modified Files:
sql/backends/monet5/sql_statement.c
sql/server/rel_optimizer.c
Branch: graph0
Log Message:
Fix the compiler errors when building with --disable-assert
diffs (29 lines):
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -3671,13 +3671,10 @@ stmt*
stmt_gr8_intersect_join_lists(backend *be, stmt* query){
InstrPtr q = NULL;
list* l = NULL;
- int num_operands = -1; // expected 4
-
// generate the MAL instruction
assert(query->type == st_list && "Invalid input type");
- num_operands = list_length(query->op4.lval);
- assert(num_operands == 4); // candidate list left and right +
projection list left and right
+ assert(list_length(query->op4.lval) == 4); // candidate list left and
right + projection list left and right
q = newStmt(be->mb, "graph", "intersect_join_lists");
if(!q) return NULL;
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
@@ -6410,6 +6410,7 @@ rel_mark_used(mvc *sql, sql_rel *rel, in
if(me->used){
int mark =
exp_mark_used(graph_ptr->edges, me);
assert(mark > 0 && "All
arguments should be marked in the subrel");
+ (void) mark; // silent the
warning when NDEBUG is defined
shortest_path_used = true;
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
