makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/sphinx-fulltext-search] use new unique id instead of salt

Browse source 
a new unique id is generated by sphinx and stored in the config table
instead of using avatar_salt.

PHPBB3-10946
This commit is contained in:
Dhruv 2012-07-11 16:57:18 +05:30
parent 4b40f0d3c6
commit 172c583f19
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/docs/sphinx.sample.conf
View file

@ -1,4 +1,4 @@
source source_phpbb_{AVATAR_SALT}_main source source_phpbb_{SPHINX_ID}_main
{ {
type = mysql type = mysql
sql_host = localhost sql_host = localhost
@ -38,7 +38,7 @@ source source_phpbb_{AVATAR_SALT}_main
sql_attr_timestamp = topic_last_post_time sql_attr_timestamp = topic_last_post_time
sql_attr_str2ordinal = post_subject sql_attr_str2ordinal = post_subject
} }
source source_phpbb_{AVATAR_SALT}_delta : source_phpbb_{AVATAR_SALT}_main source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
{ {
sql_query_range = sql_query_range =
sql_range_step = sql_range_step =
@ -60,10 +60,10 @@ source source_phpbb_{AVATAR_SALT}_delta : source_phpbb_{AVATAR_SALT}_main
AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
sql_query_pre = sql_query_pre =
} }
index index_phpbb_{AVATAR_SALT}_main index index_phpbb_{SPHINX_ID}_main
{ {
path = {DATA_PATH}/index_phpbb_{AVATAR_SALT}_main path = {DATA_PATH}/index_phpbb_{SPHINX_ID}_main
source = source_phpbb_{AVATAR_SALT}_main source = source_phpbb_{SPHINX_ID}_main
docinfo = extern docinfo = extern
morphology = none morphology = none
stopwords = stopwords =
@ -73,10 +73,10 @@ index index_phpbb_{AVATAR_SALT}_main
min_prefix_len = 0 min_prefix_len = 0
min_infix_len = 0 min_infix_len = 0
} }
index index_phpbb_{AVATAR_SALT}_delta : index_phpbb_{AVATAR_SALT}_main index index_phpbb_{SPHINX_ID}_delta : index_phpbb_{SPHINX_ID}_main
{ {
path = {DATA_PATH}/index_phpbb_{AVATAR_SALT}_delta path = {DATA_PATH}/index_phpbb_{SPHINX_ID}_delta
source = source_phpbb_{AVATAR_SALT}_delta source = source_phpbb_{SPHINX_ID}_delta
} }
indexer indexer
{ {

15
phpBB/includes/search/fulltext_sphinx.php
View file

@ -72,16 +72,17 @@ class phpbb_search_fulltext_sphinx
// Initialize phpbb_db_tools object // Initialize phpbb_db_tools object
$this->db_tools = new phpbb_db_tools($this->db); $this->db_tools = new phpbb_db_tools($this->db);
$this->id = $config['avatar_salt']; if(!$this->config['fulltext_sphinx_id'])
{
set_config('fulltext_sphinx_id', unique_id());
}
$this->id = $this->config['fulltext_sphinx_id'];
$this->indexes = 'index_phpbb_' . $this->id . '_delta;index_phpbb_' . $this->id . '_main'; $this->indexes = 'index_phpbb_' . $this->id . '_delta;index_phpbb_' . $this->id . '_main';
$this->sphinx = new SphinxClient(); $this->sphinx = new SphinxClient();
// We only support localhost for now // We only support localhost for now
$this->sphinx->SetServer('localhost', (isset($config['fulltext_sphinx_port']) && $config['fulltext_sphinx_port']) ? (int) $config['fulltext_sphinx_port'] : 3312); $this->sphinx->SetServer('localhost', (isset($this->config['fulltext_sphinx_port']) && $this->config['fulltext_sphinx_port']) ? (int) $this->config['fulltext_sphinx_port'] : 3312);
$config['fulltext_sphinx_min_word_len'] = 2;
$config['fulltext_sphinx_max_word_len'] = 400;
$error = false; $error = false;
} }
@ -137,8 +138,8 @@ class phpbb_search_fulltext_sphinx
include ($phpbb_root_path . 'config.' . $phpEx); include ($phpbb_root_path . 'config.' . $phpEx);
/* Now that we're sure everything was entered correctly, /* Now that we're sure everything was entered correctly,
generate a config for the index. We misuse the avatar_salt generate a config for the index. We use a config value
for this, as it should be unique. */ fulltext_sphinx_id for this, as it should be unique. */
$config_object = new phpbb_search_sphinx_config($this->config_file_data); $config_object = new phpbb_search_sphinx_config($this->config_file_data);
$config_data = array( $config_data = array(