sphinx 0.9.9.2117 → 0.9.10

data/spec/fixtures/ranking_sph04.php

@@ -0,0 +1,9 @@
+<?php
+
+require ("sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->SetRankingMode(SPH_RANK_SPH04);
+$cl->Query('query');
+
+?>

data/spec/fixtures/sphinxapi.php

@@ -1,7 +1,7 @@
 <?php
 
 //
-// $Id: sphinxapi.php 2055 2009-11-06 23:09:58Z shodan $
+// $Id$
 //
 
 //
@@ -18,21 +18,23 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /// known searchd commands
-define ( "SEARCHD_COMMAND_SEARCH",	0 );
-define ( "SEARCHD_COMMAND_EXCERPT",	1 );
-define ( "SEARCHD_COMMAND_UPDATE",	2 );
-define ( "SEARCHD_COMMAND_KEYWORDS",3 );
-define ( "SEARCHD_COMMAND_PERSIST",	4 );
-define ( "SEARCHD_COMMAND_STATUS",	5 );
-define ( "SEARCHD_COMMAND_QUERY",	6 );
+define ( "SEARCHD_COMMAND_SEARCH",		0 );
+define ( "SEARCHD_COMMAND_EXCERPT",		1 );
+define ( "SEARCHD_COMMAND_UPDATE",		2 );
+define ( "SEARCHD_COMMAND_KEYWORDS",	3 );
+define ( "SEARCHD_COMMAND_PERSIST",		4 );
+define ( "SEARCHD_COMMAND_STATUS",		5 );
+define ( "SEARCHD_COMMAND_QUERY",		6 );
+define ( "SEARCHD_COMMAND_FLUSHATTRS",	7 );
 
 /// current client-side command implementation versions
-define ( "VER_COMMAND_SEARCH",		0x116 );
+define ( "VER_COMMAND_SEARCH",		0x117 );
 define ( "VER_COMMAND_EXCERPT",		0x100 );
 define ( "VER_COMMAND_UPDATE",		0x102 );
 define ( "VER_COMMAND_KEYWORDS",	0x100 );
 define ( "VER_COMMAND_STATUS",		0x100 );
 define ( "VER_COMMAND_QUERY",		0x100 );
+define ( "VER_COMMAND_FLUSHATTRS",	0x100 );
 
 /// known searchd status codes
 define ( "SEARCHD_OK",				0 );
@@ -57,6 +59,8 @@ define ( "SPH_RANK_WORDCOUNT",		3 );	///< simple word-count weighting, rank is a
 define ( "SPH_RANK_PROXIMITY",		4 );
 define ( "SPH_RANK_MATCHANY",		5 );
 define ( "SPH_RANK_FIELDMASK",		6 );
+define ( "SPH_RANK_SPH04",			7 );
+define ( "SPH_RANK_TOTAL",			8 );
 
 /// known sort modes
 define ( "SPH_SORT_RELEVANCE",		0 );
@@ -78,6 +82,7 @@ define ( "SPH_ATTR_ORDINAL",		3 );
 define ( "SPH_ATTR_BOOL",			4 );
 define ( "SPH_ATTR_FLOAT",			5 );
 define ( "SPH_ATTR_BIGINT",			6 );
+define ( "SPH_ATTR_STRING",			7 );
 define ( "SPH_ATTR_MULTI",			0x40000000 );
 
 /// known grouping functions
@@ -344,11 +349,6 @@ function sphUnpackI64 ( $v )
 	$mq = floor($m/10000000.0);
 	$l = $m - $mq*10000000.0 + $c;
 	$h = $q*4294967296.0 + $r*429.0 + $mq;
-	if ( $l==10000000 )
-	{
-		$l = 0;
-		$h += 1;
-	}
 
 	$h = sprintf ( "%.0f", $h );
 	$l = sprintf ( "%07.0f", $l );
@@ -358,27 +358,11 @@ function sphUnpackI64 ( $v )
 }
 
 
-function sphFixUint ( $value )
-{
-	if ( PHP_INT_SIZE>=8 )
-	{
-		// x64 route, workaround broken unpack() in 5.2.2+
-		if ( $value<0 ) $value += (1<<32);
-		return $value;
-	}
-	else
-	{
-		// x32 route, workaround php signed/unsigned braindamage
-		return sprintf ( "%u", $value );
-	}
-}
-
-
 /// sphinx searchd client class
 class SphinxClient
 {
 	var $_host;			///< searchd host (default is "localhost")
-	var $_port;			///< searchd port (default is 9312)
+	var $_port;			///< searchd port (default is 3312)
 	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)
