Changeset: a6245b1dc724 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a6245b1dc724
Branch: Jun2023
Log Message:
Merge heads.
diffs (243 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2202,7 +2202,8 @@ log_new(int debug, const char *fn, const
}
static logged_range*
-do_flush_range_cleanup(logger* lg) {
+do_flush_range_cleanup(logger* lg)
+{
rotation_lock(lg);
logged_range* frange = lg->flush_ranges;
logged_range* first = frange;
@@ -2230,7 +2231,6 @@ do_flush_range_cleanup(logger* lg) {
frange->output_log = NULL;
}
}
-
return flast;
}
@@ -2373,7 +2373,7 @@ log_activate(logger *lg)
bool flush = false;
gdk_return res = GDK_SUCCEED;
rotation_lock(lg);
- if (!lg->current->next && lg->current->drops > 100000 && ((ulng)
ATOMIC_GET(&lg->current->end) - (ulng) ATOMIC_GET(&lg->current->pend)) > 0 &&
lg->saved_id+1 == lg->id) {
+ if (!lg->flushnow && !lg->current->next && lg->current->drops > 100000
&& ((ulng) ATOMIC_GET(&lg->current->end) - (ulng)
ATOMIC_GET(&lg->current->pend)) > 0 && lg->saved_id+1 == lg->id) {
lg->id++;
/* start new file */
res = log_open_output(lg);
@@ -2410,8 +2410,7 @@ log_flush(logger *lg, ulng ts)
return GDK_SUCCEED;
log_return res = LOG_OK;
ulng cid = olid;
- if (lid > lgid)
- lid = lgid;
+ assert (lid <= lgid);
while(cid < lid && res == LOG_OK) {
if (!lg->input_log) {
char *filename;
@@ -3190,8 +3189,7 @@ log_tstart(logger *lg, bool flushnow, ul
if (lg->saved_id+1 < lg->id)
log_flush(lg, (1ULL<<63));
lg->flushnow = flushnow;
- }
- else {
+ } else {
if (check_rotation_conditions(lg)) {
lg->id++;
if (log_open_output(lg) != GDK_SUCCEED)
diff --git a/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
b/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
--- a/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
+++ b/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
@@ -11,6 +11,7 @@ select convert(123, decimal(10,3))
----
123.000
+# numeric
query I rowsort
select cast(true as smallint)
----
@@ -36,6 +37,7 @@ select cast(23.45 as decimal(5,2))
----
23.450
+# date, time and timestamp
query T rowsort
select cast('2020-07-29' as date)
----
@@ -76,10 +78,16 @@ select cast('2020-07-29 17:44:59.321+01:
----
2020-07-29 18:14:59.321000+02:00
+# intervals
query T rowsort
-select cast('1234' as interval month)
+select cast('67' as interval month)
----
-1234
+67
+
+query T rowsort
+select cast('120' as interval day)
+----
+120
query T rowsort
select cast('86400.123' as interval second)
@@ -87,6 +95,22 @@ select cast('86400.123' as interval seco
1 day, 0:00:00
query T rowsort
+select cast('18:40:05' as interval hour to second)
+----
+18:40:05
+
+query T rowsort
+select cast('2 18:40:05.123' as interval day to second(3))
+----
+2 days, 18:40:05
+
+query T rowsort
+select cast('2-5' as interval year to month)
+----
+29
+
+# blob, clob, inet, json, url, uuid
+query T rowsort
select cast('abcd' as blob)
----
ABCD
@@ -116,6 +140,7 @@ select cast('e31960fb-dc8b-452d-ab30-b34
----
e31960fb-dc8b-452d-ab30-b342723e756a
+# convert()
query T rowsort
select convert('a4cd' , blob)
----
@@ -146,6 +171,27 @@ select convert('e31960fb-dc8b-452d-ab30-
----
e31960fb-dc8b-452d-ab30-b342723e756a
+# prefix type casting
+query T rowsort
+select E'EA\fB\tC\n\\Z'
+----
+EA@B@C@\Z
+
+query T rowsort
+select e'eA\fB\tC\n\\Z'
+----
+eA@B@C@\Z
+
+query T rowsort
+select R'RA\fB\tC\n\\Z'
+----
+RA\fB\tC\n\\Z
+
+query T rowsort
+select r'rA\fB\tC\n\\Z'
+----
+rA\fB\tC\n\\Z
+
query T rowsort
select x'abcd'
----
@@ -165,6 +211,71 @@ select cast('abcde' as clob)
abcde
query T rowsort
+select date '2020-09-28'
+----
+2020-09-28
+
+query T rowsort
+select time '18:40:05'
+----
+18:40:05
+
+query T rowsort
+select time(6) '18:40:05.123456'
+----
+18:40:05.123456
+
+query T rowsort
+select time(3) with time zone '18:40:05.123+02:00'
+----
+18:40:05.123000+02:00
+
+query T rowsort
+select timestamp '2020-09-28 18:40:05'
+----
+2020-09-28 18:40:05
+
+query T rowsort
+select timestamp(6) '2020-09-28 18:40:05.123456'
+----
+2020-09-28 18:40:05.123456
+
+query T rowsort
+select timestamp(3) with time zone '2020-09-28 18:40:05.123+02:00'
+----
+2020-09-28 18:40:05.123000+02:00
+
+query T rowsort
+select interval '67205' second
+----
+18:40:05
+
+query T rowsort
+select interval '30' day
+----
+30
+
+query T rowsort
+select interval '6' month
+----
+6
+
+query T rowsort
+select interval '18:40:05' hour to second
+----
+18:40:05
+
+query T rowsort
+select interval '2 18:40:05.123' day to second(3)
+----
+2 days, 18:40:05
+
+query T rowsort
+select interval '2-5' year to month
+----
+29
+
+query T rowsort
select inet '192.168.1.5/24'
----
192.168.1.5/24
@@ -184,23 +295,3 @@ select uuid 'e31960fb-dc8b-452d-ab30-b34
----
e31960fb-dc8b-452d-ab30-b342723e756a
-query T rowsort
-select E'EA\fB\tC\n\\Z'
-----
-EA@B@C@\Z
-
-query T rowsort
-select e'eA\fB\tC\n\\Z'
-----
-eA@B@C@\Z
-
-query T rowsort
-select R'RA\fB\tC\n\\Z'
-----
-RA\fB\tC\n\\Z
-
-query T rowsort
-select r'rA\fB\tC\n\\Z'
-----
-rA\fB\tC\n\\Z
-
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
