Ensure that all object labels for individual objects generated by

randomjson.c are unique.

FossilOrigin-Name: 29c46aca231b3f1e997ef306a5a651408185bf3ad09ab9fc1fe21ed18caa4d02

diff --git a/ext/misc/randomjson.c b/ext/misc/randomjson.c
index 20ee12b9fe913892b58a1b84a7c2a3fa32851ccd..5036fa6047188d474ad1d448da6e646241301d34 100644 (file)
--- a/ext/misc/randomjson.c
+++ b/ext/misc/randomjson.c
@@ -108,10 +108,9 @@ static char *azJsonTemplate[] = {
   "{\"a\":%,\"b\":%,\"c\":%,\"d\":%,\"\":%}",  "{a:%,b:%,c:%,d:%,'':%}",
   "{\"d\":%}",                                 "{d:%}",
   "{\"eeee\":%, \"ffff\":%}",                  "{eeee:% /*and*/, ffff:%}",
-  "{\"$g\":%,\"_h_\":%}",                      "{$g:%,_h_:%,}",
+  "{\"$g\":%,\"_h_\":%,\"a b c d\":%}",        "{$g:%,_h_:%,\"a b c d\":%}",
   "{\"x\":%,\n  \"y\":%}",                     "{\"x\":%,\n  \"y\":%}",
-  "{\"a b c d\":%,\"\\u00XX\":%,\"\\uXXXX\":%,\"x\":%,\"y\":%}",
-            "{\"a b c d\":%,\"\\xXX\":%,\"\\uXXXX\":%,x:%,y:%}",
+  "{\"\\u00XX\":%,\"\\uXXXX\":%}",             "{\"\\xXX\":%,\"\\uXXXX\":%}",
   "{\"Z\":%}",                                 "{Z:%,}",
   "[%]",                                       "[%,]",
   "[%,%]",                                     "[%,%]",
@@ -159,6 +158,10 @@ static void jsonExpand(
     n = strlen(z);
     if( (zX = strstr(z,"XX"))!=0 ){
       unsigned int r = prngInt(p);
+      if( (r&0xff)==((r>>8)&0xff) ) r += 0x100;
+      while( (r&0xff)==((r>>16)&0xff) || ((r>>8)&0xff)==((r>>16)&0xff) ){
+        r += 0x10000;
+      }
       memcpy(zBuf, z, n+1);
       z = zBuf;
       zX = strstr(z,"XX");

diff --git a/manifest b/manifest
index 7141e85632185a32e4dcaa85296d17d478e30e50..c15311e551a70ef85d2243d89fa787d0a641b0d7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfix\sin\sthe\srandomjson.c\sextension.
-D 2023-12-18T13:51:54.496
+C Ensure\sthat\sall\sobject\slabels\sfor\sindividual\sobjects\sgenerated\sby\nrandomjson.c\sare\sunique.
+D 2023-12-18T14:16:58.155
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -394,7 +394,7 @@ F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee
 F ext/misc/percentile.c b9086e223d583bdaf8cb73c98a6539d501a2fc4282654adbfea576453d82e691
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
-F ext/misc/randomjson.c 8642d0ce204de743f148c11b320f4493046bf2a57f79efb19be3388101a7d092
+F ext/misc/randomjson.c 182cabbeb294f56f68ba2fd0879790e6d4889bb50b6a532604cc6f360d6dd516
 F ext/misc/regexp.c 4bdd0045912f81c84908bd535ec5ad3b1c8540b4287c70ab84070963624047db
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
@@ -2154,8 +2154,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a4e6d1f86f3a502e4170f5a90031e269e48363e95114a66b84d373e3ce0b2704
-R 9787f93b49de93cd2fa8fe010120ae0d
+P 1f3a33df530dbe330ea8b14a69369b807b413b25a167d1a3938f8f0faf97cc91
+R 52287023e6071fa0fbc19b0133af9058
 U drh
-Z 72d64dbdca15edf4ed5cc684c21af296
+Z 09d32bf163b956d3c1ed37f12088104f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c6d3735f6ad6939d0e441e73ba04dc84bbfd7949..90e206a8b23d1bbe58797bd497089e1c6dce9ae9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1f3a33df530dbe330ea8b14a69369b807b413b25a167d1a3938f8f0faf97cc91
\ No newline at end of file
+29c46aca231b3f1e997ef306a5a651408185bf3ad09ab9fc1fe21ed18caa4d02
\ No newline at end of file