X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=aa385f88a98f835013e74b91683f87760ccd7a49;hb=5053dee0c4d74ee87d8068fc1230eb721262e786;hp=b1d6e0e8fce4f36bd4b9020ebd12ea6a04ad1b5b;hpb=1e15de12518ee28c4cd5298ab545c77092e57194;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index b1d6e0e..aa385f8 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.32 2002-08-28 13:01:41 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.45 2003-07-25 08:57:01 adam Exp $
  */
 
 #include <assert.h>
 #include <time.h>
 
 #include <yaz/log.h>
-#include <yaz++/yaz-proxy.h>
+#include <yaz++/proxy.h>
 
 Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
     Yaz_Z_Assoc(the_PDU_Observable)
@@ -24,6 +24,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
     m_proxy_authentication = 0;
     m_max_clients = 50;
     m_seed = time(0);
+    m_idletime = 600;
     m_optimize = xstrdup ("1");
 }
 
@@ -55,7 +56,7 @@ IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable
 {
     Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable);
     new_proxy->m_parent = this;
-    new_proxy->timeout(500);
+    new_proxy->timeout(m_idletime);
     new_proxy->set_proxy_target(m_proxyTarget);
     new_proxy->set_APDU_log(get_APDU_log());
     new_proxy->set_proxy_authentication(m_proxy_authentication);
@@ -144,21 +145,52 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		c->m_init_flag = 0;
 
 		c->m_last_ok = 0;
+		c->m_cache.clear();
 		c->m_last_resultCount = 0;
 		c->m_sr_transform = 0;
 		c->m_waiting = 0;
-		c->timeout(600); 
+		c->m_resultSetStartPoint = 0;
+		c->timeout(m_idletime); 
 	    }
 	    c->m_seqno = parent->m_seqno;
 	    if (c->m_server && c->m_server != this)
 		c->m_server->m_client = 0;
 	    c->m_server = this;
-	    c->m_seqno = parent->m_seqno;
 	    (parent->m_seqno)++;
 	    yaz_log (LOG_DEBUG, "get_client 1 %p %p", this, c);
 	    return c;
 	}
     }
