Changeset 2794 for box/trunk/bin

Timestamp:

18/10/2010 21:34:25 (19 months ago)

Author:

chris

Message:

Revert [2710] and [2717], remove TDB and replace with QDBM again, to fix
build on Windows and make it easier to merge Charles' work.

Location:

box/trunk/bin/bbackupd

Files:

• BackupClientInodeToIDMap.cpp (modified) (13 diffs)
• BackupClientInodeToIDMap.h (modified) (2 diffs)

box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp

@@ -11 +11 @@
 
 #include <stdlib.h>
-
-#define _PUBLIC_
-#include "tdb.h"
+#include <depot.h>
 
 #define BACKIPCLIENTINODETOIDMAP_IMPLEMENTATION
@@ -29 +27 @@
 } IDBRecord;
 
-#define BOX_DBM_MESSAGE(stuff) stuff << " (tdb): " << tdb_error(mpContext)
+#define BOX_DBM_MESSAGE(stuff) stuff << " (qdbm): " << dperrmsg(dpecode)
 
 #define BOX_LOG_DBM_ERROR(stuff) \
@@ -39 +37 @@
                 BOX_DBM_MESSAGE(message << ": " << filename));
 
-#define ASSERT_DBM(success, message, exception, subtype) \
-        if(!(success)) \
+#define ASSERT_DBM_OK(operation, message, filename, exception, subtype) \
+        if(!(operation)) \
         { \
-                THROW_DBM_ERROR(message, mFilename, exception, subtype); \
+                THROW_DBM_ERROR(message, filename, exception, subtype); \
         }
 
 #define ASSERT_DBM_OPEN() \
-        if(mpContext == 0) \
+        if(mpDepot == 0) \
         { \
                 THROW_EXCEPTION_MESSAGE(BackupStoreException, InodeMapNotOpen, \
@@ -53 +51 @@
 
 #define ASSERT_DBM_CLOSED() \
-        if(mpContext != 0) \
+        if(mpDepot != 0) \
         { \
                 THROW_EXCEPTION_MESSAGE(CommonException, Internal, \
@@ -70 +68 @@
         : mReadOnly(true),
           mEmpty(false),
-          mpContext(NULL)
+          mpDepot(0)
 {
 }
@@ -84 +82 @@
 BackupClientInodeToIDMap::~BackupClientInodeToIDMap()
 {
-        if(mpContext != NULL)
+        if(mpDepot != 0)
         {
                 Close();
@@ -111 +109 @@
         
         // Open the database file
-        int mode = ReadOnly ? O_RDONLY : O_RDWR;
+        int mode = ReadOnly ? DP_OREADER : DP_OWRITER;
         if(CreateNew)
         {
-                mode |= O_CREAT;
-        }
-        
-        mpContext = tdb_open(Filename, 0, 0, mode, 0700);
-        
-        ASSERT_DBM(mpContext != NULL, "Failed to open inode database",
+                mode |= DP_OCREAT;
+        }
+        
+        mpDepot = dpopen(Filename, mode, 0);
+        
+        ASSERT_DBM_OK(mpDepot, "Failed to open inode database", mFilename,
                 BackupStoreException, BerkelyDBFailure);
         
@@ -140 +138 @@
 {
         ASSERT_DBM_CLOSED();
-        ASSERT(mpContext == NULL);
+        ASSERT(mpDepot == 0);
         mEmpty = true;
         mReadOnly = true;
@@ -156 +154 @@
 {
         ASSERT_DBM_OPEN();
-        ASSERT_DBM(tdb_close(mpContext) == 0, "Failed to close inode database",
-                BackupStoreException, BerkelyDBFailure);
-        mpContext = NULL;
-}
-
-static TDB_DATA GetDatum(void* dptr, size_t dsize)
-{
-        TDB_DATA datum;
-        datum.dptr = (unsigned char *)dptr;
-        datum.dsize = dsize;
-        return datum;
-}
-
-#define GET_STRUCT_DATUM(structure) \
-        GetDatum(&structure, sizeof(structure))
+        ASSERT_DBM_OK(dpclose(mpDepot), "Failed to close inode database",
+                mFilename, BackupStoreException, BerkelyDBFailure);
+        mpDepot = 0;
+}
 
 // --------------------------------------------------------------------------
@@ -190 +177 @@
         }
 
-        if(mpContext == 0)
+        if(mpDepot == 0)
         {
                 THROW_EXCEPTION(BackupStoreException, InodeMapNotOpen);
@@ -202 +189 @@
         rec.mInDirectory = InDirectory;
 
-        ASSERT_DBM(tdb_store(mpContext, GET_STRUCT_DATUM(InodeRef),
-                GET_STRUCT_DATUM(rec), 0) == 0,
-                "Failed to add record to inode database",
+        ASSERT_DBM_OK(dpput(mpDepot, (const char *)&InodeRef, sizeof(InodeRef),
+                (const char *)&rec, sizeof(rec), DP_DOVER),
+                "Failed to add record to inode database", mFilename,
                 BackupStoreException, BerkelyDBFailure);
 }
@@ -228 +215 @@
         }
 
-        if(mpContext == 0)
+        if(mpDepot == 0)
         {
                 THROW_EXCEPTION(BackupStoreException, InodeMapNotOpen);
@@ -235 +222 @@
         ASSERT_DBM_OPEN();
 
-        TDB_DATA datum = tdb_fetch(mpContext, GET_STRUCT_DATUM(InodeRef));
-        if(datum.dptr == NULL)
+        IDBRecord rec;
+        
+        if(dpgetwb(mpDepot, (const char *)&InodeRef, sizeof(InodeRef),
+                0, sizeof(IDBRecord), (char *)&rec) == -1)
         {
                 // key not in file
                 return false;
         }
-
-        IDBRecord rec;
-        if(datum.dsize != sizeof(rec))
-        {
-                THROW_EXCEPTION_MESSAGE(CommonException, Internal,
-                        "Failed to get inode database entry: "
-                        "record has wrong size: expected " <<
-                        sizeof(rec) << " but was " << datum.dsize <<
-                        " in " << mFilename);
-        }
                 
-        rec = *(IDBRecord *)datum.dptr;
-        free(datum.dptr);
-        
         // Return data
         rObjectIDOut = rec.mObjectID;

box/trunk/bin/bbackupd/BackupClientInodeToIDMap.h

@@ -18 +18 @@
 // avoid having to include the DB files when not necessary
 #ifndef BACKIPCLIENTINODETOIDMAP_IMPLEMENTATION
-        struct TDB_CONTEXT;
-        struct TDB_DATUM;
+        class DEPOT;
 #endif
 
@@ -51 +50 @@
         bool mEmpty;
         std::string mFilename;
-        TDB_CONTEXT *mpContext;
+        DEPOT *mpDepot;
 };