gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-05 04:37:39 +03:00
Code Issues Projects Releases Wiki Activity

fix infinite loop bug in Query.cpp

Browse Source
This commit is contained in:
Matt Wells 2014-09-18 19:38:32 -07:00
parent 77f8627aec
commit 36b82474d9
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Query.cpp
View File

@ -114,11 +114,11 @@ bool Query::set2 ( char *query ,
// fix summary rerank and highlighting. // fix summary rerank and highlighting.
bool keepAllSingles = true; bool keepAllSingles = true;
// assume not boolean // assume boolean auto-detect.
char boolFlag = 0; char boolFlag = 2;
// come back up here if we changed our boolean minds // come back up here if we changed our boolean minds
top: // top:
reset(); reset();
@ -152,6 +152,10 @@ bool Query::set2 ( char *query ,
char *q = query; char *q = query;
// see if it should be boolean... // see if it should be boolean...
for ( long i = 0 ; i < queryLen ; i++ ) { for ( long i = 0 ; i < queryLen ; i++ ) {
// but if bool flag is 0 that means it is NOT boolean!
// it must be one for autodetection. so do not autodetect
// unless this is 2.
if ( boolFlag != 2 ) break;
if ( q[i]=='A' && q[i+1]=='N' && q[i+2]=='D' && if ( q[i]=='A' && q[i+1]=='N' && q[i+2]=='D' &&
(q[i+3]==' ' || q[i+3]=='(') ) (q[i+3]==' ' || q[i+3]=='(') )
boolFlag = 1; boolFlag = 1;
@ -162,6 +166,9 @@ bool Query::set2 ( char *query ,
(q[i+3]==' ' || q[i+3]=='(') ) (q[i+3]==' ' || q[i+3]=='(') )
boolFlag = 1; boolFlag = 1;
} }
// if we did not set the flag to 1 set it to 0. force to non-bool
if ( boolFlag == 2 ) boolFlag = 0;
// come back up here if we find no bool operators but had ()'s // come back up here if we find no bool operators but had ()'s
// top: // top:
@ -198,11 +205,11 @@ bool Query::set2 ( char *query ,
return log(LOG_LOGIC,"query: query: query too big."); return log(LOG_LOGIC,"query: query: query too big.");
} }
// translate ( and ) // translate ( and )
if ( boolFlag != 0 && query[i] == '(' ) { if ( boolFlag == 1 && query[i] == '(' ) {
memcpy ( p , " LeFtP " , 7 ); p += 7; memcpy ( p , " LeFtP " , 7 ); p += 7;
continue; continue;
} }
if ( boolFlag != 0 && query[i] == ')' ) { if ( boolFlag == 1 && query[i] == ')' ) {
memcpy ( p , " RiGhP " , 7 ); p += 7; memcpy ( p , " RiGhP " , 7 ); p += 7;
continue; continue;
} }
@ -294,9 +301,10 @@ bool Query::set2 ( char *query ,
return false; return false;
//log(LOG_DEBUG, "Query: QWords set"); //log(LOG_DEBUG, "Query: QWords set");
// did we have any boolean operators // did we have any boolean operators
/*
char found = 0; char found = 0;
char parens = 0; char parens = 0;
if ( boolFlag >= 1 ) { if ( boolFlag == 1 ) {
for ( long i = 0 ; i < m_numWords ; i++ ) { for ( long i = 0 ; i < m_numWords ; i++ ) {
char *w = m_qwords[i].m_word; char *w = m_qwords[i].m_word;
long wlen = m_qwords[i].m_wordLen; long wlen = m_qwords[i].m_wordLen;
@ -321,6 +329,7 @@ bool Query::set2 ( char *query ,
// if no bool operators, it's definitely not a boolean query // if no bool operators, it's definitely not a boolean query
if ( found == 0 ) boolFlag = 0; if ( found == 0 ) boolFlag = 0;
} }
*/
// set m_qterms from m_qwords, always succeeds // set m_qterms from m_qwords, always succeeds
setQTerms ( words , phrases ); setQTerms ( words , phrases );

3
main.cpp
View File

@ -4596,6 +4596,9 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
// this is a big rcp so only do one at a time... // this is a big rcp so only do one at a time...
if ( installFlag == ifk_install ) maxOut = 1; if ( installFlag == ifk_install ) maxOut = 1;
// same with this. takes too long on gk144, jams up
if ( installFlag == ifk_installgb ) maxOut = 1;
// go through each host // go through each host
for ( long i = 0 ; i < g_hostdb.getNumHosts() ; i++ ) { for ( long i = 0 ; i < g_hostdb.getNumHosts() ; i++ ) {
Host *h2 = g_hostdb.getHost(i); Host *h2 = g_hostdb.getHost(i);