Changeset: 806f907626b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=806f907626b1
Added Files:
sql/test/BugTracker-2019/Tests/r-date.Bug-6674.sql
sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.err
sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.out
Modified Files:
MonetDB.spec
configure.ag
gdk/gdk_atomic.h
sql/test/BugTracker-2019/Tests/All
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (168 lines):
diff --git a/gdk/gdk_atomic.h b/gdk/gdk_atomic.h
--- a/gdk/gdk_atomic.h
+++ b/gdk/gdk_atomic.h
@@ -209,7 +209,7 @@ typedef int ATOMIC_FLAG;
#define ATOMIC_TAS(var) _InterlockedCompareExchange(var, 1, 0)
#pragma intrinsic(_InterlockedCompareExchange)
-#elif (defined(__GNUC__) || defined(__INTEL_COMPILER)) && !(defined(__sun__)
&& SIZEOF_SIZE_T == 8) && !defined(_MSC_VER) && !defined(NO_ATOMIC_INSTRUCTIONS)
+#elif (defined(__GNUC__) || defined(__INTEL_COMPILER)) &&
defined(__ATOMIC_SEQ_CST) && !(defined(__sun__) && SIZEOF_SIZE_T == 8) &&
!defined(_MSC_VER) && !defined(NO_ATOMIC_INSTRUCTIONS)
/* the new way of doing this according to GCC (the old way, using
* __sync_* primitives is not supported) */
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -1,4 +1,5 @@
copy-into-from-stdin-empty-line.Bug-6669
+HAVE_LIBR?r-date.Bug-6674
date_trunc
date_trunc_bulk
subselect-contradiction.Bug-6683
diff --git a/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.sql
b/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.sql
@@ -0,0 +1,10 @@
+START TRANSACTION;
+
+CREATE TABLE testTableDates (d DATE);
+INSERT INTO testTableDates(d) VALUES
('2019-01-01'),('2019-01-02'),('2019-01-03');
+CREATE FUNCTION testDateLoopback(din DATE) RETURNS TABLE (dout DATE) LANGUAGE
R {
+ data.frame(dout=din)
+};
+SELECT * FROM testDateLoopback( (SELECT * FROM testTableDates) );
+
+ROLLBACK;
diff --git a/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.err
b/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'r-date.Bug-6674` in directory 'sql/test/BugTracker-2019`
itself:
+
+
+# 09:26:54 >
+# 09:26:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35785" "--set"
"mapi_usock=/var/tmp/mtest-29563/.s.monetdb.35785" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_r=yes" "--set" "embedded_c=true"
+# 09:26:54 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/monetdb5/dbfarm/demo
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35785
+# cmdline opt mapi_usock = /var/tmp/mtest-29563/.s.monetdb.35785
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_c = true
+#main thread:!ERROR:MALException:client.quit:Server stopped
+
+# 09:26:55 >
+# 09:26:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29563" "--port=35785"
+# 09:26:55 >
+
+
+# 09:26:55 >
+# 09:26:55 > "Done."
+# 09:26:55 >
+
diff --git a/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.out
b/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.stable.out
@@ -0,0 +1,88 @@
+stdout of test 'r-date.Bug-6674` in directory 'sql/test/BugTracker-2019`
itself:
+
+
+# 09:26:54 >
+# 09:26:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35785" "--set"
"mapi_usock=/var/tmp/mtest-29563/.s.monetdb.35785" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_r=yes" "--set" "embedded_c=true"
+# 09:26:54 >
+
+# MonetDB 5 server v11.33.0 (hg id: c19a721d1a09+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 62.693 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://methuselah.da.cwi.nl:35785/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29563/.s.monetdb.35785
+# MonetDB/GIS module loaded
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_views.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 09:26:55 >
+# 09:26:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29563" "--port=35785"
+# 09:26:55 >
+
+#START TRANSACTION;
+#CREATE TABLE testTableDates (d DATE);
+#INSERT INTO testTableDates(d) VALUES
('2019-01-01'),('2019-01-02'),('2019-01-03');
+[ 3 ]
+#CREATE FUNCTION testDateLoopback(din DATE) RETURNS TABLE (dout DATE) LANGUAGE
R {
+# data.frame(dout=din)
+#};
+#SELECT * FROM testDateLoopback( (SELECT * FROM testTableDates) );
+% .L3 # table_name
+% dout # name
+% date # type
+% 10 # length
+[ 2019-01-01 ]
+[ 2019-01-02 ]
+[ 2019-01-03 ]
+#ROLLBACK;
+
+# 09:26:55 >
+# 09:26:55 > "Done."
+# 09:26:55 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
