From: dan <Dan Kennedy>
Date: Thu, 18 Feb 2021 15:59:37 +0000 (+0000)
Subject: Avoid invoking the update or pre-update hooks during VACUUM operations.
X-Git-Tag: version-3.35.0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a55a839ab327630511f37098ed25d5df71b558d3;p=thirdparty%2Fsqlite.git

Avoid invoking the update or pre-update hooks during VACUUM operations.

FossilOrigin-Name: 3c25cb4ab8885a50e2a485fe76f5ffd5dd8ebe1306aca8c0989e0b7fd7dd18d2
---

diff --git a/manifest b/manifest
index d2cea81cb0..a595639ccc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvement\sto\sthe\sINSERT\soptimization\sof\scheck-in\s[16ac213c57196361]\sso\nthat\sit\sworks\swith\sSQLITE_ENABLE_HIDDEN_COLUMN\sbut\sis\salso\seasier\sto\smaintain\nand\sa\slittle\sfaster\sas\swell.
-D 2021-02-18T15:45:34.839
+C Avoid\sinvoking\sthe\supdate\sor\spre-update\shooks\sduring\sVACUUM\soperations.
+D 2021-02-18T15:59:37.490
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -502,7 +502,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c c801ce88caadea239f890fdb744628f2da02a945aca600ccfde6988f7e2cd558
+F src/insert.c 3959a2e8a6c1e688e7390ef242472817653f4ae9a42bb78b293eaa98645f1a07
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
 F src/main.c 1c5de7b3fabcdf05f4fe563aab5d81d175b89c67a8678a12ba86629356afa356
@@ -1057,7 +1057,7 @@ F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
 F test/having.test a89236dd8d55aa50c4805f82ac9daf64d477a44d712d8209c118978d0ca21ec9
 F test/hexlit.test 4a6a5f46e3c65c4bf1fa06f5dd5a9507a5627751
 F test/hidden.test 23c1393a79e846d68fd902d72c85d5e5dcf98711
-F test/hook.test bd7ea2e35951291705106295324a91b3bb455081c783e0f681ff4bc68468b8d2
+F test/hook.test fa54fa8afc842ae375f10c1f9fc0014fa59789052fc30c9eae19811fa3afa009
 F test/hook2.test b9ff3b8c6519fb67f33192f1afe86e7782ee4ac8
 F test/icu.test 716a6b89fbabe5cc63e0cd4c260befb08fd7b9d761f04d43669233292f0753b1
 F test/ieee754.test b0945d12be7d255f3dfa18e2511b17ca37e0edd2b803231c52d05b86c04ab26e
@@ -1900,7 +1900,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 5168b06bcf283ef64cb9fd76330a743baf8bb0cd747c14eae23e607e0491cbce
-R e1b8540e4a303e92cccaf5fd2962de4f
-U drh
-Z c7f2d82d7568a9beb226b994480e85d8
+P f985a78ecc0c6d9ff671c730a109d97dc781b06e47a0ab03f441cea5d021a4c3
+R 887c3ab5f5432ba4ea084453147dc94e
+U dan
+Z 858d0f25e386aba1accc2e325cd1540d
diff --git a/manifest.uuid b/manifest.uuid
index f2c6960a06..81f136ebf3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f985a78ecc0c6d9ff671c730a109d97dc781b06e47a0ab03f441cea5d021a4c3
\ No newline at end of file
+3c25cb4ab8885a50e2a485fe76f5ffd5dd8ebe1306aca8c0989e0b7fd7dd18d2
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index a78150df39..646864ee60 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -2426,6 +2426,7 @@ static void codeWithoutRowidPreupdate(
   Vdbe *v = pParse->pVdbe;
   int r = sqlite3GetTempReg(pParse);
   assert( !HasRowid(pTab) );
+  assert( 0==(pParse->db->mDbFlags & DBFLAG_Vacuum) );
   sqlite3VdbeAddOp2(v, OP_Integer, 0, r);
   sqlite3VdbeAddOp4(v, OP_Insert, iCur, regData, r, (char*)pTab, P4_TABLE);
   sqlite3VdbeChangeP5(v, OPFLAG_ISNOOP);
@@ -2958,13 +2959,18 @@ static int xferOptimization(
       insFlags = OPFLAG_NCHANGE|OPFLAG_LASTROWID|OPFLAG_APPEND|OPFLAG_PREFORMAT;
     }
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
-    sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-    insFlags &= ~OPFLAG_PREFORMAT;
-#else
-    sqlite3VdbeAddOp3(v, OP_RowCell, iDest, iSrc, regRowid);
+    if( (db->mDbFlags & DBFLAG_Vacuum)==0 ){
+      sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
+      insFlags &= ~OPFLAG_PREFORMAT;
+    }else
 #endif
-    sqlite3VdbeAddOp4(v, OP_Insert, iDest, regData, regRowid,
-        (char*)pDest, P4_TABLE);
+    {
+      sqlite3VdbeAddOp3(v, OP_RowCell, iDest, iSrc, regRowid);
+    }
+    sqlite3VdbeAddOp3(v, OP_Insert, iDest, regData, regRowid);
+    if( (db->mDbFlags & DBFLAG_Vacuum)==0 ){
+      sqlite3VdbeChangeP4(v, -1, (char*)pDest, P4_TABLE);
+    }
     sqlite3VdbeChangeP5(v, insFlags);
 
     sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1); VdbeCoverage(v);
