fixed string list in filter of SphinxQL query log; removed qcache pro…

…filer switch for empty doc list
manticoresoftware · Jun 23, 2023 · ff87cc4 · ff87cc4
1 parent 0a7508c
commit ff87cc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/sphinxfilter.cpp b/src/sphinxfilter.cpp
@@ -2182,11 +2182,11 @@ void FormatFilterQL ( const CSphFilterSettings & f, StringBuilder_c & tBuf, int
 			if ( f.m_bExclude )
 				tBuf << " NOT";
 			if ( f.m_eMvaFunc==SPH_MVAFUNC_ANY )
-				tBuf.StartBlock ( ", '", " ANY ('", "')" );
+				tBuf.StartBlock ( "', '", " ANY ('", "')" );
 			else if ( f.m_eMvaFunc==SPH_MVAFUNC_ALL )
-				tBuf.StartBlock ( ", '", " ALL ('", "')" );
+				tBuf.StartBlock ( "', '", " ALL ('", "')" );
 			else
-				tBuf.StartBlock ( ", '", " IN ('", "')" );
+				tBuf.StartBlock ( "', '", " IN ('", "')" );
 			for ( const auto &sString : f.m_dStrings )
 				tBuf << sString;
 

diff --git a/src/sphinxsearch.cpp b/src/sphinxsearch.cpp
@@ -747,7 +747,7 @@ void ExtRanker_c::Reset ( const ISphQwordSetup & tSetup )
 
 void ExtRanker_c::UpdateQcache ( int iMatches )
 {
-	if ( m_pQcacheEntry )
+	if ( m_pQcacheEntry && iMatches )
 	{
 		CSphScopedProfile tProf ( m_pCtx->m_pProfile, SPH_QSTATE_QCACHE_UP );
 		for ( int i=0; i<iMatches; i++ )
@@ -1313,10 +1313,7 @@ int ExtRanker_State_T<STATE,USE_BM25>::GetMatches ()
 	{
 		pDocs = this->GetFilteredDocs ();
 		if ( !pDocs )
-		{
-			this->UpdateQcache(0);
 			return 0;
-		}
 
 		pHlist = RankerGetHits ( pProfile, this->m_pRoot.get(), pDocs );
 	}