Differences From:

File tools/cvs2fossil/lib/c2f_integrity.tcl part of check-in [fd93aa26a6] - Finally committing another disabled integrity constraint for changesets, explanations in the comments. by aku on 2007-12-02 06:57:56. [view]

To:

File tools/cvs2fossil/lib/c2f_integrity.tcl part of check-in [00bf8c198e] - The performance was still not satisfying, even with faster recomputing of successors. Doing it multiple times (Building the graph in each breaker and sort passes) eats time. Caching in memory blows the memory. Chosen solution: Cache this information in the database.

Created a new pass 'CsetDeps' which is run between 'InitCsets' and 'BreakRevCsetCycles' (i.e. changeset creation and first breaker pass). It computes the changeset dependencies from the file-level dependencies once and saves the result in the state, in the new table 'cssuccessor'. Now the breaker and sort passes can get the information quickly, with virtually no effort. The dependencies are recomputed incrementally when a changeset is split by one of the breaker passes, for its fragments and its predecessors.

The loop check is now trivial, and integrated into the successor computation, with the heavy lifting for the detailed analysis and reporting moved down into the type-dependent SQL queries. The relevant new method is 'loops'. Now that the loop check is incremental the pass based checks have been removed from the integrity module, and the option '--loopcheck' has been eliminated. For paranoia the graph setup and modification code got its loop check reinstated as an assert, redusing the changeset report code.

Renumbered the breaker and sort passes. A number of places, like graph setup and traversal, loading of changesets, etc. got feedback indicators to show their progress.

The selection of revision and symbol changesets for the associated breaker passes was a bit on the slow side. We now keep changeset lists sorted by type (during loading or general construction) and access them directly.

by aku on 2007-12-02 20:04:40. [view]

@@ -52,23 +52,15 @@
 	AllButMeta
 	return
     }
 
-    typemethod changesets {csets} {
+    typemethod changesets {} {
 	log write 4 integrity {Check database consistency}
 
 	set n 0
 	RevisionChangesets
 	TagChangesets
 	BranchChangesets
-	trouble abort? ; # Avoid expensive check if anything found before
-
-	LoopCheck $csets
-	return
-    }
-
-    typemethod loopcheckon {} {
-	set myloopcheck 1
 	return
     }
 
     # # ## ### ##### ######## #############
@@ -770,22 +762,8 @@
 	    }
 	return
     }
 
-    proc LoopCheck {csets} {
-	::variable myloopcheck
-	if {!$myloopcheck} return
-
-	log write 4 integrity {Checking changesets for self-references}
-
-	foreach cset $csets {
-	    if {[$cset loopcheck]} {
-		trouble fatal "[$cset str] depends on itself"
-	    }
-	}
-	return
-    }
-
     proc ___UnusedChangesetChecks___ {} {
 	# This code performs a number of paranoid checks of the
 	# database, searching for inconsistent changeset/revision
 	# information.
@@ -903,15 +881,8 @@
 	}
 	log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok    " : "Failed"}] ... $header}
 	return
     }
-
-    # # ## ### ##### ######## #############
-
-    typevariable myloopcheck 0 ; # Boolean flag. Controls whether
-				 # 'integrity changesets' looks for
-				 # changesets with loops or not.
-				 # Default is to not look for them.
 
     # # ## ### ##### ######## #############
     ## Configuration