From: dan <dan@noemail.net>
Date: Tue, 13 Apr 2010 11:56:03 +0000 (+0000)
Subject: Remove old code to interpret an argument (no longer used) to "PRAGMA checkpoint".
X-Git-Tag: version-3.7.2~455^2~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f05c86dd73023b32d32545b4e83d70352400680a;p=thirdparty%2Fsqlite.git

Remove old code to interpret an argument (no longer used) to "PRAGMA checkpoint".

FossilOrigin-Name: 27dc5977c19e717afd65d3805557e38dec7bedcb
---

diff --git a/manifest b/manifest
index 2ced2fc40a..170cf0e546 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sother\sproblems\sin\sthe\sWAL\stest\sscripts.
-D 2010-04-13T11:45:31
+C Remove\sold\scode\sto\sinterpret\san\sargument\s(no\slonger\sused)\sto\s"PRAGMA\scheckpoint".
+D 2010-04-13T11:56:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -154,13 +154,13 @@ F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
 F src/os_unix.c 5bf0015cebe2f21635da2af983c348eb88b3b4c1
 F src/os_win.c 1c7453c2df4dab26d90ff6f91272aea18bcf7053
-F src/pager.c 020c29713e77755f316cd95c233e75582a63766e
-F src/pager.h 80c57ba672fcd24215a68abf1c98d474a5080b9b
+F src/pager.c 88cbb683c96080bf2ecff2b355da10d567a0353f
+F src/pager.h ce5d076f3860a5f2d7460c582cd68383343b33cf
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 6dc1871ce8ead9187161c370a58cd06c84221f76
-F src/pragma.c 5a68ee9ad23ec7486f36e6b874945348f501fcb7
+F src/pragma.c 9f1d53d40b47743f3d6151df15915970367c9de5
 F src/prepare.c fd1398cb1da54385ba5bd68d93928f10d10a1d9c
 F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -214,7 +214,7 @@ F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
 F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
 F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
 F src/vacuum.c b1d542c8919d4d11119f78069e1906a1ad07e0ee
-F src/vdbe.c 23e5462d1cd0a6d525948cfec3382890abc31d3f
+F src/vdbe.c 2e2aaa765de667dd15e0462cf853efd1b2f97998
 F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
 F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
 F src/vdbeapi.c 74c25680046a116b24b95393914d3669c23305dc
@@ -756,10 +756,10 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test 5dc92880060c255c74376b9f5c0beb85a7399b93
-F test/walcrash.test df3b4f84d7bb2252914b34ab0995ce4d249779b5
-F test/walslow.test ba50a02439f7ecfc9c92f6ba7b2013a2a707ac80
-F test/walthread.test b03790383ff7ba0119e04f230fcef3b635aab32f
+F test/wal.test d5916b3a40d74dd5bf6ff21b42e6fa7f255efd13
+F test/walcrash.test 45cfbab30bb7cbe0b2e9d5cabe90dbcad10cb89b
+F test/walslow.test 38076d5fad49e3678027be0f8110e6a32d531dc2
+F test/walthread.test 1592116f74261d77ea697d9503b0cd1ab1c15e74
 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
 F test/where2.test 45eacc126aabb37959a387aa83e59ce1f1f03820
 F test/where3.test 97d3936e6a443b968f1a61cdcc0f673252000e94
@@ -803,7 +803,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d90b1dde0702ceb0eae2a3da36733a7e5b1a6b3a
-R a841ebbbfc361d1f0f1f7f50f82ea9fc
+P dcb31181db246dd3f81ce63b144dd0cf95f06ee3
+R 6f02a41d259c74c25289be520ca51251
 U dan
