WebSVN – Moodle – Diff – /search/classes/manager.php

      * @var string Core search area category for results that do not fit into any of existing categories.
      */
     const SEARCH_AREA_CATEGORY_OTHER = 'core-other';
+    /**
+     * @var int To avoid race conditions, do not index documents newer than this many seconds.
+     */
+    const INDEXING_DELAY = 5;
     /**
      * @var \core_search\base[] Enabled search areas.
      */
     protected static $enabledsearchareas = null;
      * @param float $timelimit Time limit in seconds (0 = no time limit)
      * @param \progress_trace|null $progress Optional class for tracking progress
      * @throws \moodle_exception
      * @return bool Whether there was any updated document or not.
      */
-    public function index($fullindex = false, $timelimit = 0, \progress_trace $progress = null) {
+    public function index($fullindex = false, $timelimit = 0, ?\progress_trace $progress = null) {
-        global $DB;
+        global $DB, $CFG;
         // Cannot combine time limit with reindex.
         if ($timelimit && $fullindex) {
             throw new \coding_exception('Cannot apply time limit when reindexing');
             // Decide time to stop.
             $stopat = self::get_current_time() + $timelimit;
+        }
+        // Work out if we are in test mode, in which case we disable the indexing delay (because
+        // the normal pattern is to add a document and immediately index it).
+        $testmode = (PHPUNIT_TEST || defined('BEHAT_TEST')) &&
             empty($CFG->searchindexingdelayfortestscript);
         foreach ($searchareas as $areaid => $searcharea) {
             // This is used to store this component config.
             list($componentconfigname, $varname) = $searcharea->get_config_var_name();
+            $prevtimestart = intval(get_config($componentconfigname, $varname . '_indexingstart'));
+            // The effective start time of previous indexing was some seconds earlier because we
+            // only index data up to that time, to avoid race conditions (if it takes a while to
+            // write a document to the database and the timecreated for that document ends up being
+            // a second or two out of date). This mechanism is disabled for tests.
+            if (!$testmode) {
+                // The -1 here is because for example, if _indexingstart is 123, we will have
+                // indexed everything up to 123 - 5 = 118 (inclusive). So next time, we can start
+                // at 119 = 123 - 4 and we don't have to repeat 118.
+                $prevtimestart -= (self::INDEXING_DELAY - 1);
             $prevtimestart = intval(get_config($componentconfigname, $varname . '_indexingstart'));
             if ($fullindex === true) {
                 $referencestarttime = 0;
             $options = array('indexfiles' => $fileindexing, 'lastindexedtime' => $prevtimestart);
             if ($timelimit) {
                 $options['stopat'] = $stopat;
+            }
             $options['progress'] = $progress;
+            // Skip 'future' documents, also any written very recently (to avoid race conditions).
+            // The exception is for PHPunit and Behat (step 'I update the global search index')
+            // where we allow it to index recent documents as well, we don't want it to have to wait.
-            $iterator = new skip_future_documents_iterator(new \core\dml\recordset_walk(
+            $iterator = new skip_future_documents_iterator(
-                    $recordset, array($searcharea, 'get_document'), $options));
+                new \core\dml\recordset_walk($recordset, [$searcharea, 'get_document'], $options),
+                $indexingstart - ($testmode ? 0 : self::INDEXING_DELAY),
+            );
             $result = $this->engine->add_documents($iterator, $searcharea, $options);
             $recordset->close();
             $batchinfo = '';
             if (count($result) === 6) {
                 [$numrecords, $numdocs, $numdocsignored, $lastindexeddoc, $partial, $batches] = $result;
      * @param string $startfromarea Area to start from
      * @param int $startfromtime Timestamp to start from
      * @return \stdClass Object indicating success
      */
     public function index_context($context, $singleareaid = '', $timelimit = 0,
-            \progress_trace $progress = null, $startfromarea = '', $startfromtime = 0) {
+            ?\progress_trace $progress = null, $startfromarea = '', $startfromtime = 0) {
         if (!$progress) {
             $progress = new \null_progress_trace();
+        }
      * If there are no index requests, the function will do nothing.
+     *
      * @param float $timelimit Time limit (0 = none)
      * @param \progress_trace|null $progress Optional progress indicator
      */
-    public function process_index_requests($timelimit = 0.0, \progress_trace $progress = null) {
+    public function process_index_requests($timelimit = 0.0, ?\progress_trace $progress = null) {
         global $DB;
         if (!$progress) {
             $progress = new \null_progress_trace();

Proyectos de Subversion Moodle

(root)/search/classes/manager.php – Rev 1 → 1441