From: dan <dan@noemail.net>
Date: Mon, 6 Apr 2015 11:04:51 +0000 (+0000)
Subject: Fix a problem with fts3 prefix terms within phrase queries on "order=DESC" tables... 
X-Git-Tag: version-3.8.9~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3cdbad2748af9bb6002693efdd231d3dceeb74a;p=thirdparty%2Fsqlite.git

Fix a problem with fts3 prefix terms within phrase queries on "order=DESC" tables with a mix of negative and positive rowids.

FossilOrigin-Name: 3ad829e50faca538db3abb2afb898b5521550c5c
---

e3cdbad2748af9bb6002693efdd231d3dceeb74a
diff --cc manifest
index 762233f676,12c20e5b8a..839dc44cc6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\swith\sresolving\sORDER\sBY\sclauses\sthat\sfeature\sCOLLATE\sclauses\sattached\sto\scompound\sSELECT\sstatements.
- D 2015-04-04T16:49:04.697
+ C Fix\sa\sproblem\swith\sfts3\sprefix\sterms\swithin\sphrase\squeries\son\s"order=DESC"\stables\swith\sa\smix\sof\snegative\sand\spositive\srowids.
 -D 2015-04-06T09:05:29.052
++D 2015-04-06T11:04:51.176
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -588,7 -588,7 +588,7 @@@ F test/fts3expr2.test 18da930352e5693ea
  F test/fts3expr3.test 9e91b8edbcb197bf2e92161aa7696446d96dce5f
  F test/fts3expr4.test e1be1248566f43c252d4404d52914f1fc4bfa065
  F test/fts3fault.test cb72dccb0a3b9f730f16c5240f3fcb9303eb1660
--F test/fts3fault2.test 3198eef2804deea7cac8403e771d9cbcb752d887
++F test/fts3fault2.test f953bb3cf903988172270a9a0aafd5a890b0f98f
  F test/fts3first.test dbdedd20914c8d539aa3206c9b34a23775644641
  F test/fts3join.test 53e66a0c21eb568580674a43b21c059acb26f499
  F test/fts3malloc.test b0e4c133b8d61d4f6d112d8110f8320e9e453ef6
@@@ -1249,7 -1249,10 +1249,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 4ae9a3acc4eeeb7998769eb856c97c2233476f72 427b50fba7362e5b447e79d39050f25ed2ef10af
- R 0a683c8bd67cbd2be5ea29e95266b636
 -P edc1de2a588fd50c0049bb2be76d3f6783443165
 -R a8252a4468bea13d638722c58d3ce9cc
 -T *branch * fts3-prefix-query-fix
 -T *sym-fts3-prefix-query-fix *
 -T -sym-trunk *
++P edc1de2a588fd50c0049bb2be76d3f6783443165 0cdf502885ea7e5805d7ba3719f055f5d48fc78d
++R 3d0aeff53f9d343a974360d23614c066
  U dan
- Z c9ac74415bdb7893d918eacf5a95862c
 -Z 7c1c374a4c4efe674ae583b0f9d983d2
++Z ac6175e8f164395f5f3f99cbe84625aa
diff --cc manifest.uuid
index ff36ec293f,2a42d14f33..60fdaf0098
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- edc1de2a588fd50c0049bb2be76d3f6783443165
 -0cdf502885ea7e5805d7ba3719f055f5d48fc78d
++3ad829e50faca538db3abb2afb898b5521550c5c
diff --cc test/fts3fault2.test
index f2d10bc3f8,f2d10bc3f8..030ff73dc2
--- a/test/fts3fault2.test
+++ b/test/fts3fault2.test
@@@ -155,4 -155,4 +155,23 @@@ ifcapable fts3_unicode 
    }
  }
  
++reset_db
++do_test 6.0 {
++  execsql {
++    CREATE VIRTUAL TABLE t6 USING fts4(x,order=DESC);
++    INSERT INTO t6(docid, x) VALUES(-1,'a b');
++    INSERT INTO t6(docid, x) VALUES(1, 'b');
++  }
++  faultsim_save_and_close
++} {}
++
++do_faultsim_test 6.1 -faults oom* -prep {
++  faultsim_restore_and_reopen
++  db eval {SELECT * FROM sqlite_master}
++} -body {
++  execsql { SELECT docid FROM t6 WHERE t6 MATCH '"a* b"' }
++} -test {
++  faultsim_test_result {0 -1}
++}
++
  finish_test