Remove some unused code from sqlite3rebaser_rebase().

FossilOrigin-Name: 07cc955eab0e993a75be82d58e17ca53c8abbcaf851983d235049599c19e582f

diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index 2d80f1d4cfbf8a6e8abc1f69250a1f417fb50316..ea322e40272e3a14391e096a56df31e0c133813d 100644 (file)
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -5169,7 +5169,7 @@ static int sessionRebase(
   SessionTable *pTab = 0;
   SessionBuffer sOut = {0,0,0};
 
-    while( SQLITE_ROW==sessionChangesetNext(pIter, &aRec, &nRec, &bNew) ){
+  while( SQLITE_ROW==sessionChangesetNext(pIter, &aRec, &nRec, &bNew) ){
     SessionChange *pChange = 0;
     int bDone = 0;
 
@@ -5192,12 +5192,11 @@ static int sessionRebase(
       sessionAppendBlob(&sOut, (u8*)pIter->zTab, strlen(pIter->zTab)+1, &rc);
     }
 
-    if( pTab ){
-      int bPkOnly = (pIter->bPatchset && pIter->op==SQLITE_DELETE);
-      int iHash = sessionChangeHash(pTab, bPkOnly, aRec, pTab->nChange);
+    if( pTab && rc==SQLITE_OK ){
+      int iHash = sessionChangeHash(pTab, 0, aRec, pTab->nChange);
 
       for(pChange=pTab->apChange[iHash]; pChange; pChange=pChange->pNext){
-        if( sessionChangeEqual(pTab, bPkOnly, aRec, 0, pChange->aRecord) ){
+        if( sessionChangeEqual(pTab, 0, aRec, 0, pChange->aRecord) ){
           break;
         }
       }

diff --git a/manifest b/manifest
index a89e8a242e6e6a629d7315205d65e5138adb3160..82229d2d93113b0cfb818d175ba827aa9c9e8bb7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\sproblem\swith\srebasing\supdates\sagainst\smultiple\sremote\schanges.
-D 2018-03-22T19:52:22.516
+C Remove\ssome\sunused\scode\sfrom\ssqlite3rebaser_rebase().
+D 2018-03-22T20:11:14.074
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -403,7 +403,7 @@ F ext/session/sessionfault2.test c76c76fe3c47737cb55cad7a254c0f05d0e3122f13e16de
 F ext/session/sessionrebase.test 4e1bcfd26fd8ed8ac571746f56cceeb45184f4d65490ea0d405227cfc8a9cba8
 F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
 F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
-F ext/session/sqlite3session.c 53beee879f98922892c95b765e72dd1e9e3651d6755970a6a9895598bc70643c
+F ext/session/sqlite3session.c b411b1fa4640d09e516a880aecaa78a0a96b86c0ad43d838f01ed9bea9e4d502
 F ext/session/sqlite3session.h 5f40a0660ff972c0c50f5fd6b33488fdbd2eb0c1244ea95777f8dbd5e529be04
 F ext/session/test_session.c f253742ea01b089326f189b5ae15a5b55c1c9e97452e4a195ee759ba51b404d5
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
@@ -1716,7 +1716,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 0e45baaec01947f6cbf47d5d5922a4cabe7d27181c04c0a08259c952fd023947
-R 227b9a8775d98d07c0c6cbd43198ca86
+P c8e7b5a061a3f2fbd9072530177b80f917b39ab5d7cd6acb0a221ab33e78a5cd
+R 1ada6392e139233f598c5ef10ceecba8
 U dan
-Z 00a58fea2b4ecd8fcd2737991a02005b
+Z 1eb1ab24b6bf6dc6b9f05aed875e4365

diff --git a/manifest.uuid b/manifest.uuid
index 5424ffe6a880313904e525d0805cfb633a1e734d..eafe5b75317b1ea33b37b4e9f16ea2b968272e90 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c8e7b5a061a3f2fbd9072530177b80f917b39ab5d7cd6acb0a221ab33e78a5cd
\ No newline at end of file
+07cc955eab0e993a75be82d58e17ca53c8abbcaf851983d235049599c19e582f
\ No newline at end of file