Changeset: 553ef0e09f17 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=553ef0e09f17
Added Files:
monetdb5/modules/mal/Tests/remote13.stable.err
monetdb5/modules/mal/Tests/remote13.stable.out
sql/type.txt
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
sql/backends/monet5/sql_result.c
sql/include/sql_relation.h
sql/server/rel_optimizer.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/FeatureRequests/Tests/All
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out
Branch: default
Log Message:
implemented sending the time spend in the sql optimzer time to the client
implemented removal of (outer) joins with foreign/primary keys when
computing simple count(*) or projecting only columns from the foreign
key side
diffs (truncated from 1093 to 300 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
@@ -533,6 +533,7 @@ int64_t mapi_get_querytime(MapiHdl hdl);
int mapi_get_querytype(MapiHdl hdl);
int64_t mapi_get_row_count(MapiHdl hdl);
int mapi_get_scale(MapiHdl hdl, int fnr);
+int64_t mapi_get_sqloptimizertime(MapiHdl hdl);
char *mapi_get_table(MapiHdl hdl, int fnr);
int mapi_get_tableid(MapiHdl hdl);
stream *mapi_get_to(Mapi mid);
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1844,7 +1844,7 @@ format_result(Mapi mid, MapiHdl hdl, int
}
// get the timings as reported by the backend
- sqloptimizer = 0;
+ sqloptimizer = mapi_get_sqloptimizertime(hdl);
maloptimizer = mapi_get_maloptimizertime(hdl);
querytime = mapi_get_querytime(hdl);
timerHumanStop();
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -876,6 +876,7 @@ struct MapiResultSet {
int64_t last_id;
int64_t querytime;
int64_t maloptimizertime;
+ int64_t sqloptimizertime;
int fieldcnt;
int maxfields;
char *errorstr; /* error from server */
@@ -1442,6 +1443,7 @@ new_result(MapiHdl hdl)
result->errorstr = NULL;
result->querytime = 0;
result->maloptimizertime = 0;
+ result->sqloptimizertime = 0;
memset(result->sqlstate, 0, sizeof(result->sqlstate));
result->tuple_count = 0;
@@ -3764,12 +3766,14 @@ parse_header_line(MapiHdl hdl, char *lin
result->commentonly = 0;
result->querytime = 0;
result->maloptimizertime = 0;
+ result->sqloptimizertime = 0;
nline++; /* skip space */
switch (qt) {
case Q_SCHEMA:
result->querytime = strtoll(nline, &nline, 10);
result->maloptimizertime = strtoll(nline, &nline, 10);
+ result->sqloptimizertime = strtoll(nline, &nline, 10);
break;
case Q_TRANS:
if (*nline == 'f')
@@ -3783,14 +3787,16 @@ parse_header_line(MapiHdl hdl, char *lin
queryid = strtoll(nline, &nline, 10);
result->querytime = strtoll(nline, &nline, 10);
result->maloptimizertime = strtoll(nline, &nline, 10);
+ result->sqloptimizertime = strtoll(nline, &nline, 10);
break;
case Q_TABLE:
- if (sscanf(nline, "%d %" SCNd64 " %d %" SCNd64 " %"
SCNu64 " %" SCNd64 " %" SCNd64,
+ if (sscanf(nline, "%d %" SCNd64 " %d %" SCNd64 " %"
SCNu64 " %" SCNd64 " %" SCNd64 " %" SCNd64,
&result->tableid, &result->row_count,
&result->fieldcnt, &result->tuple_count,
- &queryid, &result->querytime,
&result->maloptimizertime) < 7){
+ &queryid, &result->querytime,
&result->maloptimizertime, &result->sqloptimizertime) < 8){
result->querytime = 0;
result->maloptimizertime = 0;
+ result->sqloptimizertime = 0;
}
(void) queryid; /* ignored for now */
break;
@@ -5323,6 +5329,17 @@ mapi_get_maloptimizertime(MapiHdl hdl)
return result->maloptimizertime;
}
+int64_t
+mapi_get_sqloptimizertime(MapiHdl hdl)
+{
+ struct MapiResultSet *result;
+
+ mapi_hdl_check(hdl, "mapi_get_sqloptimizertime");
+ if ((result = hdl->result) == NULL)
+ return 0;
+ return result->sqloptimizertime;
+}
+
char *
mapi_get_dbname(Mapi mid)
{
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -192,6 +192,7 @@ mapi_export int64_t mapi_get_last_id(Map
mapi_export int64_t mapi_rows_affected(MapiHdl hdl);
mapi_export int64_t mapi_get_querytime(MapiHdl hdl);
mapi_export int64_t mapi_get_maloptimizertime(MapiHdl hdl);
+mapi_export int64_t mapi_get_sqloptimizertime(MapiHdl hdl);
mapi_export char *mapi_fetch_field(MapiHdl hdl, int fnr);
mapi_export size_t mapi_fetch_field_len(MapiHdl hdl, int fnr);
diff --git a/monetdb5/modules/mal/Tests/remote13.stable.err
b/monetdb5/modules/mal/Tests/remote13.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/remote13.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'remote13` in directory 'monetdb5/modules/mal` itself:
+
+
+# 12:00:52 >
+# 12:00:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36666" "--set"
"mapi_usock=/var/tmp/mtest-15635/.s.monetdb.36666" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_monetdb5_modules_mal"
+# 12:00:52 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 36666
+# cmdline opt mapi_usock = /var/tmp/mtest-15635/.s.monetdb.36666
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_monetdb5_modules_mal
+# cmdline opt gdk_debug = 553648138
+
+# 12:00:52 >
+# 12:00:52 > "mclient" "-lmal" "-ftest" "-tnone" "-Eutf-8"
"--host=/var/tmp/mtest-15635" "--port=36666"
+# 12:00:52 >
+
+
+# 12:00:52 >
+# 12:00:52 > "Done."
+# 12:00:52 >
+
diff --git a/monetdb5/modules/mal/Tests/remote13.stable.out
b/monetdb5/modules/mal/Tests/remote13.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/remote13.stable.out
@@ -0,0 +1,33 @@
+stdout of test 'remote13` in directory 'monetdb5/modules/mal` itself:
+
+
+# 12:00:52 >
+# 12:00:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36666" "--set"
"mapi_usock=/var/tmp/mtest-15635/.s.monetdb.36666" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_monetdb5_modules_mal"
+# 12:00:52 >
+
+# MonetDB 5 server v11.30.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_modules_mal', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.324 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:36666/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15635/.s.monetdb.36666
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:00:52 >
+# 12:00:52 > "mclient" "-lmal" "-ftest" "-tnone" "-Eutf-8"
"--host=/var/tmp/mtest-15635" "--port=36666"
+# 12:00:52 >
+
+[ "mTests_monetdb5_modules_mal_monetdb_0" ]
+[ nil ]
+
+# 12:00:52 >
+# 12:00:52 > "Done."
+# 12:00:52 >
+
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2159,6 +2159,8 @@ mvc_export_affrows(backend *b, stream *s
!mvc_send_lng(s, starttime > 0 ? GDKusec() - starttime : 0) ||
mnstr_write(s, " ", 1, 1) != 1 ||
!mvc_send_lng(s, maloptimizer) ||
+ mnstr_write(s, " ", 1, 1) != 1 ||
+ !mvc_send_lng(s, m->Topt) ||
mnstr_write(s, "\n", 1, 1) != 1)
return -1;
if (mvc_export_warning(s, w) != 1)
@@ -2398,6 +2400,9 @@ mvc_export_head(backend *b, stream *s, i
if (mnstr_write(s, " ", 1, 1) != 1 || !mvc_send_lng(s, maloptimizer))
return -1;
+ if (mnstr_write(s, " ", 1, 1) != 1 || !mvc_send_lng(s, m->Topt))
+ return -1;
+
if (mnstr_write(s, "\n% ", 3, 1) != 1)
return -1;
for (i = 0; i < t->nr_cols; i++) {
diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -173,6 +173,8 @@ typedef enum operator_type {
(et == e_func || et == e_convert)
#define is_column(et) \
(et != e_cmp)
+#define is_alias(et) \
+ (et == e_column)
#define is_analytic(e) \
(e->type == e_func && ((sql_subfunc*)e->f)->func->type == F_ANALYTIC)
#define is_base(op) \
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -358,6 +358,20 @@ get_relations(mvc *sql, sql_rel *rel, li
}
}
+static void
+get_inner_relations(mvc *sql, sql_rel *rel, list *rels)
+{
+ if (!rel_is_ref(rel) && is_join(rel->op)) {
+ sql_rel *l = rel->l;
+ sql_rel *r = rel->r;
+
+ get_inner_relations(sql, l, rels);
+ get_inner_relations(sql, r, rels);
+ } else {
+ append(rels, rel);
+ }
+}
+
static int
exp_count(int *cnt, sql_exp *e)
{
@@ -1085,14 +1099,20 @@ reorder_join(mvc *sql, sql_rel *rel)
rel->exps = NULL; /* should be all crosstables by now */
rels = new_rel_list(sql->sa);
if (is_outerjoin(rel->op)) {
+ sql_rel *l, *r;
int cnt = 0;
/* try to use an join index also for outer joins */
- list_append(rels, rel->l);
- list_append(rels, rel->r);
+ get_inner_relations(sql, rel, rels);
cnt = list_length(exps);
rel->exps = find_fk(sql, rels, exps);
if (list_length(rel->exps) != cnt)
rel->exps = order_join_expressions(sql, exps, rels);
+ l = rel->l;
+ r = rel->r;
+ if (is_join(l->op))
+ rel->l = reorder_join(sql, rel->l);
+ if (is_join(r->op))
+ rel->r = reorder_join(sql, rel->r);
} else {
get_relations(sql, rel, rels);
if (list_length(rels) > 1) {
@@ -1721,13 +1741,15 @@ rel_push_func_down(int *changes, mvc *sq
* ) [ sql_mul(.., .. NOT
NULL) ]
* )
*/
-
-
-
static sql_rel *
rel_push_count_down(int *changes, mvc *sql, sql_rel *rel)
{
- sql_rel *r = rel->l;
+ sql_rel *r;
+
+ if (!is_groupby(rel->op))
+ return rel;
+
+ r = rel->l;
if (is_groupby(rel->op) && !rel_is_ref(rel) &&
r && !r->exps && r->op == op_join && !(rel_is_ref(r)) &&
@@ -1788,6 +1810,158 @@ rel_push_count_down(int *changes, mvc *s
return rel;
}
+
+static sql_rel *
+rel_simplify_project_fk_join(int *changes, mvc *sql, sql_rel *r, list *pexps)
+{
+ sql_rel *rl = r->l;
+ sql_rel *rr = r->r;
+ sql_exp *je;
+ node *n;
+ int fk_left = 1;
+
+ /* check for foreign key join */
+ if (!r->exps || list_length(r->exps) != 1)
+ return r;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
