X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=d8857c1a6af731f0a83eb4ecbf8b2a5803655ad6;hb=b3af54f7bf58db2a5d85b6a54b720bf6c5359c1f;hp=efbb91921a517eb8d3cd2099f1d8b1a75061910c;hpb=ba54c2986ad5d1088cd70b577d9941a9d4e14e6c;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index efbb919..d8857c1 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.230 2006-10-12 13:06:00 adam Exp $
+/* $Id: zebraapi.c,v 1.234 2006-11-21 22:17:49 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -84,9 +84,10 @@ static ZEBRA_RES zebra_flush_reg (ZebraHandle zh)
     ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_flush_reg");
     zebraExplain_flush (zh->reg->zei, zh);
-    
-    extract_flushWriteKeys (zh, 1 /* final */);
-    zebra_index_merge (zh );
+
+    key_block_flush(zh->reg->key_block, 1);
+
+    zebra_index_merge(zh);
     return ZEBRA_OK;
 }
 
@@ -367,8 +368,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     }
     reg->rank_classes = NULL;
 
-    reg->key_buf = 0;
-
+    reg->key_block = 0;
     reg->keys = zebra_rec_keys_open();
 
     reg->sortKeys = zebra_rec_keys_open();
@@ -381,8 +381,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     reg->isamc = 0;
     reg->isamb = 0;
     reg->zei = 0;
-    reg->key_file_no = 0;
-    reg->ptr_i = 0;
     
     /* installing rank classes */
     zebraRankInstall (reg, rank_1_class);
@@ -550,7 +548,7 @@ static void zebra_register_close(ZebraService zs, struct zebra_register *reg)
     zebra_rec_keys_close(reg->keys);
     zebra_rec_keys_close(reg->sortKeys);
 
-    xfree(reg->key_buf);
+    key_block_destroy(&reg->key_block);
     xfree(reg->name);
     xfree(reg);
 }
