Browse Source

SetWeights removed, SPH_MATCH_EXTENDED2 is set to default for SphinxAPI and small code clean up performed

git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@4097 406a0c4d-033a-0410-8de8-e80135713968
kevg 12 years ago
parent
commit
385ac7b4db
72 changed files with 44 additions and 71 deletions
  1. 1 1
      api/java/SphinxClient.java
  2. 1 1
      api/libsphinxclient/sphinxclient.c
  3. 1 1
      api/ruby/lib/sphinx/client.rb
  4. 2 2
      api/ruby/spec/fixtures/sphinxapi.php
  5. 3 7
      api/sphinxapi.php
  6. 1 12
      api/sphinxapi.py
  7. 0 1
      api/test.php
  8. 0 1
      api/test.py
  9. 1 1
      src/sphinx.cpp
  10. 20 30
      src/sphinxrt.cpp
  11. 0 0
      test/test_001/model.bin
  12. 0 0
      test/test_002/model.bin
  13. 0 0
      test/test_003/model.bin
  14. 0 0
      test/test_004/model.bin
  15. 0 0
      test/test_005/model.bin
  16. 0 0
      test/test_007/model.bin
  17. 0 0
      test/test_011/model.bin
  18. 0 0
      test/test_012/model.bin
  19. 0 0
      test/test_013/model.bin
  20. 0 0
      test/test_014/model.bin
  21. 1 1
      test/test_022/model.bin
  22. 0 0
      test/test_023/model.bin
  23. 0 0
      test/test_024/model.bin
  24. 0 0
      test/test_025/model.bin
  25. 0 0
      test/test_026/model.bin
  26. 0 0
      test/test_027/model.bin
  27. 0 0
      test/test_029/model.bin
  28. 0 0
      test/test_031/model.bin
  29. 0 0
      test/test_035/model.bin
  30. 0 0
      test/test_036/model.bin
  31. 0 0
      test/test_042/model.bin
  32. 0 0
      test/test_043/model.bin
  33. 0 0
      test/test_044/model.bin
  34. 1 1
      test/test_045/model.bin
  35. 0 0
      test/test_047/model.bin
  36. 0 0
      test/test_048/model.bin
  37. 0 0
      test/test_049/model.bin
  38. 1 1
      test/test_053/test.xml
  39. 0 0
      test/test_058/model.bin
  40. 1 1
      test/test_061/model.bin
  41. 1 1
      test/test_064/model.bin
  42. 0 0
      test/test_068/model.bin
  43. 1 1
      test/test_069/model.bin
  44. 0 0
      test/test_072/model.bin
  45. 0 0
      test/test_073/model.bin
  46. 0 0
      test/test_074/model.bin
  47. 1 1
      test/test_078/model.bin
  48. 0 0
      test/test_079/model.bin
  49. 1 1
      test/test_084/model.bin
  50. 1 1
      test/test_085/model.bin
  51. 0 0
      test/test_086/model.bin
  52. 0 0
      test/test_093/model.bin
  53. 0 0
      test/test_095/model.bin
  54. 1 1
      test/test_096/model.bin
  55. 0 0
      test/test_098/model.bin
  56. 2 2
      test/test_098/test.xml
  57. 0 0
      test/test_099/model.bin
  58. 0 0
      test/test_102/model.bin
  59. 0 0
      test/test_104/model.bin
  60. 0 0
      test/test_105/model.bin
  61. 0 0
      test/test_108/model.bin
  62. 1 1
      test/test_109/model.bin
  63. 0 0
      test/test_121/model.bin
  64. 0 0
      test/test_124/model.bin
  65. 0 0
      test/test_135/model.bin
  66. 1 1
      test/test_136/model.bin
  67. 0 0
      test/test_139/model.bin
  68. 0 0
      test/test_153/model.bin
  69. 0 0
      test/test_169/model.bin
  70. 0 0
      test/test_179/model.bin
  71. 0 0
      test/test_202/model.bin
  72. 0 0
      test/test_212/model.bin

+ 1 - 1
api/java/SphinxClient.java

@@ -160,7 +160,7 @@ public class SphinxClient
 
 		_offset	= 0;
 		_limit	= 20;
