Changeset: 3c05cba9eecf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3c05cba9eecf
Modified Files:
gdk/gdk_time.c
gdk/gdk_time.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
sql/common/sql_types.c
Branch: extract_types
Log Message:
Ready for testweb.
diffs (truncated from 459 to 300 lines):
diff --git a/gdk/gdk_time.c b/gdk/gdk_time.c
--- a/gdk/gdk_time.c
+++ b/gdk/gdk_time.c
@@ -90,27 +90,27 @@ date_year(date dt)
return date_extract_year(dt);
}
-int
+bte
date_quarter(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return bte_nil;
return (date_extract_month(dt) - 1) / 3 + 1;
}
-int
+bte
date_month(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return bte_nil;
return date_extract_month(dt);
}
-int
+bte
date_day(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return bte_nil;
return date_extract_day(dt);
}
@@ -206,11 +206,11 @@ date_diff(date d1, date d2)
* day-of-week calculation below from this fact */
#define DOW_OFF (7 - (((21 + (2019+CNT_OFF)*365 + (2019+CNT_OFF-1)/4 -
(2019+CNT_OFF-1)/100 + (2019+CNT_OFF-1)/400 + 90) % 7) + 1))
/* return day of week of given date; Monday = 1, Sunday = 7 */
-int
+bte
date_dayofweek(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return bte_nil;
/* calculate number of days since the start of the year -CNT_OFF */
int d = date_countdays(dt);
/* then simply take the remainder from 7 and convert to correct
@@ -222,11 +222,11 @@ date_dayofweek(date dt)
* January 1 to 3 fall in the week before the 4th, they are in the
* last week of the previous year; the last days of the year may fall
* in week 1 of the following year */
-int
+bte
date_weekofyear(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return bte_nil;
int y = date_extract_year(dt);
int m = date_extract_month(dt);
int d = date_extract_day(dt);
@@ -247,11 +247,11 @@ date_weekofyear(date dt)
/* In the US they have to do it differently, of course.
* Week 1 is the week (Sunday to Saturday) in which January 1 falls */
-int
+bte
date_usweekofyear(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return bte_nil;
int y = date_extract_year(dt);
int m = date_extract_month(dt);
/* day of year (date_dayofyear without nil check) */
@@ -263,11 +263,11 @@ date_usweekofyear(date dt)
return (doy + jan1dow - 1) / 7 + 1;
}
-int
+sht
date_dayofyear(date dt)
{
if (is_date_nil(dt))
- return int_nil;
+ return sht_nil;
int m = date_extract_month(dt);
return date_extract_day(dt) + cumdays[m-1]
+ (m > 2 && isleapyear(date_extract_year(dt)));
@@ -288,19 +288,19 @@ daytime_diff(daytime d1, daytime d2)
return (d1 - d2) / 1000;
}
-int
+bte
daytime_hour(daytime tm)
{
if (is_daytime_nil(tm))
- return int_nil;
+ return bte_nil;
return daytime_extract_hour(tm);
}
-int
+bte
daytime_min(daytime tm)
{
if (is_daytime_nil(tm))
- return int_nil;
+ return bte_nil;
return daytime_extract_minute(tm);
}
diff --git a/gdk/gdk_time.h b/gdk/gdk_time.h
--- a/gdk/gdk_time.h
+++ b/gdk/gdk_time.h
@@ -38,13 +38,13 @@ gdk_export date date_add_month(date dt,
#define date_add_year(d, y) date_add_month(d, (y) * 12)
gdk_export int date_diff(date d1, date d2)
__attribute__((__const__));
-gdk_export int date_dayofweek(date dt) /* Monday=1, Sunday=7 */
+gdk_export bte date_dayofweek(date dt) /* Monday=1, Sunday=7 */
__attribute__((__const__));
-gdk_export int date_weekofyear(date dt)
+gdk_export bte date_weekofyear(date dt)
__attribute__((__const__));
-gdk_export int date_usweekofyear(date dt)
+gdk_export bte date_usweekofyear(date dt)
__attribute__((__const__));
-gdk_export int date_dayofyear(date dt)
+gdk_export sht date_dayofyear(date dt)
__attribute__((__const__));
gdk_export int date_century(date dt)
__attribute__((__const__));
@@ -52,11 +52,11 @@ gdk_export int date_decade(date dt)
__attribute__((__const__));
gdk_export int date_year(date dt)
__attribute__((__const__));
-gdk_export int date_quarter(date dt)
+gdk_export bte date_quarter(date dt)
__attribute__((__const__));
-gdk_export int date_month(date dt)
+gdk_export bte date_month(date dt)
__attribute__((__const__));
-gdk_export int date_day(date dt)
+gdk_export bte date_day(date dt)
__attribute__((__const__));
gdk_export daytime daytime_create(int hour, int minute, int second, int usec)
@@ -75,9 +75,9 @@ gdk_export daytime daytime_add_usec_modu
#define daytime_add_sec_modulo(t, s) daytime_add_usec_modulo(t,
(s)*LL_CONSTANT(1000000))
#define daytime_add_min_modulo(t, m) daytime_add_sec_modulo(t, (m) * 60)
#define daytime_add_hour_modulo(t, h) daytime_add_min_modulo(t, (h) * 60)
-gdk_export int daytime_hour(daytime tm)
+gdk_export bte daytime_hour(daytime tm)
__attribute__((__const__));
-gdk_export int daytime_min(daytime tm)
+gdk_export bte daytime_min(daytime tm)
__attribute__((__const__));
gdk_export int daytime_sec(daytime tm)
__attribute__((__const__));
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
@@ -574,7 +574,7 @@ func1(MTIMEdate_extract_year, "date_year
date_year, COPYFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdate_extract_quarter, "date_quarter", date, int,
+func1(MTIMEdate_extract_quarter, "date_quarter", date, bte,
date_quarter, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
@@ -582,23 +582,23 @@ func1(MTIMEdate_extract_month, "date_mon
date_month, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdate_extract_day, "date_day", date, int,
+func1(MTIMEdate_extract_day, "date_day", date, bte,
date_day, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdate_extract_dayofyear, "date_dayofyear", date, int,
+func1(MTIMEdate_extract_dayofyear, "date_dayofyear", date, sht,
date_dayofyear, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdate_extract_weekofyear, "date_weekofyear", date, int,
+func1(MTIMEdate_extract_weekofyear, "date_weekofyear", date, bte,
date_weekofyear, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdate_extract_usweekofyear, "date_usweekofyear", date, int,
+func1(MTIMEdate_extract_usweekofyear, "date_usweekofyear", date, bte,
date_usweekofyear, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdate_extract_dayofweek, "date_dayofweek", date, int,
+func1(MTIMEdate_extract_dayofweek, "date_dayofweek", date, bte,
date_dayofweek, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
@@ -606,11 +606,11 @@ func1(MTIMEdate_extract_epoch_ms, "epoch
date_to_msec_since_epoch, COPYFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdaytime_extract_hours, "daytime_hour", daytime, int,
+func1(MTIMEdaytime_extract_hours, "daytime_hour", daytime, bte,
daytime_hour, COPYFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEdaytime_extract_minutes, "daytime_minutes", daytime, int,
+func1(MTIMEdaytime_extract_minutes, "daytime_minutes", daytime, bte,
daytime_min, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
@@ -642,7 +642,7 @@ func1(MTIMEtimestamp_year, "timestamp_ye
timestamp_year, COPYFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEtimestamp_quarter,"timestamp_quarter", timestamp, int,
+func1(MTIMEtimestamp_quarter,"timestamp_quarter", timestamp, bte,
timestamp_quarter, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
@@ -650,15 +650,15 @@ func1(MTIMEtimestamp_month, "timestamp_m
timestamp_month, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEtimestamp_day, "timestamp_day", timestamp, int,
+func1(MTIMEtimestamp_day, "timestamp_day", timestamp, bte,
timestamp_day, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEtimestamp_hours, "timestamp_hours", timestamp, int,
+func1(MTIMEtimestamp_hours, "timestamp_hours", timestamp, bte,
timestamp_hours, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-func1(MTIMEtimestamp_minutes, "timestamp_minutes", timestamp, int,
+func1(MTIMEtimestamp_minutes, "timestamp_minutes", timestamp, bte,
timestamp_minutes, SETFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
@@ -1146,24 +1146,24 @@ static mel_func mtime_init_funcs[] = {
command("mtime", "year", MTIMEdate_extract_year, false, "extracts year from
date.", args(1,2, arg("",int),arg("d",date))),
pattern("batmtime", "year", MTIMEdate_extract_year_bulk, false, "", args(1,2,
batarg("",int),batarg("d",date))),
pattern("batmtime", "year", MTIMEdate_extract_year_bulk, false, "", args(1,3,
batarg("",int),batarg("d",date),batarg("s",oid))),
- command("mtime", "quarter", MTIMEdate_extract_quarter, false, "extracts
quarter from date", args(1,2, arg("",int),arg("d",date))),
- pattern("batmtime", "quarter", MTIMEdate_extract_quarter_bulk, false, "",
args(1,2, batarg("",int),batarg("d",date))),
- pattern("batmtime", "quarter", MTIMEdate_extract_quarter_bulk, false, "",
args(1,3, batarg("",int),batarg("d",date),batarg("s",oid))),
+ command("mtime", "quarter", MTIMEdate_extract_quarter, false, "extracts
quarter from date", args(1,2, arg("",bte),arg("d",date))),
+ pattern("batmtime", "quarter", MTIMEdate_extract_quarter_bulk, false, "",
args(1,2, batarg("",bte),batarg("d",date))),
+ pattern("batmtime", "quarter", MTIMEdate_extract_quarter_bulk, false, "",
args(1,3, batarg("",bte),batarg("d",date),batarg("s",oid))),
command("mtime", "month", MTIMEdate_extract_month, false, "extracts month
from date", args(1,2, arg("",bte),arg("d",date))),
pattern("batmtime", "month", MTIMEdate_extract_month_bulk, false, "",
args(1,2, batarg("",bte),batarg("d",date))),
pattern("batmtime", "month", MTIMEdate_extract_month_bulk, false, "",
args(1,3, batarg("",bte),batarg("d",date),batarg("s",oid))),
- command("mtime", "day", MTIMEdate_extract_day, false, "extracts day from date
", args(1,2, arg("",int),arg("d",date))),
- pattern("batmtime", "day", MTIMEdate_extract_day_bulk, false, "", args(1,2,
batarg("",int),batarg("d",date))),
- pattern("batmtime", "day", MTIMEdate_extract_day_bulk, false, "", args(1,3,
batarg("",int),batarg("d",date),batarg("s",oid))),
+ command("mtime", "day", MTIMEdate_extract_day, false, "extracts day from date
", args(1,2, arg("",bte),arg("d",date))),
+ pattern("batmtime", "day", MTIMEdate_extract_day_bulk, false, "", args(1,2,
batarg("",bte),batarg("d",date))),
+ pattern("batmtime", "day", MTIMEdate_extract_day_bulk, false, "", args(1,3,
batarg("",bte),batarg("d",date),batarg("s",oid))),
command("mtime", "epoch_ms", MTIMEdate_extract_epoch_ms, false, "", args(1,2,
arg("",lng),arg("d",date))),
pattern("batmtime", "epoch_ms", MTIMEdate_extract_epoch_ms_bulk, false, "",
args(1,2, batarg("",lng),batarg("d",date))),
pattern("batmtime", "epoch_ms", MTIMEdate_extract_epoch_ms_bulk, false, "",
args(1,3, batarg("",lng),batarg("d",date),batarg("s",oid))),
- command("mtime", "hours", MTIMEdaytime_extract_hours, false, "extracts hour
from daytime", args(1,2, arg("",int),arg("h",daytime))),
- pattern("batmtime", "hours", MTIMEdaytime_extract_hours_bulk, false, "",
args(1,2, batarg("",int),batarg("d",daytime))),
- pattern("batmtime", "hours", MTIMEdaytime_extract_hours_bulk, false, "",
args(1,3, batarg("",int),batarg("d",daytime),batarg("s",oid))),
- command("mtime", "minutes", MTIMEdaytime_extract_minutes, false, "extracts
minutes from daytime", args(1,2, arg("",int),arg("d",daytime))),
- pattern("batmtime", "minutes", MTIMEdaytime_extract_minutes_bulk, false, "",
args(1,2, batarg("",int),batarg("d",daytime))),
- pattern("batmtime", "minutes", MTIMEdaytime_extract_minutes_bulk, false, "",
args(1,3, batarg("",int),batarg("d",daytime),batarg("s",oid))),
+ command("mtime", "hours", MTIMEdaytime_extract_hours, false, "extracts hour
from daytime", args(1,2, arg("",bte),arg("h",daytime))),
+ pattern("batmtime", "hours", MTIMEdaytime_extract_hours_bulk, false, "",
args(1,2, batarg("",bte),batarg("d",daytime))),
+ pattern("batmtime", "hours", MTIMEdaytime_extract_hours_bulk, false, "",
args(1,3, batarg("",bte),batarg("d",daytime),batarg("s",oid))),
+ command("mtime", "minutes", MTIMEdaytime_extract_minutes, false, "extracts
minutes from daytime", args(1,2, arg("",bte),arg("d",daytime))),
+ pattern("batmtime", "minutes", MTIMEdaytime_extract_minutes_bulk, false, "",
args(1,2, batarg("",bte),batarg("d",daytime))),
+ pattern("batmtime", "minutes", MTIMEdaytime_extract_minutes_bulk, false, "",
args(1,3, batarg("",bte),batarg("d",daytime),batarg("s",oid))),
command("mtime", "sql_seconds", MTIMEdaytime_extract_sql_seconds, false,
"extracts seconds (with fractional milliseconds) from daytime", args(1,2,
arg("",int),arg("d",daytime))),
pattern("batmtime", "sql_seconds", MTIMEdaytime_extract_sql_seconds_bulk,
false, "", args(1,2, batarg("",int),batarg("d",daytime))),
pattern("batmtime", "sql_seconds", MTIMEdaytime_extract_sql_seconds_bulk,
false, "", args(1,3, batarg("",int),batarg("d",daytime),batarg("s",oid))),
@@ -1184,18 +1184,18 @@ static mel_func mtime_init_funcs[] = {
pattern("batmtime", "diff", MTIMEdate_diff_bulk, false, "", args(1,5,
batarg("",lng),batarg("val1",date),batarg("val2",date),batarg("s1",oid),batarg("s2",oid))),
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))),
- 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))),
- command("mtime", "usweekofyear", MTIMEdate_extract_usweekofyear, false,
"Returns the week number in the year, US style.", args(1,2,
arg("",int),arg("d",date))),
- pattern("batmtime", "usweekofyear", MTIMEdate_extract_usweekofyear_bulk,
false, "", args(1,2, batarg("",int),batarg("d",date))),
- pattern("batmtime", "usweekofyear", MTIMEdate_extract_usweekofyear_bulk,
false, "", args(1,3, batarg("",int),batarg("d",date),batarg("s",oid))),
- command("mtime", "dayofweek", MTIMEdate_extract_dayofweek, false, "Returns
the current day of the week\nwhere 1=monday, .., 7=sunday", args(1,2,
arg("",int),arg("d",date))),
- pattern("batmtime", "dayofweek", MTIMEdate_extract_dayofweek_bulk, false, "",
args(1,2, batarg("",int),batarg("d",date))),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
