-/* $Id: zebraapi.c,v 1.228 2006-09-21 20:22:34 adam Exp $
+/* $Id: zebraapi.c,v 1.239 2006-12-19 16:57:38 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
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;
}
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;
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;
const char *recordCompression = 0;
const char *profilePath;
char cwd[1024];
+ int sort_type = ZEBRA_SORT_TYPE_FLAT;
ZEBRA_RES ret = ZEBRA_OK;
ASSERTZS;
}
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);
}
reg->rank_classes = NULL;
- reg->key_buf = 0;
-
+ reg->key_block = 0;
reg->keys = zebra_rec_keys_open();
reg->sortKeys = zebra_rec_keys_open();
reg->records = 0;
reg->dict = 0;
- reg->sortIdx = 0;
+ reg->sort_index = 0;
reg->isams = 0;
reg->matchDict = 0;
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);
yaz_log (YLOG_WARN, "dict_open failed");
ret = ZEBRA_FAIL;
}
- if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw)))
+
+
+ if (res_get_match (res, "sortindex", "f", "f"))
+ sort_type = ZEBRA_SORT_TYPE_FLAT;
+ else if (res_get_match (res, "sortindex", "i", "f"))
+ sort_type = ZEBRA_SORT_TYPE_ISAMB;
+ else
+ {
+ yaz_log (YLOG_WARN, "bad_value for 'sortindex'");
+ ret = ZEBRA_FAIL;
+ }
+
+
+ if (!(reg->sort_index = zebra_sort_open(reg->bfs, rw, sort_type)))
{
- yaz_log (YLOG_WARN, "sortIdx_open failed");
+ yaz_log (YLOG_WARN, "zebra_sort_open failed");
ret = ZEBRA_FAIL;
}
if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
dict_close (reg->dict);
if (reg->matchDict)
dict_close (reg->matchDict);
- sortIdx_close (reg->sortIdx);
+ zebra_sort_close(reg->sort_index);
if (reg->isams)
isams_close (reg->isams);
if (reg->isamc)
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);
}
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,
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");
/* 4 = update. Insert/replace */
{
ZEBRA_RES res;
- SYSNO sysno = 0;
+ zint sysno = 0;
char *rinfo = 0;
char recid_z[256];
int db_ord;
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];
assert (zh->res);
if (rw)
{
- int pass;
int seqno = 0;
char val = '?';
const char *rval = 0;
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,
char val;
const char *rval;
BFiles bfs;
+ ZEBRA_RES res = ZEBRA_OK;
+
ASSERTZH;
zebra_select_default_database(zh);
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)
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)
{
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;
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;
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, "/");
}