Changeset: b9a9f7b5c7cf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9a9f7b5c7cf
Modified Files:
monetdb5/optimizer/opt_mergetable.c
sql/benchmarks/tpcds/Tests/alter.timeout
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
Branch: Jun2020
Log Message:
Small test fixes, increased tpcds alter test timeout to 3 minutes, throw a
tracer info message for mergetable optimizer bailout on semijoinRef and
selectNotNilRef instead of debug. Approved output
diffs (69 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1933,7 +1933,7 @@ OPTmergetableImplementation(Client cntxt
if (getFunctionId(q) == subgroupdoneRef ||
getFunctionId(q) == groupdoneRef)
groupdone = 1;
}
- /* bail out if there is a input for a group, which has been
used for a group already (solves problems with qube like groupings) */
+ /* bail out if there is a input for a group, which has been
used for a group already (solves problems with cube like groupings) */
if (getModuleId(p) == groupRef &&
(getFunctionId(p) == subgroupRef ||
getFunctionId(p) == subgroupdoneRef ||
@@ -1950,12 +1950,12 @@ OPTmergetableImplementation(Client cntxt
}
if (getModuleId(p) == algebraRef &&
getFunctionId(p) == selectNotNilRef ) {
- TRC_WARNING(MAL_OPTIMIZER, "Mergetable bailout not nil
ref\n");
+ TRC_INFO(MAL_OPTIMIZER, "Mergetable bailout not nil
ref\n");
bailout = 1;
}
if (getModuleId(p) == algebraRef &&
getFunctionId(p) == semijoinRef ) {
- TRC_WARNING(MAL_OPTIMIZER, "Mergetable bailout semijoin
ref\n");
+ TRC_INFO(MAL_OPTIMIZER, "Mergetable bailout semijoin
ref\n");
bailout = 1;
}
if (isSample(p)) {
diff --git a/sql/benchmarks/tpcds/Tests/alter.timeout
b/sql/benchmarks/tpcds/Tests/alter.timeout
--- a/sql/benchmarks/tpcds/Tests/alter.timeout
+++ b/sql/benchmarks/tpcds/Tests/alter.timeout
@@ -1,1 +1,1 @@
-2
+3
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,22 +43,22 @@ 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(".%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);
+ X_32:bat[:str] := bat.pack(".%5":str);
+ X_33:bat[:str] := bat.pack("%5":str);
+ X_34:bat[:str] := bat.pack("bigint":str);
+ X_35:bat[:int] := bat.pack(64:int);
+ X_36:bat[:int] := bat.pack(0:int);
X_13:bat[:int] := user.my_generate_series(1:int, 5:int);
X_14:lng := aggr.count(X_13:bat[:int]);
X_21:bat[:lng] := sql.single(X_14:lng);
X_19:bat[:int] := user.my_generate_series(1:int, 100:int);
X_20:lng := aggr.count(X_19:bat[:int]);
X_22:bat[:lng] := sql.single(X_20:lng);
- (X_23:bat[:oid], X_24:bat[:oid]) := algebra.crossproduct(X_21:bat[:lng],
X_22:bat[:lng]);
- X_25:bat[:lng] := algebra.projection(X_23:bat[:oid], X_21:bat[:lng]);
- X_26:bat[:lng] := algebra.projection(X_24:bat[:oid], X_22:bat[:lng]);
- X_27:bat[:lng] := batcalc.*(X_25:bat[:lng], X_26:bat[:lng], nil:BAT,
nil:BAT);
- sql.resultSet(X_31:bat[:str], X_32:bat[:str], X_33:bat[:str],
X_34:bat[:int], X_35:bat[:int], X_27:bat[:lng]);
+ (X_23:bat[:oid], X_24:bat[:oid]) := algebra.crossproduct(X_21:bat[:lng],
X_22:bat[:lng], false:bit);
+ X_26:bat[:lng] := algebra.projection(X_23:bat[:oid], X_21:bat[:lng]);
+ X_27:bat[:lng] := algebra.projection(X_24:bat[:oid], X_22:bat[:lng]);
+ X_28:bat[:lng] := batcalc.*(X_26:bat[:lng], X_27:bat[:lng], nil:BAT,
nil:BAT);
+ sql.resultSet(X_32:bat[:str], X_33:bat[:str], X_34:bat[:str],
X_35:bat[:int], X_36:bat[:int], X_28:bat[:lng]);
end user.s4_0;
#inline actions= 0 time=1 usec
#remap actions= 1 time=32 usec
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
