Changeset: 2245927288c0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2245927288c0
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/atoms/mtime.c
Branch: default
Log Message:
I forgot the candidate version for one of the epoch functions
diffs (43 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -6143,6 +6143,7 @@ stdout of test 'MAL-signatures` in direc
[ "batmtime", "epoch", "pattern
batmtime.epoch(X_0:bat[:timestamp]):bat[:int] ",
"MTIMEseconds_since_epoch_bulk;", "" ]
[ "batmtime", "epoch", "pattern batmtime.epoch(X_0:bat[:timestamp],
X_1:bat[:oid]):bat[:int] ", "MTIMEseconds_since_epoch_bulk;", ""
]
[ "batmtime", "epoch", "pattern
batmtime.epoch(X_0:bat[:lng]):bat[:timestamp] ",
"MTIMEtimestamp_frommsec_epoch_bulk;", "" ]
+[ "batmtime", "epoch", "pattern batmtime.epoch(X_0:bat[:lng],
X_1:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_frommsec_epoch_bulk;",
"" ]
[ "batmtime", "epoch", "pattern
batmtime.epoch(X_0:bat[:int]):bat[:timestamp] ",
"MTIMEtimestamp_fromsecond_epoch_bulk;", "" ]
[ "batmtime", "epoch", "pattern batmtime.epoch(X_0:bat[:int],
X_1:bat[:oid]):bat[:timestamp] ",
"MTIMEtimestamp_fromsecond_epoch_bulk;", "" ]
[ "batmtime", "epoch_ms", "pattern
batmtime.epoch_ms(X_0:bat[:date]):bat[:lng] ",
"MTIMEdate_extract_epoch_ms_bulk;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -8677,6 +8677,7 @@ stdout of test 'MAL-signatures` in direc
[ "batmtime", "epoch", "pattern
batmtime.epoch(X_0:bat[:timestamp]):bat[:int] ",
"MTIMEseconds_since_epoch_bulk;", "" ]
[ "batmtime", "epoch", "pattern batmtime.epoch(X_0:bat[:timestamp],
X_1:bat[:oid]):bat[:int] ", "MTIMEseconds_since_epoch_bulk;", ""
]
[ "batmtime", "epoch", "pattern
batmtime.epoch(X_0:bat[:lng]):bat[:timestamp] ",
"MTIMEtimestamp_frommsec_epoch_bulk;", "" ]
+[ "batmtime", "epoch", "pattern batmtime.epoch(X_0:bat[:lng],
X_1:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_frommsec_epoch_bulk;",
"" ]
[ "batmtime", "epoch", "pattern
batmtime.epoch(X_0:bat[:int]):bat[:timestamp] ",
"MTIMEtimestamp_fromsecond_epoch_bulk;", "" ]
[ "batmtime", "epoch", "pattern batmtime.epoch(X_0:bat[:int],
X_1:bat[:oid]):bat[:timestamp] ",
"MTIMEtimestamp_fromsecond_epoch_bulk;", "" ]
[ "batmtime", "epoch_ms", "pattern
batmtime.epoch_ms(X_0:bat[:date]):bat[:lng] ",
"MTIMEdate_extract_epoch_ms_bulk;", "" ]
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -1014,6 +1014,7 @@ static mel_func mtime_init_funcs[] = {
pattern("batmtime", "epoch", MTIMEtimestamp_fromsecond_epoch_bulk, false, "",
args(1,3, batarg("",timestamp),batarg("t",int),batarg("s",oid))),
command("mtime", "epoch", MTIMEtimestamp_frommsec_epoch, false, "convert
milli seconds since epoch into a timestamp", args(1,2,
arg("",timestamp),arg("t",lng))),
pattern("batmtime", "epoch", MTIMEtimestamp_frommsec_epoch_bulk, false, "",
args(1,2, batarg("",timestamp),batarg("t",lng))),
+ pattern("batmtime", "epoch", MTIMEtimestamp_frommsec_epoch_bulk, false, "",
args(1,3, batarg("",timestamp),batarg("t",lng),batarg("s",oid))),
command("mtime", "date_sub_msec_interval", MTIMEdate_sub_msec_interval,
false, "", args(1,3, arg("",date),arg("t",date),arg("ms",lng))),
pattern("batmtime", "date_sub_msec_interval",
MTIMEdate_sub_msec_interval_bulk, false, "", args(1,3,
batarg("",date),batarg("t",date),batarg("ms",lng))),
pattern("batmtime", "date_sub_msec_interval",
MTIMEdate_sub_msec_interval_bulk_p1, false, "", args(1,3,
batarg("",date),arg("t",date),batarg("ms",lng))),
@@ -1133,8 +1134,8 @@ static mel_func mtime_init_funcs[] = {
pattern("batmtime", "diff", MTIMEdate_diff_bulk_p1, false, "", args(1,4,
batarg("",lng),arg("val1",date),batarg("val2",date),batarg("s",oid))),
pattern("batmtime", "diff", MTIMEdate_diff_bulk_p2, false, "", args(1,4,
batarg("",lng),batarg("val1",date),arg("val2",date),batarg("s",oid))),
command("mtime", "dayofyear", MTIMEdate_extract_dayofyear, false, "Returns N
where d is the Nth day\nof the year (january 1 returns 1)", args(1,2,
arg("",int),arg("d",date))),
+ pattern("batmtime", "dayofyear", MTIMEdate_extract_dayofyear_bulk, false, "",
args(1,2, batarg("",int),batarg("d",date))),
pattern("batmtime", "dayofyear", MTIMEdate_extract_dayofyear_bulk, false, "",
args(1,3, batarg("",int),batarg("d",date),batarg("s",oid))),
- pattern("batmtime", "dayofyear", MTIMEdate_extract_dayofyear_bulk, false, "",
args(1,2, batarg("",int),batarg("d",date))),
command("mtime", "weekofyear", MTIMEdate_extract_weekofyear, false, "Returns
the week number in the year.", args(1,2, arg("",int),arg("d",date))),
pattern("batmtime", "weekofyear", MTIMEdate_extract_weekofyear_bulk, false,
"", args(1,2, batarg("",int),batarg("d",date))),
pattern("batmtime", "weekofyear", MTIMEdate_extract_weekofyear_bulk, false,
"", args(1,3, batarg("",int),batarg("d",date),batarg("s",oid))),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
