Changeset: 4970dec07da0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4970dec07da0
Modified Files:
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_session.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/server/sql_mvc.c
sql/storage/store.c
Branch: gdk_tracer
Log Message:
Minor fixes
diffs (95 lines):
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -285,7 +285,21 @@ findFunctionType(Module scope, MalBlkPtr
int actual = getArgType(mb, p, i);
int formal = getArgType(s->def, sig, i);
if (resolveType(formal, actual) == -1) {
- DEBUG(MAL_RESOLVE, "Unmatched '%d'
(formal: %s - actual: %s)\n", i, getTypeName(formal), getTypeName(actual));
+ /* CHECK */
+ // IMPORTANT
+ //
+ // This was like that below. If not
using GDKfree() is an issue
+ // let me know, because there other
cases like this one!
+ //
+ // #ifdef DEBUG_MAL_RESOLVE
+ // char *ftpe =
getTypeName(formal);
+ // char *atpe = getTypeName(actual);
+ // fprintf(stderr, "#unmatched %d
formal %s actual %s\n",
+ // i,
ftpe, atpe);
+ // GDKfree(ftpe);
+ // GDKfree(atpe);
+ // #endif
+ DEBUG(MAL_RESOLVE, "Unmatched '%d'
(formal: %s - actual: %s)\n", i, getTypeName(formal), getTypeName(actual));
unmatched = i;
break;
}
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -453,7 +453,7 @@ MSresetVariables(Client cntxt, MalBlkPtr
DEBUG(MAL_SESSION, "Reset variable: %s %d\n",
getFunctionId(mb->stmt[0]), mb->var[mb->stmt[0]->argv[0]].used);
if (mb->errors == MAL_SUCCEED)
- trimMalVariables_(mb, glb);\
+ trimMalVariables_(mb, glb);
DEBUG(MAL_SESSION, "After trim: %s %d\n", getFunctionId(mb->stmt[0]),
mb->vtop);
}
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1398,7 +1398,7 @@ rel2bin_basetable(backend *be, sql_rel *
if (!t && c)
t = c->t;
- dels = stmt_tid(be, t, rel->flag == REL_PARTITION);
+ dels = stmt_tid(be, t, rel->flag == REL_PARTITION);
/* add aliases */
assert(rel->exps);
@@ -1414,7 +1414,7 @@ rel2bin_basetable(backend *be, sql_rel *
const char *cname = cexp->r;
list *l = sa_list(sql->sa);
- c = find_sql_column(t, cname);
+ c = find_sql_column(t, cname);
s = stmt_col(be, c, dels);
append(l, s);
if (exps->h->next) {
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
@@ -577,7 +577,7 @@ stmt_bat(backend *be, sql_column *c, int
s->nr = l[c->colnr+1];
return s;
}
- q = newStmt(mb, sqlRef, bindRef);
+ q = newStmt(mb, sqlRef, bindRef);
if (q == NULL)
return NULL;
if (access == RD_UPD_ID) {
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -678,7 +678,7 @@ mvc_release(mvc *m, const char *name)
while (ok == SQL_OK && (!tr->name || strcmp(tr->name, name) != 0)) {
/* commit all intermediate savepoints */
if (sql_trans_commit(tr) != SQL_OK)
- GDKfatal("Release savepoints should not fail");
+ GDKfatal("release savepoints should not fail");
tr = sql_trans_destroy(tr, true);
}
tr->name = NULL;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2259,7 +2259,7 @@ store_manager(void)
if (res != LOG_OK) {
MT_lock_unset(&bs_lock);
- GDKfatal("Write-ahead logging failure, disk full?");
+ GDKfatal("write-ahead logging failure, disk full?");
}
flusher_new_cycle();
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
