From: drh <> Date: Wed, 18 Mar 2026 18:14:14 +0000 (+0000) Subject: Minor optimization to error message generation in integrity_check. X-Git-Tag: major-release~74^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac53ce155a2c2e384fc1b20b53ac5eaa99a5b0eb;p=thirdparty%2Fsqlite.git Minor optimization to error message generation in integrity_check. FossilOrigin-Name: e0fa7c500052af9d36cb2d232131ef93361403187f4a60f53279b102c7a95860 --- diff --git a/manifest b/manifest index 9f1c62b6bd..9215f6671f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Comment\simprovements.\s\sEnsure\sthat\stests\sin\sshellB.test\sthat\srequire\nvirtual\stables\sdo\snot\srun\swhen\scompiling\swithout\svirtual\stable\ssupport. -D 2026-03-18T17:16:18.380 +C Minor\soptimization\sto\serror\smessage\sgeneration\sin\sintegrity_check. +D 2026-03-18T18:14:14.851 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -726,7 +726,7 @@ F src/parse.y 3b784d6083380a950e3b1b32ce5ddd303e8c7c209d8ab788df2c62aaf9ee8eb3 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 092b758d2c5e4dabb30eae46d8dfad77c0f70b16bf3ff1943f7a232b0fe0d4ba F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd -F src/pragma.c 267d13065ab9af6b67368f654ea047714e5274e04ffe10c86721d7a4c3f846a2 +F src/pragma.c 789ef67117b74b5be0a2db6681f7f0c55e6913791b9da309aefd280de2c8a74d F src/prepare.c f6a6e28a281bd1d1da12f47d370a81af46159b40f73bf7fa0b276b664f9c8b7d F src/printf.c 9cff219dba73b1aa9a8113e83e962f03f7bea8b6eb51cefb25bc468d5a69fb2d F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c @@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 4e996c183ea8d270b4448b471d4d032e13cef89f537674599d1e7c367cc2d0f8 -R fffb821a24289be0806305bca2026d2b +P a270c6cc0eea8a8a2cf1ce30d724b2f12b11a1c343cd8520bd7843f4e62878f8 +R 26ade8ca132e7215ac38ba62aa36e2a7 U drh -Z 284483328b4916f94a2e5cff06a45a22 +Z 05abd0005f3d08ed3533335ee2e75034 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index beca0e5a2e..39f06bbb55 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a270c6cc0eea8a8a2cf1ce30d724b2f12b11a1c343cd8520bd7843f4e62878f8 +e0fa7c500052af9d36cb2d232131ef93361403187f4a60f53279b102c7a95860 diff --git a/src/pragma.c b/src/pragma.c index 1b4e34313b..961ba0b0e8 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -2072,13 +2072,10 @@ void sqlite3Pragma( jmp2 = sqlite3VdbeAddOp3(v, OP_IFindKey, iIdxCur+j, ckUniq, r1); VdbeCoverage(v); sqlite3VdbeChangeP4(v, -1, (const char*)pIdx, P4_INDEX); - - sqlite3VdbeLoadString(v, 3, "index "); - sqlite3VdbeLoadString(v, 4, pIdx->zName); - sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3); - sqlite3VdbeLoadString(v, 4, - " stores an imprecise floating-point value for row "); - sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3); + sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, + sqlite3MPrintf(db, "index %s stores an imprecise floating-point " + "value for row ", pIdx->zName), + P4_DYNAMIC); sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3); integrityCheckResultRow(v); sqlite3VdbeAddOp2(v, OP_Goto, 0, ckUniq);