-/* $Id: zebraapi.c,v 1.220 2006-06-07 10:14:41 adam Exp $
+/* $Id: zebraapi.c,v 1.231 2006-11-14 08:12:08 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
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>
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");
{
Res res;
+ zebra_flock_init();
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("zebraapi");
/* installing rank classes */
zebraRankInstall (reg, rank_1_class);
- zebraRankInstall (reg, rank_zv_class);
zebraRankInstall (reg, rank_similarity_class);
zebraRankInstall (reg, rank_static_class);
{
reg->zei = zebraExplain_open(reg->records, reg->dh,
res, rw, reg,
- explain_extract);
+ zebra_extract_explain);
if (!reg->zei)
{
yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
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);
}
+ 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);
+ }
+ }
}
void map_basenames_func (void *vp, const char *name, const char *value)
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;
}
}
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)
{
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
{
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_normal);
}
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)
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 */
+ 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");
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 */
+ 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");
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 */
+ 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");
projects / idzebra-moved-to-github.git / blobdiff