API QueuedJob support for Solr_Reindex

API Incremental clear and re-index of records rather than clearing all records from SolrIndex up front
silverstripe · Jul 28, 2015 · 1683f77 · 1683f77
1 parent 259bd03
commit 1683f77
Show file tree

Hide file tree

Showing 22 changed files with 2,103 additions and 198 deletions.
diff --git a/_config.php b/_config.php
@@ -2,3 +2,5 @@
 
 global $databaseConfig;
 if (isset($databaseConfig['type'])) SearchUpdater::bind_manipulation_capture();
+
+Deprecation::notification_version('1.0.0', 'fulltextsearch');
diff --git a/_config/processor.yml b/_config/processor.yml
@@ -4,6 +4,10 @@ Name: defaultprocessor
 Injector:
   SearchUpdateProcessor:
     class: SearchUpdateImmediateProcessor
+  SolrReindexHandler:
+    class: SolrReindexImmediateHandler
+  SearchLogFactory:
+    class: 'MonologFactory'
 ---
 Name: messagequeueprocessor
 Only:
@@ -14,6 +18,8 @@ Except:
 Injector:
   SearchUpdateProcessor:
     class: SearchUpdateMessageQueueProcessor
+  SolrReindexHandler:
+    class: SolrReindexMessageHandler
 ---
 Name: queuedjobprocessor
 Only:
@@ -24,3 +30,5 @@ Except:
 Injector:
   SearchUpdateProcessor:
     class: SearchUpdateQueuedJobProcessor
+  SolrReindexHandler:
+    class: SolrReindexQueuedHandler
diff --git a/code/search/SearchVariant.php b/code/search/SearchVariant.php
@@ -39,6 +39,14 @@ abstract function reindexStates();
 	 */
 	abstract function activateState($state);
 
+	/**
+	 * Apply this variant to a search query
+	 *
+	 * @param SearchQuery $query
+	 * @param SearchIndex $index
+	 */
+	abstract public function alterQuery($query, $index);
+
 	/*** OVERRIDES end here*/
 
 	/** Holds a cache of all variants */

diff --git a/code/search/SearchVariantSiteTreeSubsitesPolyhome.php b/code/search/SearchVariantSiteTreeSubsitesPolyhome.php
@@ -48,7 +48,7 @@ function alterDefinition($base, $index) {
 		);
 	}
 
-	function alterQuery($query, $index) {
+	public function alterQuery($query, $index) {
 		$subsite = Subsite::currentSubsiteID();
 		$query->filter('_subsite', array($subsite, SearchQuery::$missing));
 	}

diff --git a/code/search/SearchVariantVersioned.php b/code/search/SearchVariantVersioned.php
@@ -28,7 +28,7 @@ function alterDefinition($base, $index) {
 		);
 	}
 
-	function alterQuery($query) {
+	public function alterQuery($query, $index) {
 		$stage = Versioned::current_stage();
 		$query->filter('_versionedstage', array($stage, SearchQuery::$missing));
 	}