@@ -1065,7 +1063,7 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 	    else if (poset[i].sysno)
 	    {
 		char *buf;
-		int len;
+		int len = 0;
 		zebra_snippets *hit_snippet = zebra_snippets_create();
 
 		zebra_snippets_hit_vector(zh, setname, poset[i].sysno, 
@@ -1318,7 +1316,7 @@ ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
 ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 {
     ZEBRA_RES res = ZEBRA_OK;
-    SYSNO sysno;
+    zint sysno;
     int i;
     ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_admin_import_segment");
@@ -1360,7 +1358,7 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
     /* 4 = update. Insert/replace */
 {
     ZEBRA_RES res;
-    SYSNO sysno = 0;
+    zint sysno = 0;
     char *rinfo = 0;
     char recid_z[256];
     int db_ord;
@@ -1564,6 +1562,16 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
     return wrbuf_len(wrbuf);
 }
 
+/** \brief set register state (state*.LCK)
+    \param zh Zebra handle
+    \param val state
+    \param seqno sequence number
+    
+    val is one of:
+    d=writing to shadow(dirty)
+    o=no writing, 
+    c=commit
+*/
 static void zebra_set_state (ZebraHandle zh, int val, int seqno)
 {
     char state_fname[256];
@@ -1673,7 +1681,6 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
     assert (zh->res);
     if (rw)
     {
-        int pass;
         int seqno = 0;
         char val = '?';
         const char *rval = 0;
@@ -1709,51 +1716,40 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
         if (zh->shadow_enable)
             rval = res_get (zh->res, "shadow");
         
-        for (pass = 0; pass < 2; pass++)
+        if (rval)
         {
-            if (rval)
-            {
-                zebra_lock_r (zh->lock_normal);
-                zebra_lock_w (zh->lock_shadow);
-            }
-            else
+            zebra_lock_r(zh->lock_normal);
+            zebra_lock_w(zh->lock_shadow);
+        }
+        else
+        {
+            zebra_lock_w(zh->lock_normal);
+            zebra_lock_w(zh->lock_shadow);
+        }
+        zebra_get_state (zh, &val, &seqno);
+        if (val != 'o')
+        {
+            /* either we didn't finish commit or shadow is dirty */
+            zebra_unlock (zh->lock_shadow);
+            zebra_unlock (zh->lock_normal);
+            if (zebra_commit (zh))
             {
-                zebra_lock_w (zh->lock_normal);
-                zebra_lock_w (zh->lock_shadow);
+                zh->trans_no--;
+                zh->trans_w_no = 0;
+                return ZEBRA_FAIL;
             }
-            
-            zebra_get_state (zh, &val, &seqno);
-            if (val == 'c')
+            if (rval)
             {
-                yaz_log (YLOG_WARN, "previous transaction didn't finish commit");
-                zebra_unlock (zh->lock_shadow);
-                zebra_unlock (zh->lock_normal);
-                zebra_commit (zh);
-                continue;
+                zebra_lock_r(zh->lock_normal);
+                zebra_lock_w(zh->lock_shadow);
             }
-            else if (val == 'd')
+            else
             {
-                if (rval)
-                {
-                    BFiles bfs = bfs_create (res_get (zh->res, "shadow"),
-                                             zh->path_reg);
-                    yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
-                    bf_commitClean (bfs, rval);
-                    bfs_destroy (bfs);
-		}
-                else
-                {
-                    yaz_log (YLOG_WARN, "your previous transaction didn't finish");
-                }
+                zebra_lock_w(zh->lock_normal);
+                zebra_lock_w(zh->lock_shadow);
             }
-            break;
-        }
-        if (pass == 2)
-        {
-            yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit");
-            abort();
-            return ZEBRA_FAIL;
         }
+
         zebra_set_state (zh, 'd', seqno);
         
         zh->reg = zebra_register_open(zh->service, zh->reg_name,
@@ -1988,6 +1984,8 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
     char val;
     const char *rval;
     BFiles bfs;
+    ZEBRA_RES res = ZEBRA_OK;
+
     ASSERTZH;
 
     zebra_select_default_database(zh);
@@ -1996,24 +1994,24 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
         zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
         return ZEBRA_FAIL;
     }
-    rval = res_get (zh->res, "shadow");    
+    rval = res_get(zh->res, "shadow");    
     if (!rval)
     {
         yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined");
         return ZEBRA_OK;
     }
 
-    zebra_lock_w (zh->lock_normal);
-    zebra_lock_r (zh->lock_shadow);
+    zebra_lock_w(zh->lock_normal);
+    zebra_lock_r(zh->lock_shadow);
 
-    bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
+    bfs = bfs_create(res_get (zh->res, "register"), zh->path_reg);
     if (!bfs)
     {
 	zebra_unlock(zh->lock_shadow);
 	zebra_unlock(zh->lock_normal);
         return ZEBRA_FAIL;
     }
-    zebra_get_state (zh, &val, &seqno);
+    zebra_get_state(zh, &val, &seqno);
 
     if (val == 'd')
     {
@@ -2026,33 +2024,43 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
     if (bf_commitExists (bfs))
     {
         if (clean_only)
-            zebra_set_state (zh, 'd', seqno);
+            zebra_set_state(zh, 'd', seqno);
         else
         {
-            zebra_set_state (zh, 'c', seqno);
+            zebra_set_state(zh, 'c', seqno);
             
-            yaz_log (YLOG_DEBUG, "commit start");
-            bf_commitExec (bfs);
+            yaz_log(YLOG_DEBUG, "commit start");
+            if (bf_commitExec (bfs))
+                res = ZEBRA_FAIL;
+        }
+        if (res == ZEBRA_OK)
+        {
+            seqno++;
+            zebra_set_state(zh, 'o', seqno);
+            
+            zebra_unlock(zh->lock_shadow);
+            zebra_unlock(zh->lock_normal);
+            
+            zebra_lock_w(zh->lock_shadow);
+            bf_commitClean(bfs, rval);
+            zebra_unlock(zh->lock_shadow);
+        }
+        else
+        {
+            zebra_unlock(zh->lock_shadow);
+            zebra_unlock(zh->lock_normal);
+            yaz_log(YLOG_WARN, "zebra_commit: failed");
         }
-        seqno++;
-        zebra_set_state (zh, 'o', seqno);
-
-	zebra_unlock (zh->lock_shadow);
-	zebra_unlock (zh->lock_normal);
-
-	zebra_lock_w(zh->lock_shadow);
-        bf_commitClean (bfs, rval);
-	zebra_unlock (zh->lock_shadow);
     }
     else
     {
 	zebra_unlock(zh->lock_shadow);
 	zebra_unlock(zh->lock_normal);
-        yaz_log (log_level, "nothing to commit");
+        yaz_log(log_level, "nothing to commit");
     }
-    bfs_destroy (bfs);
+    bfs_destroy(bfs);
 
-    return ZEBRA_OK;
+    return res;
 }
 
 ZEBRA_RES zebra_clean(ZebraHandle zh)
@@ -2228,7 +2236,7 @@ ZEBRA_RES zebra_add_record(ZebraHandle zh,
 
 ZEBRA_RES zebra_insert_record(ZebraHandle zh, 
 			      const char *recordType,
-			      SYSNO *sysno, const char *match,
+			      zint *sysno, const char *match,
 			      const char *fname,
 			      const char *buf, int buf_size, int force_update)
 {
@@ -2259,12 +2267,12 @@ ZEBRA_RES zebra_insert_record(ZebraHandle zh,
     return res; 
 }
 
-ZEBRA_RES zebra_update_record (ZebraHandle zh, 
-			       const char *recordType,
-			       SYSNO* sysno, const char *match,
-			       const char *fname,
-			       const char *buf, int buf_size,
-			       int force_update)
+ZEBRA_RES zebra_update_record(ZebraHandle zh, 
+                              const char *recordType,
+                              zint *sysno, const char *match,
+                              const char *fname,
+                              const char *buf, int buf_size,
+                              int force_update)
 {
     ZEBRA_RES res;
 
@@ -2296,12 +2304,12 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh,
     return res; 
 }
 
-ZEBRA_RES zebra_delete_record (ZebraHandle zh, 
-			       const char *recordType,
-			       SYSNO *sysno, const char *match,
-			       const char *fname,
-			       const char *buf, int buf_size,
-			       int force_update) 
+ZEBRA_RES zebra_delete_record(ZebraHandle zh, 
+                              const char *recordType,
+                              zint *sysno, const char *match,
+                              const char *fname,
+                              const char *buf, int buf_size,
+                              int force_update) 
 {
     ZEBRA_RES res;
 
@@ -2458,11 +2466,11 @@ void zebra_setError_zint(ZebraHandle zh, int code, zint i)
     zh->errString = nmem_strdup(zh->nmem_error, vstr);
 }
 
-void zebra_lock_prefix (Res res, char *path)
+void zebra_lock_prefix(Res res, char *path)
 {
     const char *lock_dir = res_get_def (res, "lockDir", "");
-
-    strcpy (path, lock_dir);
+    
+    strcpy(path, lock_dir);
     if (*path && path[strlen(path)-1] != '/')
         strcat (path, "/");
 }