@@ -422,7 +406,7 @@ class SphinxClient
 	{
 		// per-client-object settings
 		$this->_host		= "localhost";
-		$this->_port		= 9312;
+		$this->_port		= 3312;
 		$this->_path		= false;
 		$this->_socket		= false;
 
@@ -555,16 +539,8 @@ class SphinxClient
 
 	function _OldConnect ()
 	{
-		if ( $this->_socket!==false )
-		{
-			// we are in persistent connection mode, so we have a socket
-			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) )
-				return $this->_socket;
-
-			// force reopen
-			$this->_socket = false;
-		}
+		if ( $this->_socket !== false )
+			return $this->_socket;
 
 		$errno = 0;
 		$errstr = "";
@@ -736,13 +712,7 @@ class SphinxClient
 	/// set ranking mode
 	function SetRankingMode ( $ranker )
 	{
-		assert ( $ranker==SPH_RANK_PROXIMITY_BM25
-			|| $ranker==SPH_RANK_BM25
-			|| $ranker==SPH_RANK_NONE
-			|| $ranker==SPH_RANK_WORDCOUNT
-			|| $ranker==SPH_RANK_PROXIMITY
-			|| $ranker==SPH_RANK_MATCHANY
-			|| $ranker==SPH_RANK_FIELDMASK );
+		assert ( $ranker>=0 && $ranker<SPH_RANK_TOTAL );
 		$this->_ranker = $ranker;
 	}
 
@@ -1207,7 +1177,16 @@ class SphinxClient
 					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
 						substr ( $response, $p, 8 ) ) );
 					$p += 8;
-					$doc = sphFixUint($doc);
+
+					if ( PHP_INT_SIZE>=8 )
+					{
+						// x64 route, workaround broken unpack() in 5.2.2+
+						if ( $doc<0 ) $doc += (1<<32);
+					} else
+					{
+						// x32 route, workaround php signed/unsigned braindamage
+						$doc = sprintf ( "%u", $doc );
+					}
 				}
 				$weight = sprintf ( "%u", $weight );
 
@@ -1246,11 +1225,15 @@ class SphinxClient
 						while ( $nvalues-->0 && $p<$max )
 						{
 							list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-							$attrvals[$attr][] = sphFixUint($val);
+							$attrvals[$attr][] = sprintf ( "%u", $val );
 						}
+					} else if ( $type==SPH_ATTR_STRING )
+					{
+						$attrvals[$attr] = substr ( $response, $p, $val );
+						$p += $val;						
 					} else
 					{
-						$attrvals[$attr] = sphFixUint($val);
+						$attrvals[$attr] = sprintf ( "%u", $val );
 					}
 				}
 
@@ -1317,6 +1300,7 @@ class SphinxClient
 		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
 		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
 		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
+		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
 
 		/////////////////
 		// build request
@@ -1328,6 +1312,7 @@ class SphinxClient
 		if ( $opts["single_passage"] )	$flags |= 4;
 		if ( $opts["use_boundaries"] )	$flags |= 8;
 		if ( $opts["weight_order"] )	$flags |= 16;
+		if ( $opts["query_mode"] )		$flags |= 32;
 		$req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
 		$req .= pack ( "N", strlen($index) ) . $index; // req index
 		$req .= pack ( "N", strlen($words) ) . $words; // req words
@@ -1626,8 +1611,38 @@ class SphinxClient
 		$this->_MBPop ();
 		return $res;
 	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// flush
+	//////////////////////////////////////////////////////////////////////////
+
+	function FlushAttrs ()
+	{
+		$this->_MBPush ();
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop();
+			return false;
+		}
+
+		$req = pack ( "nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0 ); // len=0
+		if ( !( $this->_Send ( $fp, $req, 8 ) ) ||
+			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_FLUSHATTRS ) ) )
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		$tag = -1;
+		if ( strlen($response)==4 )
+			list(,$tag) = unpack ( "N*", $response );
+
+		$this->_MBPop ();
+		return $tag;
+	}
+
 }
 
 //
-// $Id: sphinxapi.php 2055 2009-11-06 23:09:58Z shodan $
-//
+// $Id$
+//

data/spec/sphinx/sphinx-id64.conf

