Fix incorrect column-usage accounting associated with generated columns

and added by check-in [6601da58032d18ae].  Fix for ticket [b92e5e8ec2cdbaa1].

FossilOrigin-Name: 9d75e1ccc72e9f536f45df3b24e9ecd25076cc1f7cf16b806b19e0e1b68e8326

diff --git a/manifest b/manifest
index 71f241ddbbfe76043b8fe722c547df00486981a5..2683bb2795cd5db68fc9825dc73cb81c93694eff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correctly\sdeal\swith\smulti-row\sVALUES\sclauses\sthat\scontain\swindow\sfunctions.
-D 2019-12-07T13:42:47.829
+C Fix\sincorrect\scolumn-usage\saccounting\sassociated\swith\sgenerated\scolumns\nand\sadded\sby\scheck-in\s[6601da58032d18ae].\s\sFix\sfor\sticket\s[b92e5e8ec2cdbaa1].
+D 2019-12-08T00:06:39.667
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -525,7 +525,7 @@ F src/pragma.h ec3b31eac9b1df040f1cc8cb3d89bc06605c3b4cb3d76f833de8d6d6c3f77f04
 F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 2f8fb48e61d0006031df27e53810b6767972526d768d3cc6888435dc350c4c7a
+F src/resolve.c 618bf4f57fa0617cd5295117fea5f25955b76d278303405a8551c4204593011e
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 0fe10579de20eb8dc04ec9ed29659fa782bee2bcc85a35734637f3e2cabc2762
 F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817ded
@@ -1852,7 +1852,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 7fa664ea0ea1e0283a9af50c9ff8dd360ee6042f9e491a136f53d9bcbbc9c7ef
-R 8acf566acd18f28ff5f44f794c86ea1a
+P 26d991f214db143976e2593d3564b5003eb3539a2728d1a0ccae2a2accece76f
+R bc0d73acbc8587ee6f73a8bcfcdc4572
 U drh
-Z 3f1e23bb9c947c2f94e584078a29cd8e
+Z 601ba4ee7feb7038f49e2c77dc276ebb

diff --git a/manifest.uuid b/manifest.uuid
index 582d98ec96c79b2fdd17cbc0892c1a40a5b7ddf4..ab5aa326c21f22c7cb0ec2629cd7d9889abe1c0c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-26d991f214db143976e2593d3564b5003eb3539a2728d1a0ccae2a2accece76f
\ No newline at end of file
+9d75e1ccc72e9f536f45df3b24e9ecd25076cc1f7cf16b806b19e0e1b68e8326
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 31f20855328357ec04a4cd66b80db46d0a272bf5..fdf4bf0f0ea5ce5be17b54e83b92f475b2b92717 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -551,30 +551,39 @@ static int lookupName(
 
   /* If a column from a table in pSrcList is referenced, then record
   ** this fact in the pSrcList.a[].colUsed bitmask.  Column 0 causes
-  ** bit 0 to be set.  Column 1 sets bit 1.  And so forth.
+  ** bit 0 to be set.  Column 1 sets bit 1.  And so forth.  Bit 63 is
+  ** set if the 63rd or any subsequent column is used.
   **
   ** The colUsed mask is an optimization used to help determine if an
   ** index is a covering index.  The correct answer is still obtained
-  ** if the mask contains extra bits.  But omitting bits from the mask
-  ** might result in an incorrect answer.
+  ** if the mask contains extra set bits.  However, it is important to
+  ** avoid setting bits beyond the maximum column number of the table.
+  ** (See ticket [b92e5e8ec2cdbaa1]).
   **
-  ** The high-order bit of the mask is a "we-use-them-all" bit.
-  ** If the column number is greater than the number of bits in the bitmask
-  ** then set the high-order bit of the bitmask.  Also set the high-order
-  ** bit if the column is a generated column, as that adds dependencies
-  ** that are difficult to track, so we assume that all columns are used.
+  ** If a generated column is referenced, set bits for every column
+  ** of the table.
   */
   if( pExpr->iColumn>=0 && pMatch!=0 ){
     int n = pExpr->iColumn;
+    Table *pTab;
     testcase( n==BMS-1 );
     if( n>=BMS ){
       n = BMS-1;
     }
-    assert( pExpr->y.pTab!=0 );
+    pTab = pExpr->y.pTab;
+    assert( pTab!=0 );
     assert( pMatch->iCursor==pExpr->iTable );
-    if( pExpr->y.pTab->tabFlags & TF_HasGenerated ){
-      Column *pColumn = pExpr->y.pTab->aCol + pExpr->iColumn;
-      if( pColumn->colFlags & COLFLAG_GENERATED ) n = BMS-1;
+    if( pTab->tabFlags & TF_HasGenerated ){
+      Column *pColumn = pTab->aCol + pExpr->iColumn;
+      if( pColumn->colFlags & COLFLAG_GENERATED ){
+        testcase( pTab->nCol==63 );
+        testcase( pTab->nCol==64 );
+        if( pTab->nCol>=64 ){
+          pMatch->colUsed = ALLBITS;
+        }else{
+          pMatch->colUsed = MASKBIT(pTab->nCol)-1;
+        }
+      }
     }
     pMatch->colUsed |= ((Bitmask)1)<<n;
   }