Changeset: 12c96ee0be4c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/12c96ee0be4c
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/server/rel_dump.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sqlparse.c
Branch: less_explain_info
Log Message:
More small modifications/cleanup
diffs (235 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -144,7 +144,8 @@ sql_symbol2relation(backend *be, symbol
lng t_begin = GDKusec();
storage_based_opt = value_based_opt && rel && !is_ddl(rel->op);
- if (rel && !(rel->op == op_ddl && rel->card == CARD_ATOM && rel->flag
== ddl_psm && (be->mvc->emod & mod_exec) != 0)) { /* no need to optimize exec */
+ if (rel && !(rel->op == op_ddl && rel->card == CARD_ATOM &&
+ rel->flag == ddl_psm && (be->mvc->emod ==
mod_exec) != 0)) { /* no need to optimize exec */
if (rel)
rel = sql_processrelation(be->mvc, rel, profile, 1,
value_based_opt, storage_based_opt);
if (rel && (rel_no_mitosis(be->mvc, rel) ||
rel_need_distinct_query(rel)))
@@ -5582,7 +5583,7 @@ SQLread_dump_rel(Client cntxt, MalBlkPtr
m->step = S_REWRITE;
m->temporal = T_AFTER;
- m->show_props = true;
+ m->show_details = true;
rel_print_refs(m, s, rel, 0, refs, 0);
rel_print_(m, s, rel, 0, refs, 0);
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -64,7 +64,7 @@ SQLrun(Client c, mvc *m)
if (c->curprg->def)
printFunction(c->fdout, mb, 0, LIST_MAL_NAME |
LIST_MAL_VALUE | LIST_MAL_TYPE | LIST_MAL_MAPI);
} else {
- if (m->emod == mod_trace){
+ if (m->trace){
if ((msg = startTrace(c)) == MAL_SUCCEED) {
setVariableScope(mb);
MT_lock_set(&mal_contextLock);
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -262,7 +262,7 @@ static int
backend bebackup = *be; /* backup current backend */
exception_buffer ebsave = *sa_get_eb(m->sa);
- m->show_props = true;
+ m->show_details = true;
if (strlen(mod) >= IDLENGTH) {
(void) sql_error(m, 10, SQLSTATE(42000) "Module name '%s' too
large for the backend", mod);
@@ -914,7 +914,7 @@ static int
Symbol symbackup = c->curprg;
exception_buffer ebsave = *sa_get_eb(m->sa);
- m->show_props = true;
+ m->show_details = true;
if (list_empty(prp->value.pval)) {
sql_error(m, 003, SQLSTATE(42000) "Missing REMOTE property on
the input relation");
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
@@ -1403,7 +1403,8 @@ SQLparser_body(Client c, backend *be)
m->emod = mod_none;
m->temporal = T_NONE;
m->step = S_NONE;
- m->show_props = false;
+ m->show_details = false;
+ m->trace = false;
c->query = NULL;
c->qryctx.starttime = GDKusec();
c->qryctx.endtime = c->querytimeout ? c->qryctx.starttime +
c->querytimeout : 0;
@@ -1511,7 +1512,7 @@ SQLparser_body(Client c, backend *be)
int opt = 0;
if (m->emode == m_prepare && m->emod == mod_exec) {
/* generated the named parameters for the
placeholders */
- if (backend_dumpstmt(be, c->curprg->def, r->r,
!(m->emod & mod_exec), 0, c->query) < 0) {
+ if (backend_dumpstmt(be, c->curprg->def, r->r,
!(m->emod == mod_exec), 0, c->query) < 0) {
msg = handle_error(m, 0, msg);
err = 1;
MSresetInstructions(c->curprg->def,
oldstop);
@@ -1519,7 +1520,7 @@ SQLparser_body(Client c, backend *be)
}
r = r->l;
m->emode = m_normal;
- m->emod &= ~mod_exec;
+ m->emod = mod_none;
}
if (!err && backend_dumpstmt(be, c->curprg->def, r,
!(m->emod == mod_exec), 0, c->query) < 0) {
msg = handle_error(m, 0, msg);
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -368,7 +368,7 @@ exp_print(mvc *sql, stream *fout, sql_ex
default:
;
}
- if (sql->show_props) {
+ if (sql->show_details) {
if (e->type != e_atom && e->type != e_cmp && is_partitioning(e))
mnstr_printf(fout, " PART");
if (e->type != e_atom && e->type != e_cmp && is_ascending(e))
@@ -742,7 +742,7 @@ rel_print_rel(mvc *sql, stream *fout, s
default:
assert(0);
}
- if (sql->show_props && decorate && rel->p) {
+ if (sql->show_details && decorate && rel->p) {
for (prop *p = rel->p; p; p = p->p) {
if (p->kind != PROP_COUNT || (ATOMIC_GET(&GDKdebug) &
TESTINGMASK) == 0) {
char *pv = propvalue2string(sql->ta, p);
@@ -855,7 +855,7 @@ void
rel_print_(mvc *sql, stream *fout, sql_rel *rel, int depth, list *refs, int
decorate)
{
rel_print_rel(sql, fout, rel, depth, refs, decorate);
- if (sql->show_props && sql->runs) {
+ if (sql->show_details && sql->runs) {
for (int i = 0 ; i < NSQLREWRITERS ; i++) {
sql_optimizer_run *run = &(sql->runs[i]);
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
@@ -805,7 +805,8 @@ mvc_create(sql_store *store, allocator *
m->emod = mod_none;
m->temporal = T_NONE;
m->step = S_NONE;
- m->show_props = false;
+ m->show_details = false;
+ m->trace = false;
m->reply_size = 100;
m->debug = debug;
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -55,30 +55,29 @@
/* allowed to reduce (in the where and having parts we can reduce) */
/* different query execution modes (emode) */
-#define m_normal 0
+#define m_normal 0
#define m_deallocate 1
-#define m_prepare 2
-#define m_plan 3
+#define m_prepare 2
+#define m_plan 3
/* special modes for function/procedure and view instantiation and
dependency generation */
-#define m_instantiate 5
-#define m_deps 6
+#define m_instantiate 5
+#define m_deps 6
/* different query execution modifiers (emod) */
-#define mod_none 0
-#define mod_trace 1
-#define mod_explain 2
-#define mod_exec 4
+#define mod_none 0
+#define mod_explain 1
+#define mod_exec 2
-#define S_NONE 0
-#define S_UNNEST 1
-#define S_REWRITE 2
-#define S_PHYSICAL 3
+#define S_NONE 0
+#define S_UNNEST 1
+#define S_REWRITE 2
+#define S_PHYSICAL 3
-#define T_NONE 0
-#define T_BEFORE 1
-#define T_AFTER 2
+#define T_NONE 0
+#define T_BEFORE 1
+#define T_AFTER 2
#define BEFORE_UNNEST(m) (m->step == S_UNNEST && m->temporal == T_BEFORE)
#define AFTER_UNNEST(m) (m->step == S_UNNEST && m->temporal == T_AFTER)
@@ -161,15 +160,16 @@ typedef struct mvc {
sqlid role_id;
int timezone; /* milliseconds west of UTC */
unsigned int div_min_scale; /* minimum scale for division op*/
- int reply_size; /* reply size */
+ int reply_size; /* reply size */
int debug;
int sql_optimizer; /* SQL optimizer mask */
sql_optimizer_run *runs; /* Information about SQL optimizer runs */
- char emode; /* execution mode */
- char emod; /* execution modifier */
- unsigned temporal;
- unsigned step;
- bool show_props;
+ char emode; /* execution mode */
+ char emod; /* execution modifier */
+ unsigned temporal; /* temporal modifier for explain */
+ unsigned step; /* step modifier for explain */
+ bool show_details; /* show details in explain */
+ bool trace; /* trace query execution */
sql_session *session;
sql_store store;
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -877,7 +877,7 @@ sqlstmt:
}
| SQL_TRACE sql SCOLON
{
- m->emod = mod_trace;
+ m->trace = true;
m->scanner.as = m->scanner.yycur;
if (m->sym) {
append_symbol(m->sym->data.lval, $2);
@@ -935,7 +935,7 @@ temporal:
;
opt_show_properties:
- SHOW DETAILS { m->show_props = true; }
+ SHOW DETAILS { m->show_details = true; }
| /* empty */
;
diff --git a/sql/server/sqlparse.c b/sql/server/sqlparse.c
--- a/sql/server/sqlparse.c
+++ b/sql/server/sqlparse.c
@@ -118,7 +118,8 @@ mvc_new( bstream *rs, stream *ws) {
m->emod = mod_none;
m->temporal = T_NONE;
m->step = S_NONE;
- m->show_props = false;
+ m->show_details = false;
+ m->trace = false;
m->reply_size = 100;
m->debug = 0;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
