Changeset: c69d4d637274 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c69d4d637274
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
Branch: Feb2013
Log Message:
approve leaks output and small space cleanup
diffs (113 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1771,7 +1771,7 @@ SQLparser(Client c)
backend_call(be, c, be->q);
}
}
-
+
/* In the final phase we add any debugging control */
if (m->emod & mod_trace)
SQLsetTrace(be, c, FALSE);
@@ -1912,16 +1912,16 @@ SQLengineIntern(Client c, backend *be)
}
if (m->emod & mod_explain) {
- if (be->q && be->q->code)
+ if (be->q && be->q->code)
printFunction(c->fdout, ((Symbol) (be->q->code))->def,
0, LIST_MAL_STMT | LIST_MAL_UDF | LIST_MAPI);
else if (be->q)
msg = createException(PARSE, "SQLparser", "%s",
(*m->errstr)?m->errstr:"39000!program contains errors");
- else if (c->curprg && c->curprg->def)
+ else if (c->curprg && c->curprg->def)
printFunction(c->fdout, c->curprg->def, 0,
LIST_MAL_STMT | LIST_MAL_UDF | LIST_MAPI);
goto cleanup_engine;
}
if (m->emod & mod_dot) {
- if (be->q && be->q->code)
+ if (be->q && be->q->code)
showFlowGraph(((Symbol) (be->q->code))->def, 0,
"stdout-mapi");
else if (be->q)
msg = createException(PARSE, "SQLparser", "%s",
(*m->errstr)?m->errstr:"39000!program contains errors");
@@ -1988,7 +1988,7 @@ cleanup_engine:
m->session->status = -10;
}
- mb= c->curprg->def;
+ mb = c->curprg->def;
if (be->q && msg) {
qc_delete(m->qc, be->q);
} else if (be->q && mb &&
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -73,7 +73,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 514 ]
+[ "transient", 507 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -196,7 +196,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 174 ]
+[ "transient", 165 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -196,7 +196,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 174 ]
+[ "transient", 165 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -196,7 +196,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 194 ]
+[ "transient", 185 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -196,7 +196,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 194 ]
+[ "transient", 185 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check5.stable.out
b/sql/test/leaks/Tests/check5.stable.out
--- a/sql/test/leaks/Tests/check5.stable.out
+++ b/sql/test/leaks/Tests/check5.stable.out
@@ -196,7 +196,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 194 ]
+[ "transient", 185 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
