merged rel21 branch (up to r4845) back into trunk

git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@4846 406a0c4d-033a-0410-8de8-e80135713968

src/sphinxsearch.cpp

@@ -434,7 +434,7 @@ protected:
 };
 
 template<>
-class TermAcceptor_c<TERM_POS_FIELD_LIMIT> : protected HitPointer
+class TermAcceptor_c<TERM_POS_FIELD_LIMIT> : protected HitPointer, public ISphNoncopyable
 {
 public:
 	TermAcceptor_c ( ISphQword *, const XQNode_t * pNode, const ISphQwordSetup & )
@@ -442,12 +442,9 @@ public:
 	{}
 protected:
 	inline bool					IsAcceptableHit ( const ExtHit_t * ) const;
-	inline void					Reset()
-	{
-		m_iMaxFieldPos = 0;
-	}
+	inline void					Reset() {}
 private:
-	int							m_iMaxFieldPos;
+	const int					m_iMaxFieldPos;
 };
 
 template<>

test/test_148/test.xml

@@ -10,6 +10,7 @@ indexer
 searchd
 {
 	<searchd_settings/>
+	workers = threads
 }
 
 source test
@@ -121,6 +122,18 @@ index idx_blend_kw
 	blend_chars 	= +, %, -
 	dict			= keywords
 }
+
+index rt
+{
+	type = rt
+	path			= <data_path/>/rt
+	docinfo = extern
+	rt_mem_limit = 128k
+	rt_attr_uint	= idd
+	rt_field = title
+	rt_field = description
+	dict = keywords
+}
 </config>
 
 <db_create>
@@ -172,6 +185,12 @@ CREATE TABLE start_end_table
 	<sphinxql>select * from idx_blend_crc where match (' x-com NEAR/10 valid')</sphinxql>
 	<sphinxql>select * from idx_blend_kw where match (' x-com NEAR/10 valid ')</sphinxql>
 	<sphinxql>CALL SNIPPETS ( 'dummy1 dummy1 valid dummy1 dummy1 dummy1 X-COM, dummy1', 'idx_blend_kw', 'x-com NEAR/10 valid', 1 as query_mode )</sphinxql>
+	
+	<!-- regression of field position limit vs RT index -->
+	<sphinxql>REPLACE INTO rt (id, title, description) VALUES (1, 'This is a simple test', 'This is a longer description of a simple test')</sphinxql>
+	<sphinxql>SELECT id FROM rt WHERE MATCH('@description test')</sphinxql>
+	<sphinxql>SELECT id FROM rt WHERE MATCH('@description[10] test')</sphinxql>
+	
 </sphqueries>
 
 <custom_insert><![CDATA[