]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add the ability to use indices for the first few terms of an ORDER BY clause,
authordrh <drh@noemail.net>
Fri, 21 Mar 2014 20:58:42 +0000 (20:58 +0000)
committerdrh <drh@noemail.net>
Fri, 21 Mar 2014 20:58:42 +0000 (20:58 +0000)
then sort in batches to handle the later terms.

FossilOrigin-Name: fa06a6fed9f48322d9b89721799ba12c46efa898

1  2 
manifest
manifest.uuid
src/select.c
src/sqliteInt.h

diff --cc manifest
index 88f61607f595b7d7b601f876377350f2790c215e,d2ff62a05783453c2136e9c837ab3583d3fa4d2a..5abb89ba80893ec051c8a24e61ad80bf6a7bef47
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sthe\snames\sof\sSRT_DistTable\sand\sSRT_Table\sused\sby\sCTE\sto\smore\nmeaningful\sSRT_DistFifo\sand\sSRT_Fifo,\srespectively.\s\sSimplify\sthe\nIgnorableOrderby()\smacro\sin\sthe\sprocess.
- D 2014-03-21T19:56:09.443
 -C Merge\sthe\sOFFSET-on-query-without-FROM\sfix\sfrom\strunk.
 -D 2014-03-21T18:45:19.215
++C Add\sthe\sability\sto\suse\sindices\sfor\sthe\sfirst\sfew\sterms\sof\san\sORDER\sBY\sclause,\nthen\ssort\sin\sbatches\sto\shandle\sthe\slater\sterms.
++D 2014-03-21T20:58:42.176
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -217,12 -217,12 +217,12 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c cbee644f795a5fa14fa79bd760c3c9c883a6b4d8
 -F src/select.c 596b8098be41e6256968f167d1d8ece2be08d082
++F src/select.c 633c56adeb382173d01016bea9e04e4dac54dfbc
  F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
  F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 76b1cf0836f0d022aec5045474f5c6c90f7b9730
 -F src/sqliteInt.h dc37150ad6c98e7121fa0adbe243e89a12e16525
++F src/sqliteInt.h 1e16bac177ce6396e59af867afb90c92949895de
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1156,7 -1157,7 +1157,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 1f413aca00015100224273480e1ce39a76bf93ab
- R 26118dcbaf585402aab527afe8f97345
 -P e70cfa28aa393661ccc742ecd5e672d807bdd0a9 179ef81648b0ad557df78b7712f216b876b6fb65
 -R 654a6218c0c034c3e6462d9f9d0a06b2
++P 45d8cc678d128f1dda6469864215a8ed9de4366a 71e9ae72c272dc86720b2bfe719f57de437c400b
++R 3371108f475a5908c384cc490e83cfb1
  U drh
- Z d7e9ffdc5a42e976a5961e8287a0561b
 -Z 7a7ab7eaa2946af0174662f0ca0e6009
++Z 76333cbbd5592a854905d3a7e7bd7626
diff --cc manifest.uuid
index 253fab48e6b3c1047d1b1f5b22f0e2d8ef70fd2c,d1f85a0601dcf7d9755c87bd1eec519a855b9799..4099c22d6662bc0b61e0da0042323e8af77d11bd
@@@ -1,1 -1,1 +1,1 @@@
- 45d8cc678d128f1dda6469864215a8ed9de4366a
 -71e9ae72c272dc86720b2bfe719f57de437c400b
++fa06a6fed9f48322d9b89721799ba12c46efa898
diff --cc src/select.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge