Work locking mechanisms for concurrent updates/commit.

[idzebra-moved-to-github.git] / index / zserver.c

diff --git a/index/zserver.c b/index/zserver.c
index 3251127..c718b70 100644 (file)
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.27  1995-11-27 13:58:54  adam
+ * Revision 1.30  1995-12-07 17:38:48  adam
+ * Work locking mechanisms for concurrent updates/commit.
+ *
+ * Revision 1.29  1995/12/04  14:22:32  adam
+ * Extra arg to recType_byName.
+ * Started work on new regular expression parsed input to
+ * structured records.
+ *
+ * Revision 1.28  1995/11/28  09:09:48  adam
+ * Zebra config renamed.
+ * Use setting 'recordId' to identify record now.
+ * Bug fix in recindex.c: rec_release_blocks was invokeded even
+ * though the blocks were already released.
+ * File traversal properly deletes records when needed.
+ *
+ * Revision 1.27  1995/11/27  13:58:54  adam
  * New option -t. storeStore data implemented in server.
  *
  * Revision 1.26  1995/11/25  10:24:07  adam
@@ -104,6 +119,38 @@
 
 ZServerInfo server_info;
 
+static int register_check (ZServerInfo *zi)
+{
+    int state = zebraServerLockGetState();
+
+    switch (state)
+    {
+    case 'c':
+        state = 1;
+        break;
+    default:
+        state = 0;
+    }
+    if (zi->registerState == state)
+        return 0;
+
+    zi->registerState = state;
+    if (server_info.records)
+    {
+        dict_close (server_info.wordDict);
+        is_close (server_info.wordIsam);
+        rec_close (&server_info.records);
+    }
+    /* enable commit if state is 1 */
+    server_info.records = rec_open (0);
+    if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0)))
+        return -1;
+    if (!(server_info.wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0,
+                                          sizeof (struct it_key))))
+        return -1;
+    return 0;
+}
+
 bend_initresult *bend_init (bend_initrequest *q)
 {
     static bend_initresult r;
@@ -127,10 +174,16 @@ bend_initresult *bend_init (bend_initrequest *q)
             exit (1);
         }
     }
+    zebraServerLock ();
 
-    data1_tabpath = res_get(common_resource, "data1_tabpath");
+    data1_tabpath = res_get(common_resource, "profilePath");
     server_info.sets = NULL;
-
+    server_info.registerState = -1;  /* trigger open of registers! */
+#if 1
+    server_info.records = NULL;
+    server_info.wordDict = NULL;
+    server_info.wordIsam = NULL;
+#else
     server_info.records = rec_open (0);
     if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0)))
     {
@@ -148,6 +201,7 @@ bend_initresult *bend_init (bend_initrequest *q)
         r.errstring = "is_open fail: word isam";
         return &r;
     }
+#endif
     server_info.odr = odr_createmem (ODR_ENCODE);
     return &r;
 }
@@ -160,7 +214,7 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
     r.errstring = 0;
     r.hits = 0;
 
-
+    register_check (&server_info);
     odr_reset (server_info.odr);
     server_info.errCode = 0;
     server_info.errString = NULL;
@@ -196,7 +250,7 @@ static int record_int_read (int fd, char *buf, size_t count)
         return 0;
     l = (l < count) ? l : count;
     memcpy (buf, record_int_buf + record_int_pos, l);
-    record_int_buf += l;
+    record_int_pos += l;
     return l;
 }
 
@@ -209,12 +263,13 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     char *fname, *file_type;
     RecType rt;
     struct recRetrieveCtrl retrieveCtrl;
+    char subType[128];
 
     rec = rec_get (zi->records, sysno);
     file_type = rec->info[recInfo_fileType];
     fname = rec->info[recInfo_filename];
 
-    if (!(rt = recType_byName (file_type)))
+    if (!(rt = recType_byName (file_type, subType)))
     {
         logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s", 
               file_type);
@@ -227,6 +282,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
         record_int_len = rec->size[recInfo_storeData];
         record_int_buf = rec->info[recInfo_storeData];
         record_int_pos = 0;
+        logf (LOG_DEBUG, "Internal retrieve. %d bytes", record_int_len);
     }
     else 
     {
@@ -242,6 +298,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
         }
         retrieveCtrl.readf = record_ext_read;
     }
+    retrieveCtrl.subType = subType;
     retrieveCtrl.localno = sysno;
     retrieveCtrl.score = score;
     retrieveCtrl.odr = stream;
@@ -264,6 +321,8 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
     int positions[2];
     ZServerSetSysno *records;
 
+    register_check (&server_info);
+
     r.errstring = 0;
     r.last_in_set = 0;
     r.basename = "base";
@@ -294,6 +353,7 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
 
 bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num)
 {
+    register_check (&server_info);
     return 0;
 }
 
@@ -302,6 +362,7 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
     static bend_scanresult r;
     int status;
 
+    register_check (&server_info);
     odr_reset (server_info.odr);
     server_info.errCode = 0;
     server_info.errString = 0;
@@ -319,9 +380,13 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
 
 void bend_close (void *handle)
 {
-    dict_close (server_info.wordDict);
-    is_close (server_info.wordIsam);
-    rec_close (&server_info.records);
+    if (server_info.records)
+    {
+        dict_close (server_info.wordDict);
+        is_close (server_info.wordIsam);
+        rec_close (&server_info.records);
+    }
+    zebraServerUnlock ();
     return;
 }
 
@@ -330,7 +395,7 @@ int main (int argc, char **argv)
     struct statserv_options_block *sob;
 
     sob = statserv_getcontrol ();
-    strcpy (sob->configname, "base");
+    strcpy (sob->configname, FNAME_CONFIG);
     statserv_setcontrol (sob);
 
     return statserv_main (argc, argv);