Avoid duplicate b-tree searches in the duplicate row detector used to

implement DISTINCT.

FossilOrigin-Name: d577dda0a7fbfacda57e8cad2bc4651d2a05d813

diff --git a/manifest b/manifest
index 67b3b622ee5a83681e4e2c71585151b5dce7bdfe..4e1872ccafaf48332c8e02058b0c51d011be3d53 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\s"PRAGMA\scase_sensitive_like"\sand\s"PRAGMA\sshrink_memory"\sset\sthe\nnumber\sof\soutput\scolumns\sto\s0\s(as\sthey\sare\sstatements\sthat\sreturn\sno\sdata).
-D 2017-01-06T13:49:40.112
+C Avoid\sduplicate\sb-tree\ssearches\sin\sthe\sduplicate\srow\sdetector\sused\sto\nimplement\sDISTINCT.
+D 2017-01-07T00:56:01.383
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -388,7 +388,7 @@ F src/printf.c ff10a9b9902cd2afe5f655f3013c6307d969b1fd
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 4437d9d5d56b6ffdedabf394c7fe3a07ff521ce9
+F src/select.c 533e55a4067278fef76eff951462383d4147880f
 F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
 F src/sqlite.h.in 29bda4bee01248a5650567d7a22fac39bad1b542
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1543,7 +1543,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 609ac1c73f7c2b48a571c178a72383996a9538fe
-R 812971df62a9791f0bfb0122470a2213
-U dan
-Z ebefd6b7654323e8a23a6cf648753c0a
+P 6696cd1878be4bd44a24841b04163e52d847711e
+R fe79848e4bc76903961662bd26c28411
+U drh
+Z 1f3f3bb84e2a0b8cdaa2372e378cb7b9

diff --git a/manifest.uuid b/manifest.uuid
index 865cc476499fa93e9c80ed5155bad9c8ae572c2c..034f53423aaeb4bb4e45066b72dedc9c7a65cc7e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6696cd1878be4bd44a24841b04163e52d847711e
\ No newline at end of file
+d577dda0a7fbfacda57e8cad2bc4651d2a05d813
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 75ae082e962ee03d116a3ba60467dd56b8fbcfb5..e750fd324de428a090d694a1e8ca40065ffd01f1 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -657,6 +657,7 @@ static void codeDistinct(
   sqlite3VdbeAddOp4Int(v, OP_Found, iTab, addrRepeat, iMem, N); VdbeCoverage(v);
   sqlite3VdbeAddOp3(v, OP_MakeRecord, iMem, N, r1);
   sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iTab, r1, iMem, N);
+  sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
   sqlite3ReleaseTempReg(pParse, r1);
 }