Changeset: f79b38133a7b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f79b38133a7b
Modified Files:
sql/benchmarks/tpcds/Tests/48.stable.out
sql/server/rel_optimizer.c
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
Branch: sq2default
Log Message:
Reduce the depth of rel_merge_identical_joins to 5 and more tests approval
diffs (45 lines):
diff --git a/sql/benchmarks/tpcds/Tests/48.stable.out
b/sql/benchmarks/tpcds/Tests/48.stable.out
--- a/sql/benchmarks/tpcds/Tests/48.stable.out
+++ b/sql/benchmarks/tpcds/Tests/48.stable.out
@@ -35,8 +35,13 @@ stdout of test '48` in directory 'sql/be
# AND ((cd_demo_sk = ss_cdemo_sk
# AND cd_marital_status = 'M'
# AND cd_education_status = '4 yr Degree'
-% sys.L35 # table_name
-% L35 # name
+# AND ss_sales_price BETWEEN 100.00 AND 150.00)
+# OR (cd_demo_sk = ss_cdemo_sk
+# AND cd_marital_status = 'D'
+# AND cd_education_status = '2 yr Degree'
+# AND ss_sales_price BETWEEN 50.00 AND 100.00)
+% sys.%1 # table_name
+% %1 # name
% bigint # type
% 5 # length
[ 26257 ]
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
@@ -5271,7 +5271,7 @@ typedef struct {
static void
rel_find_joins(mvc *sql, sql_rel *parent, sql_rel *rel, list *l, int depth)
{
- if (!rel || depth == 20) /* limit to 20 relations bellow in the tree */
+ if (!rel || depth == 5) /* limit to 5 relations bellow in the tree */
return;
switch (rel->op) {
diff --git
a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
--- a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
+++ b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
@@ -43,8 +43,8 @@ stdout of test 'side-effect.Bug-6397` in
% 161 # length
function user.s4_0():void;
X_5:void := querylog.define("explain select count(*) from
my_generate_series(1,5) as t1,\nmy_generate_series(1,100) as t2;":str,
"default_pipe":str, 28:int);
- X_31:bat[:str] := bat.pack(".L6":str);
- X_32:bat[:str] := bat.pack("L6":str);
+ X_31:bat[:str] := bat.pack(".%5":str);
+ X_32:bat[:str] := bat.pack("%5":str);
X_33:bat[:str] := bat.pack("bigint":str);
X_34:bat[:int] := bat.pack(64:int);
X_35:bat[:int] := bat.pack(0:int);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
