-/* $Id: filter_multi.cpp,v 1.13 2006-02-02 10:25:13 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: filter_multi.cpp,v 1.29 2007-11-26 21:21:12 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
*/
+#include <yaz/log.h>
+
#include "config.hpp"
#include "filter.hpp"
#include <map>
#include <iostream>
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
-namespace yp2 {
+namespace metaproxy_1 {
namespace filter {
-
+ enum multi_merge_type {
+ round_robin,
+ serve_order
+ };
struct Multi::BackendSet {
BackendPtr m_backend;
int m_count;
Z_Entry *get_entry(ODR odr);
};
struct Multi::FrontendSet {
- struct PresentJob {
+ class PresentJob {
+ public:
BackendPtr m_backend;
- int m_pos;
- int m_inside_pos;
+ int m_pos; // position for backend (1=first, 2=second,..
+ int m_start; // present request start
+ PresentJob(BackendPtr ptr, int pos) :
+ m_backend(ptr), m_pos(pos), m_start(0) {};
};
FrontendSet(std::string setname);
FrontendSet();
~FrontendSet();
void round_robin(int pos, int number, std::list<PresentJob> &job);
+ void serve_order(int pos, int number, std::list<PresentJob> &job);
std::list<BackendSet> m_backend_sets;
std::string m_setname;
};
class Multi::Rep {
friend class Multi;
- friend class Frontend;
+ friend struct Frontend;
+ Rep();
FrontendPtr get_frontend(Package &package);
void release_frontend(Package &package);
private:
- boost::mutex m_sessions_mutex;
- std::map<std::string, Multi::Map>m_maps;
std::map<std::string,std::string> m_target_route;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
- std::map<yp2::Session, FrontendPtr> m_clients;
+ std::map<mp::Session, FrontendPtr> m_clients;
+ bool m_hide_unavailable;
+ multi_merge_type m_merge_type;
};
}
}
-using namespace yp2;
+yf::Multi::Rep::Rep()
+{
+ m_hide_unavailable = false;
+ m_merge_type = round_robin;
+}
bool yf::Multi::BackendSet::operator < (const BackendSet &k) const
{
{
}
-yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(Package &package)
+yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
- std::map<yp2::Session,yf::Multi::FrontendPtr>::iterator it;
+ std::map<mp::Session,yf::Multi::FrontendPtr>::iterator it;
while(true)
{
return f;
}
-void yf::Multi::Rep::release_frontend(Package &package)
+void yf::Multi::Rep::release_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
- std::map<yp2::Session,yf::Multi::FrontendPtr>::iterator it;
+ std::map<mp::Session,yf::Multi::FrontendPtr>::iterator it;
it = m_clients.find(package.session());
if (it != m_clients.end())
}
-void yf::Multi::add_map_host2hosts(std::string host,
- std::list<std::string> hosts,
- std::string route)
-{
- m_p->m_maps[host] = Multi::Map(hosts, route);
-}
-
void yf::Multi::Backend::operator() (void)
{
m_package->move(m_route);
}
-void yf::Multi::Frontend::close(Package &package)
+void yf::Multi::Frontend::close(mp::Package &package)
{
std::list<BackendPtr>::const_iterator bit;
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
g.join_all();
}
+void yf::Multi::FrontendSet::serve_order(int start, int number,
+ std::list<PresentJob> &jobs)
+{
+ int i;
+ for (i = 0; i < number; i++)
+ {
+ std::list<BackendSet>::const_iterator bsit;
+ int voffset = 0;
+ int offset = start + i - 1;
+ for (bsit = m_backend_sets.begin(); bsit != m_backend_sets.end();
+ bsit++)
+ {
+ if (offset >= voffset && offset < voffset + bsit->m_count)
+ {
+ PresentJob job(bsit->m_backend, offset - voffset + 1);
+ jobs.push_back(job);
+ break;
+ }
+ voffset += bsit->m_count;
+ }
+ }
+}
+
void yf::Multi::FrontendSet::round_robin(int start, int number,
std::list<PresentJob> &jobs)
{
std::list<int> pos;
- std::list<int> inside_pos;
std::list<BackendSet>::const_iterator bsit;
for (bsit = m_backend_sets.begin(); bsit != m_backend_sets.end(); bsit++)
{
pos.push_back(1);
- inside_pos.push_back(0);
}
int p = 1;
{
more = false;
std::list<int>::iterator psit = pos.begin();
- std::list<int>::iterator esit = inside_pos.begin();
bsit = m_backend_sets.begin();
- for (; bsit != m_backend_sets.end(); psit++,esit++,bsit++)
+ for (; bsit != m_backend_sets.end(); psit++,bsit++)
{
if (fetched >= number)
{
{
if (p >= start)
{
- PresentJob job;
- job.m_backend = bsit->m_backend;
- job.m_pos = *psit;
- job.m_inside_pos = *esit;
+ PresentJob job(bsit->m_backend, *psit);
jobs.push_back(job);
- (*esit)++;
fetched++;
}
(*psit)++;
}
}
-void yf::Multi::Frontend::init(Package &package, Z_GDU *gdu)
+void yf::Multi::Frontend::init(mp::Package &package, Z_GDU *gdu)
{
Z_InitRequest *req = gdu->u.z3950->u.initRequest;
std::list<std::string> targets;
- yp2::util::get_vhost_otherinfo(&req->otherInfo, false, targets);
+ mp::util::get_vhost_otherinfo(req->otherInfo, targets);
if (targets.size() < 1)
{
m_is_multi = true;
// create init request
- std::list<BackendPtr>::const_iterator bit;
+ std::list<BackendPtr>::iterator bit;
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
{
- yp2::odr odr;
+ mp::odr odr;
BackendPtr b = *bit;
Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest);
std::list<std::string>vhost_one;
vhost_one.push_back(b->m_vhost);
- yp2::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo,
+ mp::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo,
odr, vhost_one);
Z_InitRequest *req = init_apdu->u.initRequest;
multi_move(m_backend_list);
// create the frontend init response based on each backend init response
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
Z_InitResponse *f_resp = f_apdu->u.initResponse;
ODR_MASK_SET(f_resp->protocolVersion, Z_ProtocolVersion_2);
ODR_MASK_SET(f_resp->protocolVersion, Z_ProtocolVersion_3);
- for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
+ int no_failed = 0;
+ int no_succeeded = 0;
+ for (bit = m_backend_list.begin(); bit != m_backend_list.end(); )
{
PackagePtr p = (*bit)->m_package;
- if (p->session().is_closed()) // if any backend closes, close frontend
- package.session().close();
+ if (p->session().is_closed())
+ {
+ // failed. Remove from list and increment number of failed
+ no_failed++;
+ bit = m_backend_list.erase(bit);
+ continue;
+ }
+ no_succeeded++;
+
Z_GDU *gdu = p->response().get();
if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
Z_APDU_initResponse)
package.response() = p->response();
return;
}
+ bit++;
+ }
+ if (m_p->m_hide_unavailable)
+ {
+ if (no_succeeded == 0)
+ package.session().close();
+ }
+ else
+ {
+ if (no_failed)
+ package.session().close();
}
package.response() = f_apdu;
}
-void yf::Multi::Frontend::search(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
{
// create search request
Z_SearchRequest *req = apdu_req->u.searchRequest;
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
{
PackagePtr p = (*bit)->m_package;
- yp2::odr odr;
+ mp::odr odr;
- if (!yp2::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
+ if (!mp::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
&req->num_databaseNames,
&req->databaseNames))
{
}
}
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu = odr.create_searchResponse(apdu_req, 0, 0);
Z_SearchResponse *f_resp = f_apdu->u.searchResponse;
m_sets[resultSet.m_setname] = resultSet;
int number;
- yp2::util::piggyback(smallSetUpperBound,
+ mp::util::piggyback(smallSetUpperBound,
largeSetLowerBound,
mediumSetPresentNumber,
result_set_size,
package.response() = f_apdu; // in this scope because of p
}
-void yf::Multi::Frontend::present(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
{
// create present request
Z_PresentRequest *req = apdu_req->u.presentRequest;
it = m_sets.find(std::string(req->resultSetId));
if (it == m_sets.end())
{
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *apdu =
odr.create_presentResponse(
apdu_req,
std::list<Multi::FrontendSet::PresentJob> jobs;
int start = *req->resultSetStartPoint;
int number = *req->numberOfRecordsRequested;
- it->second.round_robin(start, number, jobs);
+
+ if (m_p->m_merge_type == round_robin)
+ it->second.round_robin(start, number, jobs);
+ else if (m_p->m_merge_type == serve_order)
+ it->second.serve_order(start, number, jobs);
+
+ if (0)
+ {
+ std::list<Multi::FrontendSet::PresentJob>::const_iterator jit;
+ for (jit = jobs.begin(); jit != jobs.end(); jit++)
+ {
+ yaz_log(YLOG_LOG, "job pos=%d", jit->m_pos);
+ }
+ }
std::list<BackendPtr> present_backend_list;
bsit = it->second.m_backend_sets.begin();
for (; bsit != it->second.m_backend_sets.end(); bsit++)
{
- std::list<Multi::FrontendSet::PresentJob>::const_iterator jit;
int start = -1;
int end = -1;
-
- for (jit = jobs.begin(); jit != jobs.end(); jit++)
{
- if (jit->m_backend == bsit->m_backend)
+ std::list<Multi::FrontendSet::PresentJob>::const_iterator jit;
+ for (jit = jobs.begin(); jit != jobs.end(); jit++)
{
- if (start == -1 || jit->m_pos < start)
- start = jit->m_pos;
- if (end == -1 || jit->m_pos > end)
- end = jit->m_pos;
+ if (jit->m_backend == bsit->m_backend)
+ {
+ if (start == -1 || jit->m_pos < start)
+ start = jit->m_pos;
+ if (end == -1 || jit->m_pos > end)
+ end = jit->m_pos;
+ }
}
}
if (start != -1)
{
+ std::list<Multi::FrontendSet::PresentJob>::iterator jit;
+ for (jit = jobs.begin(); jit != jobs.end(); jit++)
+ {
+ if (jit->m_backend == bsit->m_backend)
+ {
+ if (jit->m_pos >= start && jit->m_pos <= end)
+ jit->m_start = start;
+ }
+ }
+
PackagePtr p = bsit->m_backend->m_package;
*req->resultSetStartPoint = start;
}
}
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu = odr.create_presentResponse(apdu_req, 0, 0);
Z_PresentResponse *f_resp = f_apdu->u.presentResponse;
odr_malloc(odr, sizeof(Z_NamePlusRecord *) * nprl->num_records);
int i = 0;
std::list<Multi::FrontendSet::PresentJob>::const_iterator jit;
- for (jit = jobs.begin(); jit != jobs.end(); jit++)
+ for (jit = jobs.begin(); jit != jobs.end(); jit++, i++)
{
PackagePtr p = jit->m_backend->m_package;
Z_APDU *b_apdu = gdu->u.z3950;
Z_PresentResponse *b_resp = b_apdu->u.presentResponse;
- nprl->records[i++] =
- b_resp->records->u.databaseOrSurDiagnostics->
- records[jit->m_inside_pos];
+ nprl->records[i] = (Z_NamePlusRecord*)
+ odr_malloc(odr, sizeof(Z_NamePlusRecord));
+ int inside_pos = jit->m_pos - jit->m_start;
+ if (inside_pos >= b_resp->records->
+ u.databaseOrSurDiagnostics->num_records)
+ break;
+ *nprl->records[i] = *b_resp->records->
+ u.databaseOrSurDiagnostics->records[inside_pos];
+ nprl->records[i]->databaseName =
+ odr_strdup(odr, jit->m_backend->m_vhost.c_str());
}
+ nprl->num_records = i; // usually same as jobs.size();
*f_resp->nextResultSetPosition = start + i;
*f_resp->numberOfRecordsReturned = i;
}
package.response() = f_apdu;
}
-void yf::Multi::Frontend::scan1(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::scan1(mp::Package &package, Z_APDU *apdu_req)
{
if (m_backend_list.size() > 1)
{
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu =
odr.create_scanResponse(
apdu_req, YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP, 0);
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
{
PackagePtr p = (*bit)->m_package;
- yp2::odr odr;
+ mp::odr odr;
- if (!yp2::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
+ if (!mp::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
&req->num_databaseNames,
&req->databaseNames))
{
return e;
}
-void yf::Multi::Frontend::scan2(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req)
{
Z_ScanRequest *req = apdu_req->u.scanRequest;
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
{
PackagePtr p = (*bit)->m_package;
- yp2::odr odr;
+ mp::odr odr;
- if (!yp2::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
+ if (!mp::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
&req->num_databaseNames,
&req->databaseNames))
{
if (res->entries && res->entries->nonsurrogateDiagnostics)
{
// failure
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu = odr.create_scanResponse(apdu_req, 1, 0);
Z_ScanResponse *f_res = f_apdu->u.scanResponse;
if (false)
{
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu = odr.create_scanResponse(apdu_req, 1, "not implemented");
package.response() = f_apdu;
}
else
{
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *f_apdu = odr.create_scanResponse(apdu_req, 0, 0);
Z_ScanResponse *resp = f_apdu->u.scanResponse;
}
-void yf::Multi::process(Package &package) const
+void yf::Multi::process(mp::Package &package) const
{
FrontendPtr f = m_p->get_frontend(package);
Z_APDU *apdu = gdu->u.z3950;
if (apdu->which == Z_APDU_initRequest)
{
- yp2::odr odr;
+ mp::odr odr;
package.response() = odr.create_close(
apdu,
}
else
{
- yp2::odr odr;
+ mp::odr odr;
package.response() = odr.create_close(
apdu, Z_Close_protocolError,
m_p->release_frontend(package);
}
-void yp2::filter::Multi::configure(const xmlNode * ptr)
+void mp::filter::Multi::configure(const xmlNode * ptr)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
continue;
if (!strcmp((const char *) ptr->name, "target"))
{
- std::string route = yp2::xml::get_route(ptr);
- std::string target = yp2::xml::get_text(ptr);
+ std::string route = mp::xml::get_route(ptr);
+ std::string target = mp::xml::get_text(ptr);
std::cout << "route=" << route << " target=" << target << "\n";
m_p->m_target_route[target] = route;
}
- else if (!strcmp((const char *) ptr->name, "virtual"))
+ else if (!strcmp((const char *) ptr->name, "hideunavailable"))
{
- std::list<std::string> targets;
- std::string vhost;
- xmlNode *v_node = ptr->children;
- for (; v_node; v_node = v_node->next)
- {
- if (v_node->type != XML_ELEMENT_NODE)
- continue;
-
- if (yp2::xml::is_element_yp2(v_node, "vhost"))
- vhost = yp2::xml::get_text(v_node);
- else if (yp2::xml::is_element_yp2(v_node, "target"))
- targets.push_back(yp2::xml::get_text(v_node));
- else
- throw yp2::filter::FilterException
- ("Bad element "
- + std::string((const char *) v_node->name)
- + " in virtual section"
- );
- }
- std::string route = yp2::xml::get_route(ptr);
- add_map_host2hosts(vhost, targets, route);
- std::list<std::string>::const_iterator it;
- for (it = targets.begin(); it != targets.end(); it++)
- {
- std::cout << "Add " << vhost << "->" << *it
- << "," << route << "\n";
- }
+ m_p->m_hide_unavailable = true;
+ }
+ else if (!strcmp((const char *) ptr->name, "mergetype"))
+ {
+ std::string mergetype = mp::xml::get_text(ptr);
+ if (mergetype == "roundrobin")
+ m_p->m_merge_type = round_robin;
+ else if (mergetype == "serveorder")
+ m_p->m_merge_type = serve_order;
+ else
+ throw mp::filter::FilterException
+ ("Bad mergetype " + mergetype + " in multi filter");
+
}
else
{
- throw yp2::filter::FilterException
+ throw mp::filter::FilterException
("Bad element "
+ std::string((const char *) ptr->name)
- + " in virt_db filter");
+ + " in multi filter");
}
}
}
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
{
- return new yp2::filter::Multi;
+ return new mp::filter::Multi;
}
extern "C" {
- struct yp2_filter_struct yp2_filter_multi = {
+ struct metaproxy_1_filter_struct metaproxy_1_filter_multi = {
0,
"multi",
filter_creator