Version 4.3.0

applications/core/tasks/viewupdates.php

@@ -38,52 +38,96 @@ class _viewupdates extends \IPS\Task
 		$this->runUntilTimeout(function(){
 			try
 			{
-				$result = \IPS\Db::i()->select( 'classname, id, COUNT(*) AS count', 'core_view_updates', NULL, NULL, 20, array( 'classname', 'id' ) );
-
-				/* If there's no more, break the loop and stop */
-				if( !count( $result ) )
+				$database = \IPS\Db::i()->select( 'classname, id, COUNT(*) AS count', 'core_view_updates', NULL, NULL, 20, array( 'classname', 'id' ), NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER );
+				$redis = array();
+				
+				/* Database results first */
+				foreach( $database as $row )
 				{
-					return FALSE;
-				}
-
-				foreach( $result as $row )
-				{
-					$class = $row['classname'];
-					if ( class_exists( $class ) and in_array( 'IPS\Content\Views', class_implements( $class ) ) AND isset( $class::$databaseColumnMap['views'] ) )
+					try
 					{
-						try
-						{
-							\IPS\Db::i()->update(
-								$class::$databaseTable,
-								"`{$class::$databasePrefix}{$class::$databaseColumnMap['views']}`=`{$class::$databasePrefix}{$class::$databaseColumnMap['views']}`+{$row['count']}",
-								array( "{$class::$databasePrefix}{$class::$databaseColumnId}=?", $row['id'] )
-							);
-						}
-						catch( \IPS\Db\Exception $e )
-						{
-							/* Table to update no longer exists */
-							if( $e->getCode() == 1146 )
-							{
-								\IPS\Db::i()->delete( 'core_view_updates', array( 'classname=?', $row['classname'] ) );
-							}
-
-							throw $e;
-						}
+						$this->update( $row['classname'], $row['id'], $row['count'] );
 					}
-
+					catch( \OutOfRangeException $e )
+					{
+						\IPS\Db::i()->delete( 'core_view_updates', array( 'classname=?', $row['classname'] ) );
+					}
+					
 					\IPS\Db::i()->delete( 'core_view_updates', array( 'classname=? AND id=?', $row['classname'], $row['id'] ) );
 				}
+			}
+			catch ( \UnderflowException $e ) { }
+			
+			/* Now try redis */
+			if ( \IPS\REDIS_ENABLED and \IPS\CACHE_METHOD == 'Redis' and \IPS\CACHE_CONFIG )
+			{
+				try
+				{
+					$redis = \IPS\Redis::i()->zRevRangeByScore( 'topic_views', '+inf', '-inf', array('withscores' => TRUE, 'limit' => array( 0, 20 ) ) );
 
-				/* If we're here we just ran some, so we can return true to see if there are any more to run */
+					foreach( $redis as $data => $count )
+					{
+						list( $class, $id ) = explode( '__', $data );
+						
+						try
+						{
+							$this->update( $class, $id, intval( $count ) );
+						}
+						catch( \OutOfRangeException $e ) { }
+						
+						\IPS\Redis::i()->zRem( 'topic_views', $data );
+					}
+				}
+				catch( \Exception $e ) { }
+			}
+			
+			/* Go for another go? */
+			if ( count( $database ) or count( $redis ) )
+			{
 				return TRUE;
 			}
-			catch ( \UnderflowException $e )
+			else
 			{
 				return FALSE;
 			}
 		});
 	}
 	
+	/**
+	 * Update the row
+	 *
+	 * @param	string	$class  Class to update
+	 * @param	int		$id		ID of item
+	 * @param	int		$count	Count to update
+	 * @throws \OutOfRangeException	When table to update no longer exists
+	 */
+	protected function update( $class, $id, $count )
+	{
+		if ( class_exists( $class ) and in_array( 'IPS\Content\Views', class_implements( $class ) ) AND isset( $class::$databaseColumnMap['views'] ) )
+		{
+			try
+			{
+				\IPS\Db::i()->update(
+					$class::$databaseTable,
+					"`{$class::$databasePrefix}{$class::$databaseColumnMap['views']}`=`{$class::$databasePrefix}{$class::$databaseColumnMap['views']}`+{$count}",
+					array( "{$class::$databasePrefix}{$class::$databaseColumnId}=?", $id )
+				);
+				
+				\IPS\Content\Search\Index::i()->updateViewCounts( $class, $id, $count );
+			}
+			catch( \IPS\Db\Exception $e )
+			{
+				/* Table to update no longer exists */
+				if( $e->getCode() == 1146 )
+				{
+					throw new \OutOfRangeException;
+				}
+
+				throw $e;
+			}
+		}
+	}
+	
 	/**
 	 * Cleanup
 	 *