-/* $Id: zebraapi.c,v 1.202 2006-02-21 15:23:11 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: zebraapi.c,v 1.243 2007-01-16 15:01:15 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "index.h"
+#include "rank.h"
#include "orddict.h"
#include <charmap.h>
#include <idzebra/api.h>
static void zebra_open_res(ZebraHandle zh);
static void zebra_close_res(ZebraHandle zh);
+static ZEBRA_RES zebra_check_handle(ZebraHandle zh)
+{
+ if (zh)
+ return ZEBRA_OK;
+ return ZEBRA_FAIL;
+}
+
+#define ZEBRA_CHECK_HANDLE(zh) if (zebra_check_handle(zh) != ZEBRA_OK) return ZEBRA_FAIL
+
static void zebra_chdir (ZebraService zs)
{
const char *dir ;
#endif
}
-static void zebra_flush_reg (ZebraHandle zh)
+static ZEBRA_RES zebra_flush_reg (ZebraHandle zh)
{
- ASSERTZH;
+ 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;
}
static struct zebra_register *zebra_register_open(ZebraService zs,
int rw, int useshadow,
Res res,
const char *reg_path);
-static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
+static void zebra_register_close(ZebraService zs, struct zebra_register *reg);
ZebraHandle zebra_open(ZebraService zs, Res res)
{
zh->shadow_enable = 1;
zh->m_staticrank = 0;
+ zh->m_segment_indexing = 0;
default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
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;
+ zebra_flock_init();
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("zebraapi");
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;
}
}
+ zh->timing = yaz_timing_create();
zh->path_root = res_get (zh->global_res, "root");
zh->nmem = nmem_create();
zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
+
+ if (1)
+ {
+ const char *module_path = res_get(res, "modulePath");
+ if (module_path)
+ recTypeClass_load_modules(&zh->record_classes, zh->nmem,
+ module_path);
+ }
return zh;
}
return 0;
const char *recordCompression = 0;
const char *profilePath;
char cwd[1024];
+ int sort_type = ZEBRA_SORT_TYPE_FLAT;
+ ZEBRA_RES ret = ZEBRA_OK;
ASSERTZS;
yaz_log (YLOG_DEBUG, "zebra_register_open rw=%d useshadow=%d p=%p n=%s rp=%s",
rw, useshadow, reg, name, reg_path ? reg_path : "(none)");
- reg->dh = data1_createx (DATA1_FLAG_XML);
+ reg->dh = data1_create();
if (!reg->dh)
{
+ xfree(reg->name);
xfree(reg);
return 0;
}
if (!reg->bfs)
{
data1_destroy(reg->dh);
+ xfree(reg->name);
xfree(reg);
return 0;
}
{
bfs_destroy(reg->bfs);
data1_destroy(reg->dh);
+ xfree(reg->name);
xfree(reg);
return 0;
}
}
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->recTypes = recTypes_init (zs->record_classes, reg->dh);
- reg->zebra_maps = zebra_maps_open (res, reg_path);
+ reg->zebra_maps =
+ zebra_maps_open(res, reg_path, profilePath);
+ if (!reg->zebra_maps)
+ {
+ recTypes_destroy(reg->recTypes);
+ bfs_destroy(reg->bfs);
+ data1_destroy(reg->dh);
+ xfree(reg->name);
+ xfree(reg);
+ return 0;
+ }
reg->rank_classes = NULL;
- reg->key_buf = 0;
-
+ reg->key_block = 0;
reg->keys = zebra_rec_keys_open();
-#if NATTR
reg->sortKeys = zebra_rec_keys_open();
-#else
- reg->sortKeys.buf = 0;
- reg->sortKeys.buf_max = 0;
-#endif
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);
- zebraRankInstall (reg, rank_zv_class);
+ zebraRankInstall (reg, rank_similarity_class);
zebraRankInstall (reg, rank_static_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "bzip2"))
record_compression = REC_COMPRESS_BZIP2;
+ if (1)
+ {
+ const char *index_fname = res_get_def(res, "index", "default.idx");
+ if (index_fname && *index_fname)
+ {
+ if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK)
+ ret = ZEBRA_FAIL;
+ }
+ }
+
if (!(reg->records = rec_open (reg->bfs, rw, record_compression)))
{
yaz_log (YLOG_WARN, "rec_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
if (rw)
{
if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res)))
{
yaz_log (YLOG_WARN, "dict_open failed");
- return 0;
+ 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, "sortIdx_open failed");
- return 0;
+ 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, "zebra_sort_open failed");
+ ret = ZEBRA_FAIL;
}
if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
{
key_isams_m(res, &isams_m))))
{
yaz_log (YLOG_WARN, "isams_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m))))
{
yaz_log (YLOG_WARN, "isamc_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "b", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m), 0)))
{
yaz_log (YLOG_WARN, "isamb_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "bc", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m), 1)))
{
yaz_log (YLOG_WARN, "isamb_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "null", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m), -1)))
{
yaz_log (YLOG_WARN, "isamb_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
- reg->zei = zebraExplain_open (reg->records, reg->dh,
- res, rw, reg,
- explain_extract);
- if (!reg->zei)
+ if (ret == ZEBRA_OK)
{
- yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
+ reg->zei = zebraExplain_open(reg->records, reg->dh,
+ res, rw, reg,
+ zebra_extract_explain);
+ if (!reg->zei)
+ {
+ yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
+ ret = ZEBRA_FAIL;
+ }
+ }
+
+ if (ret != ZEBRA_OK)
+ {
+ zebra_register_close(zs, reg);
return 0;
}
-
- reg->active = 2;
yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg);
return reg;
}
ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_shutdown");
zebra_mutex_cond_lock (&zh->service->session_lock);
ZEBRA_RES zebra_admin_start (ZebraHandle zh)
{
ZebraService zs;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_start");
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
return ZEBRA_OK;
}
-static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
+static void zebra_register_close(ZebraService zs, struct zebra_register *reg)
{
ASSERTZS;
assert(reg);
yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
- if (reg->records)
- {
- zebraExplain_close (reg->zei);
- dict_close (reg->dict);
- if (reg->matchDict)
- dict_close (reg->matchDict);
- sortIdx_close (reg->sortIdx);
- if (reg->isams)
- isams_close (reg->isams);
- if (reg->isamc)
- isamc_close (reg->isamc);
- if (reg->isamb)
- isamb_close (reg->isamb);
- rec_close (®->records);
- }
+
+ zebraExplain_close (reg->zei);
+ dict_close (reg->dict);
+ if (reg->matchDict)
+ dict_close (reg->matchDict);
+ zebra_sort_close(reg->sort_index);
+ if (reg->isams)
+ isams_close (reg->isams);
+ if (reg->isamc)
+ isamc_close (reg->isamc);
+ if (reg->isamb)
+ isamb_close (reg->isamb);
+ rec_close (®->records);
recTypes_destroy (reg->recTypes);
zebra_maps_close (reg->zebra_maps);
data1_destroy (reg->dh);
zebra_rec_keys_close(reg->keys);
-#if NATTR
zebra_rec_keys_close(reg->sortKeys);
-#else
- xfree(reg->sortKeys.buf);
-#endif
- xfree(reg->key_buf);
+ key_block_destroy(®->key_block);
xfree(reg->name);
xfree(reg);
}
{
if (!zs)
return ZEBRA_OK;
- yaz_log (log_level, "zebra_stop");
-
while (zs->sessions)
{
zebra_close (zs->sessions);
recTypeClass_destroy(zs->record_classes);
nmem_destroy(zs->nmem);
res_close (zs->global_res);
+
+ yaz_timing_stop(zs->timing);
+ yaz_log (YLOG_LOG, "zebra_stop: %4.2f %4.2f %4.2f",
+ yaz_timing_get_real(zs->timing),
+ yaz_timing_get_user(zs->timing),
+ yaz_timing_get_sys(zs->timing));
+
+
+ yaz_timing_destroy(&zs->timing);
xfree(zs);
return ZEBRA_OK;
}
-ZEBRA_RES zebra_close (ZebraHandle zh)
+ZEBRA_RES zebra_close(ZebraHandle zh)
{
ZebraService zs;
struct zebra_session **sp;
int i;
yaz_log(log_level, "zebra_close");
- if (!zh)
- return ZEBRA_OK;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
zh->errCode = 0;
zs = zh->service;
resultSetDestroy (zh, -1, 0, 0);
if (zh->reg)
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
zebra_close_res (zh);
res_close(zh->session_res);
if (zh->reg)
{
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
zh->reg = 0;
}
zebra_close_res(zh);
res_set (zh->res, "lockDir", zh->path_reg);
sprintf (fname, "norm.%s.LCK", zh->reg_name);
zh->lock_normal =
- zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ zebra_lock_create (res_get(zh->res, "lockDir"), fname);
sprintf (fname, "shadow.%s.LCK", zh->reg_name);
zh->lock_shadow =
- zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ zebra_lock_create (res_get(zh->res, "lockDir"), fname);
if (!zh->lock_normal || !zh->lock_shadow)
{
{
if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
- else
- yaz_log(YLOG_LOG, "static rank unset");
+ }
+ if (zh->res)
+ {
+ if (res_get_int(zh->res, "segment", &zh->m_segment_indexing) ==
+ ZEBRA_OK)
+ {
+ yaz_log(YLOG_DEBUG, "segment indexing set and is %d",
+ zh->m_segment_indexing);
+ }
}
}
ZEBRA_RES zebra_select_database (ZebraHandle zh, const char *basename)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
yaz_log(log_level, "zebra_select_database %s",basename);
assert(basename);
return zebra_select_databases (zh, 1, &basename);
const char *cp;
int len = 0;
char *new_reg = 0;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(basenames);
yaz_log(log_level, "zebra_select_databases n=%d [0]=%s",
return ZEBRA_OK;
}
-ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
- const char *setname, zint *hits)
+ZEBRA_RES zebra_search_RPN_x(ZebraHandle zh, ODR o, Z_RPNQuery *query,
+ const char *setname, zint *hits,
+ int *estimated_hit_count,
+ int *partial_resultset)
{
ZEBRA_RES r;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(o);
assert(query);
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
- zh->hits = 0;
- *hits = 0;
if (zebra_begin_read(zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
r = resultSetAddRPN(zh, odr_extract_mem(o), query,
- zh->num_basenames, zh->basenames, setname);
+ zh->num_basenames, zh->basenames, setname,
+ hits, estimated_hit_count, partial_resultset);
zebra_end_read(zh);
- *hits = zh->hits;
return r;
}
+ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
+ const char *setname, zint *hits)
+{
+ int estimated_hit_count;
+ int partial_resultset;
+ return zebra_search_RPN_x(zh, o, query, setname, hits,
+ &estimated_hit_count,
+ &partial_resultset);
+}
+
ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
const char *setname,
Z_RecordComposition *comp,
int i;
ZEBRA_RES ret = ZEBRA_OK;
zint *pos_array;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(setname);
assert(recs);
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 res;
RSET limit_rset = 0;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(stream);
assert(zapt);
assert(position);
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;
}
int *sort_status)
{
ZEBRA_RES res;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(num_input_setnames>0);
assert(input_setnames);
char u[40];
ZebraService zs;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
- zs= zh->service;
+ zs = zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
p = res_get(zs->global_res, u);
ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
const char *record_type)
{
- ASSERTZH;
yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s",
database, record_type);
if (zebra_select_database(zh, database) == ZEBRA_FAIL)
ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_import_end");
return zebra_end_trans(zh);
}
ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
{
ZEBRA_RES res = ZEBRA_OK;
- SYSNO sysno;
+ zint sysno;
int i;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_import_segment");
for (i = 0; i<segment->num_segmentRecords; i++)
/* 4 = update. Insert/replace */
{
ZEBRA_RES res;
- SYSNO sysno = 0;
+ zint sysno = 0;
char *rinfo = 0;
char recid_z[256];
int db_ord;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
assert(action>0 && action <=4);
assert(rec_buf);
{
if (action == 1) /* fail if insert */
{
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
"Cannot insert record: already exist");
return ZEBRA_FAIL;
{
if (action == 2 || action == 3) /* fail if delete or update */
{
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
"Cannot delete/update record: does not exist");
return ZEBRA_FAIL;
}
action = 1; /* make it an insert (if it's an update).. */
}
- res = buffer_extract_record (zh, rec_buf, rec_len,
- action == 3 ? 1 : 0 /* delete flag */,
- 0, /* test mode */
- 0, /* recordType */
- &sysno,
- 0, /* match */
- 0, /* fname */
- 0, /* force update */
- 1 /* allow update */
+ res = zebra_buffer_extract_record(zh, rec_buf, rec_len,
+ action == 3 ? 1 : 0 /* delete flag */,
+ 0, /* test mode */
+ 0, /* recordType */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ 0, /* force update */
+ 1 /* allow update */
);
if (res == ZEBRA_FAIL)
{
{
dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
}
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
return res;
}
ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
{
ZEBRA_RES ret = ZEBRA_OK;
- ASSERTZH;
+
yaz_log(log_level, "zebra_drop_database %s", db);
+ ZEBRA_CHECK_HANDLE(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
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
{
"drop database only supported for isam:b");
ret = ZEBRA_FAIL;
}
- zebra_end_trans (zh);
+ if (zebra_end_trans (zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ ret = ZEBRA_FAIL;
+ }
return ret;
}
ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
{
- ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
+ ZEBRA_CHECK_HANDLE(zh);
assert(db);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
if (zebraExplain_newDatabase (zh->reg->zei, db, 0
/* explainDatabase */))
{
- zebra_end_trans (zh);
+ if (zebra_end_trans (zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ }
zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, db);
return ZEBRA_FAIL;
}
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];
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
assert (zh->res);
if (rw)
{
- int pass;
int seqno = 0;
char val = '?';
const char *rval = 0;
if (zh->reg)
{
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
}
zh->trans_w_no = zh->trans_no;
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,
if (zh->trans_no != 1)
{
- zebra_flush_reg (zh);
- return ZEBRA_OK;
+ return zebra_flush_reg (zh);
}
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
if (zh->reg)
{
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
}
zh->reg = zebra_register_open(zh->service, zh->reg_name,
0, val == 'c' ? 1 : 0,
ZEBRA_RES zebra_end_trans (ZebraHandle zh)
{
ZebraTransactionStatus dummy;
- ASSERTZH;
+
yaz_log(log_level, "zebra_end_trans");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_end_transaction(zh, &dummy);
}
int seqno;
const char *rval;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(status);
yaz_log(log_level, "zebra_end_transaction");
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
zh->reg = 0;
yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
- status->processed = (int) zh->records_processed;
- status->inserted = (int) zh->records_inserted;
- status->updated = (int) zh->records_updated;
- status->deleted = (int) zh->records_deleted;
+ status->processed = zh->records_processed;
+ status->inserted = zh->records_inserted;
+ status->updated = zh->records_updated;
+ status->deleted = zh->records_deleted;
zebra_get_state (zh, &val, &seqno);
if (val != 'd')
return ZEBRA_OK;
}
-int zebra_repository_update (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log (log_level, "updating %s", path);
- repositoryUpdate (zh, path);
- return 0;
+
+ if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
+ return zebra_update_file_match(zh, path);
+ else
+ return zebra_update_from_path(zh, path);
}
-int zebra_repository_delete (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log (log_level, "deleting %s", path);
- repositoryDelete (zh, path);
- return 0;
+ return zebra_delete_from_path(zh, path);
}
-int zebra_repository_show (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
repositoryShow (zh, path);
- return 0;
+ return ZEBRA_OK;
}
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);
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");
}
- yaz_log (YLOG_DEBUG, "commit clean");
- bf_commitClean (bfs, rval);
- seqno++;
- zebra_set_state (zh, 'o', seqno);
}
else
{
- yaz_log (log_level, "nothing to commit");
+ zebra_unlock(zh->lock_shadow);
+ zebra_unlock(zh->lock_normal);
+ yaz_log(log_level, "nothing to commit");
}
- bfs_destroy (bfs);
+ bfs_destroy(bfs);
- zebra_unlock (zh->lock_shadow);
- zebra_unlock (zh->lock_normal);
- return ZEBRA_OK;
+ return res;
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_clean");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_commit_ex(zh, 1);
}
ZEBRA_RES zebra_commit(ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_commit");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_commit_ex(zh, 0);
}
+
ZEBRA_RES zebra_init(ZebraHandle zh)
{
const char *rval;
BFiles bfs = 0;
- ASSERTZH;
+
yaz_log(log_level, "zebra_init");
+ ZEBRA_CHECK_HANDLE(zh);
+
zebra_select_default_database(zh);
if (!zh->res)
{
ZEBRA_RES zebra_compact(ZebraHandle zh)
{
BFiles bfs;
- ASSERTZH;
+
yaz_log(log_level, "zebra_compact");
+ ZEBRA_CHECK_HANDLE(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
void zebra_result(ZebraHandle zh, int *code, char **addinfo)
{
- ASSERTZH;
yaz_log(log_level, "zebra_result");
- *code = zh->errCode;
- *addinfo = zh->errString;
+ if (zh)
+ {
+ *code = zh->errCode;
+ *addinfo = zh->errString;
+ }
+ else
+ {
+ *code = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo ="ZebraHandle is NULL";
+ }
}
void zebra_shadow_enable(ZebraHandle zh, int value)
ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
{
- ASSERTZH;
- assert(encoding);
yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
+ ZEBRA_CHECK_HANDLE(zh);
+ assert(encoding);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
- ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
+ ZEBRA_CHECK_HANDLE(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
- ASSERTZH;
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
+ ASSERTZH;
res_set(zh->res, name, value);
}
int zebra_trans_no (ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_trans_no");
+ ASSERTZH;
return zh->trans_no;
}
int zebra_get_shadow_enable (ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_get_shadow_enable");
+ ASSERTZH;
return zh->shadow_enable;
}
void zebra_set_shadow_enable (ZebraHandle zh, int value)
{
- ASSERTZH;
yaz_log(log_level, "zebra_set_shadow_enable %d",value);
+ ASSERTZH;
zh->shadow_enable = value;
}
-/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve
- so that it's identicical to the original api_records_retrieve */
-void api_records_retrieve (ZebraHandle zh, ODR stream,
- const char *setname, Z_RecordComposition *comp,
- oid_value input_format, int num_recs,
- ZebraRetrievalRecord *recs)
-{
- zebra_records_retrieve(zh, stream, setname, comp, input_format,
- num_recs, recs);
-}
-
-/* ---------------------------------------------------------------------------
- Record insert(=update), delete
-
- If sysno is provided, then it's used to identify the record.
- If not, and match_criteria is provided, then sysno is guessed
- If not, and a record is provided, then sysno is got from there
-NOTE: Now returns 0 at success and updates sysno, which is an int*
- 20-jun-2003 Heikki
-*/
-
-int zebra_add_record(ZebraHandle zh,
- const char *buf, int buf_size)
+ZEBRA_RES zebra_add_record(ZebraHandle zh,
+ const char *buf, int buf_size)
{
return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0);
}
-ZEBRA_RES zebra_insert_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_insert_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;
ASSERTZH;
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- res = buffer_extract_record (zh, buf, buf_size,
- 0, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match, fname,
- 0,
- 0); /* allow_update */
- zebra_end_trans(zh);
+ res = zebra_buffer_extract_record(zh, buf, buf_size,
+ 0, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ sysno,
+ match, fname,
+ 0,
+ 0); /* allow_update */
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
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;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(buf);
yaz_log(log_level, "zebra_update_record");
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- res = buffer_extract_record (zh, buf, buf_size,
- 0, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match, fname,
- force_update,
- 1); /* allow_update */
- zebra_end_trans(zh);
+ res = zebra_buffer_extract_record(zh, buf, buf_size,
+ 0, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ sysno,
+ match, fname,
+ force_update,
+ 1); /* allow_update */
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
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;
- ASSERTZH;
- assert(sysno);
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(buf);
- yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(log_level, "zebra_delete_record");
+ if (sysno)
+ yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- res = buffer_extract_record (zh, buf, buf_size,
- 1, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match,fname,
- force_update,
- 1); /* allow_update */
- zebra_end_trans(zh);
+ res = zebra_buffer_extract_record(zh, buf, buf_size,
+ 1, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ sysno,
+ match,fname,
+ force_update,
+ 1); /* allow_update */
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
return res;
}
zint lhits = 0;
ZEBRA_RES res = ZEBRA_OK;
Z_RPNQuery *query;
- ODR odr = odr_createmem(ODR_ENCODE);
- ASSERTZH;
+ ODR odr;
+
+
+ ZEBRA_CHECK_HANDLE(zh);
+
+ odr = odr_createmem(ODR_ENCODE);
+
assert(pqf_query);
assert(setname);
int num_input_setnames = 0;
int sort_status = 0;
Z_SortKeySpecList *sort_sequence;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(sort_spec);
assert(output_setname);
*/
ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
zebra_limit_destroy(zh->m_limit);
zh->m_limit = zebra_limit_create(complement_flag, ids);
return ZEBRA_OK;
*/
void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
{
+ if (!zh)
+ return;
zh->errCode = code;
nmem_reset(zh->nmem_error);
zh->errString = addinfo ? nmem_strdup(zh->nmem_error, addinfo) : 0;
zh->errString = nmem_strdup(zh->nmem_error, vstr);
}
+void zebra_lock_prefix(Res res, char *path)
+{
+ const char *lock_dir = res_get_def (res, "lockDir", "");
+
+ strcpy(path, lock_dir);
+ if (*path && path[strlen(path)-1] != '/')
+ strcat (path, "/");
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff