1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Improved VDBE branch coverage in the run-time frame-spec error detection

logic of window functions.

FossilOrigin-Name: f56d305a7bad6608d51d8c8cef417ddb66cff50f0a75d28554ea669e47f3d90d
This commit is contained in:
drh
2019-04-01 14:30:30 +00:00
parent c906533650
commit 21826f44bf
3 changed files with 13 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
C Improved\scomments\son\sthe\sVDBE\sbranch\scoverage\stesting\slogic.\s\sFix\sthe\nVDBE\sbranch\scoverage\smeasurement\son\sthe\sOP_MustBeInt\sopcode. C Improved\sVDBE\sbranch\scoverage\sin\sthe\srun-time\sframe-spec\serror\sdetection\nlogic\sof\swindow\sfunctions.
D 2019-04-01T14:01:21.321 D 2019-04-01T14:30:30.127
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -606,7 +606,7 @@ F src/where.c ff2955dc2743c1af05ba5a8232ab72724d9a63b76dbee256368f40fd3ef82db5
F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
F src/wherecode.c 9572aab9eff42859a5f3e9b212f704521a84bf77e444217f0339d8b811e6333f F src/wherecode.c 9572aab9eff42859a5f3e9b212f704521a84bf77e444217f0339d8b811e6333f
F src/whereexpr.c 90859652920f153d2c03f075488744be2926625ebd36911bcbcb17d0d29c891c F src/whereexpr.c 90859652920f153d2c03f075488744be2926625ebd36911bcbcb17d0d29c891c
F src/window.c bd1e1c2674546d0a61c04895352b2651756136757c2c399bd11b6cc609416e0d F src/window.c 76a3a9bea5e1b6823fdcab93601fdb5ec8ccb619cbf3142b9d67a8e3a262dff1
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1814,7 +1814,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 1fcf3307d37f0e8e0c8c54491c609b73c7add6eaa38409a41c7cd6614a877a19 P 8681750e855a020ee374cb9f973f701a72068e33f97d0101a4fab3a228e5ebda
R 548d264b85d1f84e31c647fc92a651ab R d88739e3fc7524dd1061128e4965a1fa
U drh U drh
Z 3917bade205e6ba6a19fe2a0919e61ee Z 0bbe78fa3e82a47d788c8c31972dadc2

View File

@@ -1 +1 @@
8681750e855a020ee374cb9f973f701a72068e33f97d0101a4fab3a228e5ebda f56d305a7bad6608d51d8c8cef417ddb66cff50f0a75d28554ea669e47f3d90d

View File

@@ -1309,7 +1309,7 @@ static void windowCheckValue(Parse *pParse, int reg, int eCond){
int regString = sqlite3GetTempReg(pParse); int regString = sqlite3GetTempReg(pParse);
sqlite3VdbeAddOp4(v, OP_String8, 0, regString, 0, "", P4_STATIC); sqlite3VdbeAddOp4(v, OP_String8, 0, regString, 0, "", P4_STATIC);
sqlite3VdbeAddOp3(v, OP_Ge, regString, sqlite3VdbeCurrentAddr(v)+2, reg); sqlite3VdbeAddOp3(v, OP_Ge, regString, sqlite3VdbeCurrentAddr(v)+2, reg);
sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC); sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL);
VdbeCoverage(v); VdbeCoverage(v);
assert( eCond==3 || eCond==4 ); assert( eCond==3 || eCond==4 );
VdbeCoverageIf(v, eCond==3); VdbeCoverageIf(v, eCond==3);
@@ -1323,11 +1323,11 @@ static void windowCheckValue(Parse *pParse, int reg, int eCond){
VdbeCoverageIf(v, eCond==2); VdbeCoverageIf(v, eCond==2);
} }
sqlite3VdbeAddOp3(v, aOp[eCond], regZero, sqlite3VdbeCurrentAddr(v)+2, reg); sqlite3VdbeAddOp3(v, aOp[eCond], regZero, sqlite3VdbeCurrentAddr(v)+2, reg);
VdbeCoverageIf(v, eCond==0); VdbeCoverageNeverNullIf(v, eCond==0); /* NULL case captured by */
VdbeCoverageIf(v, eCond==1); VdbeCoverageNeverNullIf(v, eCond==1); /* the OP_MustBeInt */
VdbeCoverageIf(v, eCond==2); VdbeCoverageNeverNullIf(v, eCond==2);
VdbeCoverageIf(v, eCond==3); VdbeCoverageNeverNullIf(v, eCond==3); /* NULL case caught by */
VdbeCoverageIf(v, eCond==4); VdbeCoverageNeverNullIf(v, eCond==4); /* the OP_Ge */
sqlite3MayAbort(pParse); sqlite3MayAbort(pParse);
sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_ERROR, OE_Abort); sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_ERROR, OE_Abort);
sqlite3VdbeAppendP4(v, (void*)azErr[eCond], P4_STATIC); sqlite3VdbeAppendP4(v, (void*)azErr[eCond], P4_STATIC);