[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Handle simply newlines
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358086 )
Change subject: Handle simply newlines
..
Handle simply newlines
Remove multiple empty lines and add some lines to functions
Prepare to make phpcs pass
Change-Id: I82926472980bd51ebe6375252d4154155397158b
---
M CirrusSearch.php
M includes/BuildDocument/Completion/SuggestBuilder.php
M includes/BuildDocument/Completion/SuggestScoring.php
M includes/CompletionSuggester.php
M includes/Connection.php
M includes/Elastica/MultiSearch.php
M includes/Elastica/ReindexTask.php
M includes/Extra/Query/TokenCountRouter.php
M includes/Hooks.php
M includes/InterwikiSearcher.php
M includes/Maintenance/AnalysisConfigBuilder.php
M includes/Maintenance/IndexCreator.php
M includes/Maintenance/MappingConfigBuilder.php
M includes/Maintenance/MetaStoreIndex.php
M includes/NearMatchPicker.php
M includes/OtherIndexes.php
M includes/Query/FullTextSimpleMatchQueryBuilder.php
M includes/Query/SimpleKeywordFeature.php
M includes/Sanity/Checker.php
M includes/Sanity/Remediator.php
M includes/Search/DatetimeIndexField.php
M includes/Search/RescoreBuilders.php
M includes/Search/ResultsType.php
M includes/Search/SearchContext.php
M includes/Search/SourceTextIndexField.php
M includes/Search/TextIndexField.php
M includes/Searcher.php
M includes/SiteMatrixInterwikiResolver.php
M includes/Util.php
M maintenance/forceSearchIndex.php
M maintenance/saneitizeJobs.php
M maintenance/updateSuggesterIndex.php
M profiles/PhraseSuggesterProfiles.config.php
M profiles/PhraseSuggesterProfiles.php
M tests/jenkins/FullyFeaturedConfig.php
M tests/relforge/bm25enwiki/rescore.inc
M tests/relforge/bm25enwiki_inclinks_pv/rescore.inc
M tests/relforge/bm25enwiki_inclinks_pv_reverse/rescore.inc
M tests/relforge/bm25frwiki/rescore.inc
M tests/relforge/en-wp-bm25-wp10-normal-sugg/rescore.inc
M tests/relforge/en-wp-bm25-wp10/rescore.inc
M tests/unit/CompletionSuggesterTest.php
M tests/unit/InterwikiResolverTest.php
M tests/unit/RequestLoggerTest.php
M tests/unit/SearcherTest.php
M tests/unit/SuggestScoringTest.php
M tests/unit/UserTestingTest.php
47 files changed, 83 insertions(+), 84 deletions(-)
Approvals:
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 726c1cf..c2e6fc2 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -531,7 +531,6 @@
'minimum_should_match' => '30%',
];
-
// Hard limit to the max_query_terms parameter of more like this queries.
// This prevent running too large queries.
$wgCirrusSearchMoreLikeThisMaxQueryTermsLimit = 100;
@@ -811,7 +810,6 @@
*/
$wgCirrusSearchUseIcuTokenizer = 'default';
-
/**
* Set the default scoring function to be used by
maintenance/updateSuggesterIndex.php
* @see includes/BuildDocument/SuggestScoring.php for more details about
scoring functions
@@ -1090,7 +1088,6 @@
* reindex is running.
*/
$wgCirrusSearchPrefixIds = false;
-
/**
* Adds an artificial backend latency in miroseconds.
diff --git a/includes/BuildDocument/Completion/SuggestBuilder.php
b/includes/BuildDocument/Completion/SuggestBuilder.php
index 69c067b..7de959d 100644
--- a/includes/BuildDocument/Completion/SuggestBuilder.php
+++ b/includes/BuildDocument/Completion/SuggestBuilder.php
@@ -217,7 +217,6 @@
return array_values( array_unique( $fields ) );
}
-
/**
* Builds the 'title' suggestion.
*
diff --git a/includes/BuildDocument/Completion/SuggestScoring.php
b/includes/BuildDocument/Completion/SuggestScoring.php
index 359e7de..ef64e76 100644
--- a/includes/BuildDocument/Completion/SuggestScoring.php
+++ b/includes/BuildDocument/Completion/SuggestScoring.php
@@ -66,7 +66,6 @@
public function setMaxDocs( $maxDocs );
}
-
/**
* Very simple scoring method based on incoming links
*/
@@ -88,7 +87,8 @@
/**
* @param int $maxDocs
*/
- public function setMaxDocs( $maxDocs ) {}
+ public function setMaxDocs( $maxDocs ) {
+ }
}
/**
@@ -276,7 +276,6 @@
}
}
}
-
/**
* Score that combines QualityScore and the pageviews statistics (popularity)
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 9fc8bf7..84523d9 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -404,7 +404,6 @@
// for CrossNS redirect
we prefer the returned suggestion
$suggestion->setText(
$targetTitle );
-
} else {
$suggestion->setText(
$page );
}
diff --git
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Handle simply newlines
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/358086 )
Change subject: Handle simply newlines
..
Handle simply newlines
Remove multiple empty lines and add some lines to functions
Prepare to make phpcs pass
Change-Id: I82926472980bd51ebe6375252d4154155397158b
---
M CirrusSearch.php
M includes/BuildDocument/Completion/SuggestBuilder.php
M includes/BuildDocument/Completion/SuggestScoring.php
M includes/CompletionSuggester.php
M includes/Connection.php
M includes/Elastica/MultiSearch.php
M includes/Elastica/ReindexTask.php
M includes/Extra/Query/TokenCountRouter.php
M includes/Hooks.php
M includes/InterwikiSearcher.php
M includes/Maintenance/AnalysisConfigBuilder.php
M includes/Maintenance/IndexCreator.php
M includes/Maintenance/MappingConfigBuilder.php
M includes/Maintenance/MetaStoreIndex.php
M includes/NearMatchPicker.php
M includes/OtherIndexes.php
M includes/Query/FullTextSimpleMatchQueryBuilder.php
M includes/Query/SimpleKeywordFeature.php
M includes/Sanity/Checker.php
M includes/Sanity/Remediator.php
M includes/Search/DatetimeIndexField.php
M includes/Search/RescoreBuilders.php
M includes/Search/ResultsType.php
M includes/Search/SearchContext.php
M includes/Search/SourceTextIndexField.php
M includes/Search/TextIndexField.php
M includes/Searcher.php
M includes/SiteMatrixInterwikiResolver.php
M includes/Util.php
M maintenance/forceSearchIndex.php
M maintenance/saneitizeJobs.php
M maintenance/updateSuggesterIndex.php
M profiles/PhraseSuggesterProfiles.config.php
M profiles/PhraseSuggesterProfiles.php
M tests/jenkins/FullyFeaturedConfig.php
M tests/relforge/bm25enwiki/rescore.inc
M tests/relforge/bm25enwiki_inclinks_pv/rescore.inc
M tests/relforge/bm25enwiki_inclinks_pv_reverse/rescore.inc
M tests/relforge/bm25frwiki/rescore.inc
M tests/relforge/en-wp-bm25-wp10-normal-sugg/rescore.inc
M tests/relforge/en-wp-bm25-wp10/rescore.inc
M tests/unit/CompletionSuggesterTest.php
M tests/unit/InterwikiResolverTest.php
M tests/unit/RequestLoggerTest.php
M tests/unit/SearcherTest.php
M tests/unit/SuggestScoringTest.php
M tests/unit/UserTestingTest.php
47 files changed, 68 insertions(+), 84 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/86/358086/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 726c1cf..c2e6fc2 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -531,7 +531,6 @@
'minimum_should_match' => '30%',
];
-
// Hard limit to the max_query_terms parameter of more like this queries.
// This prevent running too large queries.
$wgCirrusSearchMoreLikeThisMaxQueryTermsLimit = 100;
@@ -811,7 +810,6 @@
*/
$wgCirrusSearchUseIcuTokenizer = 'default';
-
/**
* Set the default scoring function to be used by
maintenance/updateSuggesterIndex.php
* @see includes/BuildDocument/SuggestScoring.php for more details about
scoring functions
@@ -1090,7 +1088,6 @@
* reindex is running.
*/
$wgCirrusSearchPrefixIds = false;
-
/**
* Adds an artificial backend latency in miroseconds.
diff --git a/includes/BuildDocument/Completion/SuggestBuilder.php
b/includes/BuildDocument/Completion/SuggestBuilder.php
index 69c067b..7de959d 100644
--- a/includes/BuildDocument/Completion/SuggestBuilder.php
+++ b/includes/BuildDocument/Completion/SuggestBuilder.php
@@ -217,7 +217,6 @@
return array_values( array_unique( $fields ) );
}
-
/**
* Builds the 'title' suggestion.
*
diff --git a/includes/BuildDocument/Completion/SuggestScoring.php
b/includes/BuildDocument/Completion/SuggestScoring.php
index 359e7de..ef64e76 100644
--- a/includes/BuildDocument/Completion/SuggestScoring.php
+++ b/includes/BuildDocument/Completion/SuggestScoring.php
@@ -66,7 +66,6 @@
public function setMaxDocs( $maxDocs );
}
-
/**
* Very simple scoring method based on incoming links
*/
@@ -88,7 +87,8 @@
/**
* @param int $maxDocs
*/
- public function setMaxDocs( $maxDocs ) {}
+ public function setMaxDocs( $maxDocs ) {
+ }
}
/**
@@ -276,7 +276,6 @@
}
}
}
-
/**
* Score that combines QualityScore and the pageviews statistics (popularity)
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 9fc8bf7..84523d9 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -404,7 +404,6 @@
// for CrossNS redirect
we prefer the returned suggestion
$suggestion->setText(
$targetTitle );
-
} else {
$suggestion->setText(
$page );
}
diff --git a/includes/Connection.php b/includes/Connection.php
index
