Changeset: d199beeb9b99 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d199beeb9b99
Modified Files:
sql/benchmarks/tpcds/Tests/40.stable.out
sql/benchmarks/tpcds/Tests/40.stable.out.int128
sql/server/rel_optimizer.c
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
Branch: Oct2020
Log Message:
merged with jun2020
diffs (80 lines):
diff --git a/sql/benchmarks/tpcds/Tests/40.stable.out
b/sql/benchmarks/tpcds/Tests/40.stable.out
--- a/sql/benchmarks/tpcds/Tests/40.stable.out
+++ b/sql/benchmarks/tpcds/Tests/40.stable.out
@@ -35,7 +35,7 @@ stdout of test '40` in directory 'sql/be
# END) AS sales_after
#FROM catalog_sales
#LEFT OUTER JOIN catalog_returns ON (cs_order_number = cr_order_number
-% sys.warehouse, .item, ., . # table_name
+% sys.warehouse, sys.item, ., . # table_name
% w_state, i_item_id, sales_before, sales_after # name
% char, char, decimal, decimal # type
% 2, 16, 20, 20 # length
diff --git a/sql/benchmarks/tpcds/Tests/40.stable.out.int128
b/sql/benchmarks/tpcds/Tests/40.stable.out.int128
--- a/sql/benchmarks/tpcds/Tests/40.stable.out.int128
+++ b/sql/benchmarks/tpcds/Tests/40.stable.out.int128
@@ -35,7 +35,7 @@ stdout of test '40` in directory 'sql/be
# END) AS sales_after
#FROM catalog_sales
#LEFT OUTER JOIN catalog_returns ON (cs_order_number = cr_order_number
-% sys.warehouse, .item, ., . # table_name
+% sys.warehouse, sys.item, ., . # table_name
% w_state, i_item_id, sales_before, sales_after # name
% char, char, decimal, decimal # type
% 2, 16, 40, 40 # length
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
@@ -663,7 +663,6 @@ order_join_expressions(mvc *sql, list *d
node *n = NULL;
int i, *keys, cnt = list_length(dje);
void **data;
- int debug = mvc_debug_on(sql, 16);
if (cnt == 0)
return res;
@@ -681,9 +680,9 @@ order_join_expressions(mvc *sql, list *d
sql_rel *r = find_rel(rels, e->r);
if (l && is_select(l->op) && l->exps)
- keys[i] += list_length(l->exps)*10 +
exps_count(l->exps)*debug;
+ keys[i] += list_length(l->exps)*10 +
exps_count(l->exps);
if (r && is_select(r->op) && r->exps)
- keys[i] += list_length(r->exps)*10 +
exps_count(r->exps)*debug;
+ keys[i] += list_length(r->exps)*10 +
exps_count(r->exps);
}
data[i] = n->data;
}
@@ -939,6 +938,8 @@ order_joins(visitor *v, list *rels, list
while(list_length(exps) && fnd) {
fnd = 0;
/* find the first expression which could be added */
+ if (list_length(sdje) > 1)
+ sdje = order_join_expressions(v->sql, sdje, rels);
for(djn = sdje->h; djn && !fnd && rels->h; djn =
(!fnd)?djn->next:NULL) {
node *ln, *rn, *en;
diff --git a/sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out
b/sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out
--- a/sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out
+++ b/sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out
@@ -31,7 +31,7 @@ stdout of test 'fk-smaller-pk.Bug-3983`
#CREATE TABLE parent2(a int, b int, PRIMARY KEY(a,b));
#CREATE TABLE child1(x int, y int, FOREIGN KEY(x,y) REFERENCES parent2);
#SELECT table_name, column_name, key_name, key_col_nr, key_type, depend_type
FROM dependency_columns_on_keys WHERE table_name LIKE 'parent%' AND key_name
LIKE 'parent%';
-% .dependency_columns_on_keys, .dependency_columns_on_keys,
.dependency_columns_on_keys, .dependency_columns_on_keys,
.dependency_columns_on_keys, .dependency_columns_on_keys # table_name
+% .dependency_columns_on_keys, .dependency_columns_on_keys,
sys.dependency_columns_on_keys, .dependency_columns_on_keys,
sys.dependency_columns_on_keys, .dependency_columns_on_keys # table_name
% table_name, column_name, key_name, key_col_nr, key_type,
depend_type # name
% varchar, varchar, varchar, int, smallint,
smallint # type
% 7, 1, 16, 1, 1, 1 # length
diff --git a/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
b/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
--- a/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
+++ b/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
@@ -174,7 +174,7 @@ stdout of test 'check_MaxStrLength_viola
% char, smallint, int, varchar # type
% 48, 1, 1, 0 # length
#SELECT '"sys"."dependency_columns_on_keys"."key_name"' as full_col_nm, 1024
as max_allowed_length, length("key_name") as data_length, t."key_name" as
data_value FROM "sys"."dependency_columns_on_keys" t WHERE "key_name" IS NOT
NULL AND length("key_name") > (select type_digits from sys._columns where name
= 'key_name' and table_id in (select id from tables where name =
'dependency_columns_on_keys' and schema_id in (select id from sys.schemas where
name = 'sys')));
-% ., ., ., . # table_name
+% ., ., sys., sys. # table_name
% full_col_nm, max_allowed_length, data_length, data_value # name
% char, smallint, int, varchar # type
% 45, 1, 1, 0 # length
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
