Changeset: 7030a89d5fe3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7030a89d5fe3
Modified Files:
monetdb5/modules/atoms/json.c
sql/test/BugTracker-2019/Tests/All
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
Branch: Nov2019
Log Message:
Merge with Apr2019
diffs (150 lines):
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -512,8 +512,6 @@ JSONgetValue(JSON *jt, int idx)
if (jt->elm[idx].valuelen == 0)
return GDKstrdup(str_nil);
- if (strncmp(jt->elm[idx].value, "null", 4) == 0)
- return GDKstrdup(str_nil);
s = GDKzalloc(jt->elm[idx].valuelen + 1);
if (s)
strncpy(s, jt->elm[idx].value, jt->elm[idx].valuelen);
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
@@ -38,5 +38,5 @@ HAVE_LIBPY3?python-loader-string.Bug-675
select-char.Bug-6761
grant-select-column.Bug-6765
next-get-value-bulk.Bug-6766
-KNOWNFAIL?filter_json_null.Bug-6773
+filter_json_null.Bug-6773
prod-decimals.Bug-6774
diff --git a/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
b/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
--- a/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
+++ b/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
@@ -1,2 +1,2 @@
select json.filter('{"foo": null}', '$.foo');
-select json.filter('[null]', '$.0');
+select json.filter('[null]', '$[0]');
diff --git
a/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
b/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
--- a/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
+++ b/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
@@ -0,0 +1,33 @@
+stderr of test 'filter_json_null.Bug-6773` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 15:23:55 >
+# 15:23:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30124" "--set"
"mapi_usock=/var/tmp/mtest-13615/.s.monetdb.30124" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 15:23:55 >
+
+# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/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 = 30124
+# cmdline opt mapi_usock = /var/tmp/mtest-13615/.s.monetdb.30124
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_c = true
+#main thread:!ERROR:MALException:client.quit:Server stopped
+
+# 15:23:56 >
+# 15:23:56 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13615" "--port=30124"
+# 15:23:56 >
+
+
+# 15:23:56 >
+# 15:23:56 > "Done."
+# 15:23:56 >
+
diff --git
a/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
b/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
--- a/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
+++ b/sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
@@ -0,0 +1,80 @@
+stdout of test 'filter_json_null.Bug-6773` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 15:23:55 >
+# 15:23:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30124" "--set"
"mapi_usock=/var/tmp/mtest-13615/.s.monetdb.30124" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 15:23:55 >
+
+# MonetDB 5 server v11.33.12 (hg id: 1306a067c8ad+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.511 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://zarquon.zarniwoop.org:30124/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13615/.s.monetdb.30124
+# 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_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
+
+# 09:17:19 >
+# 09:17:19 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14211" "--port=30470"
+# 09:17:19 >
+
+#select json.filter('{"foo": null}', '$.foo');
+% .L2 # table_name
+% L2 # name
+% json # type
+% 6 # length
+[ "[null]" ]
+#select json.filter('[null]', '$[0]');
+% .L2 # table_name
+% L2 # name
+% json # type
+% 6 # length
+[ "[null]" ]
+
+# 15:23:56 >
+# 15:23:56 > "Done."
+# 15:23:56 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