-		_mode	= SPH_MATCH_ALL;
+		_mode	= SPH_MATCH_EXTENDED2;
 		_sort	= SPH_SORT_RELEVANCE;
 		_sortby	= "";
 		_minId	= 0;

+ 1 - 1
api/libsphinxclient/sphinxclient.c

@@ -223,7 +223,7 @@ sphinx_client * sphinx_create ( sphinx_bool copy_args )
 	client->timeout					= 0.0f;
 	client->offset					= 0;
 	client->limit					= 20;
-	client->mode					= SPH_MATCH_ALL;
+	client->mode					= SPH_MATCH_EXTENDED2;
 	client->num_weights				= 0;
 	client->weights					= NULL;
 	client->sort					= SPH_SORT_RELEVANCE;

+ 1 - 1
api/ruby/lib/sphinx/client.rb

@@ -181,7 +181,7 @@ module Sphinx
       # per-query settings
       @offset        = 0                       # how many records to seek from result-set start (default is 0)
       @limit         = 20                      # how many records to return from result-set starting at offset (default is 20)
-      @mode          = SPH_MATCH_ALL           # query matching mode (default is SPH_MATCH_ALL)
+      @mode          = SPH_MATCH_EXTENDED2     # query matching mode (default is SPH_MATCH_EXTENDED2)
       @weights       = []                      # per-field weights (default is 1 for all fields)
       @sort          = SPH_SORT_RELEVANCE      # match sorting mode (default is SPH_SORT_RELEVANCE)
       @sortby        = ''                      # attribute to sort by (defualt is "")

+ 2 - 2
api/ruby/spec/fixtures/sphinxapi.php

@@ -182,7 +182,7 @@ class SphinxClient
 	var $_port;			///< searchd port (default is 9312)
 	var $_offset;		///< how many records to seek from result-set start (default is 0)
 	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
-	var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
+	var $_mode;			///< query matching mode (default is SPH_MATCH_EXTENDED2)
 	var $_weights;		///< per-field weights (default is 1 for all fields)
 	var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
 	var $_sortby;		///< attribute to sort by (defualt is "")
@@ -226,7 +226,7 @@ class SphinxClient
 		// per-query settings
 		$this->_offset		= 0;
 		$this->_limit		= 20;
-		$this->_mode		= SPH_MATCH_ALL;
+		$this->_mode		= SPH_MATCH_EXTENDED2;
 		$this->_weights		= array ();
 		$this->_sort		= SPH_SORT_RELEVANCE;
 		$this->_sortby		= "";

+ 3 - 7
api/sphinxapi.php

@@ -404,7 +404,7 @@ class SphinxClient
 	var $_port;			///< searchd port (default is 9312)
 	var $_offset;		///< how many records to seek from result-set start (default is 0)
 	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
-	var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
+	var $_mode;			///< query matching mode (default is SPH_MATCH_EXTENDED2)
 	var $_weights;		///< per-field weights (default is 1 for all fields)
 	var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
 	var $_sortby;		///< attribute to sort by (defualt is "")
@@ -459,7 +459,7 @@ class SphinxClient
 		// per-query settings
 		$this->_offset		= 0;
 		$this->_limit		= 20;
-		$this->_mode		= SPH_MATCH_ALL;
+		$this->_mode		= SPH_MATCH_EXTENDED2;
 		$this->_weights		= array ();
 		$this->_sort		= SPH_SORT_RELEVANCE;
 		$this->_sortby		= "";
@@ -795,11 +795,7 @@ class SphinxClient
 	/// DEPRECATED; use SetFieldWeights() instead
 	function SetWeights ( $weights )
 	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $weight )
-			assert ( is_int($weight) );
-
-		$this->_weights = $weights;
+		die("This method is now deprecated; please use SetFieldWeights instead");
 	}
 
 	/// bind per-field weights by name

+ 1 - 12
api/sphinxapi.py

@@ -123,7 +123,7 @@ class SphinxClient:
 		self._socket		= None
 		self._offset		= 0								# how much records to seek from result-set start (default is 0)
 		self._limit			= 20							# how much records to return from result-set starting at offset (default is 20)