@@ -3003,26 +3009,24 @@ static int xferOptimization(
       ** might change the definition of a collation sequence and then run
       ** a VACUUM command. In that case keys may not be written in strictly
       ** sorted order.  */
-#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
-      if( (HasRowid(pDest) || !IsPrimaryKeyIndex(pDestIdx)) )
-#endif
-      {
-        for(i=0; i<pSrcIdx->nColumn; i++){
-          const char *zColl = pSrcIdx->azColl[i];
-          if( sqlite3_stricmp(sqlite3StrBINARY, zColl) ) break;
-        }
-        if( i==pSrcIdx->nColumn ){
-          idxInsFlags = OPFLAG_USESEEKRESULT|OPFLAG_PREFORMAT;
-          sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
-          sqlite3VdbeAddOp2(v, OP_RowCell, iDest, iSrc);
-        }
+      for(i=0; i<pSrcIdx->nColumn; i++){
+        const char *zColl = pSrcIdx->azColl[i];
+        if( sqlite3_stricmp(sqlite3StrBINARY, zColl) ) break;
+      }
+      if( i==pSrcIdx->nColumn ){
+        idxInsFlags = OPFLAG_USESEEKRESULT|OPFLAG_PREFORMAT;
+        sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
+        sqlite3VdbeAddOp2(v, OP_RowCell, iDest, iSrc);
       }
     }else if( !HasRowid(pSrc) && pDestIdx->idxType==SQLITE_IDXTYPE_PRIMARYKEY ){
       idxInsFlags |= OPFLAG_NCHANGE;
     }
     if( idxInsFlags!=(OPFLAG_USESEEKRESULT|OPFLAG_PREFORMAT) ){
       sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-      if( !HasRowid(pDest) && IsPrimaryKeyIndex(pDestIdx) ){
+      if( (db->mDbFlags & DBFLAG_Vacuum)==0 
+       && !HasRowid(pDest) 
+       && IsPrimaryKeyIndex(pDestIdx) 
+      ){
         codeWithoutRowidPreupdate(pParse, pDest, iDest, regData);
       }
     }
diff --git a/test/hook.test b/test/hook.test
index 5d6a354572..0b72b2dcff 100644
--- a/test/hook.test
+++ b/test/hook.test
@@ -979,24 +979,40 @@ db update_hook update_cb
 proc preupdate_cb {args} { lappend ::res "preupdate" $args }
 proc update_cb {args} { lappend ::res "update" $args }
 
-#set ::res [list]
-#do_test 11.2 {
-#  execsql VACUUM
-#  set ::res
-#} {}
+set ::res [list]
+do_test 12.2 {
+  execsql VACUUM
+  set ::res
+} {}
 
-do_test 11.3 {
+do_test 12.3 {
   set ::res [list]
   execsql { INSERT INTO t3 SELECT a, b FROM t2 }
   set ::res
 } {preupdate {INSERT main t3 0 0} preupdate {INSERT main t3 0 0}}
 
-do_test 11.4 {
+do_test 12.4 {
   execsql { DELETE FROM t3 }
   set ::res [list]
   execsql { INSERT INTO t3 SELECT * FROM t2 }
   set ::res
 } {preupdate {INSERT main t3 0 0} preupdate {INSERT main t3 0 0}}
 
+do_execsql_test 12.5 {
+  CREATE TABLE t4(a COLLATE nocase PRIMARY KEY, b) WITHOUT ROWID;
+  INSERT INTO t4 VALUES('abc', 1);
+  INSERT INTO t4 VALUES('DEF', 2);
+}
+
+set ::res [list]
+do_test 12.6 {
+  execsql VACUUM
+  set ::res
+} {}
+
+do_catchsql_test 12.6 {
+  INSERT INTO t4 VALUES('def', 3);
+} {1 {UNIQUE constraint failed: t4.a}}
+
 finish_test