refactor _InitQuery()

[apt.git] / ftparchive / cachedb.h

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 377c4160728463117402a9c2f85f9ce1e82903a6..54a27494487e8f8641376bcebe854b72a572bc6d 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,16 +12,20 @@
 #ifndef CACHEDB_H
 #define CACHEDB_H
 
 #ifndef CACHEDB_H
 #define CACHEDB_H
 

-

 #include <apt-pkg/debfile.h>
 
 #include <db.h>
 #include <apt-pkg/debfile.h>
 
 #include <db.h>

-#include <inttypes.h>
-#include <sys/stat.h>

 #include <errno.h>
 #include <string>
 #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
 {
 
 class CacheDB
 {


@@ -37,7 +41,7 @@ class CacheDB
    std::string DBFile;
 
    // Generate a key for the DB of a given type
    std::string DBFile;
 
    // 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 +49,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,10 +80,16 @@ class CacheDB
       return true;
    }
    bool OpenFile();
       return true;
    }
    bool OpenFile();

+   void CloseFile();
+
+   bool OpenDebFile();
+   void CloseDebFile();
+

    bool GetFileStat(bool const &doStat = false);
    bool GetCurStat();
    bool LoadControl();
    bool LoadContents(bool const &GenOnly);
    bool GetFileStat(bool const &doStat = false);
    bool GetCurStat();
    bool LoadControl();
    bool LoadContents(bool const &GenOnly);

+   bool LoadSource();

    bool GetMD5(bool const &GenOnly);
    bool GetSHA1(bool const &GenOnly);
    bool GetSHA256(bool const &GenOnly);
    bool GetMD5(bool const &GenOnly);
    bool GetSHA1(bool const &GenOnly);
    bool GetSHA256(bool const &GenOnly);


@@ -75,7 +98,8 @@ class CacheDB
    // 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), 
    // 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), 

-                  FlSHA512=(1<<6)};
+                  FlSHA512=(1<<6), FlSource=(1<<7),
+   };

 
    struct StatStore
    {
 
    struct StatStore
    {


@@ -99,6 +123,8 @@ class CacheDB
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;

+   DscExtract Dsc;
+

    std::string MD5Res;
    std::string SHA1Res;
    std::string SHA256Res;
    std::string MD5Res;
    std::string SHA1Res;
    std::string SHA256Res;


@@ -126,7 +152,8 @@ class CacheDB
          Misses += S.Misses; 
          DeLinkBytes += S.DeLinkBytes;
       };
          Misses += S.Misses; 
          DeLinkBytes += S.DeLinkBytes;
       };

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

    } Stats;
    
    bool ReadyDB(std::string const &DB);
    } Stats;
    
    bool ReadyDB(std::string const &DB);


@@ -136,13 +163,24 @@ class CacheDB
    inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}
    
    bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
    inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}
    
    bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);

-   bool GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
-                   bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
+
+   // terrible old overloaded interface
+   bool GetFileInfo(std::string const &FileName, 
+                    bool const &DoControl, 
+                    bool const &DoContents, 
+                    bool const &GenContentsOnly, 
+                    bool const &DoSource,
+                   bool const &DoMD5, 
+                    bool const &DoSHA1, 
+                    bool const &DoSHA256, 
+                    bool const &DoSHA512, 
+                    bool const &checkMtime = false);
+

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

-   CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
+   CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {TmpKey[0]='\0'; ReadyDB(DB);};

    ~CacheDB() {ReadyDB(std::string()); delete DebFile;};
 };
     
    ~CacheDB() {ReadyDB(std::string()); delete DebFile;};
 };