9 files changed, 211 insertions, 87 deletions
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index 1191fd0ae1..ec5fec23ad 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -3,9 +3,9 @@ parameters:
     tables.config_text: %core.table_prefix%config_text
     tables.ext: %core.table_prefix%ext
     tables.log: %core.table_prefix%log
+    tables.migrations: %core.table_prefix%migrations
+    tables.modules: %core.table_prefix%modules
     tables.notification_types: %core.table_prefix%notification_types
     tables.notifications: %core.table_prefix%notifications
     tables.user_notifications: %core.table_prefix%user_notifications
     tables.users: %core.table_prefix%users
-    tables.migrations: %core.table_prefix%migrations
-    tables.modules: %core.table_prefix%modules
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf
index fcaba6dcf3..d1b98d6cbc 100644
--- a/phpBB/docs/sphinx.sample.conf
+++ b/phpBB/docs/sphinx.sample.conf
@@ -1,46 +1,31 @@
 source source_phpbb_{SPHINX_ID}_main
 {
-	type = mysql #mysql or pgsql
-	sql_host = localhost #SQL server host sphinx connects to
+	type = mysql # mysql or pgsql
+	sql_host = localhost # SQL server host sphinx connects to
 	sql_user = username
 	sql_pass = password
 	sql_db = db_name
-	sql_port =  3306 #optional, default is 3306 for mysql and 5432 for pgsql
+	sql_port =  3306 # optional, default is 3306 for mysql and 5432 for pgsql
 	sql_query_pre = SET NAMES 'utf8'
-	sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = MAX(post_id) WHERE counter_id = 1
+	sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1
 	sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts
 	sql_range_step = 5000
-	sql_query = SELECT
-\
-							p.post_id AS id,
-\
-							p.forum_id,
-\
-							p.topic_id,
-\
-							p.poster_id,
-\
-							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
-\
-							p.post_time,
-\
-							p.post_subject,
-\
-							p.post_subject as title,
-\
-							p.post_text as data,
-\
-							t.topic_last_post_time,
-\
-							0 as deleted
-\
-						FROM phpbb_posts p, phpbb_topics t
-\
-						WHERE
-\
-							p.topic_id = t.topic_id
-\
-							AND p.post_id >= $start AND p.post_id <= $end 
+	sql_query = SELECT \
+							p.post_id AS id, \
+							p.forum_id, \
+							p.topic_id, \
+							p.poster_id, \
+							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
+							p.post_time, \
+							p.post_subject, \
+							p.post_subject as title, \
+							p.post_text as data, \
+							t.topic_last_post_time, \
+							0 as deleted\
+						FROM phpbb_posts p, phpbb_topics t \
+						WHERE \
+							p.topic_id = t.topic_id \
+							AND p.post_id >= $start AND p.post_id <= $end
 	sql_query_post =
 	sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1
 	sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id
@@ -55,39 +40,25 @@ source source_phpbb_{SPHINX_ID}_main
 }
 source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
 {
+	sql_query_pre =
 	sql_query_range =
 	sql_range_step =
-	sql_query = SELECT
-\
-							p.post_id AS id,
-\
-							p.forum_id,
-\
-							p.topic_id,
-\
-							p.poster_id,
-\
-							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
-\
-							p.post_time,
-\
-							p.post_subject,
-\
-							p.post_subject as title,
-\
-							p.post_text as data,
-\
-							t.topic_last_post_time,
-\
-							0 as deleted
-\
-						FROM phpbb_posts p, phpbb_topics t
-\
-						WHERE
-\
-							p.topic_id = t.topic_id
-\
-							AND p.post_id >=  ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) 
+	sql_query = SELECT \
+							p.post_id AS id, \
+							p.forum_id, \
+							p.topic_id, \
+							p.poster_id, \
+							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
+							p.post_time, \
+							p.post_subject, \
+							p.post_subject as title, \
+							p.post_text as data, \
+							t.topic_last_post_time, \
+							0 as deleted \
+						FROM phpbb_posts p, phpbb_topics t \
+						WHERE \
+							p.topic_id = t.topic_id \
+							AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
 	sql_query_pre =
 }
 index index_phpbb_{SPHINX_ID}_main
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 8dda94bc2c..b915ee081b 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -568,12 +568,12 @@ class phpbb_db_driver
 	* Run more than one insert statement.
 	*
 	* @param string $table table name to run the statements on
