tests: fail testsuccess if notices are shown, too

[apt.git] / ftparchive / cachedb.h

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 0ba80909ae557ae1737e137f440efd76881197dc..417c25a9fb22764eb8e44381f19517aaa01927ee 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,17 +12,22 @@
 #ifndef CACHEDB_H
 #define CACHEDB_H
 
 #ifndef CACHEDB_H
 #define CACHEDB_H
 

-
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/debfile.h>

 
 #include <db.h>
 
 #include <db.h>

-#include <string>
-#include <apt-pkg/debfile.h>
-#include <inttypes.h>
-#include <sys/stat.h>

 #include <errno.h>
 #include <errno.h>

-    
+#include <string>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+

 #include "contents.h"
 #include "contents.h"

-    
+#include "sources.h"
+
+class FileFd;
+
+

 class CacheDB
 {
    protected:
 class CacheDB
 {
    protected:


@@ -34,10 +39,10 @@ class CacheDB
    DB *Dbp;
    bool DBLoaded;
    bool ReadOnly;
    DB *Dbp;
    bool DBLoaded;
    bool ReadOnly;

-   string DBFile;
+   std::string DBFile;

 
    // Generate a key for the DB of a given type
 
    // Generate a key for the DB of a given type

-   inline void InitQuery(const char *Type)
+   void _InitQuery(const char *Type)

    {
       memset(&Key,0,sizeof(Key));
       memset(&Data,0,sizeof(Data));
    {
       memset(&Key,0,sizeof(Key));
       memset(&Data,0,sizeof(Data));


@@ -45,6 +50,19 @@ class CacheDB
       Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
    }
    
       Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
    }
    

+   void InitQueryStats() {
+      _InitQuery("st");
+   }
+   void InitQuerySource() {
+      _InitQuery("cs");
+   }
+   void InitQueryControl() {
+      _InitQuery("cl");
+   }
+   void InitQueryContent() {
+      _InitQuery("cn");
+   }
+

    inline bool Get() 
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;
    inline bool Get() 
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;


@@ -63,30 +81,56 @@ class CacheDB
       return true;
    }
    bool OpenFile();
       return true;
    }
    bool OpenFile();

-   bool GetFileStat(bool const &doStat = false);
+   void CloseFile();
+
+   bool OpenDebFile();
+   void CloseDebFile();
+
+   // GetCurStat needs some compat code, see lp #1274466)
+   bool GetCurStatCompatOldFormat();
+   bool GetCurStatCompatNewFormat();

    bool GetCurStat();
    bool GetCurStat();

+
+   bool GetFileStat(bool const &doStat = false);

    bool LoadControl();
    bool LoadContents(bool const &GenOnly);
    bool LoadControl();
    bool LoadContents(bool const &GenOnly);

-   bool GetMD5(bool const &GenOnly);
-   bool GetSHA1(bool const &GenOnly);
-   bool GetSHA256(bool const &GenOnly);
-   
+   bool LoadSource();
+   bool GetHashes(bool const GenOnly, unsigned int const DoHashes);
+

    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),

-       FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)};
+                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5),
+                  FlSHA512=(1<<6), FlSource=(1<<7)
+   };
+
+   // the on-disk format changed (FileSize increased to 64bit) in 
+   // commit 650faab0 which will lead to corruption with old caches
+   struct StatStoreOldFormat
+   {
+      uint32_t Flags;
+      uint32_t mtime;
+      uint32_t FileSize;
+      uint8_t  MD5[16];
+      uint8_t  SHA1[20];
+      uint8_t  SHA256[32];
+   } CurStatOldFormat;
+
+   // WARNING: this struct is read/written to the DB so do not change the
+   //          layout of the fields (see lp #1274466), only append to it

    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          
    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          

-      uint32_t FileSize;
+      uint64_t FileSize;

       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];
       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];

+      uint8_t  SHA512[64];

    } CurStat;
    struct StatStore OldStat;
    
    // 'set' state
    } CurStat;
    struct StatStore OldStat;
    
    // 'set' state

-   string FileName;
+   std::string FileName;

    FileFd *Fd;
    debDebFile *DebFile;
    
    FileFd *Fd;
    debDebFile *DebFile;
    


@@ -95,10 +139,9 @@ class CacheDB
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;

-   string MD5Res;
-   string SHA1Res;
-   string SHA256Res;
-   
+   DscExtract Dsc;
+   HashStringList HashesList;
+

    // Runtime statistics
    struct Stats
    {
    // Runtime statistics
    struct Stats
    {


@@ -106,32 +149,48 @@ class CacheDB
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;

+      double SHA512Bytes;

       unsigned long Packages;
       unsigned long Misses;  
       unsigned long Packages;
       unsigned long Misses;  

-      unsigned long DeLinkBytes;
+      unsigned long long DeLinkBytes;

       
       inline void Add(const Stats &S) {
       
       inline void Add(const Stats &S) {

-        Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes; 
+        Bytes += S.Bytes; 
+         MD5Bytes += S.MD5Bytes; 
+         SHA1Bytes += S.SHA1Bytes; 

         SHA256Bytes += S.SHA256Bytes;
         SHA256Bytes += S.SHA256Bytes;

-        Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;};
-      Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
+        SHA512Bytes += S.SHA512Bytes;
+        Packages += S.Packages;
+         Misses += S.Misses; 
+         DeLinkBytes += S.DeLinkBytes;
+      };
+      Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0),
+               SHA512Bytes(0),Packages(0), Misses(0), DeLinkBytes(0) {};

    } Stats;
    
    } Stats;
    

-   bool ReadyDB(string const &DB);
+   bool ReadyDB(std::string const &DB = "");

    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    
    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    

-   inline off_t GetFileSize(void) {return CurStat.FileSize;}
+   inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}

    
    

-   bool SetFile(string const &FileName,struct stat St,FileFd *Fd);
-   bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
-                   bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &checkMtime = false);
+   bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
+
+   // terrible old overloaded interface
+   bool GetFileInfo(std::string const &FileName,
+        bool const &DoControl,
+        bool const &DoContents,
+        bool const &GenContentsOnly,
+        bool const DoSource,
+        unsigned int const DoHashes,
+        bool const &checkMtime = false);
+

    bool Finish();   
    
    bool Clean();
    
    bool Finish();   
    
    bool Clean();
    

-   CacheDB(string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
-   ~CacheDB() {ReadyDB(string()); delete DebFile;};
+   explicit CacheDB(std::string const &DB);
+   ~CacheDB();

 };
     
 #endif
 };
     
 #endif