Changeset: 5e82a1cfe9b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5e82a1cfe9b1
Modified Files:
clients/Tests/exports.stable.out
sql/storage/bat/bat_storage.c
Branch: pax-log
Log Message:
Merge with default.
diffs (truncated from 8721 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -62104,21 +62104,6 @@ pattern optimizer.strimps(X_0:str, X_1:s
OPTwrapper;
Use strimps index if appropriate
optimizer
-volcano
-pattern optimizer.volcano():str
-OPTwrapper;
-(empty)
-optimizer
-volcano
-pattern optimizer.volcano(X_0:str, X_1:str):str
-OPTwrapper;
-Simulate volcano style execution
-optimizer
-volcano_pipe
-function optimizer.volcano_pipe():void;
-(empty)
-(empty)
-optimizer
wlc
pattern optimizer.wlc():str
OPTwrapper;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -45619,21 +45619,6 @@ pattern optimizer.strimps(X_0:str, X_1:s
OPTwrapper;
Use strimps index if appropriate
optimizer
-volcano
-pattern optimizer.volcano():str
-OPTwrapper;
-(empty)
-optimizer
-volcano
-pattern optimizer.volcano(X_0:str, X_1:str):str
-OPTwrapper;
-Simulate volcano style execution
-optimizer
-volcano_pipe
-function optimizer.volcano_pipe():void;
-(empty)
-(empty)
-optimizer
wlc
pattern optimizer.wlc():str
OPTwrapper;
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
@@ -356,6 +356,11 @@ void IMPSdestroy(BAT *b);
lng IMPSimprintsize(BAT *b);
int MT_access(const char *pathname, int mode);
int MT_check_nr_cores(void);
+void MT_cond_broadcast(MT_Cond *cond);
+void MT_cond_destroy(MT_Cond *cond);
+void MT_cond_init(MT_Cond *cond);
+void MT_cond_signal(MT_Cond *cond);
+void MT_cond_wait(MT_Cond *cond, MT_Lock *lock);
int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum
MT_thr_detach d, const char *threadname);
void MT_exiting_thread(void);
FILE *MT_fopen(const char *filename, const char *mode);
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -398,7 +398,7 @@ count_mask_bits(const struct canditer *c
return n;
}
-/* initialize a candidate iterator, return number of iterations */
+/* initialize a candidate iterator */
void
canditer_init(struct canditer *ci, BAT *b, BAT *s)
{
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,3 +1,6 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Thu Apr 28 2022 Pedro Ferreira <[email protected]>
+- Disabled volcano pipeline due to known issues.
+
diff --git a/monetdb5/modules/atoms/CMakeLists.txt
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -18,7 +18,7 @@ target_sources(atoms
url.c
uuid.c
json.c
- mtime.c
+ mtime.c mtime.h
inet.c
identifier.c
xml.c xml.h
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
@@ -29,11 +29,9 @@
*/
#include "monetdb_config.h"
-#include "gdk.h"
-#include "gdk_time.h"
+#include "mtime.h"
#include "mal_client.h"
-#include "mal_interpreter.h"
-#include "mal_exception.h"
+
#ifndef HAVE_STRPTIME
extern char *strptime(const char *, const char *, struct tm *);
@@ -486,13 +484,6 @@ 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
-/* TODO change dayint again into an int instead of lng */
-static inline lng
-date_diff_imp(const date d1, const date d2)
-{
- int diff = date_diff(d1, d2);
- return is_int_nil(diff) ? lng_nil : (lng) diff * (lng) (24*60*60*1000);
-}
func2(MTIMEdate_diff, "diff",
date, date, lng, date_diff_imp, func2_noexcept,
DEC_VAR, DEC_VAR, DEC_VAR_R, DEC_INT,
@@ -506,28 +497,6 @@ func2(MTIMEdaytime_diff_msec, "diff",
GET_NEXT_VAR, GET_NEXT_VAR,
APPEND_VAR, FINISH_INT_SINGLE, CLEAR_NOTHING)
-static inline str
-date_sub_msec_interval(date *ret, date d, lng ms)
-{
- if (is_date_nil(d) || is_lng_nil(ms)) {
- *ret = date_nil;
- return MAL_SUCCEED;
- }
- if (is_date_nil((*ret = date_add_day(d, (int) (-ms /
(24*60*60*1000))))))
- throw(MAL, "mtime.date_sub_msec_interval", SQLSTATE(22003)
"overflow in calculation");
- return MAL_SUCCEED;
-}
-static inline str
-date_add_msec_interval(date *ret, date d, lng ms)
-{
- if (is_date_nil(d) || is_lng_nil(ms)) {
- *ret = date_nil;
- return MAL_SUCCEED;
- }
- if (is_date_nil((*ret = date_add_day(d, (int) (ms / (24*60*60*1000))))))
- throw(MAL, "mtime.date_add_msec_interval", SQLSTATE(22003)
"overflow in calculation");
- return MAL_SUCCEED;
-}
func2(MTIMEdate_sub_msec_interval, "date_sub_msec_interval",
date, lng, date, date_sub_msec_interval, func2_except,
DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT,
@@ -541,28 +510,6 @@ func2(MTIMEdate_add_msec_interval, "date
GET_NEXT_VAR, GET_NEXT_VAR,
APPEND_VAR, FINISH_INT_SINGLE, CLEAR_NOTHING)
-static inline str
-timestamp_sub_msec_interval(timestamp *ret, timestamp ts, lng ms)
-{
- if (is_timestamp_nil(ts) || is_lng_nil(ms)) {
- *ret = timestamp_nil;
- return MAL_SUCCEED;
- }
- if (is_timestamp_nil((*ret = timestamp_add_usec(ts, -ms * 1000))))
- throw(MAL, "mtime.timestamp_sub_msec_interval", SQLSTATE(22003)
"overflow in calculation");
- return MAL_SUCCEED;
-}
-static inline str
-timestamp_add_msec_interval(timestamp *ret, timestamp ts, lng ms)
-{
- if (is_timestamp_nil(ts) || is_lng_nil(ms)) {
- *ret = timestamp_nil;
- return MAL_SUCCEED;
- }
- if (is_timestamp_nil((*ret = timestamp_add_usec(ts, ms * 1000))))
- throw(MAL, "mtime.timestamp_add_msec_interval", SQLSTATE(22003)
"overflow in calculation");
- return MAL_SUCCEED;
-}
func2(MTIMEtimestamp_sub_msec_interval, "timestamp_sub_msec_interval",
timestamp, lng, timestamp, timestamp_sub_msec_interval, func2_except,
DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT,
@@ -576,28 +523,6 @@ func2(MTIMEtimestamp_add_msec_interval,
GET_NEXT_VAR, GET_NEXT_VAR,
APPEND_VAR, FINISH_INT_SINGLE, CLEAR_NOTHING)
-static inline str
-timestamp_sub_month_interval(timestamp *ret, timestamp ts, int m)
-{
- if (is_timestamp_nil(ts) || is_int_nil(m)) {
- *ret = timestamp_nil;
- return MAL_SUCCEED;
- }
- if (is_timestamp_nil((*ret = timestamp_add_month(ts, -m))))
- throw(MAL, "mtime.timestamp_sub_month_interval",
SQLSTATE(22003) "overflow in calculation");
- return MAL_SUCCEED;
-}
-static inline str
-timestamp_add_month_interval(timestamp *ret, timestamp ts, int m)
-{
- if (is_timestamp_nil(ts) || is_int_nil(m)) {
- *ret = timestamp_nil;
- return MAL_SUCCEED;
- }
- if (is_timestamp_nil((*ret = timestamp_add_month(ts, m))))
- throw(MAL, "mtime.timestamp_add_month_interval",
SQLSTATE(22003) "overflow in calculation");
- return MAL_SUCCEED;
-}
func2(MTIMEtimestamp_sub_month_interval, "timestamp_sub_month_interval",
timestamp, int, timestamp, timestamp_sub_month_interval, func2_except,
DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT,
@@ -611,20 +536,6 @@ func2(MTIMEtimestamp_add_month_interval,
GET_NEXT_VAR, GET_NEXT_VAR,
APPEND_VAR, FINISH_INT_SINGLE, CLEAR_NOTHING)
-static inline daytime
-time_sub_msec_interval(const daytime t, const lng ms)
-{
- if (is_lng_nil(ms))
- return daytime_nil;
- return daytime_add_usec_modulo(t, -ms * 1000);
-}
-static inline daytime
-time_add_msec_interval(const daytime t, const lng ms)
-{
- if (is_lng_nil(ms))
- return daytime_nil;
- return daytime_add_usec_modulo(t, ms * 1000);
-}
func2(MTIMEtime_sub_msec_interval, "time_sub_msec_interval",
daytime, lng, daytime, time_sub_msec_interval, func2_noexcept,
DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT,
@@ -638,28 +549,6 @@ func2(MTIMEtime_add_msec_interval, "time
GET_NEXT_VAR, GET_NEXT_VAR,
APPEND_VAR, FINISH_INT_SINGLE, CLEAR_NOTHING)
-static inline str
-date_submonths(date *ret, date d, int m)
-{
- if (is_date_nil(d) || is_int_nil(m)) {
- *ret = date_nil;
- return MAL_SUCCEED;
- }
- if (is_date_nil((*ret = date_add_month(d, -m))))
- throw(MAL, "mtime.date_submonths", SQLSTATE(22003) "overflow in
calculation");
- return MAL_SUCCEED;
-}
-static inline str
-date_addmonths(date *ret, date d, int m)
-{
- if (is_date_nil(d) || is_int_nil(m)) {
- *ret = date_nil;
- return MAL_SUCCEED;
- }
- if (is_date_nil((*ret = date_add_month(d, m))))
- throw(MAL, "mtime.date_addmonths", SQLSTATE(22003) "overflow in
calculation");
- return MAL_SUCCEED;
-}
func2(MTIMEdate_submonths, "date_submonths",
date, int, date, date_submonths, func2_except,
DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT,
@@ -673,8 +562,6 @@ func2(MTIMEdate_addmonths, "date_addmont
GET_NEXT_VAR, GET_NEXT_VAR,
APPEND_VAR, FINISH_INT_SINGLE, CLEAR_NOTHING)
-#define date_to_msec_since_epoch(t) is_date_nil(t) ? lng_nil :
(timestamp_diff(timestamp_create(t, daytime_create(0, 0, 0, 0)), unixepoch) /
1000)
-#define daytime_to_msec_since_epoch(t) daytime_diff(t, daytime_create(0, 0, 0,
0))
func1(MTIMEdate_extract_century, "date_century", date, int,
date_century, COPYFLAGS, func1_noexcept,
DEC_VAR_R, DEC_VAR_R,
@@ -736,22 +623,6 @@ func1(MTIMEdaytime_extract_epoch_ms, "ep
DEC_VAR_R, DEC_VAR_R,
INIT_VARIN, INIT_VAROUT, GET_NEXT_VAR)
-static inline lng
-TSDIFF(timestamp t1, timestamp t2)
-{
- lng diff = timestamp_diff(t1, t2);
- if (!is_lng_nil(diff)) {
-#ifndef TRUNCATE_NUMBERS
- if (diff < 0)
- diff = -((-diff + 500) / 1000);
- else
- diff = (diff + 500) / 1000;
-#else
- diff /= 1000;
-#endif
- }
- return diff;
-}
func2(MTIMEtimestamp_diff_msec, "diff",
timestamp, timestamp, lng, TSDIFF, func2_noexcept,
DEC_VAR, DEC_VAR, DEC_VAR_R, DEC_INT,
@@ -759,26 +630,6 @@ func2(MTIMEtimestamp_diff_msec, "diff",
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
