Changeset: bc095a8c2376 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc095a8c2376 Modified Files: sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single Branch: unlock Log Message:
approved output diffs (48 lines): diff --git a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out --- a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out +++ b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out @@ -40,9 +40,9 @@ function user.s4_0():void; X_1249:bat[:int] := bat.pack(0:int); X_184:bat[:timestamp] := bat.new(nil:timestamp); X_196:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "1999-10-31 09:00:00.000000":timestamp, "2000-04-02 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_200:bat[:timestamp] := mal.manifold("mtime":str, "timestamp_add_msec_interval":str, X_184:bat[:timestamp], -28800000:lng); + X_200:bat[:timestamp] := batmtime.timestamp_add_msec_interval(X_184:bat[:timestamp], -28800000:lng); X_215:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2000-04-02 10:00:00.000000":timestamp, "2000-10-29 09:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_219:bat[:timestamp] := mal.manifold("mtime":str, "timestamp_add_msec_interval":str, X_184:bat[:timestamp], -25200000:lng); + X_219:bat[:timestamp] := batmtime.timestamp_add_msec_interval(X_184:bat[:timestamp], -25200000:lng); X_233:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2000-10-29 09:00:00.000000":timestamp, "2001-04-01 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); X_254:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2001-04-01 10:00:00.000000":timestamp, "2001-10-28 09:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); X_272:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2001-10-28 09:00:00.000000":timestamp, "2002-04-07 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); @@ -134,7 +134,7 @@ function user.s4_0():void; X_1235:bat[:timestamp] := batcalc.ifthenelse(X_215:bat[:bit], X_219:bat[:timestamp], X_1232:bat[:timestamp]); X_1237:bat[:timestamp] := batcalc.ifthenelse(X_196:bat[:bit], X_200:bat[:timestamp], X_1235:bat[:timestamp]); X_1238:bat[:timestamp] := batcalc.timestamp(X_1237:bat[:timestamp], 7:int); - X_1242:bat[:str] := mal.manifold("mtime":str, "timestamp_to_str":str, X_1238:bat[:timestamp], "%Y":str); + X_1242:bat[:str] := batmtime.timestamp_to_str(X_1238:bat[:timestamp], "%Y":str); sql.resultSet(X_1246:bat[:str], X_1247:bat[:str], X_1248:bat[:str], X_1249:bat[:int], X_1249:bat[:int], X_1242:bat[:str]); end user.s4_0; #inline actions= 0 time=24 usec diff --git a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single --- a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single +++ b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single @@ -40,9 +40,9 @@ function user.s4_0():void; X_1249:bat[:int] := bat.pack(0:int); X_184:bat[:timestamp] := bat.new(nil:timestamp); X_196:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "1999-10-31 09:00:00.000000":timestamp, "2000-04-02 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_200:bat[:timestamp] := mal.manifold("mtime":str, "timestamp_add_msec_interval":str, X_184:bat[:timestamp], -28800000:lng); + X_200:bat[:timestamp] := batmtime.timestamp_add_msec_interval(X_184:bat[:timestamp], -28800000:lng); X_215:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2000-04-02 10:00:00.000000":timestamp, "2000-10-29 09:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_219:bat[:timestamp] := mal.manifold("mtime":str, "timestamp_add_msec_interval":str, X_184:bat[:timestamp], -25200000:lng); + X_219:bat[:timestamp] := batmtime.timestamp_add_msec_interval(X_184:bat[:timestamp], -25200000:lng); X_233:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2000-10-29 09:00:00.000000":timestamp, "2001-04-01 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); X_254:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2001-04-01 10:00:00.000000":timestamp, "2001-10-28 09:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); X_272:bat[:bit] := batcalc.between(X_184:bat[:timestamp], "2001-10-28 09:00:00.000000":timestamp, "2002-04-07 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); @@ -134,7 +134,7 @@ function user.s4_0():void; X_1235:bat[:timestamp] := batcalc.ifthenelse(X_215:bat[:bit], X_219:bat[:timestamp], X_1232:bat[:timestamp]); X_1237:bat[:timestamp] := batcalc.ifthenelse(X_196:bat[:bit], X_200:bat[:timestamp], X_1235:bat[:timestamp]); X_1238:bat[:timestamp] := batcalc.timestamp(X_1237:bat[:timestamp], 7:int); - X_1242:bat[:str] := mal.manifold("mtime":str, "timestamp_to_str":str, X_1238:bat[:timestamp], "%Y":str); + X_1242:bat[:str] := batmtime.timestamp_to_str(X_1238:bat[:timestamp], "%Y":str); sql.resultSet(X_1246:bat[:str], X_1247:bat[:str], X_1248:bat[:str], X_1249:bat[:int], X_1249:bat[:int], X_1242:bat[:str]); end user.s4_0; #inline actions= 0 time=24 usec _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list