mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove an unnecessary branch from expr.c. 

FossilOrigin-Name: 7cc9746c5414e02012efb8180f9eca2646800e74
This commit is contained in:
dan 2016-09-06 17:21:17 +00:00
parent c7a77ae1c6
commit 773d3afaa3
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@ -1,5 +1,5 @@
C Avoid\sunnecessary\smemory\sallocations\sfor\saiMap\sin\scodeEqualityConstraints.
D 2016-09-06T17:13:40.420
C Remove\san\sunnecessary\sbranch\sfrom\sexpr.c.
D 2016-09-06T17:21:17.043
F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
F src/expr.c 4c2b9886927fb6628560ad40d14b04946d71abbd
F src/expr.c 028c34005cb804abe8f73453ac08baa44f4b63f9
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@ -1028,7 +1028,7 @@ F test/rowvalue5.test a440d490c8c0bf606034c09d5c6bbf7840b98f95
F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
F test/rowvalue7.test 5d06ff19d9e6969e574a2e662a531dd0c67801a8
F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
F test/rowvalue9.test 480c60654941bebdc2d0caa0104df7ca358cbed2
F test/rowvalue9.test 03a5edc94ab5983b98820f6541c62b43560cd84c
F test/rowvaluefault.test 7b16485e3f2b371f3e3d05455b8ded6d0c090244
F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
@ -1522,7 +1522,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P c6e528c1c0f17c69c7745b018afa36694118258f
R 71337de042abb55d5e21dbccb2bcc3d7
U drh
Z ad68562def745ab96bb3491072f1a7f4
P 70319c3d76abd1e403fcf2a62668736b92a5f3d5
R e9d987800340c93d5c8b755d8bc8e3a7
U dan
Z f81283c76e744b298a5230c53cc06749

2
manifest.uuid
View File

@ -1 +1 @@
70319c3d76abd1e403fcf2a62668736b92a5f3d5
7cc9746c5414e02012efb8180f9eca2646800e74

2
src/expr.c
View File

@ -2482,7 +2482,7 @@ int sqlite3CodeSubselect(
assert( pEList->nExpr>0 );
assert( sqlite3KeyInfoIsWriteable(pKeyInfo) );
for(i=0; i<nVal; i++){
Expr *p = (nVal>1) ? sqlite3VectorFieldSubexpr(pLeft, i) : pLeft;
Expr *p = sqlite3VectorFieldSubexpr(pLeft, i);
pKeyInfo->aColl[i] = sqlite3BinaryCompareCollSeq(
pParse, p, pEList->a[i].pExpr
);

6
test/rowvalue9.test
View File

@ -235,6 +235,12 @@ do_execsql_test 5.0 {
do_execsql_test 5.1 {
SELECT rowid FROM e1 WHERE (a, c) IN (SELECT x, y FROM e2);
} {1}
do_execsql_test 5.2 {
SELECT rowid FROM e2 WHERE rowid IN (SELECT +c FROM e1);
} {2}
do_execsql_test 5.3 {
SELECT rowid FROM e2 WHERE rowid IN (SELECT 0+c FROM e1);
} {2}
finish_test