From 5735921b0fe85baed89afc3b08c4a6b4304b9cc7 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 12 Sep 2024 21:03:11 +0000 Subject: [PATCH 1/2] Add RSYNC_OPT to the sqlite3-rsync build flags. FossilOrigin-Name: b2a3497e5525dd33faf70961107a0529f476735fef756953c66e105747271c6d --- Makefile.in | 3 ++- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 10b5db15a5..ebe8f3c59a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -707,12 +707,13 @@ RSYNC_SRC = \ RSYNC_OPT = \ -DSQLITE_ENABLE_DBPAGE_VTAB \ + -USQLITE_THREADSAFE \ -DSQLITE_THREADSAFE=0 \ -DSQLITE_OMIT_LOAD_EXTENSION \ -DSQLITE_OMIT_DEPRECATED sqlite3-rsync$(TEXE): $(RSYNC_SRC) - $(TCC) -o $@ $(RSYNC_SRC) $(TLIBS) + $(TCC) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(TLIBS) scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ diff --git a/manifest b/manifest index 9ee27c15a8..adaa2851cc 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Port\ssome\sof\sthe\sshell's\sCLI\sflag-handling\scode\sinto\ssqlite3-rsync\sto\smake\sthe\sarg\shandling\smore\srobust. -D 2024-09-12T18:15:28.846 +C Add\sRSYNC_OPT\sto\sthe\ssqlite3-rsync\sbuild\sflags. +D 2024-09-12T21:03:11.083 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 4ac84300552e9ab8245288dec9941b6b820b48e15cbcd7c87db2ce45998c62f8 +F Makefile.in 086a7ca4e5223da3990e1a6f0cdc082af74c3ca0e175b0af955a44115832ba85 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 F Makefile.msc f25c476f22a25f23af8dc7260e9f95896250e7fceb621388ca8ae4f096bd3fda F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -2213,8 +2213,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P e385525793c7d74ce8ee139c9d6cfc1248834754598f3fd45b22b9426ff106ee -R 2634868962b675f42ebfd90b6ccf2615 +P 53fb9b11807ff7accd8cd41f9cb6516d2503f161ea976940437a1d3aae868665 +R 81dd8418b79d70f2c41a3d45559c0c93 U stephan -Z ca092fee4c8dab92860037cbb2c82076 +Z c1b8ca8f0b0849e8a689568eca20e4f4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 67577b0f49..929ef187b8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -53fb9b11807ff7accd8cd41f9cb6516d2503f161ea976940437a1d3aae868665 +b2a3497e5525dd33faf70961107a0529f476735fef756953c66e105747271c6d From 5c6dc45a10478cc16607170314efb48a361cc5ef Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 12 Sep 2024 23:30:29 +0000 Subject: [PATCH 2/2] Better initialization of new database files in sqlite3-rsync. FossilOrigin-Name: 75d5a8eb3d4ece06900109ad4022ba2a3e82de2f0acb012e3a02bfb4326bfa6d --- manifest | 14 +++++++------- manifest.uuid | 2 +- tool/sqlite3-rsync.c | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index adaa2851cc..4ae4d1787e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sRSYNC_OPT\sto\sthe\ssqlite3-rsync\sbuild\sflags. -D 2024-09-12T21:03:11.083 +C Better\sinitialization\sof\snew\sdatabase\sfiles\sin\ssqlite3-rsync. +D 2024-09-12T23:30:29.682 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -2174,7 +2174,7 @@ F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60 F tool/sqldiff.c 847fc8fcfddf5ce4797b7394cad6372f2f5dc17d8186e2ef8fb44d50fae4f44a -F tool/sqlite3-rsync.c 20783cd979df8c32d33eab3c38c44a79343be63a73b6cbd1ee56a0a14d73b3fe +F tool/sqlite3-rsync.c 4a2bfb77e633b6a6edbd88d7bfc3e6e03a0c8662d0c3ae815e6c1ff7eb7df94e F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848 @@ -2213,8 +2213,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 53fb9b11807ff7accd8cd41f9cb6516d2503f161ea976940437a1d3aae868665 -R 81dd8418b79d70f2c41a3d45559c0c93 -U stephan -Z c1b8ca8f0b0849e8a689568eca20e4f4 +P b2a3497e5525dd33faf70961107a0529f476735fef756953c66e105747271c6d +R 3def4dc608d40602e340858854fc17d3 +U drh +Z 3eea4133291b7d423d6d8c3c9c75fcb1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 929ef187b8..f5d4b54d7d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b2a3497e5525dd33faf70961107a0529f476735fef756953c66e105747271c6d +75d5a8eb3d4ece06900109ad4022ba2a3e82de2f0acb012e3a02bfb4326bfa6d diff --git a/tool/sqlite3-rsync.c b/tool/sqlite3-rsync.c index 350ed84afd..3c7ae0e70a 100644 --- a/tool/sqlite3-rsync.c +++ b/tool/sqlite3-rsync.c @@ -1088,6 +1088,7 @@ static void replicaSide(SQLiteRsync *p){ if( nRPage==0 ){ runSql(p, "PRAGMA page_size=%u", szOPage); runSql(p, "PRAGMA journal_mode=WAL"); + runSql(p, "SELECT * FROM sqlite_schema"); } runSql(p, "BEGIN IMMEDIATE"); runSqlReturnText(p, buf, "PRAGMA journal_mode");