From: Jiří Škrábal Date: Tue, 7 Dec 2004 10:56:34 +0000 (+0000) Subject: - do not handle indieces in LB Proxy X-Git-Tag: glite-wms-utils-exception_R_1_0_0~54 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=dd7bd837a58fd6dab6c10c1bc6e772b485a28a7a;p=jra1mw.git - do not handle indieces in LB Proxy --- diff --git a/org.glite.lb.server/src/lbproxy.c b/org.glite.lb.server/src/lbproxy.c index a26ce48..8413cfe 100644 --- a/org.glite.lb.server/src/lbproxy.c +++ b/org.glite.lb.server/src/lbproxy.c @@ -345,6 +345,7 @@ int handle_conn(int conn, struct timeval client_start, void *data) struct clnt_data_t *cdata = (struct clnt_data_t *)data; edg_wll_Context ctx; struct timeval total_to = { TOTAL_CLNT_TIMEOUT,0 }; + char buf[300]; if ( !(ctx = (edg_wll_Context) calloc(1, sizeof(*ctx))) ) { @@ -362,6 +363,7 @@ int handle_conn(int conn, struct timeval client_start, void *data) ctx->allowAnonymous = 1; ctx->isProxy = 1; ctx->noAuth = 1; + ctx->noIndex = 1; ctx->semset = semset; ctx->semaphores = semaphores; diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c index d2f4b1b..1f23f5c 100644 --- a/org.glite.lb.server/src/query.c +++ b/org.glite.lb.server/src/query.c @@ -846,7 +846,7 @@ static char *jc_to_head_where( for ( n = 0; jc[m][n].attr; n++ ) switch (jc[m][n].attr) { case EDG_WLL_QUERY_ATTR_TIME: - if ( !is_indexed(&(jc[m][n]), ctx) + if ( (!ctx->isProxy && !is_indexed(&(jc[m][n]), ctx)) || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) ) break; @@ -895,7 +895,7 @@ static char *jc_to_head_where( break; case EDG_WLL_QUERY_ATTR_PARENT: - if ( !is_indexed(&(jc[m][n]), ctx) + if ( (!ctx->isProxy && !is_indexed(&(jc[m][n]), ctx)) || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) ) break; @@ -912,7 +912,7 @@ static char *jc_to_head_where( break; case EDG_WLL_QUERY_ATTR_OWNER: - if ( !is_indexed(&(jc[m][n]), ctx) + if ( (!ctx->isProxy && !is_indexed(&(jc[m][n]), ctx)) || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) ) break; @@ -944,7 +944,7 @@ static char *jc_to_head_where( case EDG_WLL_QUERY_ATTR_DONECODE: case EDG_WLL_QUERY_ATTR_EXITCODE: case EDG_WLL_QUERY_ATTR_STATUS: - if ( !is_indexed(&(jc[m][n]), ctx) + if ( (!ctx->isProxy && !is_indexed(&(jc[m][n]), ctx)) || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) ) break; @@ -970,7 +970,7 @@ static char *jc_to_head_where( case EDG_WLL_QUERY_ATTR_LOCATION: case EDG_WLL_QUERY_ATTR_RESUBMITTED: case EDG_WLL_QUERY_ATTR_USERTAG: - if ( !is_indexed(&(jc[m][n]), ctx) + if ( (!ctx->isProxy && !is_indexed(&(jc[m][n]), ctx)) || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) ) break;