MDL-66140 search: Mitigate PECL solr extension regression

scara · scara · commit e3d9c87993b6 · 2019-08-11T20:06:01.000+02:00
Refs: - https://bugs.php.net/bug.php?id=72740 - https://bugs.php.net/bug.php?id=75631 - php/pecl-search_engine-solr#16
diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
@@ -433,7 +433,10 @@ public function add_fields($query) {
             $query->addField($key);
             if ($dismax && !empty($field['mainquery'])) {
                 // Add fields the main query should be run against.
-                $query->addQueryField($key);
+                // Due to a regression in the PECL solr extension, https://bugs.php.net/bug.php?id=72740,
+                // a boost value is required, even if it is optional; to avoid boosting one among other fields,
+                // the explicit boost value will be the default one, for every field.
+                $query->addQueryField($key, 1);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,10 @@ public function add_fields($query) {`
`433`	`433`	`$query->addField($key);`
`434`	`434`	`if ($dismax && !empty($field['mainquery'])) {`
`435`	`435`	`// Add fields the main query should be run against.`
`436`		`- $query->addQueryField($key);`
	`436`	`+ // Due to a regression in the PECL solr extension, https://bugs.php.net/bug.php?id=72740,`
	`437`	`+ // a boost value is required, even if it is optional; to avoid boosting one among other fields,`
	`438`	`+ // the explicit boost value will be the default one, for every field.`
	`439`	`+ $query->addQueryField($key, 1);`
`437`	`440`	`}`
`438`	`441`	`}`
`439`	`442`	`}`