X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fzebraapi.c;h=7b146618852e3344a3453719636999e9e8d59221;hb=9b46631dae8ab93da1e8f87f5d6638a493135c03;hp=84c8e7ae71fe08ada5fb196ccb83d0fa2ed599df;hpb=d11d06eb6cb73bd56217636882f6f61a89cb0ec8;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 84c8e7a..7b14661 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.226 2006-08-29 08:27:59 adam Exp $ +/* $Id: zebraapi.c,v 1.237 2006-12-05 14:06:29 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; } @@ -173,12 +174,12 @@ ZebraHandle zebra_open(ZebraService zs, Res res) return zh; } -ZebraService zebra_start (const char *configName) +ZebraService zebra_start(const char *configName) { return zebra_start_res(configName, 0, 0); } -ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) +ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) { Res res; @@ -208,7 +209,18 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) res_close(res); return 0; } + if (zebra_check_res(res)) + { + yaz_log(YLOG_FATAL, "Configuration error(s) for %s", + configName); + return 0; + } } + else + { + zebra_check_res(res); + } + zh = xmalloc(sizeof(*zh)); zh->global_res = res; zh->sessions = 0; @@ -347,8 +359,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, } getcwd(cwd, sizeof(cwd)-1); - profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); - yaz_log(YLOG_DEBUG, "profilePath=%s cwd=%s", profilePath, cwd); + profilePath = res_get_def(res, "profilePath", 0); data1_set_tabpath (reg->dh, profilePath); data1_set_tabroot (reg->dh, reg_path); @@ -367,8 +378,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 +391,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 +558,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(®->key_block); xfree(reg->name); xfree(reg); } @@ -1065,12 +1073,15 @@ 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(); + /* we disable hit snippets for now. It does not work well + and it slows retrieval down a lot */ +#if 0 zebra_snippets_hit_vector(zh, setname, poset[i].sysno, hit_snippet); - +#endif recs[i].errCode = zebra_record_fetch(zh, poset[i].sysno, poset[i].score, hit_snippet, @@ -1177,10 +1188,10 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, return ZEBRA_FAIL; } } - res = rpn_scan (zh, stream, zapt, attributeset, - zh->num_basenames, zh->basenames, position, - num_entries, entries, is_partial, limit_rset, 0); - zebra_end_read (zh); + res = rpn_scan(zh, stream, zapt, attributeset, + zh->num_basenames, zh->basenames, position, + num_entries, entries, is_partial, limit_rset); + zebra_end_read(zh); return res; } @@ -1318,7 +1329,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 +1371,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; @@ -1485,12 +1496,20 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) if (zh->reg->isamb) { int db_ord; - zebraExplain_curDatabase (zh->reg->zei, db); - db_ord = zebraExplain_get_database_ord(zh->reg->zei); - dict_delete_subtree_ord(zh->reg->matchDict, db_ord, - 0 /* handle */, 0 /* func */); - zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); - zebraExplain_removeDatabase(zh->reg->zei, zh); + if (zebraExplain_curDatabase (zh->reg->zei, db)) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, db); + ret = ZEBRA_FAIL; + } + else + { + db_ord = zebraExplain_get_database_ord(zh->reg->zei); + dict_delete_subtree_ord(zh->reg->matchDict, db_ord, + 0 /* handle */, 0 /* func */); + zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); + zebraExplain_removeDatabase(zh->reg->zei, zh); + zebra_remove_file_match(zh); + } } else { @@ -1556,6 +1575,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]; @@ -1665,7 +1694,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; @@ -1701,51 +1729,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, @@ -1980,6 +1997,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); @@ -1988,60 +2007,73 @@ 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') + { + yaz_log(YLOG_WARN, "previous transaction didn't reach commit"); + clean_only = 1; + } if (rval && *rval) bf_cache (bfs, rval); 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); -#ifndef WIN32 - sync (); -#endif + 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) @@ -2217,7 +2249,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) { @@ -2248,12 +2280,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; @@ -2285,12 +2317,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; @@ -2447,11 +2479,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, "/"); }