@@ -57,7 +57,7 @@ indexer
 
 searchd
 {
-    port                = 9312
+    port                = 3312
     log                 = /opt/sphinx-0.9.9-id64/var/log/searchd.log
     query_log           = /opt/sphinx-0.9.9-id64/var/log/query.log
     read_timeout        = 5

data/spec/sphinx/sphinx.conf

@@ -57,7 +57,7 @@ indexer
 
 searchd
 {
-    port                = 9312
+    port                = 3312
     log                 = /opt/sphinx-0.9.9/var/log/searchd.log
     query_log           = /opt/sphinx-0.9.9/var/log/query.log
     read_timeout        = 5

data/spec/sphinx/sphinx_test.sql

@@ -3,15 +3,13 @@ SQLyog Enterprise - MySQL GUI v5.20
 Host - 5.0.27-community-nt : Database - sphinx_test
 *********************************************************************
 Server version : 5.0.27-community-nt
-*/
-
+*/
 
 SET NAMES utf8;
 
 SET SQL_MODE='';
 
-DROP database `sphinx_test`;
-CREATE database `sphinx_test`;
+CREATE database IF NOT EXISTS `sphinx_test`;
 
 USE `sphinx_test`;
 

data/sphinx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sphinx}
-  s.version = "0.9.9.2117"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmytro Shteflyuk"]
-  s.date = %q{2009-12-04}
+  s.date = %q{2009-11-04}
   s.description = %q{An easy interface to Sphinx standalone full-text search engine. It is implemented as plugin for Ruby on Rails, but can be easily used as standalone library.}
   s.email = %q{kpumuk@kpumuk.info}
   s.extra_rdoc_files = [
@@ -21,18 +21,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "init.rb",
+     "install.rb",
      "lib/sphinx.rb",
-     "lib/sphinx/buffered_io.rb",
      "lib/sphinx/client.rb",
-     "lib/sphinx/constants.rb",
-     "lib/sphinx/indifferent_access.rb",
      "lib/sphinx/request.rb",
      "lib/sphinx/response.rb",
-     "lib/sphinx/server.rb",
-     "lib/sphinx/timeout.rb",
      "spec/client_response_spec.rb",
      "spec/client_spec.rb",
-     "spec/client_validations_spec.rb",
      "spec/fixtures/default_search.php",
      "spec/fixtures/default_search_index.php",
      "spec/fixtures/excerpt_custom.php",
@@ -81,6 +76,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/ranking_none.php",
      "spec/fixtures/ranking_proximity.php",
      "spec/fixtures/ranking_proximity_bm25.php",
+     "spec/fixtures/ranking_sph04.php",
      "spec/fixtures/ranking_wordcount.php",
      "spec/fixtures/retries.php",
      "spec/fixtures/retries_delay.php",
@@ -96,11 +92,12 @@ Gem::Specification.new do |s|
      "spec/fixtures/update_attributes.php",
      "spec/fixtures/update_attributes_mva.php",
      "spec/fixtures/weights.php",
-     "spec/spec_helper.rb",
      "spec/sphinx/sphinx-id64.conf",
      "spec/sphinx/sphinx.conf",
      "spec/sphinx/sphinx_test.sql",
-     "sphinx.gemspec"
+     "sphinx.gemspec",
+     "sphinx.yml.tpl",
+     "tasks/sphinx.rake"
   ]
   s.homepage = %q{http://github.com/kpumuk/sphinx}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -109,9 +106,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Sphinx Client API for Ruby}
   s.test_files = [
     "spec/client_response_spec.rb",
-     "spec/client_spec.rb",
-     "spec/client_validations_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/client_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/sphinx.yml.tpl

@@ -0,0 +1,3 @@
+config_file: /opt/sphinx/etc/sphinx.conf
+root_dir: /opt/sphinx/bin
+indexes: test1 test2

data/tasks/sphinx.rake

@@ -0,0 +1,75 @@
+namespace :sphinx do
+  desc 'Run indexer for configured indexes'
+  task :index do
+    config = load_config
+    if config[:indexes]
+      system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" #{config[:indexes]}"
+    else
+      puts 'You should specify indexes in sphinx.yml'
+    end
+  end
+
+  desc 'Run indexer for all indexes'
+  task :index_all do
+    config = load_config
+    system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" --all"
+  end
+
+  desc 'Rotate configured indexes and restart searchd server'
+  task :rotate do
+    config = load_config
+    if config[:indexes]
+      system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" --rotate #{config[:indexes]}"
+    else
+      puts 'You should specify indexes in sphinx.yml'
+    end
+  end
+
+  desc 'Rotate all indexes and restart searchd server'
+  task :rotate_all do
+    config = load_config
+    system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" --rotate --all"
+  end
+  
+  desc 'Start searchd server'
+  task :start do
+    config = load_config
+    if File.exists?(config[:pid_file])
+      puts 'Sphinx searchd server is already started.'
+    else
+      system "#{config[:root_dir]}/searchd --config \"#{config[:config_file]}\""
+      puts 'Sphinx searchd server started.'
+    end
+  end
+  
+  desc 'Stop searchd server'
+  task :stop do
+    config = load_config
+    unless File.exists?(config[:pid_file])
+      puts 'Sphinx searchd server is not running.'
+    else
+      pid = File.read(config[:pid_file]).chomp
+      kill 'SIGHUP', pid
+      puts 'Sphinx searchd server stopped.'
+    end
+  end
+  
+  desc 'Restart searchd server'
+  task :restart => [:stop, :start]
+  
+  def load_config
+    return @sphinx_config if @sphinx_config
+
+    options = YAML.load_file(File.dirname(__FILE__) + '/../../../../config/sphinx.yml') rescue {}
+    @sphinx_config = {
+      :config_file => options['config_file'] || '/etc/sphinx.conf',
+      :root_dir => options['root_dir'] || '/usr/bin',
+      :indexes => options['indexes']
+    }
+    sphinx_config = File.read(@sphinx_config[:config_file]) rescue ''
+    
+    sphinx_config =~ /searchd\s*{.*pid_file\s*=\s*(.*?)\n.*}/m
+    @sphinx_config[:pid_file] = $1 || '/var/run/searchd.pid'
+    return @sphinx_config
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sphinx
 version: !ruby/object:Gem::Version 
-  version: 0.9.9.2117
+  version: 0.9.10
 platform: ruby
 authors: 
 - Dmytro Shteflyuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +02:00
+date: 2009-11-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,18 +27,13 @@ files:
 - Rakefile
 - VERSION.yml
 - init.rb
+- install.rb
 - lib/sphinx.rb
-- lib/sphinx/buffered_io.rb
 - lib/sphinx/client.rb
-- lib/sphinx/constants.rb
-- lib/sphinx/indifferent_access.rb
 - lib/sphinx/request.rb
 - lib/sphinx/response.rb
-- lib/sphinx/server.rb
-- lib/sphinx/timeout.rb
 - spec/client_response_spec.rb
 - spec/client_spec.rb
-- spec/client_validations_spec.rb
 - spec/fixtures/default_search.php
 - spec/fixtures/default_search_index.php
 - spec/fixtures/excerpt_custom.php
@@ -87,6 +82,7 @@ files:
 - spec/fixtures/ranking_none.php
 - spec/fixtures/ranking_proximity.php
 - spec/fixtures/ranking_proximity_bm25.php
+- spec/fixtures/ranking_sph04.php
 - spec/fixtures/ranking_wordcount.php
 - spec/fixtures/retries.php
 - spec/fixtures/retries_delay.php
@@ -102,11 +98,12 @@ files:
 - spec/fixtures/update_attributes.php
 - spec/fixtures/update_attributes_mva.php
 - spec/fixtures/weights.php
-- spec/spec_helper.rb
 - spec/sphinx/sphinx-id64.conf
 - spec/sphinx/sphinx.conf
 - spec/sphinx/sphinx_test.sql
 - sphinx.gemspec
+- sphinx.yml.tpl
+- tasks/sphinx.rake
 has_rdoc: true
 homepage: http://github.com/kpumuk/sphinx
 licenses: []
@@ -138,5 +135,3 @@ summary: Sphinx Client API for Ruby
 test_files: 
 - spec/client_response_spec.rb
 - spec/client_spec.rb
-- spec/client_validations_spec.rb
-- spec/spec_helper.rb

data/lib/sphinx/buffered_io.rb

@@ -1,26 +0,0 @@
-# A simple wrapper around <tt>Net::BufferedIO</tt> performing
-# non-blocking select.
-#
-# @private
-class Sphinx::BufferedIO < Net::BufferedIO # :nodoc:
-  BUFSIZE = 1024 * 16
-
-  if RUBY_VERSION < '1.9.1'
-    def rbuf_fill
-      begin
-        @rbuf << @io.read_nonblock(BUFSIZE)
-      rescue Errno::EWOULDBLOCK
-        retry unless @read_timeout
-        if IO.select([@io], nil, nil, @read_timeout)
-          retry
-        else
-          raise Timeout::Error, 'IO timeout'
-        end
-      end
-    end
-  end
-
-  def setsockopt(*args)
-    @io.setsockopt(*args)
-  end
-end