Changeset 1124

Timestamp:

Jul 7, 2010, 7:35:17 AM (11 years ago)

Author:

Peter Johansson

Message:

detecting old cache files and re-writing them in new format (version 8). closes #443 and #289

Location:

trunk

Files:

• lib/Stats.cc (modified) (1 diff)
• lib/Stats.h (modified) (1 diff)
• lib/StatsCollection.cc (modified) (1 diff)
• test/cache_partial_test.cc (modified) (2 diffs)
• test/stats_test.cc (modified) (1 diff)

trunk/lib/Stats.cc

@@ -289 +289 @@
 
 
-  svn_revnum_t Stats::load_cache(std::istream& is)
+  svn_revnum_t Stats::load_cache(std::istream& is, bool& latest_ver)
   {
     std::string str;
     getline(is, str);
-    if (str == "CACHE FILE VERSION 8")
+    if (str == "CACHE FILE VERSION 8") {
+      latest_ver = true;
       return load_cache8(is);
+    }
+    latest_ver = false;
     if (str == "CACHE FILE VERSION 7")
       return load_cache7(is);

trunk/lib/Stats.h

@@ -93 +93 @@
     /**
        Load object from a stream.
-       
+
+       \a latest_ver is set to true if cache_file is latest version;
+       otherwise it is set to false.
+
        \return revision the cache represents - 0 if failed
      */
-    svn_revnum_t load_cache(std::istream&);
+    svn_revnum_t load_cache(std::istream&, bool& latest_ver);
 
     /**

trunk/lib/StatsCollection.cc

@@ -63 +63 @@
     bool result = true;
     for (map::const_iterator i(stats_.begin()); i!=stats_.end(); ++i) {
-      svn_revnum_t cache_rev = i->second->load_cache(is);
+      bool latest_ver=true;
+      svn_revnum_t cache_rev = i->second->load_cache(is, latest_ver);
+      result &= latest_ver;
       if (cache_rev < i->second->last_changed_rev()) {
         result = false;

trunk/test/cache_partial_test.cc

@@ -24 +24 @@
 #include "Suite.h"
 
-#include "lib/ClassicStats.h"
+#include "lib/AddStats.h"
 #include "lib/File.h"
 #include "lib/SVN.h"
 #include "lib/SVNinfo.h"
+#include "lib/StatsCollection.h"
 #include "lib/utility.h"
 
@@ -65 +66 @@
   // test that load of partial cache is successful
   copy_file(test::src_filename("data/AUTHORS.svndigest-cache-r61"), cache_file);
-  ClassicStats cstats(filename);
+  AddStats cstats(filename);
   std::ifstream is(cache_file.c_str());
-  svn_revnum_t rev = cstats.load_cache(is);
+  bool cache_ok=true;
+  cstats.load_cache(is, cache_ok);
+  cstats.load_cache(is, cache_ok);
+  svn_revnum_t rev = cstats.load_cache(is, cache_ok);
+  if (!cache_ok) {
+    suite.out() << "error: seems cache file " << cache_file << " is old\n";
+    suite.add(false);
+  }
   if (rev!=48) {
     suite.out() << "load cache: " << cache_file << " returned " << rev << "\n"

trunk/test/stats_test.cc

@@ -194 +194 @@
     ClassicStats stats2(path());
     assert(in.good());
-    if (!stats2.load_cache(in)){
+    bool new_cache=true;
+    if (!stats2.load_cache(in, new_cache)){
       std::cout << "load_cache() failed\n";
       return false;