-		self._mode			= SPH_MATCH_ALL					# query matching mode (default is SPH_MATCH_ALL)
+		self._mode			= SPH_MATCH_EXTENDED2					# query matching mode (default is SPH_MATCH_EXTENDED2)
 		self._weights		= []							# per-field weights (default is 1 for all fields)
 		self._sort			= SPH_SORT_RELEVANCE			# match sorting mode (default is SPH_SORT_RELEVANCE)
 		self._sortby		= ''							# attribute to sort by (defualt is "")
@@ -366,17 +366,6 @@ class SphinxClient:
 		self._sortby = clause
 
 
-	def SetWeights (self, weights): 
-		"""
-		Set per-field weights.
-		WARNING, DEPRECATED; do not use it! use SetFieldWeights() instead
-		"""
-		assert(isinstance(weights, list))
-		for w in weights:
-			AssertUInt32 ( w )
-		self._weights = weights
-
-
 	def SetFieldWeights (self, weights):
 		"""
 		Bind per-field weights by name; expects (name,field_weight) dictionary as argument.

+ 0 - 1
api/test.php

@@ -104,7 +104,6 @@ for ( $i=0; $i<count($args); $i++ )
 $cl->SetServer ( $host, $port );
 $cl->SetConnectTimeout ( 1 );
 $cl->SetArrayResult ( true );
-$cl->SetWeights ( array ( 100, 1 ) );
 $cl->SetMatchMode ( $mode );
 if ( count($filtervals) )	$cl->SetFilter ( $filter, $filtervals );
 if ( $groupby )				$cl->SetGroupBy ( $groupby, SPH_GROUPBY_ATTR, $groupsort );

+ 0 - 1
api/test.py

@@ -77,7 +77,6 @@ while (i<len(sys.argv)):
 # do query
 cl = SphinxClient()
 cl.SetServer ( host, port )
-cl.SetWeights ( [100, 1] )
 cl.SetMatchMode ( mode )
 if filtervals:
 	cl.SetFilter ( filtercol, filtervals )

+ 1 - 1
src/sphinx.cpp

@@ -6444,7 +6444,7 @@ CSphQuery::CSphQuery ()
 	, m_iLimit		( 20 )
 	, m_pWeights	( NULL )
 	, m_iWeights	( 0 )
-	, m_eMode		( SPH_MATCH_ALL )
+	, m_eMode		( SPH_MATCH_EXTENDED )
 	, m_eRanker		( SPH_RANK_DEFAULT )
 	, m_eSort		( SPH_SORT_RELEVANCE )
 	, m_iMaxMatches	( 1000 )

+ 20 - 30
src/sphinxrt.cpp

@@ -3013,41 +3013,31 @@ void RtIndex_t::CommitReplayable ( RtSegment_t * pNewSeg, CSphVector<SphDocID_t>
 	// all writers waiting double buffer done
 	CSphVector<RtSegment_t *> dSegments2Dump;
 	CSphSourceStats tStat2Dump;
-	if ( bDump )
-	{
-		Verify ( m_tSaveOuterMutex.Lock() );
-
-		// wait writer that saved data
-		if ( bDoubleBufferActive )
-		{
-			bDump = false;
-			m_tSaveOuterMutex.Unlock();
-		} else
-		{
-			// copy stats for disk chunk
-			dSegments2Dump = m_pSegments;
-			tStat2Dump = m_tStats;
-			m_iDoubleBuffer = m_pSegments.GetLength();
 
-			m_tKlist.Flush();
-			m_dDiskChunkKlist.Reset ( m_tKlist.GetKillListSize() );
-			if ( m_tKlist.GetKillListSize() )
-			{
-				memcpy ( m_dDiskChunkKlist.Begin(), m_tKlist.GetKillList(), sizeof(SphAttr_t)*m_tKlist.GetKillListSize() );
-			}
-		}
+	// no need to dump or waiting for some writer
+	if ( !bDump || bDoubleBufferActive )
+	{
+		// all done, enable other writers
+		Verify ( m_tWriterMutex.Unlock() );
+		return;
 	}
 
-	// all done, enable other writers
-	Verify ( m_tWriterMutex.Unlock() );
+	Verify ( m_tSaveOuterMutex.Lock() );
+	// copy stats for disk chunk
+	dSegments2Dump = m_pSegments;
+	tStat2Dump = m_tStats;
+	m_iDoubleBuffer = m_pSegments.GetLength();
 
-	if ( bDump )
-	{
-		SaveDiskChunk ( iTID, dSegments2Dump, tStat2Dump );
-		g_pBinlog->NotifyIndexFlush ( m_sIndexName.cstr(), iTID, false );
+	m_tKlist.Flush();
+	m_dDiskChunkKlist.Reset ( m_tKlist.GetKillListSize() );
+	if ( m_tKlist.GetKillListSize() )
+		memcpy ( m_dDiskChunkKlist.Begin(), m_tKlist.GetKillList(), sizeof(SphAttr_t)*m_tKlist.GetKillListSize() );
 
-		m_tSaveOuterMutex.Unlock();
-	}
+	SaveDiskChunk ( iTID, dSegments2Dump, tStat2Dump );
+	g_pBinlog->NotifyIndexFlush ( m_sIndexName.cstr(), iTID, false );
+
+	Verify ( m_tSaveOuterMutex.Unlock() );
+	Verify ( m_tWriterMutex.Unlock() );
 }
 
 void RtIndex_t::RollBack ()

File diff suppressed because it is too large
+ 0 - 0
test/test_001/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_002/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_003/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_004/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_005/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_007/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_011/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_012/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_013/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_014/model.bin


+ 1 - 1
test/test_022/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:4:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:2;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:7:"wrapped";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:6:"FOLDED";}i:1;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:2;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:7:"wrapped";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:6:"folded";}i:2;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:3;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:4;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:42:"somewhatmorelongformthatwouldoverflowshort";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:9:"shortform";}i:3;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:3;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:4;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:42:"somewhatmorelongformthatwouldoverflowshort";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:52:"sOMEwHATmORElONGfORMtHATwOULDoVERFLOWsHORTfORMbUFFER";}}}
+a:1:{i:0;a:4:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:1;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}i:2;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:7:"wrapped";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:6:"FOLDED";}i:1;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:1;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}i:2;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:7:"wrapped";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:6:"folded";}i:2;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:3;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}i:4;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:42:"somewhatmorelongformthatwouldoverflowshort";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:9:"shortform";}i:3;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:2:{i:3;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}i:4;a:2:{s:6:"weight";s:4:"1557";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"2";s:11:"total_found";s:1:"2";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:42:"somewhatmorelongformthatwouldoverflowshort";a:2:{s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:52:"sOMEwHATmORElONGfORMtHATwOULDoVERFLOWsHORTfORMbUFFER";}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_023/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_024/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_025/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_026/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_027/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_029/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_031/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_035/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_036/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_042/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_043/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_044/model.bin


+ 1 - 1
test/test_045/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:3:{i:0;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:4;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:2:"11";s:4:"hits";s:2:"11";}}}i:1;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:4:{i:5;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:6;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:7;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:8;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"7";s:11:"total_found";s:1:"7";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:2:"11";s:4:"hits";s:2:"11";}}}i:2;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:5:{i:8;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:7;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:6;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:5;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}i:4;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"8";s:11:"total_found";s:1:"8";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:2:"11";s:4:"hits";s:2:"11";}}}}}}
+a:1:{i:0;a:1:{i:0;a:3:{i:0;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:4;a:2:{s:6:"weight";s:4:"1284";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:2:"11";s:4:"hits";s:2:"11";}}}i:1;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:4:{i:5;a:2:{s:6:"weight";s:4:"1284";s:5:"attrs";a:0:{}}i:6;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}i:7;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}i:8;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"7";s:11:"total_found";s:1:"7";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:2:"11";s:4:"hits";s:2:"11";}}}i:2;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:5:{i:8;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}i:7;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}i:6;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}i:5;a:2:{s:6:"weight";s:4:"1284";s:5:"attrs";a:0:{}}i:4;a:2:{s:6:"weight";s:4:"1284";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"8";s:11:"total_found";s:1:"8";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:2:"11";s:4:"hits";s:2:"11";}}}}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_047/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_048/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_049/model.bin


+ 1 - 1
test/test_053/test.xml

@@ -45,7 +45,7 @@ index test2
 </config>
 
 <queries>
-<query index="test1 test2">test"</query>
+<query index="test1 test2" mode="any">test"</query>
 </queries>
 
 <db_create>

File diff suppressed because it is too large
+ 0 - 0
test/test_058/model.bin


+ 1 - 1
test/test_061/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:3:{i:2147483632;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}s:10:"2147483652";a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}s:10:"2147483672";a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"3";s:11:"total_found";s:1:"3";s:4:"time";s:5:"0.001";s:5:"words";a:1:{s:4:"main";a:2:{s:4:"docs";s:1:"3";s:4:"hits";s:1:"3";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:4:"main";}}}
+a:1:{i:0;a:1:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:3:{i:2147483632;a:2:{s:6:"weight";s:4:"1442";s:5:"attrs";a:0:{}}s:10:"2147483652";a:2:{s:6:"weight";s:4:"1442";s:5:"attrs";a:0:{}}s:10:"2147483672";a:2:{s:6:"weight";s:4:"1442";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"3";s:11:"total_found";s:1:"3";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:4:"main";a:2:{s:4:"docs";s:1:"3";s:4:"hits";s:1:"3";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:4:"main";}}}

+ 1 - 1
test/test_064/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:11:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"text";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.001";s:5:"words";a:1:{s:4:"text";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:5:"query";s:4:"text";}}}
+a:1:{i:0;a:1:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"text";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"1500";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:4:"text";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:4:"text";}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_068/model.bin


+ 1 - 1
test/test_069/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:1:{i:0;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"gid";i:1;}s:7:"matches";a:5:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"gid";s:3:"123";}}i:5;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"gid";s:2:"50";}}i:4;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"gid";s:2:"40";}}i:2;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"gid";s:2:"20";}}i:3;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"gid";s:2:"15";}}}s:5:"total";s:1:"5";s:11:"total_found";s:1:"5";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:1:"5";s:4:"hits";s:1:"5";}}}}}}
+a:1:{i:0;a:1:{i:0;a:1:{i:0;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"gid";i:1;}s:7:"matches";a:5:{i:1;a:2:{s:6:"weight";s:4:"1295";s:5:"attrs";a:1:{s:3:"gid";i:123;}}i:5;a:2:{s:6:"weight";s:4:"1295";s:5:"attrs";a:1:{s:3:"gid";i:50;}}i:4;a:2:{s:6:"weight";s:4:"1295";s:5:"attrs";a:1:{s:3:"gid";i:40;}}i:2;a:2:{s:6:"weight";s:4:"1295";s:5:"attrs";a:1:{s:3:"gid";i:20;}}i:3;a:2:{s:6:"weight";s:4:"1295";s:5:"attrs";a:1:{s:3:"gid";i:15;}}}s:5:"total";s:1:"5";s:11:"total_found";s:1:"5";s:5:"words";a:1:{s:4:"test";a:2:{s:4:"docs";s:1:"5";s:4:"hits";s:1:"5";}}}}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_072/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_073/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_074/model.bin


+ 1 - 1
test/test_078/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:3:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.003";s:5:"words";a:1:{s:3:"aaa";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"3";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:3:"aaa";}i:1;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"2";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:2:{s:3:"aaa";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"3";}s:3:"ccc";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:7:"aaa ccc";}i:2;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:2:{s:3:"yyy";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}s:3:"ddd";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:7:"yyy ddd";}}}
+a:1:{i:0;a:3:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"1725";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:3:"aaa";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"3";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:3:"aaa";}i:1;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"2684";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.002";s:5:"words";a:2:{s:3:"aaa";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"3";}s:3:"ccc";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:7:"aaa ccc";}i:2;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:0:{}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"1643";s:5:"attrs";a:0:{}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:2:{s:3:"yyy";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}s:3:"ddd";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:7:"yyy ddd";}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_079/model.bin


+ 1 - 1
test/test_084/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:4:"attr";i:1;}s:7:"matches";a:1:{i:2;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:4:"attr";s:1:"0";}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:7:"phantom";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:7:"phantom";}}}
+a:1:{i:0;a:1:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:4:"attr";i:1;}s:7:"matches";a:1:{i:2;a:2:{s:6:"weight";s:4:"1643";s:5:"attrs";a:1:{s:4:"attr";i:0;}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:7:"phantom";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:7:"phantom";}}}

+ 1 - 1
test/test_085/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:3:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"xid";i:1;}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"xid";s:2:"10";}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:3:"one";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:3:"one";}i:1;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"xid";i:1;}s:7:"matches";a:1:{i:3;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"xid";s:3:"300";}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:5:"three";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:5:"three";}i:2;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"xid";i:1;}s:7:"matches";a:1:{i:5;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"xid";s:3:"500";}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:4:"five";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:4:"five";}}}
+a:1:{i:0;a:3:{i:0;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"xid";i:1;}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"1704";s:5:"attrs";a:1:{s:3:"xid";i:10;}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:3:"one";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:3:"one";}i:1;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"xid";i:1;}s:7:"matches";a:1:{i:3;a:2:{s:6:"weight";s:4:"1704";s:5:"attrs";a:1:{s:3:"xid";i:300;}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:5:"three";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:5:"three";}i:2;a:13:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:4:"body";}s:5:"attrs";a:1:{s:3:"xid";i:1;}s:7:"matches";a:1:{i:5;a:2:{s:6:"weight";s:4:"1704";s:5:"attrs";a:1:{s:3:"xid";i:500;}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:4:"time";s:5:"0.000";s:5:"words";a:1:{s:4:"five";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}s:8:"resarray";i:0;s:8:"roundoff";i:0;s:5:"query";s:4:"five";}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_086/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_093/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_095/model.bin


+ 1 - 1
test/test_096/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:13:{i:0;s:11:"iteration=0";i:1;s:7:"up.ok=2";i:2;s:10:"started=ok";i:3;s:11:"iteration=1";i:4;s:7:"up.ok=2";i:5;s:10:"started=ok";i:6;s:11:"iteration=2";i:7;s:7:"up.ok=2";i:8;s:10:"started=ok";i:9;s:11:"iteration=3";i:10;s:7:"up.ok=2";i:11;s:10:"started=ok";i:12;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:3:{i:0;s:6:"adtext";i:1;s:7:"heading";i:2;s:8:"postcode";}s:5:"attrs";a:5:{s:3:"lng";i:5;s:3:"lat";i:5;s:7:"section";i:1;s:7:"make_id";i:1;s:15:"transmission_id";i:1;}s:7:"matches";a:1:{i:4;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:5:{s:3:"lng";d:-0.479999005794525146484375;s:3:"lat";d:0.69197499752044677734375;s:7:"section";i:1;s:7:"make_id";i:5;s:15:"transmission_id";i:4;}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:6:"corsa4";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}}}}
+a:1:{i:0;a:1:{i:0;a:13:{i:0;s:11:"iteration=0";i:1;s:7:"up.ok=2";i:2;s:10:"started=ok";i:3;s:11:"iteration=1";i:4;s:7:"up.ok=2";i:5;s:10:"started=ok";i:6;s:11:"iteration=2";i:7;s:7:"up.ok=2";i:8;s:10:"started=ok";i:9;s:11:"iteration=3";i:10;s:7:"up.ok=2";i:11;s:10:"started=ok";i:12;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:3:{i:0;s:6:"adtext";i:1;s:7:"heading";i:2;s:8:"postcode";}s:5:"attrs";a:5:{s:3:"lng";i:5;s:3:"lat";i:5;s:7:"section";i:1;s:7:"make_id";i:1;s:15:"transmission_id";i:1;}s:7:"matches";a:1:{i:4;a:2:{s:6:"weight";s:4:"1704";s:5:"attrs";a:5:{s:3:"lng";d:-0.47999900579452515;s:3:"lat";d:0.69197499752044678;s:7:"section";i:1;s:7:"make_id";i:5;s:15:"transmission_id";i:4;}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:6:"corsa4";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_098/model.bin


+ 2 - 2
test/test_098/test.xml

@@ -104,8 +104,8 @@ index exact_wf
 
 <queries>
 <query index='main'>google$com</query>
-<query index='main'>foo(bar)</query>
-<query index='main'>foo\(bar\)</query>
+<query index='main' mode="any">foo(bar)</query>
+<query index='main' mode="any">foo\(bar\)</query>
 <query index='main' mode="extended2">google$com</query>
 <query index='main' mode="extended2">foo(bar)</query>
 <query index='main' mode="extended2">foo\(bar\)</query>

File diff suppressed because it is too large
+ 0 - 0
test/test_099/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_102/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_104/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_105/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_108/model.bin


+ 1 - 1
test/test_109/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:1:{i:0;a:9:{i:0;s:19:"total inserted=1019";i:1;s:27:"id=21 query 0: total_rows=1";i:2;a:2:{s:2:"id";s:2:"21";s:8:"group_id";s:5:"10900";}i:3;s:37:"match('gooddy') query 1: total_rows=1";i:4;a:2:{s:2:"id";s:2:"21";s:8:"group_id";s:5:"10900";}i:5;s:41:"segments merge: replaced=100, queried=790";i:6;s:37:"merge+rotate and merge of indexes v31";i:7;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:5:"title";}s:5:"attrs";a:1:{s:3:"idd";i:1;}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"idd";i:11;}}}s:5:"total";s:3:"999";s:11:"total_found";s:3:"999";s:5:"words";a:1:{s:5:"dummy";a:2:{s:4:"docs";s:3:"999";s:4:"hits";s:3:"999";}}}i:8;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:5:"title";}s:5:"attrs";a:1:{s:3:"idd";i:1;}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:1:{s:3:"idd";i:11;}}}s:5:"total";s:3:"999";s:11:"total_found";s:3:"999";s:5:"words";a:1:{s:5:"dummy";a:2:{s:4:"docs";s:3:"999";s:4:"hits";s:3:"999";}}}}}}
+a:1:{i:0;a:1:{i:0;a:9:{i:0;s:19:"total inserted=1019";i:1;s:27:"id=21 query 0: total_rows=1";i:2;a:2:{s:2:"id";s:2:"21";s:8:"group_id";s:5:"10900";}i:3;s:37:"match('gooddy') query 1: total_rows=1";i:4;a:2:{s:2:"id";s:2:"21";s:8:"group_id";s:5:"10900";}i:5;s:41:"segments merge: replaced=100, queried=790";i:6;s:37:"merge+rotate and merge of indexes v31";i:7;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:5:"title";}s:5:"attrs";a:1:{s:3:"idd";i:1;}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"1272";s:5:"attrs";a:1:{s:3:"idd";i:11;}}}s:5:"total";s:3:"999";s:11:"total_found";s:3:"999";s:5:"words";a:1:{s:5:"dummy";a:2:{s:4:"docs";s:3:"999";s:4:"hits";s:3:"999";}}}i:8;a:9:{s:5:"error";s:0:"";s:7:"warning";s:0:"";s:6:"status";i:0;s:6:"fields";a:1:{i:0;s:5:"title";}s:5:"attrs";a:1:{s:3:"idd";i:1;}s:7:"matches";a:1:{i:1;a:2:{s:6:"weight";s:4:"1272";s:5:"attrs";a:1:{s:3:"idd";i:11;}}}s:5:"total";s:3:"999";s:11:"total_found";s:3:"999";s:5:"words";a:1:{s:5:"dummy";a:2:{s:4:"docs";s:3:"999";s:4:"hits";s:3:"999";}}}}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_121/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_124/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_135/model.bin


+ 1 - 1
test/test_136/model.bin

@@ -1 +1 @@
-a:2:{i:0;a:1:{i:0;a:17:{i:0;s:11:"iteration=0";i:1;s:7:"up.ok=2";i:2;s:17:"stoped=ok(code=0)";i:3;s:10:"started=ok";i:4;s:11:"iteration=1";i:5;s:7:"up.ok=2";i:6;s:17:"stoped=ok(code=0)";i:7;s:10:"started=ok";i:8;s:11:"iteration=2";i:9;s:7:"up.ok=2";i:10;s:17:"stoped=ok(code=0)";i:11;s:10:"started=ok";i:12;s:11:"iteration=3";i:13;s:7:"up.ok=2";i:14;s:17:"stoped=ok(code=0)";i:15;s:10:"started=ok";i:16;a:6:{s:5:"error";s:0:"";s:5:"attrs";a:2:{s:7:"section";i:1;s:4:"mva1";i:1073741825;}s:7:"matches";a:1:{i:3;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:2:{s:7:"section";i:103;s:4:"mva1";a:3:{i:0;i:6;i:1;i:7;i:2;i:8;}}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:5:"test3";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}}}i:1;a:1:{i:0;a:17:{i:0;s:11:"iteration=0";i:1;s:7:"up.ok=2";i:2;s:17:"stoped=ok(code=0)";i:3;s:10:"started=ok";i:4;s:11:"iteration=1";i:5;s:7:"up.ok=2";i:6;s:17:"stoped=ok(code=0)";i:7;s:10:"started=ok";i:8;s:11:"iteration=2";i:9;s:7:"up.ok=2";i:10;s:17:"stoped=ok(code=0)";i:11;s:10:"started=ok";i:12;s:11:"iteration=3";i:13;s:7:"up.ok=2";i:14;s:17:"stoped=ok(code=0)";i:15;s:10:"started=ok";i:16;a:6:{s:5:"error";s:0:"";s:5:"attrs";a:2:{s:7:"section";i:1;s:4:"mva1";i:1073741825;}s:7:"matches";a:1:{i:3;a:2:{s:6:"weight";s:1:"1";s:5:"attrs";a:2:{s:7:"section";i:103;s:4:"mva1";a:3:{i:0;s:1:"6";i:1;s:1:"7";i:2;s:1:"8";}}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:5:"test3";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}}}}
+a:2:{i:0;a:1:{i:0;a:17:{i:0;s:11:"iteration=0";i:1;s:7:"up.ok=2";i:2;s:17:"stoped=ok(code=0)";i:3;s:10:"started=ok";i:4;s:11:"iteration=1";i:5;s:7:"up.ok=2";i:6;s:17:"stoped=ok(code=0)";i:7;s:10:"started=ok";i:8;s:11:"iteration=2";i:9;s:7:"up.ok=2";i:10;s:17:"stoped=ok(code=0)";i:11;s:10:"started=ok";i:12;s:11:"iteration=3";i:13;s:7:"up.ok=2";i:14;s:17:"stoped=ok(code=0)";i:15;s:10:"started=ok";i:16;a:6:{s:5:"error";s:0:"";s:5:"attrs";a:2:{s:7:"section";i:1;s:4:"mva1";i:1073741825;}s:7:"matches";a:1:{i:3;a:2:{s:6:"weight";s:4:"1695";s:5:"attrs";a:2:{s:7:"section";i:103;s:4:"mva1";a:3:{i:0;i:6;i:1;i:7;i:2;i:8;}}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:5:"test3";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}}}i:1;a:1:{i:0;a:17:{i:0;s:11:"iteration=0";i:1;s:7:"up.ok=2";i:2;s:17:"stoped=ok(code=0)";i:3;s:10:"started=ok";i:4;s:11:"iteration=1";i:5;s:7:"up.ok=2";i:6;s:17:"stoped=ok(code=0)";i:7;s:10:"started=ok";i:8;s:11:"iteration=2";i:9;s:7:"up.ok=2";i:10;s:17:"stoped=ok(code=0)";i:11;s:10:"started=ok";i:12;s:11:"iteration=3";i:13;s:7:"up.ok=2";i:14;s:17:"stoped=ok(code=0)";i:15;s:10:"started=ok";i:16;a:6:{s:5:"error";s:0:"";s:5:"attrs";a:2:{s:7:"section";i:1;s:4:"mva1";i:1073741825;}s:7:"matches";a:1:{i:3;a:2:{s:6:"weight";s:4:"1695";s:5:"attrs";a:2:{s:7:"section";i:103;s:4:"mva1";a:3:{i:0;i:6;i:1;i:7;i:2;i:8;}}}}s:5:"total";s:1:"1";s:11:"total_found";s:1:"1";s:5:"words";a:1:{s:5:"test3";a:2:{s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}}}}

File diff suppressed because it is too large
+ 0 - 0
test/test_139/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_153/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_169/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_179/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_202/model.bin


File diff suppressed because it is too large
+ 0 - 0
test/test_212/model.bin


Some files were not shown because too many files changed in this diff