]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge performance enhancements and other patches. factor-out-scalar-subselect
authordrh <drh@noemail.net>
Fri, 28 Dec 2018 21:40:46 +0000 (21:40 +0000)
committerdrh <drh@noemail.net>
Fri, 28 Dec 2018 21:40:46 +0000 (21:40 +0000)
FossilOrigin-Name: 44e1b55aab331933719b67f7fcf7d335234b8b79599fba6033a0a27094bcb644

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

diff --cc manifest
index 8969f652904d23296c3de9ec0d73675bae031544,e9337d00537d256f9ea909f3dd9deb9563b4e45e..ec69408d6b47ff8595bab0a2f0c01d71cf58aeb6
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Here\sis\sthe\sbeginnings\sof\san\seffort\sto\sfactor\sout\sthe\simplementation\sof\nscalar\ssubqueries\sto\sbe\simplemented\sas\ssubroutines\sat\sthe\send\sof\sthe\smain\nbody\sof\sbytecode,\safter\sthe\sjump\sback\sto\sthe\sOP_Init\sopcode.\s\sThis\sis\san\nincremental\scheck-in\sthat\scontains\sonly\spreliminary\schanges.
- D 2018-12-26T15:04:43.407
 -C Merge\sperformance\senhancements\sfrom\strunk.
 -D 2018-12-28T21:32:35.935
++C Merge\sperformance\senhancements\sand\sother\spatches.
++D 2018-12-28T21:40:46.050
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@@ -454,7 -454,7 +454,7 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c 4429a1615440f0253d470b59f955fe84787fd6f709ae114c0a12d132ae725599
  F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
  F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
- F src/build.c b620091357744710ae9940f03947b4bd69c2d5bf7cd76746e5a7cd5a8787beec
 -F src/build.c 5ca38181e826bcc35e0176c31a691d897ed0cc708fc935fd51e8023705cdcf1a
++F src/build.c f5968d8081182ddfee1629d7465c232c1d4f5d54687a632b188ae2cef5d32368
  F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
@@@ -515,7 -515,7 +515,7 @@@ F src/shell.c.in 207da30342db0b6fac8b24
  F src/sqlite.h.in b54cd42d2f3b739a00de540cafe2dcd0de3b8e1748a2db33a68def487e9e602f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h 0e8cc89b4a589d2bb7de085ddce04ba53a2ad926c7a71ac194114c02cc9810fc
 -F src/sqliteInt.h ac354476cedd0a7cf103ec225423bc654bc0df8a7a1019ce298425ebe91062cf
++F src/sqliteInt.h 1da81c69ce881019fe00565c75406265cf40be92a17f323f9045bf034e719ecb
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1792,10 -1795,7 +1795,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 3c2ad0e915e835b1cb2962879beff50b2745d0cefe1cfc89ef90b7879c139ce6
- R 7253304d573583193fd660d5a38c4b33
- T *branch * factor-out-scalar-subselect
- T *sym-factor-out-scalar-subselect *
- T -sym-reuse-subqueries *
 -P da53f3d3ff26cc32d3a5ac788b6785baa3d1688e50d9354025a3130dc7e71a38 891f1f72187f0f9ec0d24fda98cc08be3ae3c3ff8b27c4e409ee7135c3106398
 -R c1c92a3b03da98f440390a0e9ced2b83
++P 50e5f390fbab4189c9700a2c62c951ab9acbf0a03c491e88f3e3bcf19a2311cc 0f1b9ff9e1e6f13e03045fcb7d0907227085054f9eb0b0b8471fb26b0094b13a
++R 447360c957ed3833b50528f10575cb30
  U drh
- Z 7394ebc147279ea7d69a4b85835f879c
 -Z 16f502f29d74bfe53bffbbe615dec4cd
++Z e14093037f7573306bc3a2513169a16b
diff --cc manifest.uuid
index 734f7bfe1f21bae971123a46a15defed56bc0ecb,b04e66bf829d8af5f087245a93f5daeeb06ecd51..509dc3d9c8cbc8229836060df8aa37227ec938fd
@@@ -1,1 -1,1 +1,1 @@@
- 50e5f390fbab4189c9700a2c62c951ab9acbf0a03c491e88f3e3bcf19a2311cc
 -0f1b9ff9e1e6f13e03045fcb7d0907227085054f9eb0b0b8471fb26b0094b13a
++44e1b55aab331933719b67f7fcf7d335234b8b79599fba6033a0a27094bcb644
diff --cc src/build.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge