]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Enhancements to the query planner to exploit transitive relationships in the
authordrh <drh@noemail.net>
Fri, 25 Jan 2013 02:10:06 +0000 (02:10 +0000)
committerdrh <drh@noemail.net>
Fri, 25 Jan 2013 02:10:06 +0000 (02:10 +0000)
WHERE clause, and other minor changes to bring the sessions branch into
alignment with the trunk.

FossilOrigin-Name: 82d3d1ae824e1fbc7958657be79231590ec17ace

1  2 
Makefile.msc
main.mk
manifest
manifest.uuid
src/sqliteInt.h
src/tclsqlite.c
src/vdbeaux.c

diff --cc Makefile.msc
Simple merge
diff --cc main.mk
Simple merge
diff --cc manifest
index 1c83628cb82afcd954fb0aecdce3990a70294510,0922ce4694a8a54200708b3c2160c042be0936a9..fb791e4527b0b39f52eb664bc1552d4a40a698c6
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch,\sespecially\sthe\nORDER\sBY\sbug\sfix\sof\s3.7.15.2.
- D 2013-01-09T14:49:37.244
 -C Improved\sparsing\sof\sthe\sarguments\sto\sthe\s".backup"\scommand\sin\sthe\s\ncommand-line\sshell.
 -D 2013-01-23T18:53:23.246
++C Enhancements\sto\sthe\squery\splanner\sto\sexploit\stransitive\srelationships\sin\sthe\nWHERE\sclause,\sand\sother\sminor\schanges\sto\sbring\sthe\ssessions\sbranch\sinto\nalignment\swith\sthe\strunk.
++D 2013-01-25T02:10:06.424
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f74e5635d39e882c915c8b988848a744b3fb3a6a
 -F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
++F Makefile.msc 5de508f802789aae3e96d86261c5cf633d67ce00
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@@ -101,21 -101,9 +101,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk f2fd62730fb5c7771f565f1ea9da70f481eb9577
 -F main.mk 404cd38114d1a94ef6ad5aa01a1c8bb46da36161
++F main.mk 787401c56823d6cf0d2fa01540d04bd438b11ee5
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -187,15 -175,15 +187,15 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 0bca3bf694f14f96a13873d87f62d6a6f38f913f
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 395e458a6dc611cbe1179f424753f0c344957607
- F src/shell.c 11c9611580bb2ffce3a232f31f7f8cc310df0843
+ F src/shell.c af0309c2491a0d82ded1c2af3f64fcdb29d26ad5
 -F src/sqlite.h.in 39cc33bb08897c748fe3383c29ccf56585704177
 +F src/sqlite.h.in 6a7a592aacc98674f39cb520cb7a7af87c2c2438
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h f3f74ba8e76a9a850bfc38a529e7d7ad8227d0be
 -F src/sqliteInt.h fb4109b7a77d985a39bbd04f1fbc49c940d4e410
++F src/sqliteInt.h aa9282588b320654c0efa4379737a05e8f6616e4
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 0faa4b56ab352368b0bffa0874de5cf5c9d89c7e
 -F src/tclsqlite.c 3213f3101e3b85f047d6e389da5a53d76d3d7540
++F src/tclsqlite.c bc021495cad081c13ccdcebd524857aedd831e11
  F src/test1.c f62769c989146149590662ab02de4a813813a9c5
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@@ -209,9 -197,10 +209,10 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 -F src/test_config.c 09781397ccc24268cb895be0d4c21b4aad651486
 +F src/test_config.c 1ffddfdfa5a73e7fb497e8c89c22754bbc949c81
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
+ F src/test_fs.c 1c51e203b2c20235d8c3739f8c1fb13a7502915b
  F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
  F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
@@@ -250,12 -239,12 +251,12 @@@ F src/update.c abb0fcabe551dae0a133fd2a
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
 -F src/vdbe.c f51eb3207594703d24e91335cb16906e894b48aa
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 79abf9b31be406d35ca77d6999cb2d42aaf91e78
 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
 -F src/vdbeaux.c 7c3231498470049b6f1ce05d3992c48f615d2b5d
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 +F src/vdbe.c 4cf34269ba3a2f405eb4eb966c793baa07d863c0
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 2de43968dc47f1961d5bc76aa3cb68eacf433a7c
 +F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647
- F src/vdbeaux.c 0ce759dca1d1662f45f60a9336bf84b5cd15debf
++F src/vdbeaux.c 570714c7e2440da1b04689171124d84ef3015cd4
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
@@@ -1045,7 -1034,7 +1047,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 7e068e39b3b31364271664e0afb1cd95a235c26f 5774f2175ce621dfc4b6b93f7ee13fd66f3ec2b9
- R 101fdb4f64767f317f7e78bca581a816
 -P 5bfb5967d70433bf41d39b57506b7ec167a1b6a0
 -R 08c8109626ac00561b249e6640d8f589
++P 34af6fac679aeb18ab8349f74e95f3cb6e722ea4 f1127e87b90c7ba049404ec68cb4e99009c22185
++R 0f44bd61453292415328773cf0329dea
  U drh
- Z 0052399aede3694d61b751e5cf31021b
 -Z c715715f0fc3823fbef7e95ac29cf308
++Z ad09dedaf38b5f33a2fcbd082e7bc0e7
diff --cc manifest.uuid
index 34c69ee84668a74ebafbf36329013ed6dd2d0a29,60af10143cff8871e9587bb06e42978758aa6c02..b02a34a62eeb4f3e0b581f2a70e274ea94ba3512
@@@ -1,1 -1,1 +1,1 @@@
- 34af6fac679aeb18ab8349f74e95f3cb6e722ea4
 -f1127e87b90c7ba049404ec68cb4e99009c22185
++82d3d1ae824e1fbc7958657be79231590ec17ace
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/tclsqlite.c
Simple merge
diff --cc src/vdbeaux.c
Simple merge