+    else if (!c)
+    {
+	Yaz_ProxyClient *cc = 0;
+	
+	for (c = parent->m_clientPool; c; c = c->m_next)
+	{
+	    assert (c->m_prev);
+	    assert (*c->m_prev == c);
+	    if (c->m_server == 0 && c->m_cookie[0] == 0 && 
+		!strcmp(m_proxyTarget, c->get_hostname()))
+	    {
+		cc = c;
+	    }
+	}
+	if (cc)
+	{
+	    // found it in cache
+	    c = cc;
+
+	    yaz_log (LOG_LOG, "Reuse session %d to %d %s",
+		     c->m_seqno, parent->m_seqno, c->get_hostname());
+
+	    c->m_seqno = parent->m_seqno;
+	    assert(c->m_server == 0);
+	    c->m_server = this;
+	    
+	    (parent->m_seqno)++;
+	    return c;
+	}
+    }
     if (!m_client)
     {
 	if (apdu->which != Z_APDU_initRequest)
@@ -187,7 +219,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	Yaz_ProxyClient *c_min = 0;
 	int min_seq = -1;
 	int no_of_clients = 0;
-	yaz_log (LOG_LOG, "Existing sessions");
+	if (parent->m_clientPool)
+	    yaz_log (LOG_LOG, "Existing sessions");
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
 	    yaz_log (LOG_LOG, " Session %-3d wait=%d %s", c->m_seqno,
@@ -212,8 +245,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    }
 	    else
 	    {
-		yaz_log (LOG_LOG, "Reuse session %d to %d",
-		      c->m_seqno, parent->m_seqno);
+		yaz_log (LOG_LOG, "Move session %d to %d %s",
+		      c->m_seqno, parent->m_seqno, c->get_hostname());
 		if (cookie)
 		    strcpy (c->m_cookie, cookie);
 		else
@@ -250,9 +283,11 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	c->m_init_flag = 0;
 	c->m_last_resultCount = 0;
         c->m_last_ok = 0;
+	c->m_cache.clear();
 	c->m_sr_transform = 0;
 	c->m_waiting = 0;
-	c->timeout(10);
+	c->m_resultSetStartPoint = 0;
+	c->timeout(20);
 
 	(parent->m_seqno)++;
     }
@@ -262,10 +297,43 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 
 Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 {
+    if (*m_parent->m_optimize == '0')
+        return apdu;      // don't optimize result sets..
+    if (apdu->which == Z_APDU_presentRequest)
+    {
+	Z_PresentRequest *pr = apdu->u.presentRequest;
+	Z_NamePlusRecordList *npr;
+	int toget = *pr->numberOfRecordsRequested;
+	int start = *pr->resultSetStartPoint;
+
+	if (m_client->m_last_resultSetId &&
+	    !strcmp(m_client->m_last_resultSetId, pr->resultSetId))
+	{
+	    if (m_client->m_cache.lookup (odr_encode(), &npr, start, toget,
+					  pr->preferredRecordSyntax,
+					  pr->recordComposition))
+	    {
+		yaz_log (LOG_LOG, "Returned cache records for present request");
+		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
+		new_apdu->u.presentResponse->referenceId = pr->referenceId;
+		
+		new_apdu->u.presentResponse->numberOfRecordsReturned
+		    = odr_intdup(odr_encode(), toget);
+								 
+		new_apdu->u.presentResponse->records = (Z_Records*)
+		    odr_malloc(odr_encode(), sizeof(Z_Records));
+		new_apdu->u.presentResponse->records->which = Z_Records_DBOSD;
+		new_apdu->u.presentResponse->records->u.databaseOrSurDiagnostics = npr;
+		new_apdu->u.presentResponse->nextResultSetPosition =
+		    odr_intdup(odr_encode(), start+toget);
+		send_Z_PDU(new_apdu);
+		return 0;
+	    }
+	}
+    }
+
     if (apdu->which != Z_APDU_searchRequest)
 	return apdu;
-    if (*m_parent->m_optimize != '1')
-        return apdu;
     Z_SearchRequest *sr = apdu->u.searchRequest;
     Yaz_Z_Query *this_query = new Yaz_Z_Query;
     Yaz_Z_Databases this_databases;
@@ -277,33 +345,70 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
     
     if (m_client->m_last_ok && m_client->m_last_query &&
 	m_client->m_last_query->match(this_query) &&
+        !strcmp(m_client->m_last_resultSetId, sr->resultSetName) &&
         m_client->m_last_databases.match(this_databases))
     {
 	delete this_query;
 	if (m_client->m_last_resultCount > *sr->smallSetUpperBound &&
 	    m_client->m_last_resultCount < *sr->largeSetLowerBound)
 	{
-	    // medium Set
-            // send present request (medium size)
-	    yaz_log (LOG_LOG, "Optimizing search for medium set");
-	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
-	    Z_PresentRequest *pr = new_apdu->u.presentRequest;
-	    pr->referenceId = sr->referenceId;
-	    pr->resultSetId = sr->resultSetName;
-	    pr->preferredRecordSyntax = sr->preferredRecordSyntax;
-	    *pr->numberOfRecordsRequested = *sr->mediumSetPresentNumber;
+	    Z_NamePlusRecordList *npr;
+	    int toget = *sr->mediumSetPresentNumber;
+	    Z_RecordComposition *comp = 0;
+
+	    if (toget > m_client->m_last_resultCount)
+		toget = m_client->m_last_resultCount;
+	    
 	    if (sr->mediumSetElementSetNames)
 	    {
-		pr->recordComposition = (Z_RecordComposition *)
+		comp = (Z_RecordComposition *)
 		    odr_malloc(odr_encode(), sizeof(Z_RecordComposition));
-		pr->recordComposition->which = Z_RecordComp_simple;
-		pr->recordComposition->u.simple = sr->mediumSetElementSetNames;
+		comp->which = Z_RecordComp_simple;
+		comp->u.simple = sr->mediumSetElementSetNames;
+	    }
+ 
+	    if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
+					  sr->preferredRecordSyntax, comp))
+	    {
+		yaz_log (LOG_LOG, "Returned cache records for medium set");
+		Z_APDU *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;
+		
+		new_apdu->u.searchResponse->numberOfRecordsReturned
+		    = odr_intdup(odr_encode(), toget);
+							
+		new_apdu->u.searchResponse->presentStatus =
+		    odr_intdup(odr_encode(), Z_PresentStatus_success);
+		new_apdu->u.searchResponse->records = (Z_Records*)
+		    odr_malloc(odr_encode(), sizeof(Z_Records));
+		new_apdu->u.searchResponse->records->which = Z_Records_DBOSD;
+		new_apdu->u.searchResponse->records->u.databaseOrSurDiagnostics = npr;
+		new_apdu->u.searchResponse->nextResultSetPosition =
+		    odr_intdup(odr_encode(), toget+1);
+		send_Z_PDU(new_apdu);
+		return 0;
+	    }
+	    else
+	    {
+		// medium Set
+		// send present request (medium size)
+		yaz_log (LOG_LOG, "Optimizing search for medium set");
+
+		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
+		Z_PresentRequest *pr = new_apdu->u.presentRequest;
+		pr->referenceId = sr->referenceId;
+		pr->resultSetId = sr->resultSetName;
+		pr->preferredRecordSyntax = sr->preferredRecordSyntax;
+		*pr->numberOfRecordsRequested = toget;
+		pr->recordComposition = comp;
+		m_client->m_sr_transform = 1;
+		return new_apdu;
 	    }
-	    m_client->m_sr_transform = 1;
-	    return new_apdu;
 	}
 	else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound ||
-	    m_client->m_last_resultCount == 0)
+	    m_client->m_last_resultCount <= 0)
 	{
             // large set. Return pseudo-search response immediately
 	    yaz_log (LOG_LOG, "Optimizing search for large set");
@@ -316,24 +421,56 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	}
 	else
 	{
+	    Z_NamePlusRecordList *npr;
+	    int toget = m_client->m_last_resultCount;
+	    Z_RecordComposition *comp = 0;
 	    // small set
             // send a present request (small set)
-	    yaz_log (LOG_LOG, "Optimizing search for small set");
-	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
-	    Z_PresentRequest *pr = new_apdu->u.presentRequest;
-	    pr->referenceId = sr->referenceId;
-	    pr->resultSetId = sr->resultSetName;
-	    pr->preferredRecordSyntax = sr->preferredRecordSyntax;
-	    *pr->numberOfRecordsRequested = m_client->m_last_resultCount;
+	    
 	    if (sr->smallSetElementSetNames)
 	    {
-		pr->recordComposition = (Z_RecordComposition *)
+		comp = (Z_RecordComposition *)
 		    odr_malloc(odr_encode(), sizeof(Z_RecordComposition));
-		pr->recordComposition->which = Z_RecordComp_simple;
-		pr->recordComposition->u.simple = sr->smallSetElementSetNames;
+		comp->which = Z_RecordComp_simple;
+		comp->u.simple = sr->smallSetElementSetNames;
+	    }
+
+	    if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
+					  sr->preferredRecordSyntax, comp))
+	    {
+		yaz_log (LOG_LOG, "Returned cache records for small set");
+		Z_APDU *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;
+		
+		new_apdu->u.searchResponse->numberOfRecordsReturned
+		    = odr_intdup(odr_encode(), toget);
+								 
+		new_apdu->u.searchResponse->presentStatus =
+		    odr_intdup(odr_encode(), Z_PresentStatus_success);
+		new_apdu->u.searchResponse->records = (Z_Records*)
+		    odr_malloc(odr_encode(), sizeof(Z_Records));
+		new_apdu->u.searchResponse->records->which = Z_Records_DBOSD;
+		new_apdu->u.searchResponse->records->u.databaseOrSurDiagnostics = npr;
+		new_apdu->u.searchResponse->nextResultSetPosition =
+		    odr_intdup(odr_encode(), toget+1);
+		send_Z_PDU(new_apdu);
+		return 0;
+	    }
+	    else
+	    {
+		yaz_log (LOG_LOG, "Optimizing search for small set");
+		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
+		Z_PresentRequest *pr = new_apdu->u.presentRequest;
+		pr->referenceId = sr->referenceId;
+		pr->resultSetId = sr->resultSetName;
+		pr->preferredRecordSyntax = sr->preferredRecordSyntax;
+		*pr->numberOfRecordsRequested = toget;
+		pr->recordComposition = comp;
+		m_client->m_sr_transform = 1;
+		return new_apdu;
 	    }
