Changeset: e5aac4ddb3c4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5aac4ddb3c4
Added Files:
sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.sql
sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.err
sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.out
Modified Files:
monetdb5/modules/atoms/json.c
sql/test/BugTracker-2019/Tests/All
Branch: default
Log Message:
Merge with Nov2019
diffs (163 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
@@ -472,6 +472,7 @@ JSONcompile(char *expr, pattern terms[])
}
if (*s == '[') {
// array step
+ bool closed = false;
s++;
skipblancs(s);
if (*s != '*') {
@@ -482,9 +483,14 @@ JSONcompile(char *expr, pattern terms[])
throw(MAL, "json.path", "'*' or digit
expected");
}
for (; *s; s++)
- if (*s == ']')
+ if (*s == ']') {
+ closed = true;
break;
+ }
if (*s == 0) {
+ if (!closed) {
+ throw(MAL, "json.path", "] expected");
+ }
t++;
break;
}
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
@@ -49,3 +49,4 @@ index-insert-crash.Bug-6781
avg-changes-value-scale.Bug-6783
isaUUID.Bug-6784
count-distinct.Bug-6790
+jsonpath-validity.Bug-6792
diff --git a/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.sql
b/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.sql
@@ -0,0 +1,7 @@
+CREATE TABLE jstest (
+ j json
+);
+
+INSERT INTO jstest VALUES ('{"track":{"segments":[{"location":[ 47.763,13.4034
],"start time":"2018-10-14 10:05:14","HR":73},{"location":[ 47.706,13.2635
],"start time":"2018-10-14 10:39:21","HR":135}]}}');
+
+select json.filter(j, '$.track.segments[*][*') from jstest;
diff --git
a/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.err
b/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'jsonpath-validity.Bug-6792` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 17:11:07 >
+# 17:11:07 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38745" "--set"
"mapi_usock=/var/tmp/mtest-32023/.s.monetdb.38745" "--forcemito"
"--dbpath=/home/kutsurak/work/src/monet/worktrees/Nov2019/build/install/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:11:07 >
+
+# builtin opt gdk_dbpath =
/home/kutsurak/work/src/monet/worktrees/Nov2019/build/install/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = 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 = 38745
+# cmdline opt mapi_usock = /var/tmp/mtest-32023/.s.monetdb.38745
+# cmdline opt gdk_dbpath =
/home/kutsurak/work/src/monet/worktrees/Nov2019/build/install/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_c = true
+#client2:!ERROR:MALException:json.path:] expected
+
+# 17:11:08 >
+# 17:11:08 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-32023" "--port=38745"
+# 17:11:08 >
+
+MAPI = (monetdb) /var/tmp/mtest-32023/.s.monetdb.38745
+QUERY = select json.filter(j, '$.track.segments[*][*') from jstest;
+ERROR = !] expected
+
+
+# 17:11:08 >
+# 17:11:08 > "Done."
+# 17:11:08 >
+
diff --git
a/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.out
b/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/jsonpath-validity.Bug-6792.stable.out
@@ -0,0 +1,71 @@
+stdout of test 'jsonpath-validity.Bug-6792` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 17:11:07 >
+# 17:11:07 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38745" "--set"
"mapi_usock=/var/tmp/mtest-32023/.s.monetdb.38745" "--forcemito"
"--dbpath=/home/kutsurak/work/src/monet/worktrees/Nov2019/build/install/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:11:07 >
+
+# MonetDB 5 server v11.35.4
+# 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.488 GiB available main-memory of which we use 12.622 GiB
+# 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:38745/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-32023/.s.monetdb.38745
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.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_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: 61_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
+
+# 17:11:08 >
+# 17:11:08 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-32023" "--port=38745"
+# 17:11:08 >
+
+#CREATE TABLE jstest (
+# j json
+#);
+#INSERT INTO jstest VALUES ('{"track":{"segments":[{"location":[
47.763,13.4034 ],"start time":"2018-10-14 10:05:14","HR":73},{"location":[
47.706,13.2635 ],"start time":"2018-10-14 10:39:21","HR":135}]}}');
+[ 1 ]
+
+# 17:11:08 >
+# 17:11:08 > "Done."
+# 17:11:08 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
