Changeset: 7801762b5ab9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7801762b5ab9
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/mtime.c
Branch: default
Log Message:
In order for the export tests to pass, the newline on the macro arguments list
must be escaped. Also simplified loop
diffs (truncated from 403 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1513,12 +1513,12 @@ str MTIMEcurrent_time(daytime *ret);
str MTIMEcurrent_timestamp(timestamp *ret);
str MTIMEdate_add_msec_interval(date *ret, const date *v1, const lng *v2);
str MTIMEdate_add_msec_interval_bulk(bat *ret, const bat *bid1, const bat
*bid2);
-str MTIMEdate_add_msec_interval_bulk_p1(bat *ret, const date *v1, const bat
*bid2);
-str MTIMEdate_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng
*v2);
+str MTIMEdate_add_msec_interval_bulk_p1(bat *ret, const date *src1, const bat
*bid2);
+str MTIMEdate_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng
*src2);
str MTIMEdate_addmonths(date *ret, const date *v1, const int *v2);
str MTIMEdate_addmonths_bulk(bat *ret, const bat *bid1, const bat *bid2);
-str MTIMEdate_addmonths_bulk_p1(bat *ret, const date *v1, const bat *bid2);
-str MTIMEdate_addmonths_bulk_p2(bat *ret, const bat *bid1, const int *v2);
+str MTIMEdate_addmonths_bulk_p1(bat *ret, const date *src1, const bat *bid2);
+str MTIMEdate_addmonths_bulk_p2(bat *ret, const bat *bid1, const int *src2);
str MTIMEdate_date(date *ret, const date *src);
str MTIMEdate_date_bulk(bat *ret, const bat *bid);
str MTIMEdate_diff(int *ret, const date *v1, const date *v2);
@@ -1547,12 +1547,12 @@ str MTIMEdate_fromstr(date *ret, const s
str MTIMEdate_fromstr_bulk(bat *ret, const bat *bid);
str MTIMEdate_sub_msec_interval(date *ret, const date *v1, const lng *v2);
str MTIMEdate_sub_msec_interval_bulk(bat *ret, const bat *bid1, const bat
*bid2);
-str MTIMEdate_sub_msec_interval_bulk_p1(bat *ret, const date *v1, const bat
*bid2);
-str MTIMEdate_sub_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng
*v2);
+str MTIMEdate_sub_msec_interval_bulk_p1(bat *ret, const date *src1, const bat
*bid2);
+str MTIMEdate_sub_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng
*src2);
str MTIMEdate_submonths(date *ret, const date *v1, const int *v2);
str MTIMEdate_submonths_bulk(bat *ret, const bat *bid1, const bat *bid2);
-str MTIMEdate_submonths_bulk_p1(bat *ret, const date *v1, const bat *bid2);
-str MTIMEdate_submonths_bulk_p2(bat *ret, const bat *bid1, const int *v2);
+str MTIMEdate_submonths_bulk_p1(bat *ret, const date *src1, const bat *bid2);
+str MTIMEdate_submonths_bulk_p2(bat *ret, const bat *bid1, const int *src2);
str MTIMEdate_to_str(str *ret, const date *v1, const str *v2);
str MTIMEdate_to_str_bulk(bat *ret, const bat *bid1, const bat *bid2);
str MTIMEdate_to_str_bulk_p1(bat *ret, const date *src1, const bat *bid2);
@@ -1614,12 +1614,12 @@ str MTIMEtime_to_str_bulk_p1(bat *ret, c
str MTIMEtime_to_str_bulk_p2(bat *ret, const bat *bid1, const str *src2);
str MTIMEtimestamp_add_month_interval(timestamp *ret, const timestamp *v1,
const int *v2);
str MTIMEtimestamp_add_month_interval_bulk(bat *ret, const bat *bid1, const
bat *bid2);
-str MTIMEtimestamp_add_month_interval_bulk_p1(bat *ret, const timestamp *v1,
const bat *bid2);
-str MTIMEtimestamp_add_month_interval_bulk_p2(bat *ret, const bat *bid1, const
int *v2);
+str MTIMEtimestamp_add_month_interval_bulk_p1(bat *ret, const timestamp *src1,
const bat *bid2);
+str MTIMEtimestamp_add_month_interval_bulk_p2(bat *ret, const bat *bid1, const
int *src2);
str MTIMEtimestamp_add_msec_interval(timestamp *ret, const timestamp *v1,
const lng *v2);
str MTIMEtimestamp_add_msec_interval_bulk(bat *ret, const bat *bid1, const bat
*bid2);
-str MTIMEtimestamp_add_msec_interval_bulk_p1(bat *ret, const timestamp *v1,
const bat *bid2);
-str MTIMEtimestamp_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const
lng *v2);
+str MTIMEtimestamp_add_msec_interval_bulk_p1(bat *ret, const timestamp *src1,
const bat *bid2);
+str MTIMEtimestamp_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const
lng *src2);
str MTIMEtimestamp_century(int *ret, const timestamp *src);
str MTIMEtimestamp_century_bulk(bat *ret, const bat *bid);
str MTIMEtimestamp_day(int *ret, const timestamp *src);
@@ -1654,12 +1654,12 @@ str MTIMEtimestamp_sql_seconds(int *ret,
str MTIMEtimestamp_sql_seconds_bulk(bat *ret, const bat *bid);
str MTIMEtimestamp_sub_month_interval(timestamp *ret, const timestamp *v1,
const int *v2);
str MTIMEtimestamp_sub_month_interval_bulk(bat *ret, const bat *bid1, const
bat *bid2);
-str MTIMEtimestamp_sub_month_interval_bulk_p1(bat *ret, const timestamp *v1,
const bat *bid2);
-str MTIMEtimestamp_sub_month_interval_bulk_p2(bat *ret, const bat *bid1, const
int *v2);
+str MTIMEtimestamp_sub_month_interval_bulk_p1(bat *ret, const timestamp *src1,
const bat *bid2);
+str MTIMEtimestamp_sub_month_interval_bulk_p2(bat *ret, const bat *bid1, const
int *src2);
str MTIMEtimestamp_sub_msec_interval(timestamp *ret, const timestamp *v1,
const lng *v2);
str MTIMEtimestamp_sub_msec_interval_bulk(bat *ret, const bat *bid1, const bat
*bid2);
-str MTIMEtimestamp_sub_msec_interval_bulk_p1(bat *ret, const timestamp *v1,
const bat *bid2);
-str MTIMEtimestamp_sub_msec_interval_bulk_p2(bat *ret, const bat *bid1, const
lng *v2);
+str MTIMEtimestamp_sub_msec_interval_bulk_p1(bat *ret, const timestamp *src1,
const bat *bid2);
+str MTIMEtimestamp_sub_msec_interval_bulk_p2(bat *ret, const bat *bid1, const
lng *src2);
str MTIMEtimestamp_timestamp(timestamp *ret, const timestamp *src);
str MTIMEtimestamp_timestamp_bulk(bat *ret, const bat *bid);
str MTIMEtimestamp_to_str(str *ret, const timestamp *v1, const str *v2);
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -202,7 +202,7 @@ BLOBnitems_bulk(bat *ret, const bat *bid
{
BAT *b = NULL, *bn = NULL;
BUN n, p, q;
- int *dst, i = 0;
+ int *dst;
str msg = MAL_SUCCEED;
BATiter bi;
@@ -219,7 +219,7 @@ BLOBnitems_bulk(bat *ret, const bat *bid
bi = bat_iterator(b);
BATloop(b, p, q) {
blob *next = BUNtvar(bi, p);
- dst[i++] = blob_nitems(next);
+ dst[p] = blob_nitems(next);
}
bn->tnonil = b->tnonil;
bn->tnil = b->tnil;
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
@@ -306,9 +306,9 @@ bailout:
\
#define func2_noexcept(FUNC, RET, PARAM1, PARAM2) RET = FUNC(PARAM1, PARAM2)
#define func2_except(FUNC, RET, PARAM1, PARAM2) msg = FUNC(&RET, PARAM1,
PARAM2); if (msg) break;
-func2(MTIMEdate_diff, MTIMEdate_diff_bulk, "diff", date, date, int, date_diff,
func2_noexcept,
+func2(MTIMEdate_diff, MTIMEdate_diff_bulk, "diff", date, date, int, date_diff,
func2_noexcept, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT, GET_NEXT_INT,
GET_NEXT_INT, APPEND_INT)
-func2(MTIMEdaytime_diff_msec, MTIMEdaytime_diff_msec_bulk, "diff", daytime,
daytime, lng, daytime_diff, func2_noexcept,
+func2(MTIMEdaytime_diff_msec, MTIMEdaytime_diff_msec_bulk, "diff", daytime,
daytime, lng, daytime_diff, func2_noexcept, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT, GET_NEXT_INT,
GET_NEXT_INT, APPEND_INT)
static inline str
@@ -333,9 +333,9 @@ date_add_msec_interval(date *ret, date d
throw(MAL, "mtime.date_add_msec_interval", SQLSTATE(22003)
"overflow in calculation");
return MAL_SUCCEED;
}
-func2(MTIMEdate_sub_msec_interval, MTIMEdate_sub_msec_interval_bulk,
"date_sub_msec_interval", date, lng, date, date_sub_msec_interval,
func2_except,
+func2(MTIMEdate_sub_msec_interval, MTIMEdate_sub_msec_interval_bulk,
"date_sub_msec_interval", date, lng, date, date_sub_msec_interval,
func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
-func2(MTIMEdate_add_msec_interval, MTIMEdate_add_msec_interval_bulk,
"date_add_msec_interval", date, lng, date, date_add_msec_interval,
func2_except,
+func2(MTIMEdate_add_msec_interval, MTIMEdate_add_msec_interval_bulk,
"date_add_msec_interval", date, lng, date, date_add_msec_interval,
func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
static inline str
@@ -360,9 +360,9 @@ timestamp_add_msec_interval(timestamp *r
throw(MAL, "mtime.timestamp_add_msec_interval", SQLSTATE(22003)
"overflow in calculation");
return MAL_SUCCEED;
}
-func2(MTIMEtimestamp_sub_msec_interval, MTIMEtimestamp_sub_msec_interval_bulk,
"timestamp_sub_msec_interval", timestamp, lng, timestamp,
timestamp_sub_msec_interval, func2_except,
+func2(MTIMEtimestamp_sub_msec_interval, MTIMEtimestamp_sub_msec_interval_bulk,
"timestamp_sub_msec_interval", timestamp, lng, timestamp,
timestamp_sub_msec_interval, func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
-func2(MTIMEtimestamp_add_msec_interval, MTIMEtimestamp_add_msec_interval_bulk,
"timestamp_add_msec_interval", timestamp, lng, timestamp,
timestamp_add_msec_interval, func2_except,
+func2(MTIMEtimestamp_add_msec_interval, MTIMEtimestamp_add_msec_interval_bulk,
"timestamp_add_msec_interval", timestamp, lng, timestamp,
timestamp_add_msec_interval, func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
static inline str
@@ -387,9 +387,9 @@ timestamp_add_month_interval(timestamp *
throw(MAL, "mtime.timestamp_add_month_interval",
SQLSTATE(22003) "overflow in calculation");
return MAL_SUCCEED;
}
-func2(MTIMEtimestamp_sub_month_interval,
MTIMEtimestamp_sub_month_interval_bulk, "timestamp_sub_month_interval",
timestamp, int, timestamp, timestamp_sub_month_interval, func2_except,
+func2(MTIMEtimestamp_sub_month_interval,
MTIMEtimestamp_sub_month_interval_bulk, "timestamp_sub_month_interval",
timestamp, int, timestamp, timestamp_sub_month_interval, func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
-func2(MTIMEtimestamp_add_month_interval,
MTIMEtimestamp_add_month_interval_bulk, "timestamp_add_month_interval",
timestamp, int, timestamp, timestamp_add_month_interval, func2_except,
+func2(MTIMEtimestamp_add_month_interval,
MTIMEtimestamp_add_month_interval_bulk, "timestamp_add_month_interval",
timestamp, int, timestamp, timestamp_add_month_interval, func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
static inline daytime
@@ -406,9 +406,9 @@ time_add_msec_interval(const daytime t,
return daytime_nil;
return daytime_add_usec_modulo(t, ms * 1000);
}
-func2(MTIMEtime_sub_msec_interval, MTIMEtime_sub_msec_interval_bulk,
"time_sub_msec_interval", daytime, lng, daytime, time_sub_msec_interval,
func2_noexcept,
+func2(MTIMEtime_sub_msec_interval, MTIMEtime_sub_msec_interval_bulk,
"time_sub_msec_interval", daytime, lng, daytime, time_sub_msec_interval,
func2_noexcept, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
-func2(MTIMEtime_add_msec_interval, MTIMEtime_add_msec_interval_bulk,
"time_add_msec_interval", daytime, lng, daytime, time_add_msec_interval,
func2_noexcept,
+func2(MTIMEtime_add_msec_interval, MTIMEtime_add_msec_interval_bulk,
"time_add_msec_interval", daytime, lng, daytime, time_add_msec_interval,
func2_noexcept, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
static inline str
@@ -433,34 +433,34 @@ date_addmonths(date *ret, date d, int m)
throw(MAL, "mtime.date_addmonths", SQLSTATE(22003) "overflow in
calculation");
return MAL_SUCCEED;
}
-func2(MTIMEdate_submonths, MTIMEdate_submonths_bulk, "date_submonths", date,
int, date, date_submonths, func2_except,
+func2(MTIMEdate_submonths, MTIMEdate_submonths_bulk, "date_submonths", date,
int, date, date_submonths, func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
-func2(MTIMEdate_addmonths, MTIMEdate_addmonths_bulk, "date_addmonths", date,
int, date, date_addmonths, func2_except,
+func2(MTIMEdate_addmonths, MTIMEdate_addmonths_bulk, "date_addmonths", date,
int, date, date_addmonths, func2_except, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
-func1(MTIMEdate_extract_century, MTIMEdate_extract_century_bulk,
"date_century", date, int, date_century, COPYFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_century, MTIMEdate_extract_century_bulk,
"date_century", date, int, date_century, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_decade, MTIMEdate_extract_decade_bulk, "date_decade",
date, int, date_decade, COPYFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_decade, MTIMEdate_extract_decade_bulk, "date_decade",
date, int, date_decade, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_year, MTIMEdate_extract_year_bulk, "date_year", date,
int, date_year, COPYFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_year, MTIMEdate_extract_year_bulk, "date_year", date,
int, date_year, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_quarter, MTIMEdate_extract_quarter_bulk,
"date_quarter", date, int, date_quarter, SETFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_quarter, MTIMEdate_extract_quarter_bulk,
"date_quarter", date, int, date_quarter, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_month, MTIMEdate_extract_month_bulk, "date_month",
date, int, date_month, SETFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_month, MTIMEdate_extract_month_bulk, "date_month",
date, int, date_month, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_day, MTIMEdate_extract_day_bulk, "date_day", date,
int, date_day, SETFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_day, MTIMEdate_extract_day_bulk, "date_day", date,
int, date_day, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_dayofyear, MTIMEdate_extract_dayofyear_bulk,
"date_dayofyear", date, int, date_dayofyear, SETFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_dayofyear, MTIMEdate_extract_dayofyear_bulk,
"date_dayofyear", date, int, date_dayofyear, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_weekofyear, MTIMEdate_extract_weekofyear_bulk,
"date_weekofyear", date, int, date_weekofyear, SETFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_weekofyear, MTIMEdate_extract_weekofyear_bulk,
"date_weekofyear", date, int, date_weekofyear, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdate_extract_dayofweek, MTIMEdate_extract_dayofweek_bulk,
"date_dayofweek", date, int, date_dayofweek, SETFLAGS, func1_noexcept,
+func1(MTIMEdate_extract_dayofweek, MTIMEdate_extract_dayofweek_bulk,
"date_dayofweek", date, int, date_dayofweek, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdaytime_extract_hours, MTIMEdaytime_extract_hours_bulk,
"daytime_hour", daytime, int, daytime_hour, COPYFLAGS, func1_noexcept,
+func1(MTIMEdaytime_extract_hours, MTIMEdaytime_extract_hours_bulk,
"daytime_hour", daytime, int, daytime_hour, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdaytime_extract_minutes, MTIMEdaytime_extract_minutes_bulk,
"daytime_minutes", daytime, int, daytime_min, SETFLAGS, func1_noexcept,
+func1(MTIMEdaytime_extract_minutes, MTIMEdaytime_extract_minutes_bulk,
"daytime_minutes", daytime, int, daytime_min, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEdaytime_extract_sql_seconds, MTIMEdaytime_extract_sql_seconds_bulk,
"daytime_seconds", daytime, int, daytime_sec_usec, SETFLAGS, func1_noexcept,
+func1(MTIMEdaytime_extract_sql_seconds, MTIMEdaytime_extract_sql_seconds_bulk,
"daytime_seconds", daytime, int, daytime_sec_usec, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
static inline lng
@@ -479,7 +479,7 @@ TSDIFF(timestamp t1, timestamp t2)
}
return diff;
}
-func2(MTIMEtimestamp_diff_msec, MTIMEtimestamp_diff_msec_bulk, "diff",
timestamp, timestamp, lng, TSDIFF, func2_noexcept,
+func2(MTIMEtimestamp_diff_msec, MTIMEtimestamp_diff_msec_bulk, "diff",
timestamp, timestamp, lng, TSDIFF, func2_noexcept, \
DEC_INT, DEC_INT, DEC_INT, INIT_INT, INIT_INT, INIT_INT,
GET_NEXT_INT, GET_NEXT_INT, APPEND_INT)
static inline int
@@ -501,23 +501,23 @@ timestamp_century(const timestamp t)
#define timestamp_hours(t) daytime_hour(timestamp_daytime(t))
#define timestamp_minutes(t) daytime_min(timestamp_daytime(t))
#define timestamp_extract_usecond(ts) daytime_sec_usec(timestamp_daytime(ts))
-func1(MTIMEtimestamp_century, MTIMEtimestamp_century_bulk,
"timestamp_century", timestamp, int, timestamp_century, COPYFLAGS,
func1_noexcept,
+func1(MTIMEtimestamp_century, MTIMEtimestamp_century_bulk,
"timestamp_century", timestamp, int, timestamp_century, COPYFLAGS,
func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_decade, MTIMEtimestamp_decade_bulk, "timestamp_decade",
timestamp, int, timestamp_decade, COPYFLAGS, func1_noexcept,
+func1(MTIMEtimestamp_decade, MTIMEtimestamp_decade_bulk, "timestamp_decade",
timestamp, int, timestamp_decade, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_year, MTIMEtimestamp_year_bulk, "timestamp_year",
timestamp, int, timestamp_year, COPYFLAGS, func1_noexcept,
+func1(MTIMEtimestamp_year, MTIMEtimestamp_year_bulk, "timestamp_year",
timestamp, int, timestamp_year, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_quarter, MTIMEtimestamp_quarter_bulk,
"timestamp_quarter", timestamp, int, timestamp_quarter, SETFLAGS,
func1_noexcept,
+func1(MTIMEtimestamp_quarter, MTIMEtimestamp_quarter_bulk,
"timestamp_quarter", timestamp, int, timestamp_quarter, SETFLAGS,
func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_month, MTIMEtimestamp_month_bulk, "timestamp_month",
timestamp, int, timestamp_month, SETFLAGS, func1_noexcept,
+func1(MTIMEtimestamp_month, MTIMEtimestamp_month_bulk, "timestamp_month",
timestamp, int, timestamp_month, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_day, MTIMEtimestamp_day_bulk, "timestamp_day", timestamp,
int, timestamp_day, SETFLAGS, func1_noexcept,
+func1(MTIMEtimestamp_day, MTIMEtimestamp_day_bulk, "timestamp_day", timestamp,
int, timestamp_day, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_hours, MTIMEtimestamp_hours_bulk, "timestamp_hours",
timestamp, int, timestamp_hours, SETFLAGS, func1_noexcept,
+func1(MTIMEtimestamp_hours, MTIMEtimestamp_hours_bulk, "timestamp_hours",
timestamp, int, timestamp_hours, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_minutes, MTIMEtimestamp_minutes_bulk,
"timestamp_minutes", timestamp, int, timestamp_minutes, SETFLAGS,
func1_noexcept,
+func1(MTIMEtimestamp_minutes, MTIMEtimestamp_minutes_bulk,
"timestamp_minutes", timestamp, int, timestamp_minutes, SETFLAGS,
func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_sql_seconds, MTIMEtimestamp_sql_seconds_bulk,
"sql_seconds", timestamp, int, timestamp_extract_usecond, SETFLAGS,
func1_noexcept,
+func1(MTIMEtimestamp_sql_seconds, MTIMEtimestamp_sql_seconds_bulk,
"sql_seconds", timestamp, int, timestamp_extract_usecond, SETFLAGS,
func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
#define sql_year(m) is_int_nil(m) ? int_nil : m / 12
@@ -526,17 +526,17 @@ func1(MTIMEtimestamp_sql_seconds, MTIMEt
#define sql_hours(m) is_lng_nil(m) ? int_nil : (int) ((m % (24*60*60*1000)) /
(60*60*1000))
#define sql_minutes(m) is_lng_nil(m) ? int_nil : (int) ((m % (60*60*1000)) /
(60*1000))
#define sql_seconds(m) is_lng_nil(m) ? int_nil : (int) ((m % (60*1000)) / 1000)
-func1(MTIMEsql_year, MTIMEsql_year_bulk, "sql_year", int, int, sql_year,
COPYFLAGS, func1_noexcept,
+func1(MTIMEsql_year, MTIMEsql_year_bulk, "sql_year", int, int, sql_year,
COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEsql_month, MTIMEsql_month_bulk, "sql_month", int, int, sql_month,
SETFLAGS, func1_noexcept,
+func1(MTIMEsql_month, MTIMEsql_month_bulk, "sql_month", int, int, sql_month,
SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEsql_day, MTIMEsql_day_bulk, "sql_day", lng, lng, sql_day,
COPYFLAGS, func1_noexcept,
+func1(MTIMEsql_day, MTIMEsql_day_bulk, "sql_day", lng, lng, sql_day,
COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEsql_hours, MTIMEsql_hours_bulk, "sql_hours", lng, int, sql_hours,
SETFLAGS, func1_noexcept,
+func1(MTIMEsql_hours, MTIMEsql_hours_bulk, "sql_hours", lng, int, sql_hours,
SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEsql_minutes, MTIMEsql_minutes_bulk, "sql_minutes", lng, int,
sql_minutes, SETFLAGS, func1_noexcept,
+func1(MTIMEsql_minutes, MTIMEsql_minutes_bulk, "sql_minutes", lng, int,
sql_minutes, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEsql_seconds, MTIMEsql_seconds_bulk, "sql_seconds", lng, int,
sql_seconds, SETFLAGS, func1_noexcept,
+func1(MTIMEsql_seconds, MTIMEsql_seconds_bulk, "sql_seconds", lng, int,
sql_seconds, SETFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
static inline str
@@ -546,14 +546,14 @@ date_fromstr_func(date *ret, str s)
throw(MAL, "mtime.date_fromstr", GDK_EXCEPTION);
return MAL_SUCCEED;
}
-func1(MTIMEdate_fromstr, MTIMEdate_fromstr_bulk, "date_fromstr", str, date,
date_fromstr_func, SETFLAGS, func1_except,
+func1(MTIMEdate_fromstr, MTIMEdate_fromstr_bulk, "date_fromstr", str, date,
date_fromstr_func, SETFLAGS, func1_except, \
DEC_STR, DEC_INT, INIT_STR, INIT_INT, GET_NEXT_STR)
#define date_date(m) m
-func1(MTIMEdate_date, MTIMEdate_date_bulk, "date_date", date, date, date_date,
COPYFLAGS, func1_noexcept,
+func1(MTIMEdate_date, MTIMEdate_date_bulk, "date_date", date, date, date_date,
COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
-func1(MTIMEtimestamp_extract_date, MTIMEtimestamp_extract_date_bulk, "date",
timestamp, date, timestamp_date, COPYFLAGS, func1_noexcept,
+func1(MTIMEtimestamp_extract_date, MTIMEtimestamp_extract_date_bulk, "date",
timestamp, date, timestamp_date, COPYFLAGS, func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
static inline str
@@ -563,19 +563,19 @@ timestamp_fromstr_func(timestamp *ret, s
throw(MAL, "mtime.timestamp_fromstr", GDK_EXCEPTION);
return MAL_SUCCEED;
}
-func1(MTIMEtimestamp_fromstr, MTIMEtimestamp_fromstr_bulk,
"timestamp_fromstr", str, timestamp, timestamp_fromstr_func, SETFLAGS,
func1_except,
+func1(MTIMEtimestamp_fromstr, MTIMEtimestamp_fromstr_bulk,
"timestamp_fromstr", str, timestamp, timestamp_fromstr_func, SETFLAGS,
func1_except, \
DEC_STR, DEC_INT, INIT_STR, INIT_INT, GET_NEXT_STR)
#define timestamp_timestamp(m) m
-func1(MTIMEtimestamp_timestamp, MTIMEtimestamp_timestamp_bulk,
"timestamp_timestamp", timestamp, timestamp, timestamp_timestamp, COPYFLAGS,
func1_noexcept,
+func1(MTIMEtimestamp_timestamp, MTIMEtimestamp_timestamp_bulk,
"timestamp_timestamp", timestamp, timestamp, timestamp_timestamp, COPYFLAGS,
func1_noexcept, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
