Changeset: f86d1d4aaf04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f86d1d4aaf04
Added Files:
sql/backends/monet5/rest/Tests/All
sql/backends/monet5/rest/Tests/jsonstore00.sql
sql/backends/monet5/rest/Tests/jsonstore00.stable.err
sql/backends/monet5/rest/Tests/jsonstore00.stable.out
Modified Files:
sql/backends/monet5/rest/Makefile.ag
sql/backends/monet5/rest/rest_jsonstore_handle_get.c
Branch: default
Log Message:
implement document versioning and add tests
diffs (truncated from 548 to 300 lines):
diff --git a/sql/backends/monet5/rest/Makefile.ag
b/sql/backends/monet5/rest/Makefile.ag
--- a/sql/backends/monet5/rest/Makefile.ag
+++ b/sql/backends/monet5/rest/Makefile.ag
@@ -62,3 +62,4 @@ headers_restautoload = {
}
EXTRA_DIST = 73_jsonstore.mal jsonstore.mal rest_jsonstore.h
+EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/rest/Tests/All
b/sql/backends/monet5/rest/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/rest/Tests/All
@@ -0,0 +1,1 @@
+jsonstore00
diff --git a/sql/backends/monet5/rest/Tests/jsonstore00.sql
b/sql/backends/monet5/rest/Tests/jsonstore00.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/rest/Tests/jsonstore00.sql
@@ -0,0 +1,110 @@
+SELECT 'Unknown' AS error;
+
+SELECT 'Welcome' AS jsonstore, '(unreleased)' AS version;
+
+-- SELECT uuid() AS uuid;
+
+CREATE TABLE json_first (
+ _id uuid, _rev VARCHAR(34),
+ js json);
+
+CREATE TABLE jsondesign_first (
+ _id varchar(128),
+ _rev VARCHAR(34),
+ design json);
+
+CREATE TABLE jsonblob_first (
+ _id uuid,
+ mimetype varchar(128),
+ filename varchar(128),
+ value blob);
+
+CREATE FUNCTION first_update_doc
+( doc_id VARCHAR(36),
+ doc json )
+ RETURNS TABLE ( OK BOOLEAN )
+BEGIN
+ DECLARE ISNEW INTEGER;
+ DECLARE VERSION INT;
+ DECLARE NEWVER VARCHAR(6);
+ SET ISNEW = (SELECT
+ COUNT(*) FROM json_first
+ WHERE _id = doc_id);
+ IF (ISNEW = 0) THEN
+ SET NEWVER = '1';
+ ELSE
+ SET VERSION = (
+ SELECT MAX(
+ CAST(
+ SUBSTRING(_rev,
+ 1,POSITION('-'
+ IN _rev) - 1)
+ AS INT) + 1)
+ FROM json_first
+ WHERE _id =
+ doc_id);
+ SET NEWVER =
+ CAST(VERSION AS
+ VARCHAR(6));
+ END IF;
+ INSERT INTO json_first (
+ _id, _rev, js )
+ VALUES ( doc_id,
+ CONCAT(NEWVER,
+ CONCAT('-',
+ md5(doc))),
+ doc );
+ RETURN
+ SELECT TRUE;
+END;
+
+SELECT SUBSTRING(name, 6, length(name) -5) AS name
+FROM tables
+WHERE name LIKE 'json!_%'ESCAPE'!';
+
+INSERT INTO json_first (_id, _rev, js)
+VALUES ('4b5b0c91-61f3-46db-b279-1535c8e2bd41', concat('1-', md5('{}')), '{}');
+
+SELECT * FROM json_first;
+
+WITH curr_first(maxrev, _id) AS (
+ SELECT MAX(CAST(SUBSTRING(_rev,1,POSITION('-' IN _rev) - 1) AS INT)),
+ _id
+ FROM json_first
+ GROUP BY _id)
+SELECT json_first._id,
+ json_first._rev,
+ json_first.js
+FROM curr_first,
+ json_first
+WHERE curr_first._id = json_first._id
+AND curr_first.maxrev = CAST(SUBSTRING(_rev,1,POSITION('-' IN _rev) - 1) AS
INT);
+
+SELECT * FROM json_first WHERE _id = '4b5b0c91-61f3-46db-b279-1535c8e2bd41';
+
+WITH curr_first(maxrev, _id) AS (
+ SELECT MAX(CAST(SUBSTRING(_rev,1,POSITION('-' IN _rev) - 1) AS INT)),
+ _id
+ FROM json_first
+ WHERE _id = '4b5b0c91-61f3-46db-b279-1535c8e2bd41'
+ GROUP BY _id)
+SELECT json_first._id,
+ json_first._rev,
+ json_first.js
+FROM curr_first,
+ json_first
+WHERE curr_first._id = json_first._id
+AND curr_first.maxrev = CAST(SUBSTRING(_rev,1,POSITION('-' IN _rev) - 1) AS
INT);
+
+SELECT * FROM first_update_doc ('4b5b0c91-61f3-46db-b279-1535c8e2bd41',
'{"message":"hello world"}');
+
+DELETE FROM json_first WHERE _id = '4b5b0c91-61f3-46db-b279-1535c8e2bd41';
+
+DROP FUNCTION first_update_doc;
+DROP TABLE json_first;
+DROP TABLE jsonblob_first;
+DROP TABLE jsondesign_first;
+
+SELECT 'Missing Database Name' AS error;
+SELECT 'No Parameter Allowed' AS error;
+SELECT 'Missing Attachment PATH' AS error;
diff --git a/sql/backends/monet5/rest/Tests/jsonstore00.stable.err
b/sql/backends/monet5/rest/Tests/jsonstore00.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/rest/Tests/jsonstore00.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'jsonstore00` in directory 'sql/backends/monet5/rest` itself:
+
+
+# 10:04:37 >
+# 10:04:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33859" "--set"
"mapi_usock=/var/tmp/mtest-6476/.s.monetdb.33859" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/rijke/monetdb/default/var/MonetDB/mTests_sql_backends_monet5_rest"
"--set" "mal_listing=0"
+# 10:04:37 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/rijke/monetdb/default/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# 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 = 33859
+# cmdline opt mapi_usock = /var/tmp/mtest-6476/.s.monetdb.33859
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/rijke/monetdb/default/var/MonetDB/mTests_sql_backends_monet5_rest
+# cmdline opt mal_listing = 0
+
+# 10:04:37 >
+# 10:04:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6476" "--port=33859"
+# 10:04:37 >
+
+
+# 10:04:38 >
+# 10:04:38 > "Done."
+# 10:04:38 >
+
diff --git a/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
b/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
@@ -0,0 +1,197 @@
+stdout of test 'jsonstore00` in directory 'sql/backends/monet5/rest` itself:
+
+
+# 10:04:37 >
+# 10:04:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33859" "--set"
"mapi_usock=/var/tmp/mtest-6476/.s.monetdb.33859" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/rijke/monetdb/default/var/MonetDB/mTests_sql_backends_monet5_rest"
"--set" "mal_listing=0"
+# 10:04:37 >
+
+# MonetDB 5 server v11.16.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5_rest', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.592 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://rotterdam.ins.cwi.nl:33859/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-6476/.s.monetdb.33859
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# 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_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 10:04:37 >
+# 10:04:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6476" "--port=33859"
+# 10:04:37 >
+
+#SELECT 'Unknown' AS error;
+% .L # table_name
+% error # name
+% char # type
+% 7 # length
+[ "Unknown" ]
+#SELECT 'Welcome' AS jsonstore, '(unreleased)' AS version;
+% .L, .L # table_name
+% jsonstore, version # name
+% char, char # type
+% 7, 12 # length
+[ "Welcome", "(unreleased)" ]
+#CREATE TABLE json_first (
+# _id uuid, _rev VARCHAR(34),
+# js json);
+#CREATE TABLE jsondesign_first (
+# _id varchar(128),
+# _rev VARCHAR(34),
+# design json);
+#CREATE TABLE jsonblob_first (
+# _id uuid,
+# mimetype varchar(128),
+# filename varchar(128),
+# value blob);
+#CREATE FUNCTION first_update_doc
+#( doc_id VARCHAR(36),
+# doc json )
+# RETURNS TABLE ( OK BOOLEAN )
+#BEGIN
+# DECLARE ISNEW INTEGER;
+# DECLARE VERSION INT;
+# DECLARE NEWVER VARCHAR(6);
+# SET ISNEW = (SELECT
+# COUNT(*) FROM json_first
+# WHERE _id = doc_id);
+# IF (ISNEW = 0) THEN
+# SET NEWVER = '1';
+# ELSE
+# SET VERSION = (
+# SELECT MAX(
+# CAST(
+# SUBSTRING(_rev,
+# 1,POSITION('-'
+# IN _rev) - 1)
+# AS INT) + 1)
+# FROM json_first
+# WHERE _id =
+# doc_id);
+# SET NEWVER =
+#SELECT SUBSTRING(name, 6, length(name) -5) AS name
+#FROM tables
+#WHERE name LIKE 'json!_%'ESCAPE'!';
+% .L # table_name
+% name # name
+% varchar # type
+% 5 # length
+[ "first" ]
+#INSERT INTO json_first (_id, _rev, js)
+#VALUES ('4b5b0c91-61f3-46db-b279-1535c8e2bd41', concat('1-', md5('{}')),
'{}');
+[ 1 ]
+#SELECT * FROM json_first;
+% sys.json_first, sys.json_first, sys.json_first # table_name
+% _id, _rev, js # name
+% uuid, varchar, json # type
+% 36, 34, 2 # length
+[ 4b5b0c91-61f3-46db-b279-1535c8e2bd41,
"1-99914b932bd37a50b983c5e7c90ae93b", "{}" ]
+#WITH curr_first(maxrev, _id) AS (
+# SELECT MAX(CAST(SUBSTRING(_rev,1,POSITION('-' IN _rev) - 1) AS INT)),
+# _id
+# FROM json_first
+# GROUP BY _id)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
