Fossil SCM
Don't delete phantom artifacts from unclustered table. Potential fix for missing sync content as reported on ML.
Commit
41b29f38fdb4e5ed9e0313648160aca055c4eca0
Parent
1d30672588ec8be…
1 file changed
+2
-1
+2
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -700,11 +700,12 @@ | ||
| 700 | 700 | blob_appendf(&deleteWhere, ",%d", rid); |
| 701 | 701 | } |
| 702 | 702 | } |
| 703 | 703 | db_finalize(&q); |
| 704 | 704 | db_multi_exec( |
| 705 | - "DELETE FROM unclustered WHERE rid NOT IN (0 %s)", | |
| 705 | + "DELETE FROM unclustered WHERE rid NOT IN (0 %s)" | |
| 706 | + " AND rid NOT IN (SELECT rid FROM phantom)", | |
| 706 | 707 | blob_str(&deleteWhere) |
| 707 | 708 | ); |
| 708 | 709 | blob_reset(&deleteWhere); |
| 709 | 710 | if( nRow>0 ){ |
| 710 | 711 | md5sum_blob(&cluster, &cksum); |
| 711 | 712 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -700,11 +700,12 @@ | |
| 700 | blob_appendf(&deleteWhere, ",%d", rid); |
| 701 | } |
| 702 | } |
| 703 | db_finalize(&q); |
| 704 | db_multi_exec( |
| 705 | "DELETE FROM unclustered WHERE rid NOT IN (0 %s)", |
| 706 | blob_str(&deleteWhere) |
| 707 | ); |
| 708 | blob_reset(&deleteWhere); |
| 709 | if( nRow>0 ){ |
| 710 | md5sum_blob(&cluster, &cksum); |
| 711 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -700,11 +700,12 @@ | |
| 700 | blob_appendf(&deleteWhere, ",%d", rid); |
| 701 | } |
| 702 | } |
| 703 | db_finalize(&q); |
| 704 | db_multi_exec( |
| 705 | "DELETE FROM unclustered WHERE rid NOT IN (0 %s)" |
| 706 | " AND rid NOT IN (SELECT rid FROM phantom)", |
| 707 | blob_str(&deleteWhere) |
| 708 | ); |
| 709 | blob_reset(&deleteWhere); |
| 710 | if( nRow>0 ){ |
| 711 | md5sum_blob(&cluster, &cksum); |
| 712 |