From: drh <drh@noemail.net>
Date: Sat, 11 Oct 2014 02:12:58 +0000 (+0000)
Subject: Make sure that a GROUP BY that also implements an ORDER BY scans the table
X-Git-Tag: version-3.8.7~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4929047d1a30c3f6f57e613d2dd85e57dd37f674;p=thirdparty%2Fsqlite.git

Make sure that a GROUP BY that also implements an ORDER BY scans the table
in the correct order.  Fix for ticket [ba7cbfaedc7e6].

FossilOrigin-Name: 7a32fdfd4be2138c0ab00f3dc6f54a70e4e07be4
---

4929047d1a30c3f6f57e613d2dd85e57dd37f674
diff --cc manifest
index b8991f9317,ced935d9a0..0395f4e8a7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\san\sunnecessary\sconditional\sfrom\sthe\sEXPLAIN\sQUERY\sPLAN\slogic.
- D 2014-10-11T01:22:16.169
 -C Account\sfor\sthe\sASC/DESC\sproperties\sof\sORDER\sBY\sexpressions\swhen\susing\sthe\ssame\sindex\sfor\sGROUP\sBY\sand\sORDER\sBY.\sCandidate\sfix\sfor\s[ba7cbfaedc].
 -D 2014-10-10T20:52:53.529
++C Make\ssure\sthat\sa\sGROUP\sBY\sthat\salso\simplements\san\sORDER\sBY\sscans\sthe\stable\nin\sthe\scorrect\sorder.\s\sFix\sfor\sticket\s[ba7cbfaedc7e6].
++D 2014-10-11T02:12:58.777
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -302,7 -302,7 +302,7 @@@ F src/vtab.c 019dbfd0406a7447c990e1f7bd
  F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 45202a9a2848848a17b64316fe87bdb5a75f5910
 -F src/where.c 7137da023fa550b44f98251ab6fcf132ce4e371e
++F src/where.c 2947912f1f3d6a7766fe087fd532a5d688d745b1
  F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1203,7 -1204,10 +1204,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
--P c30124520027f0f860223bf842e2f09db3dafb5f
- R 76a395c9de317da89295170f9596fa71
 -R 8de40b978c4dd5c8456f5f796f63e003
 -T *branch * experimental
 -T *sym-experimental *
 -T -sym-trunk *
 -U dan
 -Z 060424e4e85bb8595890bea0de65ac0e
++P c5dc83ebded914f07286b7f98d0a50c28c16f609 2a9573962b837973c4959465d8a5f2641d109a5a
++R 6f36f8a6a865ae8ec418dbbf6437f4b9
++T +closed 2a9573962b837973c4959465d8a5f2641d109a5a
 +U drh
- Z efd3e7a68804083aa9d3740b204464db
++Z b85f219ca12b10b385d8fb433d0ee994
diff --cc manifest.uuid
index e90d20a635,604705047d..c394cc6a6e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c5dc83ebded914f07286b7f98d0a50c28c16f609
 -2a9573962b837973c4959465d8a5f2641d109a5a
++7a32fdfd4be2138c0ab00f3dc6f54a70e4e07be4
diff --cc src/where.c
index 4aa208d2ee,6a5e918669..bc0110779e
--- a/src/where.c
+++ b/src/where.c
@@@ -5360,7 -5362,7 +5360,7 @@@ static i8 wherePathSatisfiesOrderBy
            isMatch = 1;
            break;
          }
--        if( isMatch && (pWInfo->wctrlFlags & WHERE_GROUPBY)==0 ){
++        if( isMatch && (wctrlFlags & WHERE_GROUPBY)==0 ){
            /* Make sure the sort order is compatible in an ORDER BY clause.
            ** Sort order is irrelevant for a GROUP BY clause. */
            if( revSet ){
@@@ -5825,12 -5827,19 +5825,15 @@@ static int wherePathSolver(WhereInfo *p
      if( (pWInfo->wctrlFlags & WHERE_SORTBYGROUP)
          && pWInfo->nOBSat==pWInfo->pOrderBy->nExpr
      ){
-       Bitmask notUsed = 0;
+       Bitmask revMask = 0;
 -      int nOrder;
 -      assert( pWInfo->wctrlFlags & WHERE_GROUPBY );
 -      assert( pWInfo->sorted==0 );
 -      pWInfo->wctrlFlags &= ~WHERE_GROUPBY;
 -      nOrder = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, 
 +      int nOrder = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, 
-           pFrom, 0, nLoop-1, pFrom->aLoop[nLoop-1], &notUsed
+           pFrom, 0, nLoop-1, pFrom->aLoop[nLoop-1], &revMask
        );
 -      pWInfo->wctrlFlags |= WHERE_GROUPBY;
 +      assert( pWInfo->sorted==0 );
-       pWInfo->sorted = (nOrder==pWInfo->pOrderBy->nExpr);
+       if( nOrder==pWInfo->pOrderBy->nExpr ){
+         pWInfo->sorted = 1;
+         pWInfo->revMask = revMask;
+       }
      }
    }