From: Adam Dickmeiss Date: Tue, 27 Apr 1999 07:52:13 +0000 (+0000) Subject: Improved proxy; added query match for result set re-use. X-Git-Tag: YAZPP.0.3~102 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=8791979d0ceae761c5eebd576de19fef3216f050;p=yazpp-moved-to-github.git Improved proxy; added query match for result set re-use. --- diff --git a/README.txt b/README.txt index 95b94b8..dfd1d58 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,6 @@ YAZ++ - A C++ library for YAZ -$Id: README.txt,v 1.3 1999-02-02 14:01:10 adam Exp $ +$Id: README.txt,v 1.4 1999-04-27 07:52:13 adam Exp $ o Introduction @@ -62,5 +62,3 @@ compiler environments. yazclient.dsp - builds yazclient.exe yazserver.dsp - builds yazserver.exe yazproxy.dsp - builds yazproxy.exe - - diff --git a/include/yaz-proxy.h b/include/yaz-proxy.h index db2595f..52c0ff1 100644 --- a/include/yaz-proxy.h +++ b/include/yaz-proxy.h @@ -3,10 +3,11 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: yaz-proxy.h,v 1.5 1999-04-21 12:09:01 adam Exp $ + * $Id: yaz-proxy.h,v 1.6 1999-04-27 07:52:13 adam Exp $ */ #include +#include class Yaz_Proxy; @@ -23,6 +24,9 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc { char m_cookie[32]; Yaz_ProxyClient *m_next; Yaz_ProxyClient **m_prev; + int m_init_flag; + Yaz_Z_Query *m_last_query; + int m_last_resultCount; }; /// Information Retrieval Proxy Server. @@ -38,6 +42,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { char *get_cookie(Z_OtherInformation **otherInfo); char *get_proxy(Z_OtherInformation **otherInfo); Yaz_ProxyClient *get_client(Z_APDU *apdu); + Z_APDU *result_set_optimize(Z_APDU *apdu); Yaz_ProxyClient *m_client; IYaz_PDU_Observable *m_PDU_Observable; diff --git a/include/yaz-z-query.h b/include/yaz-z-query.h index 5a2763f..9af3fff 100644 --- a/include/yaz-z-query.h +++ b/include/yaz-z-query.h @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: yaz-z-query.h,v 1.4 1999-04-21 12:09:01 adam Exp $ + * $Id: yaz-z-query.h,v 1.5 1999-04-27 07:52:13 adam Exp $ */ #include @@ -26,6 +26,8 @@ class YAZ_EXPORT Yaz_Z_Query : public Yaz_Query { Z_Query *get_Z_Query (); /// print query void print(char *str, int len); + /// match query + int match(Yaz_Z_Query *other); private: char *buf; int len; diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index beff26c..a78e5d3 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-proxy.cpp,v $ - * Revision 1.5 1999-04-21 12:09:01 adam + * Revision 1.6 1999-04-27 07:52:13 adam + * Improved proxy; added query match for result set re-use. + * + * Revision 1.5 1999/04/21 12:09:01 adam * Many improvements. Modified to proxy server to work with "sessions" * based on cookies. * @@ -138,6 +141,44 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) return c; } +Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) +{ + if (apdu->which != Z_APDU_searchRequest) + return apdu; + Z_SearchRequest *sr = apdu->u.searchRequest; + Yaz_Z_Query *this_query = new Yaz_Z_Query; + + this_query->set_Z_Query(sr->query); + + if (m_client->m_last_query && + m_client->m_last_query->match(this_query)) + { + delete this_query; + if (*sr->smallSetUpperBound == 0) + { + Z_APDU *new_apdu; + logf (LOG_LOG, "query match"); + new_apdu = create_Z_PDU(Z_APDU_searchResponse); + new_apdu->u.searchResponse->referenceId = sr->referenceId; + new_apdu->u.searchResponse->resultCount = + &m_client->m_last_resultCount; + send_Z_PDU(new_apdu); + return 0; + } + else + { + logf (LOG_LOG, "query match (piggy back)"); + } + } + else + { + logf (LOG_LOG, "query doesn't match"); + delete m_client->m_last_query; + m_client->m_last_query = this_query; + } + return apdu; +} + void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) { logf (LOG_LOG, "Yaz_Proxy::recv_Z_PDU"); @@ -153,6 +194,23 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) Z_OtherInformation **oi; get_otherInfoAPDU(apdu, &oi); *oi = 0; + if (apdu->which == Z_APDU_initRequest) + { + if (m_client->m_init_flag) + { + Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse); + if (m_client->m_cookie) + set_otherInformationString(apdu, VAL_COOKIE, 1, + m_client->m_cookie); + send_Z_PDU(apdu); + return; + } + m_client->m_init_flag = 1; + } + apdu = result_set_optimize(apdu); + if (!apdu) + return; + logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU"); if (m_client->send_Z_PDU(apdu) < 0) { @@ -166,7 +224,7 @@ void Yaz_Proxy::failNotify() logf (LOG_LOG, "failNotity server"); if (m_keepalive) { - // Tell client (if any) that not server connection is there.. + // Tell client (if any) that no server connection is there.. if (m_client) m_client->m_server = 0; } @@ -198,6 +256,7 @@ Yaz_ProxyClient::~Yaz_ProxyClient() if (m_next) m_next->m_prev = m_prev; } + delete m_last_query; } void Yaz_Proxy::timeoutNotify() @@ -216,6 +275,9 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : m_cookie[0] = 0; m_next = 0; m_prev = 0; + m_init_flag = 0; + m_last_query = 0; + m_last_resultCount = 0; } void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu) @@ -223,6 +285,8 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu) logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU"); if (m_cookie) set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie); + if (apdu->which == Z_APDU_searchResponse) + m_last_resultCount = *apdu->u.searchResponse->resultCount; if (m_server) { logf (LOG_LOG, "Yaz_Proxy::send_Z_PDU"); diff --git a/src/yaz-z-query.cpp b/src/yaz-z-query.cpp index 16c3fb4..c375ea6 100644 --- a/src/yaz-z-query.cpp +++ b/src/yaz-z-query.cpp @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-z-query.cpp,v $ - * Revision 1.4 1999-04-21 12:09:01 adam + * Revision 1.5 1999-04-27 07:52:13 adam + * Improved proxy; added query match for result set re-use. + * + * Revision 1.4 1999/04/21 12:09:01 adam * Many improvements. Modified to proxy server to work with "sessions" * based on cookies. * @@ -77,3 +80,14 @@ void Yaz_Z_Query::print(char *str, int len) { } + +int Yaz_Z_Query::match(Yaz_Z_Query *other) +{ + if (len != other->len) + return 0; + if (!buf || !other->buf) + return 0; + if (memcmp(buf, other->buf, len)) + return 0; + return 1; +}