Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52892
Change subject: Added 84 serialVersionUID
......................................................................
Added 84 serialVersionUID
Change-Id: Ibb8f2342b2ed90c92062278587683a8fa92415d9
---
M src/org/apache/lucene/search/ArticleNamespaceScaling.java
M src/org/apache/lucene/search/ArticleQueryWrap.java
M src/org/apache/lucene/search/ArticleScaling.java
M src/org/apache/lucene/search/ConstMinScore.java
M src/org/apache/lucene/search/CustomBoostQuery.java
M src/org/apache/lucene/search/LogTransformScore.java
M src/org/apache/lucene/search/PositionalMultiQuery.java
M src/org/apache/lucene/search/PositionalOptions.java
M src/org/apache/lucene/search/PositionalQuery.java
M src/org/apache/lucene/search/RelevanceQuery.java
M src/org/apache/lucene/search/RemoteSearchableMul.java
M src/org/wikimedia/lsearch/analyzers/ExtToken.java
M src/org/wikimedia/lsearch/beans/Article.java
M src/org/wikimedia/lsearch/beans/IndexReportCard.java
M src/org/wikimedia/lsearch/beans/Redirect.java
M src/org/wikimedia/lsearch/beans/ReportId.java
M src/org/wikimedia/lsearch/beans/ResultSet.java
M src/org/wikimedia/lsearch/beans/SearchResults.java
M src/org/wikimedia/lsearch/beans/Title.java
M src/org/wikimedia/lsearch/highlight/Highlight.java
M src/org/wikimedia/lsearch/highlight/HighlightResult.java
M src/org/wikimedia/lsearch/highlight/Snippet.java
M src/org/wikimedia/lsearch/index/IndexUpdateRecord.java
M src/org/wikimedia/lsearch/index/WikiSimilarity.java
M src/org/wikimedia/lsearch/interoperability/CustomSocketFactory.java
M src/org/wikimedia/lsearch/search/AggregateInfoImpl.java
M src/org/wikimedia/lsearch/search/ArticleInfoImpl.java
M src/org/wikimedia/lsearch/search/CachedFilter.java
M src/org/wikimedia/lsearch/search/FilterWrapper.java
M src/org/wikimedia/lsearch/search/HighlightPack.java
M src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
M src/org/wikimedia/lsearch/search/NamespaceCache.java
M src/org/wikimedia/lsearch/search/NamespaceCompositeFilter.java
M src/org/wikimedia/lsearch/search/NamespaceFilter.java
M src/org/wikimedia/lsearch/search/PrefixFilter.java
M src/org/wikimedia/lsearch/search/RankValue.java
M src/org/wikimedia/lsearch/search/SearcherCache.java
M src/org/wikimedia/lsearch/search/SuffixFilter.java
M src/org/wikimedia/lsearch/search/SuffixFilterCache.java
M src/org/wikimedia/lsearch/search/SuffixFilterWrapper.java
M src/org/wikimedia/lsearch/search/SuffixNamespaceFilter.java
M src/org/wikimedia/lsearch/search/SuffixNamespaceWrapper.java
M src/org/wikimedia/lsearch/spell/Suggest.java
M src/org/wikimedia/lsearch/spell/SuggestQuery.java
M src/org/wikimedia/lsearch/spell/SuggestResult.java
M src/org/wikimedia/lsearch/util/QueryStringMap.java
46 files changed, 79 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/lucene-search-2
refs/changes/92/52892/1
diff --git a/src/org/apache/lucene/search/ArticleNamespaceScaling.java
b/src/org/apache/lucene/search/ArticleNamespaceScaling.java
index efdc3e7..4bcb936 100644
--- a/src/org/apache/lucene/search/ArticleNamespaceScaling.java
+++ b/src/org/apache/lucene/search/ArticleNamespaceScaling.java
@@ -6,6 +6,7 @@
import java.util.Map.Entry;
public class ArticleNamespaceScaling implements Serializable {
+ private static final long serialVersionUID = 1L;
protected float[] nsBoost = null;
public static float talkPageScale = 0.25f;
diff --git a/src/org/apache/lucene/search/ArticleQueryWrap.java
b/src/org/apache/lucene/search/ArticleQueryWrap.java
index 4db3685..8a71a91 100644
--- a/src/org/apache/lucene/search/ArticleQueryWrap.java
+++ b/src/org/apache/lucene/search/ArticleQueryWrap.java
@@ -13,6 +13,7 @@
*
*/
public class ArticleQueryWrap extends CustomBoostQuery {
+ private static final long serialVersionUID = 1L;
ArticleInfo article;
ArticleScaling scale;
AggregateInfo rank;
@@ -70,6 +71,7 @@
}
protected class ArticleQueryWeight extends CustomWeight {
+ private static final long serialVersionUID = 1L;
public ArticleQueryWeight(Searcher searcher) throws IOException{
super(searcher);
}
diff --git a/src/org/apache/lucene/search/ArticleScaling.java
b/src/org/apache/lucene/search/ArticleScaling.java
index 0985614..297e2ad 100644
--- a/src/org/apache/lucene/search/ArticleScaling.java
+++ b/src/org/apache/lucene/search/ArticleScaling.java
@@ -10,6 +10,7 @@
*
*/
abstract public class ArticleScaling implements Serializable {
+ private static final long serialVersionUID = 1L;
abstract public float score(float score, float diff);
public String explain(float score, float diff){
@@ -18,6 +19,7 @@
/** add to score ~ log(1/diff) between [0,max] */
public static class Bonus extends ArticleScaling {
+ private static final long serialVersionUID = 1L;
float max;
public Bonus(float max){
this.max = max;
@@ -30,6 +32,7 @@
/** Scale score by ~ log(1/diff) between [min,max] */
public static class Scaling extends ArticleScaling {
+ private static final long serialVersionUID = 1L;
float max, min;
public Scaling(float min, float max){
this.max = max;
@@ -43,6 +46,7 @@
}
/** Scale score by ~ sqrt(1/diff) between [min,max] */
public static class SqrtScale extends ArticleScaling {
+ private static final long serialVersionUID = 1L;
float max, min;
public SqrtScale(float min, float max){
this.max = max;
@@ -63,6 +67,7 @@
/** Return scores based on a step function of time */
public static class StepScale extends ArticleScaling {
+ private static final long serialVersionUID = 1L;
float[] chunks = new float[5];
public StepScale(float min, float max){
float inc = (max-min)/chunks.length;
@@ -94,6 +99,7 @@
/** No scaling */
public static class None extends ArticleScaling {
+ private static final long serialVersionUID = 1L;
@Override
public final float score(float score, float diff) {
return score;
diff --git a/src/org/apache/lucene/search/ConstMinScore.java
b/src/org/apache/lucene/search/ConstMinScore.java
index 253f5fc..81a282d 100644
--- a/src/org/apache/lucene/search/ConstMinScore.java
+++ b/src/org/apache/lucene/search/ConstMinScore.java
@@ -1,6 +1,7 @@
package org.apache.lucene.search;
public class ConstMinScore extends CustomBoostQuery {
+ private static final long serialVersionUID = 1L;
float minScore;
public ConstMinScore(Query subQuery, float minScore) {
super(subQuery);
diff --git a/src/org/apache/lucene/search/CustomBoostQuery.java
b/src/org/apache/lucene/search/CustomBoostQuery.java
index b6ef6f7..24cff54 100644
--- a/src/org/apache/lucene/search/CustomBoostQuery.java
+++ b/src/org/apache/lucene/search/CustomBoostQuery.java
@@ -50,6 +50,7 @@
* supported anymore in such a case.</font>
*/
public class CustomBoostQuery extends Query {
+ private static final long serialVersionUID = 1L;
private Query subQuery;
private Query boostQuery; // optional, can be null
@@ -176,6 +177,7 @@
//=========================== W E I G H T ============================
protected class CustomWeight implements Weight {
+ private static final long serialVersionUID = 1L;
Weight subQueryWeight;
Weight boostWeight; // optional
boolean qStrict;
diff --git a/src/org/apache/lucene/search/LogTransformScore.java
b/src/org/apache/lucene/search/LogTransformScore.java
index 346841d..a231795 100644
--- a/src/org/apache/lucene/search/LogTransformScore.java
+++ b/src/org/apache/lucene/search/LogTransformScore.java
@@ -7,6 +7,7 @@
*
*/
public class LogTransformScore extends CustomBoostQuery {
+ private static final long serialVersionUID = 1L;
public LogTransformScore(Query subQuery) {
super(subQuery);
diff --git a/src/org/apache/lucene/search/PositionalMultiQuery.java
b/src/org/apache/lucene/search/PositionalMultiQuery.java
index 01b563d..eeacece 100644
--- a/src/org/apache/lucene/search/PositionalMultiQuery.java
+++ b/src/org/apache/lucene/search/PositionalMultiQuery.java
@@ -16,6 +16,7 @@
*
*/
public class PositionalMultiQuery extends MultiPhraseQuery {
+ private static final long serialVersionUID = 1L;
protected PositionalOptions options;
protected int stopWordCount = 0;
protected ArrayList<ArrayList<Float>> boosts = new
ArrayList<ArrayList<Float>>();
@@ -55,6 +56,7 @@
*
*/
protected class PositionalMultiWeight extends MultiPhraseWeight {
+ private static final long serialVersionUID = 1L;
public PositionalMultiWeight(Searcher searcher) throws
IOException {
super(searcher);
this.similarity = getSimilarity(searcher);
diff --git a/src/org/apache/lucene/search/PositionalOptions.java
b/src/org/apache/lucene/search/PositionalOptions.java
index a978195..355b6f3 100644
--- a/src/org/apache/lucene/search/PositionalOptions.java
+++ b/src/org/apache/lucene/search/PositionalOptions.java
@@ -6,6 +6,8 @@
import org.wikimedia.lsearch.search.AggregateInfoImpl.RankInfo;
public class PositionalOptions implements Serializable {
+ private static final long serialVersionUID = 1L;
+
protected AggregateInfo aggregateMeta = null;
protected RankInfo rankMeta = null;
@@ -45,6 +47,7 @@
/** Options specific for phrases in contents */
public static class Sloppy extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public Sloppy(){
rankMeta = new RankInfo();
useBeginBoost = true;
@@ -65,6 +68,7 @@
/** Options for alttitle field */
public static class Alttitle extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public Alttitle(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -74,6 +78,7 @@
}
/** Match only whole entries on an aggregate field */
public static class AlttitleWhole extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public AlttitleWhole(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -85,6 +90,7 @@
}
public static class AlttitleWholeSloppy extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public AlttitleWholeSloppy(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -99,6 +105,7 @@
/** Options specific to related fields */
public static class Related extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public Related(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -107,6 +114,7 @@
}
public static class RelatedWhole extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public RelatedWhole(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -117,6 +125,7 @@
/** Options for additional alttitle query */
public static class AlttitleSloppy extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public AlttitleSloppy(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -127,6 +136,7 @@
/** Options for additional alttitle query */
public static class AlttitleExact extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public AlttitleExact(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -136,6 +146,7 @@
/** alttitle query to match redirects */
public static class RedirectMatch extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public RedirectMatch(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -151,6 +162,7 @@
/** alttitle query to match complete titles */
public static class RedirectComplete extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public RedirectComplete(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -163,6 +175,7 @@
/** Options for sections field */
public static class Sections extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public Sections(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -172,6 +185,7 @@
/** Options for sections field */
public static class SectionsWhole extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public SectionsWhole(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -181,6 +195,7 @@
}
/** Fallback to phasequery-type behaviour, no positional info */
public static class PhraseQueryFallback extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public PhraseQueryFallback(){
phraseQueryFallback = true;
}
@@ -188,6 +203,7 @@
/** Near match phrases, when more than 50% of nonstopwords are matched
*/
public static class AlttitleNearMatch extends PositionalOptions {
+ private static final long serialVersionUID = 1L;
public AlttitleNearMatch(){
aggregateMeta = new AggregateInfoImpl();
takeMaxScore = true;
@@ -195,9 +211,11 @@
}
public abstract static class NamespaceBoost implements Serializable {
+ private static final long serialVersionUID = 1L;
public abstract float getBoost(int namespace);
public static class DefaultBoost extends NamespaceBoost {
+ private static final long serialVersionUID = 1L;
public float getBoost(int namespace){
if(namespace % 2 == 1) // talk pages
return 0.75f;
@@ -207,8 +225,6 @@
}
}
}
-
-
@Override
public boolean equals(Object obj) {
@@ -220,7 +236,4 @@
return false;
return true;
}
-
-
-
}
diff --git a/src/org/apache/lucene/search/PositionalQuery.java
b/src/org/apache/lucene/search/PositionalQuery.java
index 1e8c2e6..c021e5a 100644
--- a/src/org/apache/lucene/search/PositionalQuery.java
+++ b/src/org/apache/lucene/search/PositionalQuery.java
@@ -15,6 +15,7 @@
*
*/
public class PositionalQuery extends PhraseQuery {
+ private static final long serialVersionUID = 1L;
protected PositionalOptions options;
protected int stopWordCount = 0;
@@ -51,7 +52,8 @@
* @author rainman
*
*/
- protected class PositionalWeight extends PhraseWeight{
+ protected class PositionalWeight extends PhraseWeight {
+ private static final long serialVersionUID = 1L;
public PositionalWeight(Searcher searcher) throws IOException{
super(searcher);
}
diff --git a/src/org/apache/lucene/search/RelevanceQuery.java
b/src/org/apache/lucene/search/RelevanceQuery.java
index a3c0aa1..30dec58 100644
--- a/src/org/apache/lucene/search/RelevanceQuery.java
+++ b/src/org/apache/lucene/search/RelevanceQuery.java
@@ -20,6 +20,7 @@
*
*/
public class RelevanceQuery extends Query {
+ private static final long serialVersionUID = 1L;
private Query main;
private ArrayList<Query> relevance = new ArrayList<Query>();
private boolean strict = false; // if true, boosting part of query does
not take part in weights normalization.
@@ -118,6 +119,7 @@
*
*/
protected class RelevanceWeight implements Weight {
+ private static final long serialVersionUID = 1L;
Weight mainWeight;
ArrayList<Weight> relevanceWeight = new ArrayList<Weight>();
boolean qStrict;
diff --git a/src/org/apache/lucene/search/RemoteSearchableMul.java
b/src/org/apache/lucene/search/RemoteSearchableMul.java
index b16ffe6..c897f68 100644
--- a/src/org/apache/lucene/search/RemoteSearchableMul.java
+++ b/src/org/apache/lucene/search/RemoteSearchableMul.java
@@ -11,6 +11,7 @@
public class RemoteSearchableMul extends UnicastRemoteObject
implements SearchableMul {
+ private static final long serialVersionUID = 1L;
private Searchable local;
diff --git a/src/org/wikimedia/lsearch/analyzers/ExtToken.java
b/src/org/wikimedia/lsearch/analyzers/ExtToken.java
index e31042f..eb9cca0 100644
--- a/src/org/wikimedia/lsearch/analyzers/ExtToken.java
+++ b/src/org/wikimedia/lsearch/analyzers/ExtToken.java
@@ -19,6 +19,7 @@
*
*/
public class ExtToken extends Token {
+ private static final long serialVersionUID = 1L;
static Logger log = Logger.getLogger(ExtToken.class);
/** position within the text */
public enum Position { NORMAL, FIRST_SECTION, TEMPLATE, IMAGE_CAT_IW,
EXT_LINK, HEADING, REFERENCE, BULLETINS, TABLE };
diff --git a/src/org/wikimedia/lsearch/beans/Article.java
b/src/org/wikimedia/lsearch/beans/Article.java
index 3ae7f8a..ac4013d 100644
--- a/src/org/wikimedia/lsearch/beans/Article.java
+++ b/src/org/wikimedia/lsearch/beans/Article.java
@@ -39,6 +39,7 @@
*
*/
public class Article implements Serializable {
+ private static final long serialVersionUID = 1L;
private String namespace, title, contents;
private long pageId;
private int references;
diff --git a/src/org/wikimedia/lsearch/beans/IndexReportCard.java
b/src/org/wikimedia/lsearch/beans/IndexReportCard.java
index 8eeef0e..65e2204 100644
--- a/src/org/wikimedia/lsearch/beans/IndexReportCard.java
+++ b/src/org/wikimedia/lsearch/beans/IndexReportCard.java
@@ -10,6 +10,7 @@
*
*/
public class IndexReportCard implements Serializable {
+ private static final long serialVersionUID = 1L;
protected boolean succDelete;
protected boolean succAdd;
protected ReportId id;
diff --git a/src/org/wikimedia/lsearch/beans/Redirect.java
b/src/org/wikimedia/lsearch/beans/Redirect.java
index 0ebf2f3..db0fc3c 100644
--- a/src/org/wikimedia/lsearch/beans/Redirect.java
+++ b/src/org/wikimedia/lsearch/beans/Redirect.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
public class Redirect implements Serializable {
+ private static final long serialVersionUID = 1L;
int namespace;
String title;
int references;
diff --git a/src/org/wikimedia/lsearch/beans/ReportId.java
b/src/org/wikimedia/lsearch/beans/ReportId.java
index e4cf6fa..fd45b76 100644
--- a/src/org/wikimedia/lsearch/beans/ReportId.java
+++ b/src/org/wikimedia/lsearch/beans/ReportId.java
@@ -13,6 +13,7 @@
*
*/
public class ReportId implements Serializable {
+ private static final long serialVersionUID = 1L;
public long pageId;
public long timestamp;
/** string repesentation of index id */
diff --git a/src/org/wikimedia/lsearch/beans/ResultSet.java
b/src/org/wikimedia/lsearch/beans/ResultSet.java
index b72e77b..3c929b7 100644
--- a/src/org/wikimedia/lsearch/beans/ResultSet.java
+++ b/src/org/wikimedia/lsearch/beans/ResultSet.java
@@ -9,6 +9,7 @@
/** A single search result */
public class ResultSet implements Serializable {
+ private static final long serialVersionUID = 1L;
public double score;
public String namespace;
public String title;
diff --git a/src/org/wikimedia/lsearch/beans/SearchResults.java
b/src/org/wikimedia/lsearch/beans/SearchResults.java
index 51325a8..4e6483e 100644
--- a/src/org/wikimedia/lsearch/beans/SearchResults.java
+++ b/src/org/wikimedia/lsearch/beans/SearchResults.java
@@ -15,6 +15,8 @@
*
*/
public class SearchResults implements Serializable {
+ private static final long serialVersionUID = 1L;
+
/** false if there is some sort of query-related error */
protected boolean success;
protected int numHits;
diff --git a/src/org/wikimedia/lsearch/beans/Title.java
b/src/org/wikimedia/lsearch/beans/Title.java
index 87c78e9..c576da5 100644
--- a/src/org/wikimedia/lsearch/beans/Title.java
+++ b/src/org/wikimedia/lsearch/beans/Title.java
@@ -5,6 +5,7 @@
/** Wiki article title */
public class Title implements java.io.Serializable {
+ private static final long serialVersionUID = 1L;
public int namespace;
public String title;
diff --git a/src/org/wikimedia/lsearch/highlight/Highlight.java
b/src/org/wikimedia/lsearch/highlight/Highlight.java
index 248806c..1e99dee 100644
--- a/src/org/wikimedia/lsearch/highlight/Highlight.java
+++ b/src/org/wikimedia/lsearch/highlight/Highlight.java
@@ -60,6 +60,7 @@
/** Results from higlighting multiple articles */
public static class ResultSet implements Serializable {
+ private static final long serialVersionUID = 1L;
public HashMap<String,HighlightResult> highlighted;
/** phrases matched in document, word1_word2 (i.e. separated by
underscore) */
public HashSet<String> phrases;
diff --git a/src/org/wikimedia/lsearch/highlight/HighlightResult.java
b/src/org/wikimedia/lsearch/highlight/HighlightResult.java
index b7a285e..09edb79 100644
--- a/src/org/wikimedia/lsearch/highlight/HighlightResult.java
+++ b/src/org/wikimedia/lsearch/highlight/HighlightResult.java
@@ -10,6 +10,7 @@
*
*/
public class HighlightResult implements Serializable {
+ private static final long serialVersionUID = 1L;
protected Snippet title = null;
protected Snippet redirect = null;
protected Snippet section = null;
diff --git a/src/org/wikimedia/lsearch/highlight/Snippet.java
b/src/org/wikimedia/lsearch/highlight/Snippet.java
index 799b899..8829d43 100644
--- a/src/org/wikimedia/lsearch/highlight/Snippet.java
+++ b/src/org/wikimedia/lsearch/highlight/Snippet.java
@@ -10,7 +10,9 @@
*
*/
public class Snippet implements Serializable {
+ private static final long serialVersionUID = 1L;
public static class Range implements Serializable {
+ private static final long serialVersionUID = 1L;
public int start;
public int end;
diff --git a/src/org/wikimedia/lsearch/index/IndexUpdateRecord.java
b/src/org/wikimedia/lsearch/index/IndexUpdateRecord.java
index 127b7f0..6680f91 100644
--- a/src/org/wikimedia/lsearch/index/IndexUpdateRecord.java
+++ b/src/org/wikimedia/lsearch/index/IndexUpdateRecord.java
@@ -21,6 +21,7 @@
*
*/
public class IndexUpdateRecord implements Serializable {
+ private static final long serialVersionUID = 1L;
protected Article article;
public enum Action { ADD, UPDATE, DELETE };
protected Action action;
diff --git a/src/org/wikimedia/lsearch/index/WikiSimilarity.java
b/src/org/wikimedia/lsearch/index/WikiSimilarity.java
index 8f10498..a5903b0 100644
--- a/src/org/wikimedia/lsearch/index/WikiSimilarity.java
+++ b/src/org/wikimedia/lsearch/index/WikiSimilarity.java
@@ -12,6 +12,7 @@
*
*/
public class WikiSimilarity extends DefaultSimilarity {
+ private static final long serialVersionUID = 1L;
static Logger log = Logger.getLogger(WikiSimilarity.class);
/**
* For content:
diff --git
a/src/org/wikimedia/lsearch/interoperability/CustomSocketFactory.java
b/src/org/wikimedia/lsearch/interoperability/CustomSocketFactory.java
index 36f66ce..80a4624 100644
--- a/src/org/wikimedia/lsearch/interoperability/CustomSocketFactory.java
+++ b/src/org/wikimedia/lsearch/interoperability/CustomSocketFactory.java
@@ -13,6 +13,7 @@
public class CustomSocketFactory
implements RMIClientSocketFactory, RMIServerSocketFactory, Serializable
{
+ private static final long serialVersionUID = 1L;
static CustomSocketFactory instance;
public CustomSocketFactory() {
diff --git a/src/org/wikimedia/lsearch/search/AggregateInfoImpl.java
b/src/org/wikimedia/lsearch/search/AggregateInfoImpl.java
index 8b0fcb9..90c32ee 100644
--- a/src/org/wikimedia/lsearch/search/AggregateInfoImpl.java
+++ b/src/org/wikimedia/lsearch/search/AggregateInfoImpl.java
@@ -19,6 +19,7 @@
*
*/
public class AggregateInfoImpl implements AggregateInfo, Serializable {
+ private static final long serialVersionUID = 1L;
private static final Logger log =
Logger.getLogger(AggregateInfoImpl.class);
protected transient AggregateMetaFieldSource src = null;
protected boolean hasRankingData = false;
@@ -98,6 +99,7 @@
/** Provides ranking information */
public static class RankInfo extends AggregateInfoImpl {
+ private static final long serialVersionUID = 1L;
@Override
public void init(IndexReader reader, String field) throws
IOException {
super.init(reader, "alttitle");
diff --git a/src/org/wikimedia/lsearch/search/ArticleInfoImpl.java
b/src/org/wikimedia/lsearch/search/ArticleInfoImpl.java
index 101bdbb..e8a000f 100644
--- a/src/org/wikimedia/lsearch/search/ArticleInfoImpl.java
+++ b/src/org/wikimedia/lsearch/search/ArticleInfoImpl.java
@@ -8,6 +8,7 @@
import org.wikimedia.lsearch.search.ArticleMeta.ArticleMetaSource;
public class ArticleInfoImpl implements ArticleInfo, Serializable {
+ private static final long serialVersionUID = 1L;
protected transient ArticleMetaSource src = null;
diff --git a/src/org/wikimedia/lsearch/search/CachedFilter.java
b/src/org/wikimedia/lsearch/search/CachedFilter.java
index c0dedb6..7bb1b05 100644
--- a/src/org/wikimedia/lsearch/search/CachedFilter.java
+++ b/src/org/wikimedia/lsearch/search/CachedFilter.java
@@ -15,6 +15,7 @@
*
*/
public class CachedFilter extends Filter {
+ private static final long serialVersionUID = 1L;
protected Filter filter;
protected transient WeakHashMap<Directory,BitSet> cache = new
WeakHashMap<Directory,BitSet>();
diff --git a/src/org/wikimedia/lsearch/search/FilterWrapper.java
b/src/org/wikimedia/lsearch/search/FilterWrapper.java
index 3a432c5..21684e7 100755
--- a/src/org/wikimedia/lsearch/search/FilterWrapper.java
+++ b/src/org/wikimedia/lsearch/search/FilterWrapper.java
@@ -16,6 +16,7 @@
*
*/
public class FilterWrapper extends Filter {
+ private static final long serialVersionUID = 1L;
protected NamespaceFilter nsFilter;
/** custom filters AND-ed with nsFilter */
protected ArrayList<Filter> filters = new ArrayList<Filter>();
diff --git a/src/org/wikimedia/lsearch/search/HighlightPack.java
b/src/org/wikimedia/lsearch/search/HighlightPack.java
index 962b05c..2b09c6a 100644
--- a/src/org/wikimedia/lsearch/search/HighlightPack.java
+++ b/src/org/wikimedia/lsearch/search/HighlightPack.java
@@ -13,6 +13,7 @@
*
*/
public class HighlightPack implements Serializable {
+ private static final long serialVersionUID = 1L;
public Term[] terms;
public int[] dfs;
public int maxDoc;
diff --git a/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
b/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
index 3168013..879b4ee 100644
--- a/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
+++ b/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
@@ -36,6 +36,7 @@
* @author John Wang
*/
public class MatchAllTitlesQuery extends Query {
+ private static final long serialVersionUID = 1L;
protected String titleField;
public MatchAllTitlesQuery(String titleField) {
@@ -91,6 +92,7 @@
}
private class MatchAllDocsWeight implements Weight {
+ private static final long serialVersionUID = 1L;
private Similarity similarity;
private float queryWeight;
private float queryNorm;
diff --git a/src/org/wikimedia/lsearch/search/NamespaceCache.java
b/src/org/wikimedia/lsearch/search/NamespaceCache.java
index 843ce97..ade35ea 100644
--- a/src/org/wikimedia/lsearch/search/NamespaceCache.java
+++ b/src/org/wikimedia/lsearch/search/NamespaceCache.java
@@ -34,6 +34,7 @@
protected static Hashtable<String,CachedFilter> specialCache = new
Hashtable<String,CachedFilter>();
public static class AllFilter extends Filter {
+ private static final long serialVersionUID = 1L;
@Override
public BitSet bits(IndexReader reader) throws IOException {
diff --git a/src/org/wikimedia/lsearch/search/NamespaceCompositeFilter.java
b/src/org/wikimedia/lsearch/search/NamespaceCompositeFilter.java
index 1b69159..38c218b 100644
--- a/src/org/wikimedia/lsearch/search/NamespaceCompositeFilter.java
+++ b/src/org/wikimedia/lsearch/search/NamespaceCompositeFilter.java
@@ -15,6 +15,7 @@
*
*/
public class NamespaceCompositeFilter extends Filter {
+ private static final long serialVersionUID = 1L;
protected ArrayList<Filter> filters;
protected ArrayList<Filter> redirects;
diff --git a/src/org/wikimedia/lsearch/search/NamespaceFilter.java
b/src/org/wikimedia/lsearch/search/NamespaceFilter.java
index e7bd682..280ecff 100644
--- a/src/org/wikimedia/lsearch/search/NamespaceFilter.java
+++ b/src/org/wikimedia/lsearch/search/NamespaceFilter.java
@@ -33,6 +33,7 @@
/** A bean-like class that contains information about what namespaces
* to filter */
public class NamespaceFilter implements Serializable {
+ private static final long serialVersionUID = 1L;
private BitSet included;
protected void init(){
diff --git a/src/org/wikimedia/lsearch/search/PrefixFilter.java
b/src/org/wikimedia/lsearch/search/PrefixFilter.java
index a88f376..406b32d 100644
--- a/src/org/wikimedia/lsearch/search/PrefixFilter.java
+++ b/src/org/wikimedia/lsearch/search/PrefixFilter.java
@@ -11,6 +11,7 @@
import org.apache.lucene.search.Filter;
public class PrefixFilter extends Filter {
+ private static final long serialVersionUID = 1L;
String[] prefixes;
public PrefixFilter(String[] prefixes){
diff --git a/src/org/wikimedia/lsearch/search/RankValue.java
b/src/org/wikimedia/lsearch/search/RankValue.java
index 88b326b..b76ebb1 100644
--- a/src/org/wikimedia/lsearch/search/RankValue.java
+++ b/src/org/wikimedia/lsearch/search/RankValue.java
@@ -14,6 +14,7 @@
*
*/
public class RankValue implements ScoreValue, Serializable {
+ private static final long serialVersionUID = 1L;
protected transient RankFieldSource src;
protected float coefficient;
diff --git a/src/org/wikimedia/lsearch/search/SearcherCache.java
b/src/org/wikimedia/lsearch/search/SearcherCache.java
index 0a0f84e..da2a493 100644
--- a/src/org/wikimedia/lsearch/search/SearcherCache.java
+++ b/src/org/wikimedia/lsearch/search/SearcherCache.java
@@ -157,6 +157,7 @@
}
public static class SearcherPoolStatus implements Serializable {
+ private static final long serialVersionUID = 1L;
boolean ok = false;
int poolSize = 0;
diff --git a/src/org/wikimedia/lsearch/search/SuffixFilter.java
b/src/org/wikimedia/lsearch/search/SuffixFilter.java
index 9f0ffba..65cdf8a 100644
--- a/src/org/wikimedia/lsearch/search/SuffixFilter.java
+++ b/src/org/wikimedia/lsearch/search/SuffixFilter.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
public class SuffixFilter implements Serializable {
+ private static final long serialVersionUID = 1L;
protected String excludeSuffix;
public SuffixFilter(String excludeSuffix) {
diff --git a/src/org/wikimedia/lsearch/search/SuffixFilterCache.java
b/src/org/wikimedia/lsearch/search/SuffixFilterCache.java
index cb5f948..409f0f9 100644
--- a/src/org/wikimedia/lsearch/search/SuffixFilterCache.java
+++ b/src/org/wikimedia/lsearch/search/SuffixFilterCache.java
@@ -16,6 +16,7 @@
/** class to create the bitset that is to be cached */
protected static class SuffixFilterBuilder extends Filter {
+ private static final long serialVersionUID = 1L;
SuffixFilter filter;
public SuffixFilterBuilder(SuffixFilter filter) {
diff --git a/src/org/wikimedia/lsearch/search/SuffixFilterWrapper.java
b/src/org/wikimedia/lsearch/search/SuffixFilterWrapper.java
index aff0c68..3229b41 100644
--- a/src/org/wikimedia/lsearch/search/SuffixFilterWrapper.java
+++ b/src/org/wikimedia/lsearch/search/SuffixFilterWrapper.java
@@ -12,6 +12,7 @@
*
*/
public class SuffixFilterWrapper extends Filter {
+ private static final long serialVersionUID = 1L;
protected SuffixFilter filter;
public SuffixFilterWrapper(SuffixFilter filter){
diff --git a/src/org/wikimedia/lsearch/search/SuffixNamespaceFilter.java
b/src/org/wikimedia/lsearch/search/SuffixNamespaceFilter.java
index c88c0b8..ccf62cc 100644
--- a/src/org/wikimedia/lsearch/search/SuffixNamespaceFilter.java
+++ b/src/org/wikimedia/lsearch/search/SuffixNamespaceFilter.java
@@ -8,6 +8,7 @@
import org.wikimedia.lsearch.config.IndexId;
public class SuffixNamespaceFilter extends Filter {
+ private static final long serialVersionUID = 1L;
protected SuffixFilter suffix;
protected NamespaceFilter ns;
protected String dbrole;
diff --git a/src/org/wikimedia/lsearch/search/SuffixNamespaceWrapper.java
b/src/org/wikimedia/lsearch/search/SuffixNamespaceWrapper.java
index a3d586a..16d71a2 100644
--- a/src/org/wikimedia/lsearch/search/SuffixNamespaceWrapper.java
+++ b/src/org/wikimedia/lsearch/search/SuffixNamespaceWrapper.java
@@ -7,6 +7,7 @@
import org.apache.lucene.search.Filter;
public class SuffixNamespaceWrapper extends Filter {
+ private static final long serialVersionUID = 1L;
SuffixNamespaceFilter filter = null;
public SuffixNamespaceWrapper(SuffixNamespaceFilter filter) {
diff --git a/src/org/wikimedia/lsearch/spell/Suggest.java
b/src/org/wikimedia/lsearch/spell/Suggest.java
index e3f5a13..de21b6c 100644
--- a/src/org/wikimedia/lsearch/spell/Suggest.java
+++ b/src/org/wikimedia/lsearch/spell/Suggest.java
@@ -239,6 +239,7 @@
*
*/
public static class ExtraInfo implements Serializable {
+ private static final long serialVersionUID = 1L;
protected HashSet<String> phrases;
protected HashSet<String> foundInContext;
protected HashSet<String> foundInTitles;
diff --git a/src/org/wikimedia/lsearch/spell/SuggestQuery.java
b/src/org/wikimedia/lsearch/spell/SuggestQuery.java
index 806cc88..91b129e 100644
--- a/src/org/wikimedia/lsearch/spell/SuggestQuery.java
+++ b/src/org/wikimedia/lsearch/spell/SuggestQuery.java
@@ -5,6 +5,7 @@
/** Result of suggestion for a query */
public class SuggestQuery implements Serializable {
+ private static final long serialVersionUID = 1L;
protected String searchterm;
protected ArrayList<Integer> ranges;
protected ArrayList<String> similarTitles;
diff --git a/src/org/wikimedia/lsearch/spell/SuggestResult.java
b/src/org/wikimedia/lsearch/spell/SuggestResult.java
index a805ea6..ea00465 100644
--- a/src/org/wikimedia/lsearch/spell/SuggestResult.java
+++ b/src/org/wikimedia/lsearch/spell/SuggestResult.java
@@ -7,6 +7,7 @@
import org.wikimedia.lsearch.ranks.StringList;
public class SuggestResult implements Serializable {
+ private static final long serialVersionUID = 1L;
String word;
String decomposed;
int frequency=0;
@@ -21,6 +22,7 @@
HashSet<String> context = null;
public static class SimilarResult extends SuggestResult {
+ private static final long serialVersionUID = 1L;
String key;
String redirectTo;
public SimilarResult(String word, int frequency, int dist,
String key, String redirectTo) {
diff --git a/src/org/wikimedia/lsearch/util/QueryStringMap.java
b/src/org/wikimedia/lsearch/util/QueryStringMap.java
index 3ab9f4a..6b67120 100644
--- a/src/org/wikimedia/lsearch/util/QueryStringMap.java
+++ b/src/org/wikimedia/lsearch/util/QueryStringMap.java
@@ -36,6 +36,7 @@
/** Extract parameters from an URL */
public class QueryStringMap extends LinkedHashMap implements Map {
+ private static final long serialVersionUID = 1L;
public QueryStringMap(URI uri) {
super();
--
To view, visit https://gerrit.wikimedia.org/r/52892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb8f2342b2ed90c92062278587683a8fa92415d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/lucene-search-2
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
