Oops! Actual Multinear here, not in r2454

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@2455 8b96e2b9-35c5-2c16-bc47-5122d61876d4
nzinfo · Aug 20, 2010 · 3ba8b41 · 3ba8b41
1 parent a9c9e80
commit 3ba8b41
Show file tree

Hide file tree

Showing 5 changed files with 200 additions and 471 deletions.
diff --git a/src/sphinx.cpp b/src/sphinx.cpp
@@ -14005,7 +14005,6 @@ static void TransformNear ( XQNode_t ** ppNode )
 		assert ( pNode->m_dWords.GetLength()==0 );
 		CSphVector<XQNode_t*> dArgs;
 		int iStartFrom;
-		bool bTransformed = false;
 
 		// transform all (A B C) NEAR D into A NEAR B NEAR C NEAR D
 		do
@@ -14023,7 +14022,6 @@ static void TransformNear ( XQNode_t ** ppNode )
 							// we will remove the node anyway, so just replace it with 1-st child instead
 							pNode->m_dChildren[i] = pChild->m_dChildren[j];
 							iStartFrom = i+1;
-							bTransformed = true;
 						} else
 							dArgs.Add ( pChild->m_dChildren[j] );
 					pChild->m_dChildren.Reset();
@@ -14039,10 +14037,6 @@ static void TransformNear ( XQNode_t ** ppNode )
 					pNode->m_dChildren [ i + iStartFrom ] = dArgs[i];
 			}
 		} while ( iStartFrom!=0 );
-
-		// such a way we get not NEAR, but transitive Multinear
-		if ( bTransformed && pNode->m_dChildren.GetLength()>2 )
-			pNode->SetOp ( SPH_QUERY_MULTINEAR );
 	}
 
 	ARRAY_FOREACH ( i, pNode->m_dChildren )

diff --git a/src/sphinxquery.h b/src/sphinxquery.h
@@ -66,7 +66,6 @@ enum XQOperator_e
 	SPH_QUERY_PROXIMITY,
 	SPH_QUERY_QUORUM,
 	SPH_QUERY_NEAR,
-	SPH_QUERY_MULTINEAR,
 	SPH_QUERY_SENTENCE,
 	SPH_QUERY_PARAGRAPH
 };