-Z 96ff40b46c8873b7b202d8b466c8d9da
+Z 68876c4a3171b03c883dda51dc5e0740
diff --git a/manifest.uuid b/manifest.uuid
index 89554b3f89..31c9695615 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dcb31181db246dd3f81ce63b144dd0cf95f06ee3
\ No newline at end of file
+27dc5977c19e717afd65d3805557e38dec7bedcb
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index a1b49ef113..ff696c64e7 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5654,7 +5654,7 @@ sqlite3_backup **sqlite3PagerBackupPtr(Pager *pPager){
 /*
 ** This function is called when the user invokes "PRAGMA checkpoint".
 */
-int sqlite3PagerCheckpoint(Pager *pPager, int nMin, int nMax, int doSync){
+int sqlite3PagerCheckpoint(Pager *pPager){
   int rc = SQLITE_OK;
   if( pPager->pLog ){
     rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
diff --git a/src/pager.h b/src/pager.h
index f329e43d81..1e14d2ea60 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -133,6 +133,7 @@ int sqlite3PagerRollback(Pager*);
 int sqlite3PagerOpenSavepoint(Pager *pPager, int n);
 int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint);
 int sqlite3PagerSharedLock(Pager *pPager);
+int sqlite3PagerCheckpoint(Pager *pPager);
 
 /* Functions used to query pager state and configuration. */
 u8 sqlite3PagerIsreadonly(Pager*);
diff --git a/src/pragma.c b/src/pragma.c
index 2ecc852957..95310e336c 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1385,23 +1385,9 @@ void sqlite3Pragma(
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
 
   if( sqlite3StrICmp(zLeft, "checkpoint")==0 ){
-    int nMin = 0;
-    int nMax = 0;
-    int nosync = 0;
-
-    if( zRight ){
-      char *z = zRight;
-      sqlite3GetInt32(z, &nMin);
-      while( sqlite3Isdigit(*z) ) z++;
-      while( *z && !sqlite3Isdigit(*z) ) z++;
-      sqlite3GetInt32(z, &nMax);
-      while( sqlite3Isdigit(*z) ) z++;
-      while( *z && !sqlite3Isdigit(*z) ) z++;
-      sqlite3GetInt32(z, &nosync);
-    }
     sqlite3VdbeUsesBtree(v, iDb);
     sqlite3VdbeAddOp2(v, OP_Transaction, iDb, 1);
-    sqlite3VdbeAddOp3(v, OP_Checkpoint, iDb, nMin, nMax);
+    sqlite3VdbeAddOp3(v, OP_Checkpoint, iDb, 0, 0);
   }else
 
 #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
diff --git a/src/vdbe.c b/src/vdbe.c
index 8e27942331..42562cee09 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5186,19 +5186,15 @@ case OP_AggFinal: {
   break;
 }
 
-/* Opcode: Checkpoint P1 P2 P3 * P5
+/* Opcode: Checkpoint P1 * * * *
 */
 case OP_Checkpoint: {
   Btree *pBt;                     /* Btree to checkpoint */
-  int nMin = pOp->p2;             /* Minimum number of pages to copy */
-  int nMax = pOp->p3;             /* Maximum number of pages to copy */
-  int doNotSync = pOp->p5;        /* True to sync database */
 
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
   assert( (p->btreeMask & (1<<pOp->p1))!=0 );
   pBt = db->aDb[pOp->p1].pBt;
-
-  rc = sqlite3PagerCheckpoint(sqlite3BtreePager(pBt), nMin, nMax, !doNotSync);
+  rc = sqlite3PagerCheckpoint(sqlite3BtreePager(pBt));
   break;
 };  
 
diff --git a/test/wal.test b/test/wal.test
index 81ed9ebb78..b12782b663 100644
--- a/test/wal.test
+++ b/test/wal.test
@@ -514,7 +514,7 @@ do_test wal-12.2 {
 do_test wal-12.3 {
   execsql { 
     DELETE FROM t1 WHERE rowid<54;
-    PRAGMA checkpoint('1 100000');
+    PRAGMA checkpoint;
   }
   file size test.db
 } [expr 14*1024]
diff --git a/test/walcrash.test b/test/walcrash.test
index 8d6f720d1b..dd4c572941 100644
--- a/test/walcrash.test
+++ b/test/walcrash.test
@@ -191,7 +191,7 @@ for {set i 1} {$i < $REPEATS} {incr i} {
       INSERT INTO t1 SELECT randomblob(900) FROM t1 LIMIT 4;   /* 28 */
       INSERT INTO t1 SELECT randomblob(900) FROM t1 LIMIT 4;   /* 32 */
 
-      PRAGMA checkpoint('70 70');
+      PRAGMA checkpoint;
       INSERT INTO t1 VALUES(randomblob(900));
       INSERT INTO t1 VALUES(randomblob(900));
       INSERT INTO t1 VALUES(randomblob(900));
@@ -231,7 +231,7 @@ for {set i 1} {$i < $REPEATS} {incr i} {
       INSERT INTO t1 SELECT randomblob(900) FROM t1 LIMIT 4;   /* 28 */
       INSERT INTO t1 SELECT randomblob(900) FROM t1 LIMIT 4;   /* 32 */
 
-      PRAGMA checkpoint('70 70');
+      PRAGMA checkpoint;
       INSERT INTO t1 VALUES(randomblob(900));
       INSERT INTO t1 VALUES(randomblob(900));
       INSERT INTO t1 VALUES(randomblob(900));
diff --git a/test/walslow.test b/test/walslow.test
index d4133f899c..73f93a48df 100644
--- a/test/walslow.test
+++ b/test/walslow.test
@@ -41,14 +41,12 @@ for {set seed 1} {$seed<10} {incr seed} {
     do_test walslow-1.seed=$seed.$iTest.1 {
       set w [expr int(rand()*2000)]
       set x [expr int(rand()*2000)]
-      set y [expr int(rand()*9)+1]
-      set z [expr int(rand()*2)]
       execsql { INSERT INTO t1 VALUES(randomblob($w), randomblob($x)) }
       execsql { PRAGMA integrity_check }
     } {ok}
 
     do_test walslow-1.seed=$seed.$iTest.2 {
-      execsql "PRAGMA checkpoint('$y $y $z')"
+      execsql "PRAGMA checkpoint;"
       execsql { PRAGMA integrity_check }
     } {ok}
 
diff --git a/test/walthread.test b/test/walthread.test
index 934d63325c..7727ab3759 100644
--- a/test/walthread.test
+++ b/test/walthread.test
@@ -124,7 +124,7 @@ set thread_program {
 
   proc checkpointer {DB} {
     while { !$::finished } {
-      dosql $DB "PRAGMA checkpoint(32)"
+      dosql $DB "PRAGMA checkpoint"
       rest 1000
     }
   }