-	    m_client->m_sr_transform = 1;
-	    return new_apdu;
 	}
     }
     else
@@ -341,6 +478,12 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	delete m_client->m_last_query;
 	m_client->m_last_query = this_query;
         m_client->m_last_ok = 0;
+	m_client->m_cache.clear();
+	m_client->m_resultSetStartPoint = 0;
+
+        xfree (m_client->m_last_resultSetId);
+        m_client->m_last_resultSetId = xstrdup (sr->resultSetName);
+
         m_client->m_last_databases.set(sr->num_databaseNames,
                                        (const char **) sr->databaseNames);
     }
@@ -363,6 +506,24 @@ static const char *apdu_name(Z_APDU *apdu)
 	return "presentRequest";
     case Z_APDU_presentResponse:
 	return "presentResponse";
+    case Z_APDU_deleteResultSetRequest:
+	return "deleteResultSetRequest";
+    case Z_APDU_deleteResultSetResponse:
+	return "deleteResultSetResponse";
+    case Z_APDU_scanRequest:
+	return "scanRequest";
+    case Z_APDU_scanResponse:
+	return "scanResponse";
+    case Z_APDU_sortRequest:
+	return "sortRequest";
+    case Z_APDU_sortResponse:
+	return "sortResponse";
+    case Z_APDU_extendedServicesRequest:
+	return "extendedServicesRequest";
+    case Z_APDU_extendedServicesResponse:
+	return "extendedServicesResponse";
+    case Z_APDU_close:
+	return "close";
     }
     return "other";
 }
