Changeset: c032d57a5b48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c032d57a5b48
Modified Files:
sql/backends/monet5/rel_bin.c
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
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
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
Branch: default
Log Message:
moved x = c1 or x = c2 etc detection into the rel_optimizer
It converts it into a cmp_in (ie x in(list))
diffs (truncated from 608 to 300 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -202,37 +202,6 @@ row2cols(mvc *sql, stmt *sub)
return sub;
}
-/* Here we also recognize 'IN/NOT IN'.
- * We change that into multiple subselects (with for IN merges).
- */
-static int
-are_equality_exps( list *exps )
-{
- if (list_length(exps) == 1) {
- sql_exp *e = exps->h->data, *le = e->l, *re = e->r;
-
- if (e->type == e_cmp && e->flag == cmp_equal && le->card !=
CARD_ATOM && re->card == CARD_ATOM)
- return 1;
- if (e->type == e_cmp && e->flag == cmp_or)
- return (are_equality_exps(e->l) &&
- are_equality_exps(e->r));
- }
- return 0;
-}
-
-static void
-get_exps( list *n, list *l )
-{
- sql_exp *e = l->h->data, *re = e->r;
-
- if (e->type == e_cmp && e->flag == cmp_equal && re->card == CARD_ATOM)
- list_append(n, e);
- if (e->type == e_cmp && e->flag == cmp_or) {
- get_exps(n, e->l);
- get_exps(n, e->r);
- }
-}
-
static stmt *
handle_in_exps( mvc *sql, sql_exp *ce, list *nl, stmt *left, stmt *right, stmt
*grp, stmt *ext, stmt *cnt, stmt *sel, int in, int use_r)
{
@@ -280,30 +249,6 @@ handle_in_exps( mvc *sql, sql_exp *ce, l
return s;
}
-/* For now this only works if all or's are part of the 'IN' */
-static stmt *
-handle_equality_exps( mvc *sql, list *l, list *r, stmt *left, stmt *right,
stmt *grp, stmt *ext, stmt *cnt, stmt *sel )
-{
- node *n;
- sql_exp *ce = NULL;
- list *nl = new_exp_list(sql->sa);
-
- get_exps(nl, l);
- get_exps(nl, r);
-
- for( n = nl->h; n; n = n->next) {
- sql_exp *e = n->data;
- if (!ce) {
- ce = e->l;
- if (!is_column(ce->type))
- return NULL;
- }
- if (!exp_match(ce, e->l))
- return NULL;
- }
- return handle_in_exps( sql, ce, nl, left, right, grp, ext, cnt, sel, 1,
1);
-}
-
static stmt *
value_list( mvc *sql, list *vals)
{
@@ -612,12 +557,6 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left
node *n;
stmt *sel1 = NULL, *sel2 = NULL;
- /* Here we also recognize 'IN/NOT IN'.
- * We change that into multiple subselects (with for IN
merges).
- */
- if (are_equality_exps(e->l) && are_equality_exps(e->r))
- if ((s = handle_equality_exps(sql, e->l, e->r,
left, right, grp, ext, cnt, sel)) != NULL)
- return s;
sel1 = sel;
sel2 = sel;
for( n = l->h; n; n = n->next ) {
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1241,6 +1241,7 @@ sqltypeinit( sql_allocator *sa)
/* needed for relational version */
sql_create_func(sa, "in", "calc", "in", ANY, ANY, BIT, SCALE_NONE);
sql_create_func(sa, "identity", "batcalc", "identity", ANY, NULL, OID,
SCALE_NONE);
+ sql_create_func(sa, "rowid", "calc", "identity", ANY, NULL, INT,
SCALE_NONE);
/* needed for indices/clusters oid(schema.table,val) returns
max(head(schema.table))+1 */
sql_create_func3(sa, "rowid", "calc", "rowid", ANY, STR, STR, OID,
SCALE_NONE);
sql_create_aggr(sa, "min", "aggr", "min", ANY, ANY);
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
@@ -2324,6 +2324,52 @@ exps_cse( sql_allocator *sa, list *oexps
return res;
}
+static int
+are_equality_exps( list *exps, sql_exp **L)
+{
+ sql_exp *l = *L;
+
+ if (list_length(exps) == 1) {
+ sql_exp *e = exps->h->data, *le = e->l, *re = e->r;
+
+ if (e->type == e_cmp && e->flag == cmp_equal && le->card !=
CARD_ATOM && re->card == CARD_ATOM) {
+ if (!l) {
+ *L = l = le;
+ if (!is_column(le->type))
+ return 0;
+ }
+ return (exp_match(l, le));
+ }
+ if (e->type == e_cmp && e->flag == cmp_or)
+ return (are_equality_exps(e->l, L) &&
+ are_equality_exps(e->r, L));
+ }
+ return 0;
+}
+
+static void
+get_exps( list *n, list *l )
+{
+ sql_exp *e = l->h->data, *re = e->r;
+
+ if (e->type == e_cmp && e->flag == cmp_equal && re->card == CARD_ATOM)
+ list_append(n, re);
+ if (e->type == e_cmp && e->flag == cmp_or) {
+ get_exps(n, e->l);
+ get_exps(n, e->r);
+ }
+}
+
+static sql_exp *
+equality_exps_2_in( mvc *sql, sql_exp *ce, list *l, list *r)
+{
+ list *nl = new_exp_list(sql->sa);
+
+ get_exps(nl, l);
+ get_exps(nl, r);
+
+ return exp_in( sql->sa, ce, nl, cmp_in);
+}
static sql_rel *
rel_select_cse(int *changes, mvc *sql, sql_rel *rel)
@@ -2345,6 +2391,32 @@ rel_select_cse(int *changes, mvc *sql, s
nexps = new_exp_list(sql->sa);
for (n=rel->exps->h; n; n = n->next) {
+ sql_exp *e = n->data, *l = NULL;
+
+ if (e->type == e_cmp && e->flag == cmp_or &&
are_equality_exps(e->l, &l) && are_equality_exps(e->r, &l) && l) {
+ (*changes)++;
+ append(nexps, equality_exps_2_in(sql, l, e->l,
e->r));
+ } else {
+ append(nexps, e);
+ }
+ }
+ rel->exps = nexps;
+ }
+ if (is_select(rel->op) && rel->exps) {
+ node *n;
+ list *nexps;
+ int needed = 0;
+
+ for (n=rel->exps->h; n && !needed; n = n->next) {
+ sql_exp *e = n->data;
+
+ if (e->type == e_cmp && e->flag == cmp_or)
+ needed = 1;
+ }
+ if (!needed)
+ return rel;
+ nexps = new_exp_list(sql->sa);
+ for (n=rel->exps->h; n; n = n->next) {
sql_exp *e = n->data;
if (e->type == e_cmp && e->flag == cmp_or) {
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -47,20 +47,20 @@ Ready.
[ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0
]
[ 2135, "triggers", 2102, NULL, 0, true, 2, false,
0 ]
[ 2146, "objects", 2102, NULL, 0, true, 2, false,
0 ]
-[ 5060, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS
\"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS
\"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;",
1, true, 0, false, 0 ]
-[ 5070, "columns", 2000, "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, false, 0 ]
-[ 5090, "db_user_info", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5098, "users", 2000, "SELECT u.\"name\" AS \"name\",
ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN
\"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true,
0, false, 0 ]
-[ 5102, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5105, "auths", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5109, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5262, "queryhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5276, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5293, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
-[ 6034, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6075, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
-[ 6097, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6206, "r", 2000, NULL, 0, false, 0, false, 0
]
+[ 5062, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS
\"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS
\"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;",
1, true, 0, false, 0 ]
+[ 5072, "columns", 2000, "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, false, 0 ]
+[ 5092, "db_user_info", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5100, "users", 2000, "SELECT u.\"name\" AS \"name\",
ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN
\"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true,
0, false, 0 ]
+[ 5104, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5107, "auths", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5111, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5264, "queryhistory", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5278, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
+[ 5295, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
+[ 6036, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6077, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
+[ 6099, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6208, "r", 2000, NULL, 0, false, 0, false, 0
]
# 18:53:13 >
# 18:53:13 > "Done."
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
@@ -54,20 +54,20 @@ Ready.
[ "oid", "int", 8 ]
[ "oid", "int", 8 ]
[ "oid", "int", 155 ]
-[ "oid", "int", 1206 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
+[ "oid", "int", 1207 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
[ "oid", "lng", 1 ]
[ "oid", "lng", 2 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 155 ]
-[ "oid", "str", 3314 ]
-[ "oid", "str", 3314 ]
+[ "oid", "str", 3316 ]
+[ "oid", "str", 3316 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # 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
@@ -34,8 +34,8 @@ Ready.
[ "oid", "bit", 61 ]
[ "oid", "bit", 61 ]
[ "oid", "bit", 326 ]
-[ "oid", "bit", 1206 ]
-[ "oid", "bit", 1206 ]
+[ "oid", "bit", 1207 ]
+[ "oid", "bit", 1207 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -88,15 +88,15 @@ Ready.
[ "oid", "int", 326 ]
[ "oid", "int", 326 ]
[ "oid", "int", 326 ]
-[ "oid", "int", 1206 ]
-[ "oid", "int", 1206 ]
-[ "oid", "int", 1206 ]
-[ "oid", "int", 1206 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
-[ "oid", "int", 3314 ]
+[ "oid", "int", 1207 ]
+[ "oid", "int", 1207 ]
+[ "oid", "int", 1207 ]
+[ "oid", "int", 1207 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
+[ "oid", "int", 3316 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -180,11 +180,11 @@ Ready.
[ "oid", "str", 326 ]
[ "oid", "str", 326 ]
[ "oid", "str", 326 ]
-[ "oid", "str", 1206 ]
-[ "oid", "str", 1206 ]
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
