Omit the WhereLoopBuilder.pOrderBy field, which is no longer needed.

FossilOrigin-Name: a13afc909c8bb643aa154b39ba8c023bae7352d3cd7cfb96be3891fa0e4bc045

diff --git a/manifest b/manifest
index cc182828321e95cd2f8f546713b0f280353a1748..b4574239e79779536becee7e1207be19de99bc66 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C An\sinitial\sattempt\sto\simplement\ssqlite3_vtab_distinct().
-D 2022-01-22T00:18:01.617
+C Omit\sthe\sWhereLoopBuilder.pOrderBy\sfield,\swhich\sis\sno\slonger\sneeded.
+D 2022-01-22T02:52:22.316
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,8 +639,8 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 7df767249645ba428b8a217278319028c679f48f2daecac8461ae6e2d281cd6d
-F src/whereInt.h 91865afa4a3540bb3bd643619acc56fbceff7defeb8f249b8e157fd5325d88be
+F src/where.c bf15b922a134948a56a078e0a01d1e63f9f8ff59f6503cba241855f8cb961b4f
+F src/whereInt.h 8a215acde0f833a4dea3d30a7bbed9f48b4b547b5d5e34cd02acee366476ab80
 F src/wherecode.c a0a5138b28550dd95916435283c507aa6bf24607ef38a0a18011e6626684330a
 F src/whereexpr.c 9f64c39e53070584e99e4d20c1dd3397e125fabbae8fd414ffec574c410ac7d3
 F src/window.c 5d3b397b0c026d0ff5890244ac41359e524c01ae31e78782e1ff418c3e271a9e
@@ -1941,11 +1941,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 19247e919fab9748cae561cb12c4c3c106064390a37e32e724d9a9066cfaff8e
-R dfc70e19d986a79e444a3389314d1aa6
-T *branch * sqlite3_vtab_distinct
-T *sym-sqlite3_vtab_distinct *
-T -sym-trunk *
+P d571262d2345bb11e71bef395cf078e5d7303b974b38b4e319adda6194ccc1c5
+R c8f2432bbe6ecf01b6e5ac0aa57d1f94
 U drh
-Z 502f02fc5994424f0d3cd19482ecaf51
+Z 0649a152fd9646f6591062a2384e3001
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7744a710a7d82d5282d6634343693b07f0ac3078..c378259f5f894c76ddb64f7e1d9bf4103eb4cddb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d571262d2345bb11e71bef395cf078e5d7303b974b38b4e319adda6194ccc1c5
\ No newline at end of file
+a13afc909c8bb643aa154b39ba8c023bae7352d3cd7cfb96be3891fa0e4bc045
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index fe262b36e1f7664913a2d12b7d5d564eb8255853..c8e7d906b91074ca2264d49ae002671db3a3d4e5 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3891,7 +3891,6 @@ static int whereLoopAddOr(
       int i, j;
     
       sSubBuild = *pBuilder;
-      sSubBuild.pOrderBy = 0;
       sSubBuild.pOrSet = &sCur;
 
       WHERETRACE(0x200, ("Begin processing OR-clause %p\n", pTerm));
@@ -5283,7 +5282,6 @@ WhereInfo *sqlite3WhereBegin(
   /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */
   testcase( pOrderBy && pOrderBy->nExpr==BMS-1 );
   if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0;
-  sWLB.pOrderBy = pOrderBy;
 
   /* The number of tables in the FROM clause is limited by the number of
   ** bits in a Bitmask 

diff --git a/src/whereInt.h b/src/whereInt.h
index a97b4afc690e2e24d12af1e9a18a3ef00658c834..1304a40a7714e22fdbd98115a08371d3c907f12c 100644 (file)
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -386,7 +386,6 @@ struct WhereMaskSet {
 struct WhereLoopBuilder {
   WhereInfo *pWInfo;        /* Information about this WHERE */
   WhereClause *pWC;         /* WHERE clause terms */
-  ExprList *pOrderBy;       /* ORDER BY clause */
   WhereLoop *pNew;          /* Template WhereLoop */
   WhereOrSet *pOrSet;       /* Record best loops here, if not NULL */
 #ifdef SQLITE_ENABLE_STAT4