Changeset: ee35b016b507 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ee35b016b507
Modified Files:
clients/mapiclient/mhelp.c
sql/ChangeLog
sql/backends/monet5/sql.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_scan.c
Branch: default
Log Message:
Move unnest and rewrite explain steps names to rel_unnest and rel_rewrite
diffs (139 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -412,10 +412,10 @@ SQLhelp sqlhelp1[] = {
{"EXPLAIN",
"Display logical or physical execution plan for the SQL statement.",
"EXPLAIN [BEFORE|AFTER] [step] [SHOW DETAILS] statement\n"
- "step [UNNEST|REWRITE|PHYSICAL]",
+ "step [REL_UNNEST|REL_REWRITE|PHYSICAL]",
NULL,
"Plain EXPLAIN defaults to logical execution plan.\n"
- "Use UNNEST|REWRITE|PHYSICAL to specify compilation step to show.\n"
+ "Use REL_UNNEST|REL_REWRITE|PHYSICAL to specify compilation step to
show.\n"
"Use BEFORE|AFTER to specify moment of compilation step\n"
"to output. The default is AFTER.\n"
"SHOW DETAILS displays column properties, rewriter number of changes\n"
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -2,8 +2,8 @@
# This file is updated with Maddlog
* Fri Oct 3 2025 Lucas Pereira <[email protected]>
-- EXPLAIN now supports a BEFORE/AFTER UNNEST/REWRITE/PHYSICAL clause
- to indicate which phase of query compilation to show. A plain
+ - EXPLAIN now supports a BEFORE/AFTER REL_UNNEST/REL_REWRITE/PHYSICAL
+ clause to indicate which phase of query compilation to show. A plain
EXPLAIN is equivalent to EXPLAIN BEFORE PHYSICAL, which is what PLAN
used to do. The old EXPLAIN is now EXPLAIN PHYSICAL. SHOW DETAILS
includes more information about properties, rewriters number of
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
@@ -5580,7 +5580,7 @@ SQLread_dump_rel(Client cntxt, MalBlkPtr
if (refs == NULL)
goto bailout;
- m->step = S_REWRITE;
+ m->step = S_REL_REWRITE;
m->temporal = T_AFTER;
m->show_details = true;
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
@@ -1584,11 +1584,11 @@ sql_processrelation(mvc *sql, sql_rel *r
int emode = sql->emode;
if (!instantiate)
sql->emode = m_deps;
- if (emode == m_plan && BEFORE_UNNEST(sql))
+ if (emode == m_plan && BEFORE_REL_UNNEST(sql))
return rel;
if (rel)
rel = rel_unnest(sql, rel);
- if (emode == m_plan && (AFTER_UNNEST(sql) || BEFORE_REWRITE(sql)))
+ if (emode == m_plan && (AFTER_REL_UNNEST(sql) ||
BEFORE_REL_REWRITE(sql)))
return rel;
sql->emode = emode;
if (rel)
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
@@ -70,21 +70,21 @@
#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_REL_UNNEST 1
+#define S_REL_REWRITE 2
+#define S_PHYSICAL 3
#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)
-#define BEFORE_REWRITE(m) (m->step == S_REWRITE && m->temporal == T_BEFORE)
-#define AFTER_REWRITE(m) (m->step == S_REWRITE && m->temporal == T_AFTER)
-#define BEFORE_PHYSICAL(m) (m->step == S_PHYSICAL && m->temporal == T_BEFORE)
-#define AFTER_PHYSICAL(m) (m->step == S_PHYSICAL && m->temporal == T_AFTER)
+#define BEFORE_REL_UNNEST(m) (m->step == S_REL_UNNEST && m->temporal ==
T_BEFORE)
+#define AFTER_REL_UNNEST(m) (m->step == S_REL_UNNEST && m->temporal ==
T_AFTER)
+#define BEFORE_REL_REWRITE(m) (m->step == S_REL_REWRITE && m->temporal ==
T_BEFORE)
+#define AFTER_REL_REWRITE(m) (m->step == S_REL_REWRITE && m->temporal ==
T_AFTER)
+#define BEFORE_PHYSICAL(m) (m->step == S_PHYSICAL && m->temporal ==
T_BEFORE)
+#define AFTER_PHYSICAL(m) (m->step == S_PHYSICAL && m->temporal ==
T_AFTER)
typedef struct sql_groupby_expression {
symbol *sdef;
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
@@ -674,7 +674,7 @@ SQLCODE SQLERROR UNDER WHENEVER
%token TYPE PROCEDURE FUNCTION sqlLOADER AGGREGATE RETURNS EXTERNAL sqlNAME
DECLARE
%token CALL LANGUAGE
%token ANALYZE SQL_EXPLAIN SQL_TRACE PREP PREPARE EXEC EXECUTE DEALLOCATE
-%token UNNEST REWRITE PHYSICAL SHOW DETAILS
+%token REL_UNNEST REL_REWRITE PHYSICAL SHOW DETAILS
%token DEFAULT DISTINCT DROP TRUNCATE
%token FOREIGN
%token RENAME ENCRYPTED UNENCRYPTED PASSWORD GRANT REVOKE ROLE ADMIN INTO
@@ -914,15 +914,15 @@ explain:
| SQL_EXPLAIN opt_show_properties
{
m->emode = m_plan;
- m->step = S_REWRITE;
+ m->step = S_REL_REWRITE;
m->temporal = T_AFTER;
m->scanner.as = m->scanner.yycur;
}
;
relational_step:
- UNNEST { m->step = S_UNNEST; }
- | REWRITE { m->step = S_REWRITE; }
+ REL_UNNEST { m->step = S_REL_UNNEST; }
+ | REL_REWRITE { m->step = S_REL_REWRITE; }
;
physical_step:
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
@@ -473,8 +473,8 @@ scanner_init_keywords(void)
failed += keywords_insert("ANALYZE", ANALYZE);
failed += keywords_insert("EXPLAIN", SQL_EXPLAIN);
- failed += keywords_insert("UNNEST", UNNEST);
- failed += keywords_insert("REWRITE", REWRITE);
+ failed += keywords_insert("REL_UNNEST", REL_UNNEST);
+ failed += keywords_insert("REL_REWRITE", REL_REWRITE);
failed += keywords_insert("PHYSICAL", PHYSICAL);
failed += keywords_insert("SHOW", SHOW);
failed += keywords_insert("DETAILS", DETAILS);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
