Complex classes like QueryGenerator often do a lot of different things. To break such a class down, we need to identify a cohesive component within that class. A common approach to find such a component is to look for fields/methods that share the same prefixes, or suffixes. You can also have a look at the cohesion graph to spot any un-connected, or weakly-connected components.
Once you have determined the fields that belong together, you can apply the Extract Class refactoring. If the component makes sense as a sub-class, Extract Subclass is also a candidate, and is often faster.
While breaking up the class, it is a good idea to analyze how other classes use QueryGenerator, and based on these observations, apply Extract Interface, too.
| 1 | <?php |
||
| 16 | class QueryGenerator { |
||
| 17 | |||
| 18 | /* The term to search for */ |
||
| 19 | private $queryText = ''; |
||
| 20 | |||
| 21 | /* Fields to search for as an array of Name to weighting, otherwise null for all, ie not |
||
| 22 | a multi match query */ |
||
| 23 | private $fields = null; |
||
| 24 | |||
| 25 | /* Aggregations already selected in format array(key => value), e.g. array('ISO' => 400) */ |
||
| 26 | private $selectedFilters = null; |
||
| 27 | |||
| 28 | /* For an empty query, show results or not */ |
||
| 29 | private $showResultsForEmptyQuery = false; |
||
| 30 | |||
| 31 | /* Manipulator to be used for aggregations */ |
||
| 32 | private $manipulator = null; |
||
| 33 | |||
| 34 | /* The length of a page of results */ |
||
| 35 | private $pageLength = 10; |
||
| 36 | |||
| 37 | /* Where to start, normally a multiple of pageLength */ |
||
| 38 | private $start = 0; |
||
| 39 | |||
| 40 | /* Cache hit counter for test purposes */ |
||
| 41 | private static $cacheHitCtr = 0; |
||
| 42 | |||
| 43 | /** |
||
| 44 | * Comma separated list of SilverStripe ClassNames to search. Leave blank for all |
||
| 45 | * @var string |
||
| 46 | */ |
||
| 47 | private $classes = ''; |
||
| 48 | |||
| 49 | |||
| 50 | 13 | public function setQueryText($newQueryText) { |
|
| 53 | |||
| 54 | |||
| 55 | 13 | public function setFields($newFields) { |
|
| 58 | |||
| 59 | |||
| 60 | 13 | public function setSelectedFilters($newSelectedFilters) { |
|
| 63 | |||
| 64 | |||
| 65 | 13 | public function setShowResultsForEmptyQuery($newShowResultsForEmptyQuery) { |
|
| 68 | |||
| 69 | |||
| 70 | 1 | public function getShowResultsForEmptyQuery() { |
|
| 71 | 1 | return $this->showResultsForEmptyQuery; |
|
| 72 | } |
||
| 73 | |||
| 74 | |||
| 75 | 8 | public function setPageLength($newPageLength) { |
|
| 78 | |||
| 79 | |||
| 80 | 1 | public function setStart($newStart) { |
|
| 83 | |||
| 84 | |||
| 85 | /** |
||
| 86 | * Update the list of Classes to search, use SilverStripe ClassName comma separated |
||
| 87 | * @param string $newClasses comma separated list of SilverStripe ClassNames |
||
| 88 | */ |
||
| 89 | 9 | public function setClasses($newClasses) { |
|
| 92 | |||
| 93 | |||
| 94 | |||
| 95 | /** |
||
| 96 | * Set the manipulator, mainly used for aggregation |
||
| 97 | * @param string $newManipulator manipulator used for aggregation, must implement ElasticaSearchHelper |
||
| 98 | */ |
||
| 99 | 7 | public function setQueryResultManipulator($newManipulator) { |
|
| 102 | |||
| 103 | |||
| 104 | /* |
||
| 105 | Accessor to cache hit counter, for testing purposes |
||
| 106 | */ |
||
| 107 | 1 | public static function getCacheHitCounter() { |
|
| 108 | 1 | return self::$cacheHitCtr; |
|
| 109 | } |
||
| 110 | |||
| 111 | |||
| 112 | 1 | public static function resetCacheHitCounter() { |
|
| 113 | 1 | self::$cacheHitCtr = 0; |
|
| 114 | 1 | } |
|
| 115 | |||
| 116 | |||
| 117 | /** |
||
| 118 | * From the input variables create a suitable query using Elastica. This is somewhat complex |
||
| 119 | * due to different formats with and without query text, with and without filters, with and |
||
| 120 | * without selected filters. Extracting this logic into a separate class makes testing much |
||
| 121 | * faster and can be used for testing new cases |
||
| 122 | * |
||
| 123 | * @return \Elastica\Query Query object suitable for searching using the Elastica library |
||
| 124 | */ |
||
| 125 | 13 | public function generateElasticaQuery() { |
|
| 181 | |||
| 182 | |||
| 183 | /** |
||
| 184 | * Generate a query for autocomplete |
||
| 185 | * @return \Elastica\Query Autocompletion query for use with Elastica library |
||
| 186 | */ |
||
| 187 | public function generateElasticaAutocompleteQuery() { |
||
| 221 | |||
| 222 | |||
| 223 | |||
| 224 | |||
| 225 | |||
| 226 | /** |
||
| 227 | * Using a query string object, return a suitable filtered or unfiltered query object |
||
| 228 | * @param Elastica\Query\QueryString $textQuery A query_string representing the current query |
||
| 229 | */ |
||
| 230 | 13 | private function addFilters($textQuery) { |
|
| 288 | |||
| 289 | |||
| 290 | 13 | private function addAggregation(&$query) { |
|
| 296 | |||
| 297 | |||
| 298 | /* |
||
| 299 | Simplest form of search, namely search for text string against all fields. In Curl terms: |
||
| 300 | |||
| 301 | curl -XGET 'http://localhost:9200/elastica_ss_module_test_en_us/_search?pretty' -d ' |
||
| 302 | { |
||
| 303 | "query": { |
||
| 304 | "query_string": { |
||
| 305 | "query": "Image" |
||
| 306 | } |
||
| 307 | } |
||
| 308 | } |
||
| 309 | ' |
||
| 310 | */ |
||
| 311 | 8 | private function simpleTextQuery() { |
|
| 325 | |||
| 326 | |||
| 327 | // USE MATCH_ALL, see https://www.elastic.co/guide/en/elasticsearch/reference/1.4/query-dsl-match-all-query.html |
||
| 328 | 5 | private function multiMatchQuery() { |
|
| 329 | 5 | $textQuery = new MultiMatch(); |
|
| 330 | |||
| 331 | // Differing cases for showing and not showing empty string |
||
| 332 | 5 | if ($this->queryText == '') { |
|
| 333 | 4 | if (!$this->showResultsForEmptyQuery) { |
|
| 334 | 1 | $textQuery->setQuery(''); |
|
| 335 | 1 | } else { |
|
| 336 | //WIP |
||
| 337 | 4 | $textQuery = new MatchAll(); |
|
| 338 | } |
||
| 339 | 4 | } |
|
| 340 | |||
| 341 | // If there is text, search for it regardless |
||
| 342 | else { |
||
| 343 | 4 | $textQuery->setQuery($this->queryText); |
|
| 344 | } |
||
| 345 | |||
| 346 | 5 | if ($textQuery instanceof MultiMatch) { |
|
| 347 | 5 | $elasticaFields = $this->convertWeightedFieldsForElastica($this->fields); |
|
| 348 | 5 | $textQuery->setFields($elasticaFields); |
|
| 349 | 5 | $textQuery->setType('most_fields'); |
|
| 350 | |||
| 351 | //Setting the lenient flag means that numeric fields can be searched for text values |
||
| 352 | 5 | $textQuery->setParam('lenient', true); |
|
| 353 | 5 | } |
|
| 354 | |||
| 355 | 5 | return $textQuery; |
|
| 356 | } |
||
| 357 | |||
| 358 | |||
| 359 | |||
| 360 | /** |
||
| 361 | * Use the configuration from the Search settings held in the database to |
||
| 362 | * form the array of fields suitable for a multimatch query. Call this |
||
| 363 | * after having called setClasses |
||
| 364 | * |
||
| 365 | * @return array Array of fieldsname to weight |
||
| 366 | */ |
||
| 367 | 12 | public function convertWeightedFieldsForElastica($fields) { |
|
| 368 | 12 | $result = array(); |
|
| 369 | 12 | $nameToType = self::getSearchFieldsMappingForClasses($this->classes,$fields); |
|
| 370 | |||
| 371 | 12 | if (sizeof($fields) != 0) { |
|
| 372 | 12 | foreach ($fields as $fieldName => $weight) { |
|
| 373 | 12 | $fieldCfg = "$fieldName"; |
|
| 374 | 12 | if ($weight != 1) { |
|
| 375 | 9 | $fieldCfg .= '^'.$weight; |
|
| 376 | 9 | } |
|
| 377 | 12 | array_push($result, $fieldCfg); |
|
| 378 | 12 | if (isset($nameToType[$fieldName])) { |
|
| 379 | 12 | if ($nameToType[$fieldName] == 'string') { |
|
| 380 | 10 | $fieldCfg = "{$fieldName}.*"; |
|
| 381 | 10 | if ($weight != 1) { |
|
| 382 | 7 | $fieldCfg .= '^'.$weight; |
|
| 383 | 7 | } |
|
| 384 | 10 | array_push($result, $fieldCfg); |
|
| 385 | 10 | } |
|
| 386 | 12 | } else { |
|
| 387 | 1 | throw new \Exception("Field $fieldName does not exist"); |
|
| 388 | } |
||
| 389 | 12 | } |
|
| 390 | 11 | } |
|
| 391 | 11 | return $result; |
|
| 392 | } |
||
| 393 | |||
| 394 | |||
| 395 | |||
| 396 | /** |
||
| 397 | * Get a hash of name to Elasticserver mapping, e.g. 'Title' => 'string' |
||
| 398 | * Use SS_Cache to save on database hits, as this data only changes at build time |
||
| 399 | * @param string $classes CSV or array of ClassNames to search, or empty for |
||
| 400 | * all of SiteTree |
||
| 401 | * @return array Array hash of fieldname to Elasticsearch mapping |
||
| 402 | */ |
||
| 403 | 12 | public static function getSearchFieldsMappingForClasses($classes = null, $fieldsAllowed = null) { |
|
| 404 | |||
| 405 | // Get a array of relevant classes to search |
||
| 406 | 12 | $cache = QueryGenerator::getCache(); |
|
|
1 ignored issue
–
show
|
|||
| 407 | 12 | $csvClasses = $classes; |
|
| 408 | 12 | if (is_array($classes)) { |
|
| 409 | 2 | $csvClasses = implode(',',$classes); |
|
| 410 | 2 | } |
|
| 411 | |||
| 412 | 12 | $key ='SEARCHABLE_FIELDS_'.str_replace(',', '_', $csvClasses); |
|
| 413 | |||
| 414 | 12 | if ($fieldsAllowed) { |
|
| 415 | 12 | $fieldsAllowedCSV = self::convertToQuotedCSV(array_keys($fieldsAllowed)); |
|
| 416 | 12 | $key .= '_' . str_replace(',', '_', str_replace("'", '_',$fieldsAllowedCSV)); |
|
| 417 | 12 | $key = str_replace('.', '_', $key); |
|
| 418 | 12 | $key = str_replace(' ', '_', $key); |
|
| 419 | 12 | } |
|
| 420 | |||
| 421 | 12 | $result = $cache->load($key); |
|
| 422 | 12 | if (!$result) { |
|
| 423 | 12 | $relevantClasses = array(); |
|
| 424 | 12 | if (empty($csvClasses)) { |
|
| 425 | 4 | $sql = "SELECT DISTINCT Name from SearchableClass where InSiteTree = 1 order by Name"; |
|
| 426 | 4 | $records = \DB::query($sql); |
|
| 427 | 4 | foreach ($records as $record) { |
|
| 428 | 4 | array_push($relevantClasses, $record['Name']); |
|
| 429 | 4 | } |
|
| 430 | 4 | } else { |
|
| 431 | 9 | $relevantClasses = explode(',', $csvClasses); |
|
| 432 | } |
||
| 433 | |||
| 434 | 12 | $result = array(); |
|
| 435 | 12 | if (sizeof($relevantClasses) > 0) { |
|
| 436 | 12 | $relevantClassesCSV = self::convertToQuotedCSV($relevantClasses); |
|
| 437 | |||
| 438 | //Perform a database query to get get a list of searchable fieldnames to Elasticsearch mapping |
||
| 439 | $sql = "SELECT sf.Name,sf.Type FROM SearchableClass sc INNER JOIN SearchableField sf ON " |
||
| 440 | 12 | . "sc.id = sf.SearchableClassID WHERE sc.name IN ($relevantClassesCSV)"; |
|
| 441 | 12 | if ($fieldsAllowed) { |
|
| 442 | 12 | $fieldsAllowedCSV = self::convertToQuotedCSV(array_keys($fieldsAllowed)); |
|
| 443 | 12 | if (strlen($fieldsAllowedCSV) > 0) { |
|
| 444 | 12 | $sql .= " AND sf.Name IN ($fieldsAllowedCSV)"; |
|
| 445 | 12 | } |
|
| 446 | 12 | } |
|
| 447 | |||
| 448 | 12 | $records = \DB::query($sql); |
|
| 449 | 12 | foreach ($records as $record) { |
|
| 450 | 12 | $name = $record['Name']; |
|
| 451 | 12 | $type = $record['Type']; |
|
| 452 | |||
| 453 | /** |
||
| 454 | * FIXME: |
||
| 455 | * This will overwrite duplicate keys such as Content or Title from other Classes. |
||
| 456 | * Ideally need to check if the mapping being overwritten changes, e.g. if |
||
| 457 | * a field such as BirthDate is date in one class and string in another |
||
| 458 | * and throw an exception accordingly |
||
| 459 | */ |
||
| 460 | 12 | $result[$name] = $type; |
|
| 461 | 12 | } |
|
| 462 | 12 | } |
|
| 463 | 12 | $cache->save(json_encode($result),$key); |
|
| 464 | 12 | } else { |
|
| 465 | // true is necessary here to decode the array hash back to an array and not a struct |
||
| 466 | 3 | self::$cacheHitCtr++; |
|
| 467 | 3 | $result = json_decode($result,true); |
|
| 468 | } |
||
| 469 | |||
| 470 | 12 | return $result; |
|
| 471 | } |
||
| 472 | |||
| 473 | |||
| 474 | 12 | public static function getCache() { |
|
| 478 | |||
| 479 | |||
| 480 | /** |
||
| 481 | * Convert either a CSV string or an array to a CSV single quoted string, suitable for use in |
||
| 482 | * an SQL IN clause |
||
| 483 | * @param string|array $csvOrArray A string separated by commas or an array |
||
| 484 | * @return string string or array as a CSV, but values quoted with single quotes |
||
| 485 | */ |
||
| 486 | 17 | public static function convertToQuotedCSV($csvOrArray) { |
|
| 505 | } |
||
| 506 |
It seems like the type of the argument is not accepted by the function/method which you are calling.
In some cases, in particular if PHP’s automatic type-juggling kicks in this might be fine. In other cases, however this might be a bug.
We suggest to add an explicit type cast like in the following example: