ultrasphinx 1.8 → 1.9

data/test/integration/app/app/models/seller.rb

@@ -8,7 +8,8 @@ class Seller < ActiveRecord::Base
     'created_at', 
     'capitalization', 
     'user_id'
-  ]
+  ],
+    :delta => true
   
   def name 
     company_name

data/test/integration/app/config/environment.rb

@@ -10,4 +10,6 @@ Rails::Initializer.run do |config|
   config.load_paths << "#{RAILS_ROOT}/app/models/person" # moduleless model path
 end
 
+Ultrasphinx::Search.client_options["finder_methods"].unshift("custom_find")
+
 # Dependencies.log_activity = true

data/test/integration/app/config/ultrasphinx/default.base

@@ -19,32 +19,40 @@
 # people think they need to do that. It's wrong.
 #
 
+<% tmp = "/tmp/sphinx/" %>
+
 indexer
 {
   # Indexer running options
   mem_limit = 256M 
+  
+  # Ultrasphinx-specific key
+  delta = <%= 1.day + 30.minutes %> 
 }
 
 searchd
 {
   # Daemon options
-  # What interface the search daemon should listen on and where to store its logs
+  
+  # What interface the search daemon should listen on 
   address = 0.0.0.0
   port = 3312
   seamless_rotate = 1
-  log = /tmp/sphinx/searchd.log
-  query_log = /tmp/sphinx/query.log
+  
+  # Where to to store the logs
+  log = <%= tmp %>searchd.log
+  query_log = <%= tmp %>query.log
   read_timeout = 5
   max_children = 300
-  pid_file = /tmp/sphinx/searchd.pid
+  pid_file = <%= tmp %>searchd.pid
   max_matches = 100000
 }
 
 client
 {
-  # Client options
+  # Ultrasphinx-specific client options
   # Name of the Aspell dictionary (two letters max)
-  dictionary_name = ap
+  dictionary_name = <%= dictionary = 'ap' %>
   # How your application connects to the search daemon (not necessarily the same as above)
   server_host = localhost
   server_port = 3312
@@ -61,10 +69,10 @@ source
 index
 {
   # Index building options
-  path = /tmp/sphinx
+  path = <%= tmp %>
   docinfo = extern # just leave this alone
   morphology = stem_en
-  stopwords = # /path/to/stopwords.txt
+  stopwords = # <%= tmp %>/<%= dictionary %>-stopwords.txt
   min_word_len = 1
 
   # HTML-specific options

data/test/integration/app/config/ultrasphinx/development.conf

@@ -0,0 +1,319 @@
+
+# Auto-generated at Sat Mar 08 14:50:18 -0500 2008.
+# Hand modifications will be overwritten.
+# /Users/eweaver/Desktop/projects/ub/vendor/plugins/ultrasphinx/test/integration/app/config/ultrasphinx/default.base
+indexer {
+  mem_limit = 256M
+}
+
+searchd {
+  read_timeout = 5
+  max_children = 300
+  log = /tmp/sphinx/searchd.log
+  port = 3312
+  max_matches = 100000
+  query_log = /tmp/sphinx/query.log
+  seamless_rotate = 1
+  pid_file = /tmp/sphinx/searchd.pid
+  address = 0.0.0.0
+}
+
+# Source configuration
+
+source geo__states_main
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM states 
+sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM states WHERE states.id = (($id - 0) / 5)
+}
+
+
+# Source configuration
+
+source sellers_main
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers 
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
+}
+
+
+# Source configuration
+
+source geo__addresses_main
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses 
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
+}
+
+
+# Source configuration
+
+source users_main
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM users 
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
+}
+
+
+# Source configuration
+
+source geo__countries_main
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM countries 
+sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM countries WHERE countries.id = (($id - 4) / 5)
+}
+
+
+# Index configuration
+
+index main
+{
+  source = geo__addresses_main
+  source = geo__countries_main
+  source = geo__states_main
+  source = sellers_main
+  source = users_main
+  charset_type = utf-8
+  html_index_attrs = 
+  charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
+  min_word_len = 1
+  #   enable_star = 1
+  stopwords = 
+  html_strip = 0
+  path = /tmp/sphinx//sphinx_index_main
+  docinfo = extern
+  morphology = stem_en
+  #   min_infix_len = 1
+}
+
+
+# Source configuration
+
+source sellers_delta
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers WHERE sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND)
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end AND sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY sellers.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
+}
+
+
+# Source configuration
+
+source geo__addresses_delta
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses 
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
+}
+
+
+# Source configuration
+
+source users_delta
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM users WHERE users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND)
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') AND users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY users.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
+}
+
+
+# Index configuration
+
+index delta
+{
+  source = geo__addresses_delta
+  source = sellers_delta
+  source = users_delta
+  charset_type = utf-8
+  html_index_attrs = 
+  charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
+  min_word_len = 1
+  #   enable_star = 1
+  stopwords = 
+  html_strip = 0
+  path = /tmp/sphinx//sphinx_index_delta
+  docinfo = extern
+  morphology = stem_en
+  #   min_infix_len = 1
+}
+

data/test/integration/app/config/ultrasphinx/development.conf.canonical