-	* @param array &$sql_ary multi-dimensional array holding the statement data.
+	* @param array $sql_ary multi-dimensional array holding the statement data.
 	*
 	* @return bool false if no statements were executed.
 	* @access public
 	*/
-	function sql_multi_insert($table, &$sql_ary)
+	function sql_multi_insert($table, $sql_ary)
 	{
 		if (!sizeof($sql_ary))
 		{
diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
new file mode 100644
index 0000000000..c18f908429
--- /dev/null
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -0,0 +1,150 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Collects rows for insert into a database until the buffer size is reached.
+* Then flushes the buffer to the database and starts over again.
+*
+* Benefits over collecting a (possibly huge) insert array and then using
+* $db->sql_multi_insert() include:
+*
+*  - Going over max packet size of the database connection is usually prevented
+*    because the data is submitted in batches.
+*
+*  - Reaching database connection timeout is usually prevented because
+*    submission of batches talks to the database every now and then.
+*
+*  - Usage of less PHP memory because data no longer needed is discarded on
+*    buffer flush.
+*
+* Attention:
+* Please note that users of this class have to call flush() to flush the
+* remaining rows to the database after their batch insert operation is
+* finished.
+*
+* Usage:
+* <code>
+*	$buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234);
+*
+*	while (do_stuff())
+*	{
+*		$buffer->insert(array(
+*			'column1' => 'value1',
+*			'column2' => 'value2',
+*		));
+*	}
+*
+*	$buffer->flush();
+* </code>
+*
+* @package dbal
+*/
+class phpbb_db_sql_insert_buffer
+{
+	/** @var phpbb_db_driver */
+	protected $db;
+
+	/** @var string */
+	protected $table_name;
+
+	/** @var int */
+	protected $max_buffered_rows;
+
+	/** @var array */
+	protected $buffer = array();
+
+	/**
+	* @param phpbb_db_driver $db
+	* @param string          $table_name
+	* @param int             $max_buffered_rows
+	*/
+	public function __construct(phpbb_db_driver $db, $table_name, $max_buffered_rows = 500)
+	{
+		$this->db = $db;
+		$this->table_name = $table_name;
+		$this->max_buffered_rows = $max_buffered_rows;
+	}
+
+	/**
+	* Inserts a single row into the buffer if multi insert is supported by the
+	* database (otherwise an insert query is sent immediately). Then flushes
+	* the buffer if the number of rows in the buffer is now greater than or
+	* equal to $max_buffered_rows.
+	*
+	* @param array $row
+	*
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
+	*/
+	public function insert(array $row)
+	{
+		$this->buffer[] = $row;
+
+		// Flush buffer if it is full or when DB does not support multi inserts.
+		// In the later case, the buffer will always only contain one row.
+		if (!$this->db->multi_insert || sizeof($this->buffer) >= $this->max_buffered_rows)
+		{
+			return $this->flush();
+		}
+
+		return false;
+	}
+
+	/**
+	* Inserts a row set, i.e. an array of rows, by calling insert().
+	*
+	* Please note that it is in most cases better to use insert() instead of
+	* first building a huge rowset. Or at least sizeof($rows) should be kept
+	* small.
+	*
+	* @param array $rows 
+	*
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
+	*/
+	public function insert_all(array $rows)
+	{
+		// Using bitwise |= because PHP does not have logical ||=
+		$result = 0;
+
+		foreach ($rows as $row)
+		{
+			$result |= (int) $this->insert($row);
+		}
+
+		return (bool) $result;
+	}
+
+	/**
+	* Flushes the buffer content to the DB and clears the buffer.
+	*
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
+	*/
+	public function flush()
+	{
+		if (!empty($this->buffer))
+		{
+			$this->db->sql_multi_insert($this->table_name, $this->buffer);
+			$this->buffer = array();
+
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ff83d4bb37..9eceeb753a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -256,6 +256,7 @@ class phpbb_notification_manager
 			SET notification_read = 1
 			WHERE notification_time <= " . (int) $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
 	}
@@ -389,7 +390,6 @@ class phpbb_notification_manager
 
 		$user_ids = array();
 		$notification_objects = $notification_methods = array();
-		$new_rows = array();
 
 		// Never send notifications to the anonymous user!
 		unset($notify_users[ANONYMOUS]);
@@ -419,6 +419,8 @@ class phpbb_notification_manager
 		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
 		unset($notification);
 
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $this->notifications_table);
+
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
@@ -426,8 +428,8 @@ class phpbb_notification_manager
 
 			$notification->user_id = (int) $user;
 
-			// Store the creation array in our new rows that will be inserted later
-			$new_rows[] = $notification->create_insert_array($data, $pre_create_data);
+			// Insert notification row using buffer.
+			$insert_buffer->insert($notification->create_insert_array($data, $pre_create_data));
 
 			// Users are needed to send notifications
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
@@ -447,8 +449,7 @@ class phpbb_notification_manager
 			}
 		}
 
