Changeset: dbc6fcf385c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbc6fcf385c3
Modified Files:
sql/server/rel_select.c
sql/test/analytics/Tests/analytics02.stable.out
Branch: window-tunning
Log Message:
Don't create too many labels
diffs (truncated from 1275 to 300 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4483,8 +4483,6 @@ calculate_window_bound(sql_query *query,
}
}
}
- if (res && !exp_name(res))
- exp_label(sql->sa, res, ++sql->label);
return res;
}
@@ -4767,8 +4765,7 @@ rel_rankop(sql_query *query, sql_rel **r
} else {
pe = exp_atom_bool(sql->sa, 0);
}
- if (pe && !exp_name(pe))
- exp_label(sql->sa, pe, ++sql->label);
+
/* diff for orderby */
if (obe) {
sql_subtype *bt = sql_bind_localtype("bit");
@@ -4798,8 +4795,6 @@ rel_rankop(sql_query *query, sql_rel **r
} else {
oe = exp_atom_bool(sql->sa, 0);
}
- if (oe && !exp_name(oe))
- exp_label(sql->sa, oe, ++sql->label);
if (frame_clause || supports_frames) {
if (frame_type == FRAME_RANGE)
@@ -4888,11 +4883,6 @@ rel_rankop(sql_query *query, sql_rel **r
if (!pe || !oe)
return NULL;
- if (start && !exp_name(start))
- exp_label(sql->sa, start, ++sql->label);
- if (eend && !exp_name(eend))
- exp_label(sql->sa, eend, ++sql->label);
-
if (!supports_frames) {
list_append(fargs, pe);
list_append(fargs, oe);
@@ -4921,8 +4911,6 @@ rel_rankop(sql_query *query, sql_rel **r
list_append(args, start && eend ? exp_copy(sql, pe) :
pe);
}
call = exp_rank_op(sql->sa, list_empty(args) ? NULL : args, gbe, obe,
wf);
- if (call && !exp_name(call))
- exp_label(sql->sa, call, ++sql->label);
*rel = p;
return call;
}
diff --git a/sql/test/analytics/Tests/analytics02.stable.out
b/sql/test/analytics/Tests/analytics02.stable.out
--- a/sql/test/analytics/Tests/analytics02.stable.out
+++ b/sql/test/analytics/Tests/analytics02.stable.out
@@ -36,11 +36,11 @@ stdout of test 'analytics02` in director
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 6, 3, 1, 0, 2, 2 # length
-[ "bigint", 64, 0, "", "%7", "%7" ]
+[ "bigint", 64, 0, "", "%1", "%1" ]
[ "bigint", 64, 0, NULL, NULL, NULL ]
#exec 0(2);
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% bigint # type
% 1 # length
[ 1 ]
@@ -59,11 +59,11 @@ stdout of test 'analytics02` in director
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 7, 2, 1, 0, 2, 2 # length
-[ "varchar", 0, 0, "", "%7", "%7" ]
+[ "varchar", 0, 0, "", "%1", "%1" ]
[ "bigint", 64, 0, NULL, NULL, NULL ]
-#exec 13(2);
-% sys.%7 # table_name
-% %7 # name
+#exec 1(2);
+% sys.%1 # table_name
+% %1 # name
% varchar # type
% 6 # length
[ "stress" ]
@@ -76,8 +76,8 @@ stdout of test 'analytics02` in director
[ "stress" ]
[ "please" ]
#select cast(sum(aa) over (rows between 5 preceding and 0 following) as
bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 2 # length
[ 15 ]
@@ -91,8 +91,8 @@ stdout of test 'analytics02` in director
[ 26 ]
[ 21 ]
#select cast(sum(aa) over (rows between 5 preceding and 2 following) as
bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 2 # length
[ 20 ]
@@ -106,8 +106,8 @@ stdout of test 'analytics02` in director
[ 26 ]
[ 21 ]
#select cast(sum(aa) over (partition by bb order by bb rows between 5
preceding and 0 following) as bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 2 # length
[ 3 ]
@@ -121,8 +121,8 @@ stdout of test 'analytics02` in director
[ 26 ]
[ NULL ]
#select cast(sum(aa) over (partition by bb order by bb rows between 5
preceding and 2 following) as bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 2 # length
[ 9 ]
@@ -136,8 +136,8 @@ stdout of test 'analytics02` in director
[ 26 ]
[ NULL ]
#select cast(prod(aa) over (rows between 5 preceding and 0 following) as
bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 4 # length
[ 15 ]
@@ -151,8 +151,8 @@ stdout of test 'analytics02` in director
[ 2880 ]
[ 576 ]
#select cast(prod(aa) over (rows between 5 preceding and 2 following) as
bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 5 # length
[ 90 ]
@@ -166,8 +166,8 @@ stdout of test 'analytics02` in director
[ 2880 ]
[ 576 ]
#select cast(prod(aa) over (partition by bb order by bb rows between 5
preceding and 0 following) as bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 3 # length
[ 3 ]
@@ -181,8 +181,8 @@ stdout of test 'analytics02` in director
[ 450 ]
[ NULL ]
#select cast(prod(aa) over (partition by bb order by bb rows between 5
preceding and 2 following) as bigint) from analytics;
-% sys.%10 # table_name
-% %10 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 3 # length
[ 24 ]
@@ -196,8 +196,8 @@ stdout of test 'analytics02` in director
[ 450 ]
[ NULL ]
#select avg(aa) over (rows between 5 preceding and 0 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% double # type
% 24 # length
[ 15 ]
@@ -211,8 +211,8 @@ stdout of test 'analytics02` in director
[ 5.2 ]
[ 5.25 ]
#select avg(aa) over (rows between 5 preceding and 2 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% double # type
% 24 # length
[ 6.666666667 ]
@@ -226,8 +226,8 @@ stdout of test 'analytics02` in director
[ 5.2 ]
[ 5.25 ]
#select avg(aa) over (partition by bb order by bb rows between 5 preceding and
0 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% double # type
% 24 # length
[ 3 ]
@@ -241,8 +241,8 @@ stdout of test 'analytics02` in director
[ 8.666666667 ]
[ NULL ]
#select avg(aa) over (partition by bb order by bb rows between 5 preceding and
2 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% double # type
% 24 # length
[ 3 ]
@@ -256,8 +256,8 @@ stdout of test 'analytics02` in director
[ 8.666666667 ]
[ NULL ]
#select min(aa) over (rows between 5 preceding and 0 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 2 # length
[ 15 ]
@@ -271,8 +271,8 @@ stdout of test 'analytics02` in director
[ 3 ]
[ 3 ]
#select min(aa) over (rows between 5 preceding and 2 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 1 # length
[ 2 ]
@@ -286,8 +286,8 @@ stdout of test 'analytics02` in director
[ 3 ]
[ 3 ]
#select min(aa) over (partition by bb order by bb rows between 5 preceding and
0 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 2 # length
[ 3 ]
@@ -301,8 +301,8 @@ stdout of test 'analytics02` in director
[ 5 ]
[ NULL ]
#select min(aa) over (partition by bb order by bb rows between 5 preceding and
2 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 1 # length
[ 2 ]
@@ -316,8 +316,8 @@ stdout of test 'analytics02` in director
[ 5 ]
[ NULL ]
#select max(aa) over (rows between 5 preceding and 0 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 2 # length
[ 15 ]
@@ -331,8 +331,8 @@ stdout of test 'analytics02` in director
[ 8 ]
[ 8 ]
#select max(aa) over (rows between 5 preceding and 2 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 2 # length
[ 15 ]
@@ -346,8 +346,8 @@ stdout of test 'analytics02` in director
[ 8 ]
[ 8 ]
#select max(aa) over (partition by bb order by bb rows between 5 preceding and
0 following) from analytics;
-% sys.%7 # table_name
-% %7 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 2 # length
[ 3 ]
@@ -361,8 +361,8 @@ stdout of test 'analytics02` in director
[ 15 ]
[ NULL ]
#select max(aa) over (partition by bb order by bb rows between 5 preceding and
2 following) from analytics;
-% sys.%7 # table_name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
