Fossil SCM

Improved cross-linking of clusters.

drh 2015-12-03 15:41 trunk merge
Commit 24606598a72eeaaafe37f8d804f4717fa07ee692
1 file changed +3 -1
+3 -1
--- src/xfer.c
+++ src/xfer.c
@@ -708,10 +708,11 @@
708708
if( nRow>=800 && nUncl>nRow+100 ){
709709
md5sum_blob(&cluster, &cksum);
710710
blob_appendf(&cluster, "Z %b\n", &cksum);
711711
blob_reset(&cksum);
712712
rid = content_put(&cluster);
713
+ manifest_crosslink(rid, &cluster, MC_NONE);
713714
blob_reset(&cluster);
714715
nUncl -= nRow;
715716
nRow = 0;
716717
blob_append_sql(&deleteWhere, ",%d", rid);
717718
}
@@ -725,11 +726,12 @@
725726
blob_reset(&deleteWhere);
726727
if( nRow>0 ){
727728
md5sum_blob(&cluster, &cksum);
728729
blob_appendf(&cluster, "Z %b\n", &cksum);
729730
blob_reset(&cksum);
730
- content_put(&cluster);
731
+ rid = content_put(&cluster);
732
+ manifest_crosslink(rid, &cluster, MC_NONE);
731733
blob_reset(&cluster);
732734
}
733735
}
734736
}
735737
736738
--- src/xfer.c
+++ src/xfer.c
@@ -708,10 +708,11 @@
708 if( nRow>=800 && nUncl>nRow+100 ){
709 md5sum_blob(&cluster, &cksum);
710 blob_appendf(&cluster, "Z %b\n", &cksum);
711 blob_reset(&cksum);
712 rid = content_put(&cluster);
 
713 blob_reset(&cluster);
714 nUncl -= nRow;
715 nRow = 0;
716 blob_append_sql(&deleteWhere, ",%d", rid);
717 }
@@ -725,11 +726,12 @@
725 blob_reset(&deleteWhere);
726 if( nRow>0 ){
727 md5sum_blob(&cluster, &cksum);
728 blob_appendf(&cluster, "Z %b\n", &cksum);
729 blob_reset(&cksum);
730 content_put(&cluster);
 
731 blob_reset(&cluster);
732 }
733 }
734 }
735
736
--- src/xfer.c
+++ src/xfer.c
@@ -708,10 +708,11 @@
708 if( nRow>=800 && nUncl>nRow+100 ){
709 md5sum_blob(&cluster, &cksum);
710 blob_appendf(&cluster, "Z %b\n", &cksum);
711 blob_reset(&cksum);
712 rid = content_put(&cluster);
713 manifest_crosslink(rid, &cluster, MC_NONE);
714 blob_reset(&cluster);
715 nUncl -= nRow;
716 nRow = 0;
717 blob_append_sql(&deleteWhere, ",%d", rid);
718 }
@@ -725,11 +726,12 @@
726 blob_reset(&deleteWhere);
727 if( nRow>0 ){
728 md5sum_blob(&cluster, &cksum);
729 blob_appendf(&cluster, "Z %b\n", &cksum);
730 blob_reset(&cksum);
731 rid = content_put(&cluster);
732 manifest_crosslink(rid, &cluster, MC_NONE);
733 blob_reset(&cluster);
734 }
735 }
736 }
737
738

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button