New MySQL CNID backend

[netatalk.git] / etc / cnid_dbd / dbd_update.c

diff --git a/etc/cnid_dbd/dbd_update.c b/etc/cnid_dbd/dbd_update.c
index 184feaab2cce8286f08179e95dab5dd3e6efd8bd..7a95bfe720cb0fed4eb30d3095c1b12d59ba74db 100644 (file)
--- a/etc/cnid_dbd/dbd_update.c
+++ b/etc/cnid_dbd/dbd_update.c
@@ -1,7 +1,6 @@
 /*
- * $Id: dbd_update.c,v 1.3 2005-05-03 14:55:11 didg Exp $
- *
  * Copyright (C) Joerg Lenneis 2003
+ * Copyright (C) Frank Lahm 2009,2010
  * All Rights Reserved.  See COPYING.
  */
 
@@ -12,8 +11,9 @@
 #include <string.h>
 #include <errno.h>
 #include <atalk/logger.h>
-#include <netatalk/endian.h>
-#include <atalk/cnid_dbd_private.h>
+#include <arpa/inet.h>
+
+#include <atalk/cnid_bdb_private.h>
 
 
 #include "pack.h"
@@ -21,110 +21,47 @@
 #include "dbd.h"
 
 
-/* cnid_update: takes the given cnid and updates the metadata. */
-
-/* FIXME: This calls pack_cnid_data(rqst) three times without modifying rqst */
-/* FIXME: (Only tested with DB 4.1.25):
+/* 
+   cnid_update: takes the given cnid and updates the metadata.
+   First, delete given CNID, then re-insert.
+*/
 
-      dbif_pget on the secondary index followed by dbif_del with the CNID on the
-      main cnid db could be replaced by a single dbif_del on the secondary index. That 
-      deletes the secondary, the corresponding entry from the main cnid db as well as the 
-      other secondary index.
-*/   
-   
-int dbd_update(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
+int dbd_update(DBD *dbd, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
 {
-    DBT key,pkey, data;
-    int rc;
-    unsigned char *buf;                            
-    int notfound = 0;
-    char getbuf[CNID_HEADER_LEN + MAXPATHLEN +1];
-#ifdef DEBUG
-    cnid_t tmpcnid;
-#endif
+    DBT key, data;
 
     memset(&key, 0, sizeof(key));
-    memset(&pkey, 0, sizeof(pkey));
     memset(&data, 0, sizeof(data));
-
     rply->namelen = 0;
 
-    buf = pack_cnid_data(rqst);
-    key.data = buf +CNID_DEVINO_OFS;
-    key.size = CNID_DEVINO_LEN;
-
-    data.data = getbuf;
-    data.size = CNID_HEADER_LEN + MAXPATHLEN + 1;
-    if ((rc = dbif_pget(DBIF_IDX_DEVINO, &key, &pkey, &data, 0)) < 0 ) {
+    /* Try to wipe everything, also using the indexes */
+    if (dbd_delete(dbd, rqst, rply, DBIF_CNID) < 0)
         goto err_db;
-    }
-    else if  (rc > 0) {
-#ifdef DEBUG
-       memcpy(&tmpcnid, pkey.data, sizeof(cnid_t));
-       LOG(log_info, logtype_cnid, "dbd_update: Deleting %u corresponding to dev/ino %s from cnid2.db",
-           ntohl(tmpcnid), stringify_devino(rqst->dev, rqst->ino));
-#endif
-        if ((rc = dbif_del(DBIF_IDX_CNID, &pkey, 0)) < 0 ) {
-            goto err_db;
-        }
-        else if (!rc) {
-               LOG(log_error, logtype_cnid, "dbd_update: delete DEVINO %u %s", ntohl(rqst->cnid), db_strerror(errno));
-        }
-    }
-    if (!rc) {
-       notfound = 1;
-    }
-
-    buf = pack_cnid_data(rqst);
-    key.data = buf + CNID_DID_OFS;
-    key.size = CNID_DID_LEN + rqst->namelen +1;
-    memset(&pkey, 0, sizeof(pkey));
-
-    if ((rc = dbif_pget(DBIF_IDX_DIDNAME, &key, &pkey, &data, 0)) < 0) {
+    if (dbd_delete(dbd, rqst, rply, DBIF_IDX_DEVINO) < 0)
+        goto err_db;
+    if (dbd_delete(dbd, rqst, rply, DBIF_IDX_DIDNAME) < 0)
         goto err_db;
-    }
-    else if  (rc > 0) {
-#ifdef DEBUG
-       memcpy(&tmpcnid, pkey.data, sizeof(cnid_t));
-       LOG(log_info, logtype_cnid, "dbd_update: Deleting %u corresponding to did %u name %s from cnid2.db",
-           ntohl(tmpcnid), ntohl(rqst->did), rqst->name);
-#endif
-        if ((rc = dbif_del(DBIF_IDX_CNID, &pkey, 0)) < 0) {
-            goto err_db;
-        }
-        else if (!rc) {
-               LOG(log_error, logtype_cnid, "dbd_update: delete DIDNAME %u %s", ntohl(rqst->cnid), db_strerror(errno));
-        }
-    }
-    if (!rc) {
-       notfound |= 2;
-    }
-
-    memset(&key, 0, sizeof(key));
-    key.data = (cnid_t *) &rqst->cnid;
-    key.size = sizeof(rqst->cnid);
 
-    memset(&data, 0, sizeof(data));
     /* Make a new entry. */
+    key.data = &rqst->cnid;
+    key.size = sizeof(rqst->cnid);
     data.data = pack_cnid_data(rqst);
-    memcpy(data.data, &rqst->cnid, sizeof(rqst->cnid));
     data.size = CNID_HEADER_LEN + rqst->namelen + 1;
+    memcpy(data.data, &rqst->cnid, sizeof(rqst->cnid));
 
-    if (dbif_put(DBIF_IDX_CNID, &key, &data, 0) < 0)
+    if (dbif_put(dbd, DBIF_CNID, &key, &data, 0) < 0)
         goto err_db;
-#ifdef DEBUG
-    LOG(log_info, logtype_cnid, "dbd_update: Updated cnid2.db with dev/ino %s did %u name %s cnid %u",
-       stringify_devino(rqst->dev, rqst->ino),
-       ntohl(rqst->did), rqst->name, ntohl(rqst->cnid));
-#endif
+
+    LOG(log_debug, logtype_cnid, "dbd_update: Updated dbd with dev/ino: 0x%llx/0x%llx, did: %u, name: %s, cnid: %u",
+        (unsigned long long)rqst->dev, (unsigned long long)rqst->ino, ntohl(rqst->did), rqst->name, ntohl(rqst->cnid));
+
     rply->result = CNID_DBD_RES_OK;
     return 1;
 
 err_db:
-#ifdef DEBUG
-    LOG(log_error, logtype_cnid, "dbd_update: Unable to update CNID %u dev/ino %s, DID %x:%s",
-        ntohl(rqst->cnid), stringify_devino(rqst->ino, rqst->did), rqst->name);
-#endif
+    LOG(log_error, logtype_cnid, "dbd_update: Unable to update CNID: %u, dev/ino: 0x%llx/0x%llx, DID: %u: %s",
+        ntohl(rqst->cnid), (unsigned long long)rqst->dev, (unsigned long long)rqst->ino, ntohl(rqst->did), rqst->name);
+
     rply->result = CNID_DBD_RES_ERR_DB;
     return -1;
 }