@@ -1,10 +1,11 @@
 
-# Auto-generated at Tue Feb 05 04:49:29 -0500 2008.
+# Auto-generated at Sat Mar 08 03:07:27 -0500 2008.
 # Hand modifications will be overwritten.
-# /Users/eweaver/Desktop/projects/chow/vendor/plugins/ultrasphinx/test/integration/app/config/ultrasphinx/default.base
+# /Users/eweaver/Desktop/projects/ub/vendor/plugins/ultrasphinx/test/integration/app/config/ultrasphinx/default.base
 indexer {
   mem_limit = 256M
 }
+
 searchd {
   read_timeout = 5
   max_children = 300
@@ -19,7 +20,7 @@ searchd {
 
 # Source configuration
 
-source geo__states
+source geo__states_main
 {
   sql_range_step = 5000
   sql_query_post = 
@@ -33,12 +34,14 @@ sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
-sql_query_range = SELECT MIN(id) ,  MAX(id) FROM states
-sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id
+sql_query_range = SELECT MIN(id) , MAX(id) FROM states 
+sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
+sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
 sql_attr_str2ordinal = mission_statement
@@ -49,7 +52,7 @@ sql_query_info = SELECT * FROM states WHERE states.id = (($id - 0) / 5)
 
 # Source configuration
 
-source sellers
+source sellers_main
 {
   sql_range_step = 5000
   sql_query_post = 
@@ -63,12 +66,14 @@ sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
-sql_query_range = SELECT MIN(id) ,  MAX(id) FROM sellers
-sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
+sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers 
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
+sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
 sql_attr_str2ordinal = mission_statement
@@ -79,7 +84,7 @@ sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
 
 # Source configuration
 
-source geo__addresses
+source geo__addresses_main
 {
   sql_range_step = 5000
   sql_query_post = 
@@ -93,12 +98,14 @@ sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
-sql_query_range = SELECT MIN(id) ,  MAX(id) FROM addresses
-sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses 
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
+sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
 sql_attr_str2ordinal = mission_statement
@@ -109,7 +116,7 @@ sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
 
 # Source configuration
 
-source users
+source users_main
 {
   sql_range_step = 5000
   sql_query_post = 
@@ -123,12 +130,14 @@ sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
-sql_query_range = SELECT MIN(id) ,  MAX(id) FROM users
-sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
+sql_query_range = SELECT MIN(id) , MAX(id) FROM users 
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
+sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
 sql_attr_str2ordinal = mission_statement
@@ -139,7 +148,7 @@ sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
 
 # Source configuration
 
-source geo__countries
+source geo__countries_main
 {
   sql_range_step = 5000
   sql_query_post = 
@@ -153,12 +162,14 @@ sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
-sql_query_range = SELECT MIN(id) ,  MAX(id) FROM countries
-sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id
+sql_query_range = SELECT MIN(id) , MAX(id) FROM countries 
+sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
+sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
 sql_attr_str2ordinal = mission_statement
@@ -169,13 +180,130 @@ sql_query_info = SELECT * FROM countries WHERE countries.id = (($id - 4) / 5)
 
 # Index configuration
 
-index complete
+index main
+{
+  source = geo__addresses_main
+  source = geo__countries_main
+  source = geo__states_main
+  source = sellers_main
+  source = users_main
+  charset_type = utf-8
+  html_index_attrs = 
+  charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
+  min_word_len = 1
+  #   enable_star = 1
+  stopwords = 
+  html_strip = 0
+  path = /tmp/sphinx//sphinx_index_main
+  docinfo = extern
+  morphology = stem_en
+  #   min_infix_len = 1
+}
+
+
+# Source configuration
+
+source sellers_delta
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers WHERE sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND)
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end AND sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY sellers.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
+}
+
+
+# Source configuration
+
+source geo__addresses_delta
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses 
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
+}
+
+
+# Source configuration
+
+source users_delta
+{
+  sql_range_step = 5000
+  sql_query_post = 
+  sql_ranged_throttle = 0
+
+type = mysql
+sql_query_pre = SET SESSION group_concat_max_len = 65535
+sql_query_pre = SET NAMES utf8
+  
+sql_db = ultrasphinx_development
+sql_host = localhost
+sql_pass = 
+sql_user = root
+sql_query_range = SELECT MIN(id) , MAX(id) FROM users WHERE users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND)
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') AND users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY users.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_facet
+sql_attr_uint = company_name_facet
+sql_attr_uint = company_two_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
+sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
+}
+
+
+# Index configuration
+
+index delta
 {
-  source = geo__addresses
-  source = geo__countries
-  source = geo__states
-  source = sellers
-  source = users
+  source = geo__addresses_delta
+  source = sellers_delta
+  source = users_delta
   charset_type = utf-8
   html_index_attrs = 
   charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
@@ -183,7 +311,7 @@ index complete
   #   enable_star = 1
   stopwords = 
   html_strip = 0
-  path = /tmp/sphinx//sphinx_index_complete
+  path = /tmp/sphinx//sphinx_index_delta
   docinfo = extern
   morphology = stem_en
   #   min_infix_len = 1