speedtest1: further improvements to the "json" testset.

FossilOrigin-Name: c4750f7cf7e2188623de8b12e01acf3e3d7dc7b5ea87ac449571eb36f97d842a

diff --git a/manifest b/manifest
index 08f99e6eef08a87f66b5cf8712059bf86b266f24..a5505b6964f24dceb0b64d349205cb28a034b8be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C speedtest1:\s\sImprovements\sto\sthe\s"json"\stestset.\s\sBetter\sbalance\sin\s"mix1".
-D 2025-01-16T20:08:59.559
+C speedtest1:\sfurther\simprovements\sto\sthe\s"json"\stestset.
+D 2025-01-16T20:46:08.022
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -1677,7 +1677,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 26f1b44de121c114d1487baa5b040c0f2d5fe6bb57febb7ae51ece6ab919783d
+F test/speedtest1.c 323ce0956430a5aae56ea20f502da7bea3fb62b8ed02e9b0f12ab078b2b258f5
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2205,8 +2205,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d33508836bc88314a205bfa9d80f3ebe695163cf0c46d500ad674535975408fb
-R dd0ac0f4915c519ed5a12a3b5d1c6f66
+P 2cc73c5e08f1a16fe8accf0af6af061e42d27635883d09234516fd470e99bc0a
+R f4bb93608db14b0baa099caf842aef42
 U drh
-Z 81cac1efd10a78c1a3b6a5cb8d65a46e
+Z 1a1ead4cbc7ce98f73040d73112e92fb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d6dcda86adf2a63557f365ba47967d39fbdbfa31..43e7b2476a43b7224f8e534df4dacdc376908392 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2cc73c5e08f1a16fe8accf0af6af061e42d27635883d09234516fd470e99bc0a
+c4750f7cf7e2188623de8b12e01acf3e3d7dc7b5ea87ac449571eb36f97d842a

diff --git a/test/speedtest1.c b/test/speedtest1.c
index c84d2c5919661d8f3fa92433ec8b4fc9c8a1ebf7..8847ed04bfa554b3f1b259e812d0b491e213b244 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -2222,18 +2222,32 @@ void testset_json(void){
   speedtest1_exec(
     "WITH c(n) AS (VALUES(0) UNION ALL SELECT n+1 FROM c WHERE n<7)\n"
     "  SELECT sum(x->>format('$.c[%%d].x',n)) FROM c, j1;\n"
+
     "WITH c(n) AS (VALUES(1) UNION ALL SELECT n+1 FROM c WHERE n<5)\n"
     "  SELECT sum(x->>format('$.\"c\"[#-%%d].y',n)) FROM c, j1;\n"
+
     "SELECT sum(x->>'$.d.ez' + x->>'$.d.\"xz\"' + x->>'a' + x->>'$.c[10].y') FROM j1;\n"
+
     "SELECT x->>'$.d.tz[2]', x->'$.d.tz' FROM j1;\n"
   );
   speedtest1_end_test();
 
+  speedtest1_begin_test(141, "queries involving json_type()");
+  speedtest1_exec(
+    "WITH c(n) AS (VALUES(1) UNION ALL SELECT n+1 FROM c WHERE n<20)\n"
+    "  SELECT json_type(x,format('$.c[#-%%d].y',n)), count(*)\n"
+    "    FROM c, j1\n"
+    "   WHERE j1.rowid=1\n"
+    "   GROUP BY 1 ORDER BY 2;"
+  );
+  speedtest1_end_test();
+
 
   speedtest1_begin_test(150, "json_insert()/set()/remove() on every row of J1");
   speedtest1_exec(
     "BEGIN;\n"
-    "UPDATE j1 SET x=jsonb_insert(x,'$.g',(x->>'f')+1);\n"
+    "UPDATE j1 SET x=jsonb_insert(x,'$.g',(x->>'f')+1,'$.h',3.14159,'$.i','hello',\n"
+    "                               '$.j',json('{x:99}'),'$.k','{y:98}');\n"
     "UPDATE j1 SET x=jsonb_set(x,'$.e',(x->>'f')-1);\n"
     "UPDATE j1 SET x=jsonb_remove(x,'$.d');\n"
     "COMMIT;\n"