Changeset: 8e4677b10f2e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e4677b10f2e
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_scan.c
Branch: default
Log Message:
Remove old fashioned feature
The DOT prefix was a temporary feature for early stethoscope version.
It is archived, because this functionality can also be generated in
a frontend tool.
diffs (106 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1566,6 +1566,7 @@ int OPTmultiplexImplementation(Client cn
str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb);
str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
+int OPTpostfixImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTprofilerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTprojectionpathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
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
@@ -402,15 +402,6 @@ SQLengineIntern(Client c, backend *be)
printFunction(c->fdout, c->curprg->def, 0,
LIST_MAL_NAME | LIST_MAL_VALUE | LIST_MAL_MAPI);
goto cleanup_engine;
}
- if (m->emod & mod_dot) {
- 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");
- else if (c->curprg->def)
- showFlowGraph(c->curprg->def, 0, "stdout-mapi");
- goto cleanup_engine;
- }
#ifdef SQL_SCENARIO_DEBUG
mnstr_printf(GDKout, "#Ready to execute SQL statement\n");
#endif
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
@@ -1216,7 +1216,7 @@ SQLparser(Client c)
SQLsetDebugger(c, m, TRUE);
if (m->emod & mod_trace)
SQLsetTrace(be, c, TRUE);
- if (!(m->emod & (mod_explain | mod_debug | mod_trace |
mod_dot)))
+ if (!(m->emod & (mod_explain | mod_debug | mod_trace )))
m->emode = m_inplace;
scanner_query_processed(&(m->scanner));
} else {
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
@@ -60,7 +60,6 @@
#define mod_debug 1
#define mod_trace 2
#define mod_explain 4
-#define mod_dot 8
/* locked needs unlocking */
#define mod_locked 16
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
@@ -588,7 +588,7 @@ SQLCODE SQLERROR UNDER WHENEVER
%token CHECK CONSTRAINT CREATE
%token TYPE PROCEDURE FUNCTION AGGREGATE RETURNS EXTERNAL sqlNAME DECLARE
%token CALL LANGUAGE
-%token ANALYZE MINMAX SQL_EXPLAIN SQL_PLAN SQL_DEBUG SQL_TRACE SQL_DOT PREPARE
EXECUTE
+%token ANALYZE MINMAX SQL_EXPLAIN SQL_PLAN SQL_DEBUG SQL_TRACE PREPARE EXECUTE
%token DEFAULT DISTINCT DROP
%token FOREIGN
%token RENAME ENCRYPTED UNENCRYPTED PASSWORD GRANT REVOKE ROLE ADMIN INTO
@@ -669,21 +669,6 @@ sqlstmt:
YYACCEPT;
}
- | SQL_DOT {
- m->emod |= mod_dot;
- m->scanner.as = m->scanner.yycur;
- m->scanner.key = 0;
- }
- sql SCOLON {
- if (m->sym) {
- append_symbol(m->sym->data.lval, $3);
- $$ = m->sym;
- } else {
- m->sym = $$ = $3;
- }
- YYACCEPT;
- }
-
| SQL_DEBUG {
if (m->scanner.mode == LINE_1) {
yyerror(m, "SQL debugging only supported in
interactive mode");
@@ -5107,7 +5092,6 @@ non_reserved_word:
| PREPARE { $$ = sa_strdup(SA, "prepare"); }
| EXECUTE { $$ = sa_strdup(SA, "execute"); }
| SQL_EXPLAIN { $$ = sa_strdup(SA, "explain"); }
-| SQL_DOT { $$ = sa_strdup(SA, "dot"); }
| SQL_DEBUG { $$ = sa_strdup(SA, "debug"); }
| SQL_TRACE { $$ = sa_strdup(SA, "trace"); }
| sqlTEXT { $$ = sa_strdup(SA, "text"); }
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -350,7 +350,6 @@ scanner_init_keywords(void)
keywords_insert("PLAN", SQL_PLAN);
keywords_insert("DEBUG", SQL_DEBUG);
keywords_insert("TRACE", SQL_TRACE);
- keywords_insert("DOT", SQL_DOT);
keywords_insert("PREPARE", PREPARE);
keywords_insert("PREP", PREPARE);
keywords_insert("EXECUTE", EXECUTE);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
