Merge pull request #3704 from 10up/fix/issue-3611-remove-old-mappings

Remove Old mappings
10up · Oct 24, 2023 · 24b619a · 24b619a
2 parents 8a4a379 + bbb8d99
commit 24b619a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 1,464 deletions.
diff --git a/includes/classes/Indexable/Comment/Comment.php b/includes/classes/Indexable/Comment/Comment.php
@@ -703,12 +703,10 @@ public function generate_mapping() {
 
 		$es_version = (string) $es_version;
 
-		$mapping_file = 'initial.php';
+		$mapping_file = '7-0.php';
 
-		if ( version_compare( $es_version, '5.0', '<' ) ) {
-			$mapping_file = 'pre-5-0.php';
-		} elseif ( version_compare( $es_version, '7.0', '>=' ) ) {
-			$mapping_file = '7-0.php';
+		if ( version_compare( $es_version, '7.0', '<' ) ) {
+			$mapping_file = 'initial.php';
 		}
 
 		/**

diff --git a/includes/classes/Indexable/Post/Post.php b/includes/classes/Indexable/Post/Post.php
@@ -317,16 +317,10 @@ public function get_mapping_name() {
 		}
 		$es_version = (string) $es_version;
 
-		$mapping_file = '5-2.php';
+		$mapping_file = '7-0.php';
 
-		if ( ! $es_version || version_compare( $es_version, '5.0' ) < 0 ) {
-			$mapping_file = 'pre-5-0.php';
-		} elseif ( version_compare( $es_version, '5.0', '>=' ) && version_compare( $es_version, '5.2', '<' ) ) {
-			$mapping_file = '5-0.php';
-		} elseif ( version_compare( $es_version, '5.2', '>=' ) && version_compare( $es_version, '7.0', '<' ) ) {
+		if ( version_compare( $es_version, '7.0', '<' ) ) {
 			$mapping_file = '5-2.php';
-		} elseif ( version_compare( $es_version, '7.0', '>=' ) ) {
-			$mapping_file = '7-0.php';
 		}
 
 		return apply_filters( 'ep_post_mapping_version', $mapping_file );
@@ -1425,26 +1419,6 @@ protected function determine_mapping_version_based_on_existing( $mapping, $index
 			return '5-2.php';
 		}
 
-		/**
-		 * Check for 5-0 mapping.
-		 * `keyword` fields were only made available in ES 5.0
-		 *
-		 * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.0/release-notes-5.0.0.html
-		 */
-		if ( 'keyword' === $post_title_sortable['type'] ) {
-			return '5-0.php';
-		}
-
-		/**
-		 * Check for pre-5-0 mapping.
-		 * `string` fields were deprecated in ES 5.0 in favor of text/keyword
-		 *
-		 * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.0/release-notes-5.0.0.html
-		 */
-		if ( 'string' === $post_title_sortable['type'] ) {
-			return 'pre-5-0.php';
-		}
-
 		return 'unknown';
 	}
 

diff --git a/includes/classes/Indexable/Term/Term.php b/includes/classes/Indexable/Term/Term.php
@@ -539,12 +539,10 @@ public function generate_mapping() {
 		}
 		$es_version = (string) $es_version;
 
-		$mapping_file = 'initial.php';
+		$mapping_file = '7-0.php';
 
-		if ( version_compare( $es_version, '5.0', '<' ) ) {
-			$mapping_file = 'pre-5-0.php';
-		} elseif ( version_compare( $es_version, '7.0', '>=' ) ) {
-			$mapping_file = '7-0.php';
+		if ( version_compare( $es_version, '7.0', '<' ) ) {
+			$mapping_file = 'initial.php';
 		}
 
 		/**