@@ -383,8 +544,9 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     {
 	if (m_client->m_init_flag)
 	{
-	    Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
-	    if (m_client->m_cookie)
+	    Z_APDU *apdu = m_client->m_initResponse;
+	    apdu->u.initResponse->otherInfo = 0;
+	    if (m_client->m_cookie && *m_client->m_cookie)
 		set_otherInformationString(apdu, VAL_COOKIE, 1,
 					   m_client->m_cookie);
 	    send_Z_PDU(apdu);
@@ -405,6 +567,15 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     if (oi)
         *oi = 0;
 
+    if (apdu->which == Z_APDU_presentRequest &&
+	m_client->m_resultSetStartPoint == 0)
+    {
+	Z_PresentRequest *pr = apdu->u.presentRequest;
+	m_client->m_resultSetStartPoint = *pr->resultSetStartPoint;
+	m_client->m_cache.copy_presentRequest(apdu->u.presentRequest);
+    } else {
+	m_client->m_resultSetStartPoint = 0;
+    }
     if (m_client->send_Z_PDU(apdu) < 0)
     {
 	delete m_client;
@@ -421,26 +592,26 @@ void Yaz_Proxy::connectNotify()
 
 void Yaz_Proxy::shutdown()
 {
-    // only keep if keep_alive flag and cookie is set...
-    if (m_keepalive && m_client && m_client->m_cookie[0])
+    // only keep if keep_alive flag is set...
+    if (m_keepalive && m_client && m_client->m_waiting == 0)
     {
-	if (m_client->m_waiting == 2)
-	    abort();
+        yaz_log (LOG_LOG, "shutdown (client to proxy) keepalive %s",
+                 m_client->get_hostname());
+        assert (m_client->m_waiting != 2);
 	// Tell client (if any) that no server connection is there..
 	m_client->m_server = 0;
-        yaz_log (LOG_LOG, "shutdown (client to proxy) keepalive %s", m_client->get_hostname());
     }
     else if (m_client)
     {
-	if (m_client->m_waiting == 2)
-	    abort();
-        yaz_log (LOG_LOG, "shutdown (client to proxy) close %s", m_client->get_hostname());
+        yaz_log (LOG_LOG, "shutdown (client to proxy) close %s",
+                 m_client->get_hostname());
+        assert (m_client->m_waiting != 2);
 	delete m_client;
     }
     else if (!m_parent)
     {
         yaz_log (LOG_LOG, "shutdown (client to proxy) bad state");
-        abort();
+        assert (m_parent);
     }
     else 
     {
@@ -487,7 +658,9 @@ Yaz_ProxyClient::~Yaz_ProxyClient()
     if (m_next)
 	m_next->m_prev = m_prev;
     m_waiting = 2;     // for debugging purposes only.
+    odr_destroy(m_init_odr);
     delete m_last_query;
+    xfree (m_last_resultSetId);
 }
 
 void Yaz_Proxy::timeoutNotify()
@@ -510,10 +683,14 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :
     m_prev = 0;
     m_init_flag = 0;
     m_last_query = 0;
+    m_last_resultSetId = 0;
     m_last_resultCount = 0;
     m_last_ok = 0;
     m_sr_transform = 0;
     m_waiting = 0;
+    m_init_odr = odr_createmem (ODR_DECODE);
+    m_initResponse = 0;
+    m_resultSetStartPoint = 0;
 }
 
 const char *Yaz_Proxy::option(const char *name, const char *value)
@@ -533,27 +710,53 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
     m_waiting = 0;
     yaz_log (LOG_LOG, "Receiving %s from %s", apdu_name(apdu),
 		     get_hostname());
+    if (apdu->which == Z_APDU_initResponse)
+    {
+        NMEM nmem = odr_extract_mem (odr_decode());
+	odr_reset (m_init_odr);
+        nmem_transfer (m_init_odr->mem, nmem);
+        m_initResponse = apdu;
+        nmem_destroy (nmem);
+    }
     if (apdu->which == Z_APDU_searchResponse)
     {
-	m_last_resultCount = *apdu->u.searchResponse->resultCount;
-	int status = *apdu->u.searchResponse->searchStatus;
-	if (status && 
-		(!apdu->u.searchResponse->records ||
-                 apdu->u.searchResponse->records->which == Z_Records_DBOSD))
+	Z_SearchResponse *sr = apdu->u.searchResponse;
+	m_last_resultCount = *sr->resultCount;
+	int status = *sr->searchStatus;
+	if (status && (!sr->records || sr->records->which == Z_Records_DBOSD))
+	{
             m_last_ok = 1;
+	    
+	    if (sr->records && sr->records->which == Z_Records_DBOSD)
+	    {
+		m_cache.add(odr_decode(),
+			    sr->records->u.databaseOrSurDiagnostics, 1,
+			    *sr->resultCount);
+	    }
+	}
     }
-    if (apdu->which == Z_APDU_presentResponse && m_sr_transform)
+    if (apdu->which == Z_APDU_presentResponse)
     {
-	m_sr_transform = 0;
 	Z_PresentResponse *pr = apdu->u.presentResponse;
-	Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
-	Z_SearchResponse *sr = new_apdu->u.searchResponse;
-	sr->referenceId = pr->referenceId;
-	*sr->resultCount = m_last_resultCount;
-	sr->records = pr->records;
-	sr->nextResultSetPosition = pr->nextResultSetPosition;
-	sr->numberOfRecordsReturned = pr->numberOfRecordsReturned;
-	apdu = new_apdu;
+	if (m_sr_transform)
+	{
+	    m_sr_transform = 0;
+	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
+	    Z_SearchResponse *sr = new_apdu->u.searchResponse;
+	    sr->referenceId = pr->referenceId;
+	    *sr->resultCount = m_last_resultCount;
+	    sr->records = pr->records;
+	    sr->nextResultSetPosition = pr->nextResultSetPosition;
+	    sr->numberOfRecordsReturned = pr->numberOfRecordsReturned;
+	    apdu = new_apdu;
+	}
+	if (pr->records->which == Z_Records_DBOSD && m_resultSetStartPoint)
+	{
+	    m_cache.add(odr_decode(),
+			pr->records->u.databaseOrSurDiagnostics,
+			m_resultSetStartPoint, -1);
+	    m_resultSetStartPoint = 0;
+	}
     }
     if (m_cookie && *m_cookie)
 	set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie);
@@ -562,4 +765,8 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
 	yaz_log (LOG_LOG, "Sending %s to client", apdu_name(apdu));
 	m_server->send_Z_PDU(apdu);
     }
+    if (apdu->which == Z_APDU_close)
+    {
+	shutdown();
+    }
 }