-		// insert into the db
-		$this->db->sql_multi_insert($this->notifications_table, $new_rows);
+		$insert_buffer->flush();
 
 		// We need to load all of the users to send notifications
 		$this->user_loader->load_users($user_ids);
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 48445d0794..28761792ec 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -258,13 +258,13 @@ class phpbb_search_fulltext_sphinx
 		$config_object = new phpbb_search_sphinx_config($this->config_file_data);
 		$config_data = array(
 			'source source_phpbb_' . $this->id . '_main' => array(
-				array('type',						$this->dbtype),
+				array('type',						$this->dbtype . ' # mysql or pgsql'),
 				// This config value sql_host needs to be changed incase sphinx and sql are on different servers
-				array('sql_host',					$dbhost),
+				array('sql_host',					$dbhost . ' # SQL server host sphinx connects to'),
 				array('sql_user',					$dbuser),
 				array('sql_pass',					$dbpasswd),
 				array('sql_db',						$dbname),
-				array('sql_port',					$dbport),
+				array('sql_port',					$dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'),
 				array('sql_query_pre',				'SET NAMES \'utf8\''),
 				array('sql_query_pre',				'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
 				array('sql_query_range',			'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),
diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/includes/search/sphinx/config_variable.php
index 35abe281cb..2c1d35a49c 100644
--- a/phpBB/includes/search/sphinx/config_variable.php
+++ b/phpBB/includes/search/sphinx/config_variable.php
@@ -75,6 +75,6 @@ class phpbb_search_sphinx_config_variable
 	*/
 	function to_string()
 	{
-		return "\t" . $this->name . ' = ' . str_replace("\n", "\\\n", $this->value) . ' ' . $this->comment . "\n";
+		return "\t" . $this->name . ' = ' . str_replace("\n", " \\\n", $this->value) . ' ' . $this->comment . "\n";
 	}
 }
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2ecddf49d4..867235e607 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -41,10 +41,12 @@ if (!function_exists('phpbb_require_updated'))
 	}
 }
 
-function phpbb_end_update($cache)
+function phpbb_end_update($cache, $config)
 {
 	$cache->purge();
 
+	$config->increment('assets_version', 1);
+
 ?>
 								</p>
 							</div>
@@ -232,7 +234,7 @@ while (!$migrator->finished())
 	{
 		echo $e->getLocalisedMessage($user);
 
-		phpbb_end_update($cache);
+		phpbb_end_update($cache, $config);
 	}
 
 	$state = array_merge(array(
@@ -265,7 +267,7 @@ while (!$migrator->finished())
 		echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
 		echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
-		phpbb_end_update($cache);
+		phpbb_end_update($cache, $config);
 	}
 }
 
@@ -276,4 +278,4 @@ if ($orig_version != $config['version'])
 
 echo $user->lang['DATABASE_UPDATE_COMPLETE'];
 
-phpbb_end_update($cache);
+phpbb_end_update($cache, $config);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f118d330ba..c25925a9c8 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -777,9 +777,9 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
 
 # User Notification Options (for first user)
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, 'phpbb_notification_method_email');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, 'phpbb_notification_method_email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, 'email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, 'email');
 
 # POSTGRES COMMIT #