Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52894
Change subject: Fix a bunch of type mistakes that relied on casting
......................................................................
Fix a bunch of type mistakes that relied on casting
Change-Id: If1dd6add7f0868d73b662e817843b8558a0f3866
---
M lib/mwdumper.jar
M src/org/apache/lucene/search/MultiSearcherBase.java
M src/org/apache/lucene/search/PositionalScorer.java
M src/org/wikimedia/lsearch/analyzers/FilterFactory.java
M src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
M src/org/wikimedia/lsearch/config/GlobalConfiguration.java
M src/org/wikimedia/lsearch/frontend/HTTPIndexDaemon.java
M src/org/wikimedia/lsearch/frontend/HttpHandler.java
M src/org/wikimedia/lsearch/frontend/SearchDaemon.java
M src/org/wikimedia/lsearch/importer/DumpImporter.java
M src/org/wikimedia/lsearch/index/WikiIndexModifier.java
M src/org/wikimedia/lsearch/oai/IndexUpdatesCollector.java
M src/org/wikimedia/lsearch/ranks/LinkReader.java
M src/org/wikimedia/lsearch/related/TitleReader.java
M src/org/wikimedia/lsearch/search/MultiSearcherMul.java
M src/org/wikimedia/lsearch/search/SearchEngine.java
M src/org/wikimedia/lsearch/spell/CleanIndexImporter.java
M src/org/wikimedia/lsearch/util/QueryStringMap.java
M test/org/wikimedia/lsearch/analyzers/AnalysisTest.java
M test/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
20 files changed, 63 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/lucene-search-2
refs/changes/94/52894/1
diff --git a/lib/mwdumper.jar b/lib/mwdumper.jar
index c6cc669..5f51345 100644
--- a/lib/mwdumper.jar
+++ b/lib/mwdumper.jar
Binary files differ
diff --git a/src/org/apache/lucene/search/MultiSearcherBase.java
b/src/org/apache/lucene/search/MultiSearcherBase.java
index 68ce6ad..77f2447 100644
--- a/src/org/apache/lucene/search/MultiSearcherBase.java
+++ b/src/org/apache/lucene/search/MultiSearcherBase.java
@@ -40,10 +40,10 @@
* the methods necessary to initialize Weights.
*/
protected static class CachedDfSource extends Searcher {
- private Map dfMap; // Map from Terms to corresponding doc freqs
+ private Map<Term,Integer> dfMap; // Map from Terms to corresponding doc
freqs
private int maxDoc; // document count
- public CachedDfSource(Map dfMap, int maxDoc, Similarity similarity) {
+ public CachedDfSource(Map<Term,Integer> dfMap, int maxDoc, Similarity
similarity) {
this.dfMap = dfMap;
this.maxDoc = maxDoc;
setSimilarity(similarity);
@@ -335,7 +335,7 @@
Query rewrittenQuery = rewrite(original);
// step 2
- Set terms = new HashSet();
+ Set<Term> terms = new HashSet<Term>();
rewrittenQuery.extractTerms(terms);
// step3
@@ -349,7 +349,7 @@
}
}
- HashMap dfMap = new HashMap();
+ HashMap<Term,Integer> dfMap = new HashMap<Term,Integer>();
for(int i=0; i<allTermsArray.length; i++) {
dfMap.put(allTermsArray[i], new Integer(aggregatedDfs[i]));
}
diff --git a/src/org/apache/lucene/search/PositionalScorer.java
b/src/org/apache/lucene/search/PositionalScorer.java
index cff8ebe..8b416c5 100644
--- a/src/org/apache/lucene/search/PositionalScorer.java
+++ b/src/org/apache/lucene/search/PositionalScorer.java
@@ -530,31 +530,31 @@
if (!checkedRepeats) {
checkedRepeats = true;
// check for repeats
- HashMap m = null;
+ ArrayList<PhrasePositionsBoost> m = null;
for (PhrasePositionsBoost pp = first; pp !=
null; pp = pp.next) {
int tpPos = pp.position + pp.offset;
for (PhrasePositionsBoost pp2 =
pp.next; pp2 != null; pp2 = pp2.next) {
int tpPos2 = pp2.position +
pp2.offset;
if (tpPos2 == tpPos) {
if (m == null)
- m = new
HashMap();
+ m = new
ArrayList<PhrasePositionsBoost>();
pp.repeats = true;
pp2.repeats = true;
- m.put(pp,null);
- m.put(pp2,null);
+ m.add(pp);
+ m.add(pp2);
}
}
}
if (m!=null)
- repeats = (PhrasePositionsBoost[])
m.keySet().toArray(new PhrasePositionsBoost[0]);
+ repeats = (PhrasePositionsBoost[])
m.toArray(new PhrasePositionsBoost[0]);
}
// with repeats must advance some repeating pp's so
they all start with differing tp's
if (repeats!=null) {
// must propagate higher offsets first
(otherwise might miss matches).
- Arrays.sort(repeats, new Comparator() {
- public int compare(Object x, Object y) {
- return ((PhrasePositionsBoost)
y).offset - ((PhrasePositionsBoost) x).offset;
+ Arrays.sort(repeats, new
Comparator<PhrasePositionsBoost>() {
+ public int compare(PhrasePositionsBoost
x, PhrasePositionsBoost y) {
+ return y.offset - x.offset;
}});
// now advance them
for (int i = 0; i < repeats.length; i++) {
diff --git a/src/org/wikimedia/lsearch/analyzers/FilterFactory.java
b/src/org/wikimedia/lsearch/analyzers/FilterFactory.java
index 507db94..e6e0f55 100644
--- a/src/org/wikimedia/lsearch/analyzers/FilterFactory.java
+++ b/src/org/wikimedia/lsearch/analyzers/FilterFactory.java
@@ -27,10 +27,10 @@
protected IndexId iid;
protected String snowballName = null;
protected boolean useStemmer,useLangFilter;
- protected Class stemmer = null;
- protected Class langFilter = null;
+ protected Class<? extends TokenFilter> stemmer = null;
+ protected Class<? extends TokenFilter> langFilter = null;
protected boolean usingCJK = false;
- protected ArrayList<Class> additionalFilters = null;
+ protected ArrayList<Class<? extends TokenFilter>> additionalFilters =
null;
protected Singular singular = null;
protected boolean hasCanonicalFilter = false;
protected boolean hasLanguageVariants = false;
@@ -53,7 +53,10 @@
noStemmerFilterFactory = new
FilterFactory(iid,lang,snowballName,false,useLangFilter,null,langFilter,usingCJK,additionalFilters,singular,hasCanonicalFilter,stopWords,type);
}
- public FilterFactory(IndexId iid, String lang, String snowballName,
boolean useStemmer, boolean useLangFilter, Class stemmer, Class langFilter,
boolean usingCJK, ArrayList<Class> additionalFilters, Singular singular,
boolean hasCanonicalFiler, Set<String> stopWords, Type type) {
+ public FilterFactory(IndexId iid, String lang, String snowballName,
boolean useStemmer, boolean useLangFilter,
+ Class<? extends TokenFilter> stemmer, Class<? extends
TokenFilter> langFilter, boolean usingCJK,
+ ArrayList<Class<? extends TokenFilter>>
additionalFilters, Singular singular, boolean hasCanonicalFiler,
+ Set<String> stopWords, Type type) {
this.iid = iid;
this.lang = lang;
this.snowballName = snowballName;
@@ -161,9 +164,9 @@
lang.equals("zh-classical") || lang.equals("zh-yue");
}
- protected void addAdditionalFilter(Class filterClass){
+ protected void addAdditionalFilter(Class<? extends TokenFilter>
filterClass){
if(additionalFilters == null)
- additionalFilters = new ArrayList<Class>();
+ additionalFilters = new ArrayList<Class<? extends
TokenFilter>>();
additionalFilters.add(filterClass);
}
@@ -174,7 +177,7 @@
return new SnowballFilter(in,snowballName);
else if(stemmer != null){
try {
- return (TokenFilter)
stemmer.getConstructor(TokenStream.class).newInstance(in);
+ return
stemmer.getConstructor(TokenStream.class).newInstance(in);
} catch (Exception e) {
e.printStackTrace();
}
@@ -203,7 +206,7 @@
try {
TokenStream chain = in;
// nest additional filters, apply them as added to the
list
- for(Class filter : additionalFilters){
+ for(Class<? extends TokenFilter> filter :
additionalFilters){
chain = (TokenStream)
filter.getConstructor(TokenStream.class).newInstance(chain);
if(filter.getName().equals("org.wikimedia.lsearch.analyzers.PhraseFilter")){
((PhraseFilter)
chain).setStopWords(stopWords);
diff --git a/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
b/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
index 1830316..887973c 100644
--- a/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
+++ b/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
@@ -427,8 +427,8 @@
public HashSet<NamespaceFilter> getFieldNamespaces(String queryText){
HashSet<String> fields = getFields(queryText);
HashSet<NamespaceFilter> ret = new HashSet<NamespaceFilter>();
- List ThreadingKeywords = new ArrayList();
- ThreadingKeywords.add("inthread");
+ List<String> threadingKeywords = new ArrayList<String>();
+ threadingKeywords.add("inthread");
for(String field : fields){
field = field.toLowerCase();
@@ -440,7 +440,7 @@
ret.add(defaultNamespaceFilter);
else if(field.startsWith("[")){
ret.add(new
NamespaceFilter(field.substring(1,field.length()-1)));
- } else if (ThreadingKeywords.contains(field)) {
+ } else if (threadingKeywords.contains(field)) {
ret.add( new NamespaceFilter(90) );
}
}
diff --git a/src/org/wikimedia/lsearch/config/GlobalConfiguration.java
b/src/org/wikimedia/lsearch/config/GlobalConfiguration.java
index 2cbdfaa..5d3d419 100644
--- a/src/org/wikimedia/lsearch/config/GlobalConfiguration.java
+++ b/src/org/wikimedia/lsearch/config/GlobalConfiguration.java
@@ -1264,7 +1264,7 @@
* @return lowercased db type
*/
protected String getMainDBType(String dbname){
- Enumeration e = ((Hashtable)database.get(dbname)).keys();
+ Enumeration<String> e = database.get(dbname).keys();
while(e.hasMoreElements()){
String type = (String)e.nextElement();
if(type.equals("single") || type.equals("mainsplit") ||
type.equals("split"))
diff --git a/src/org/wikimedia/lsearch/frontend/HTTPIndexDaemon.java
b/src/org/wikimedia/lsearch/frontend/HTTPIndexDaemon.java
index da9cc1c..349f215 100644
--- a/src/org/wikimedia/lsearch/frontend/HTTPIndexDaemon.java
+++ b/src/org/wikimedia/lsearch/frontend/HTTPIndexDaemon.java
@@ -51,7 +51,7 @@
query.put("text",postData);
}
- Collection keys = query.keySet();
+ Collection<String> keys = query.keySet();
// find the method of class update daemon
Class[] paramTypes = null;
Object[] params = null;
diff --git a/src/org/wikimedia/lsearch/frontend/HttpHandler.java
b/src/org/wikimedia/lsearch/frontend/HttpHandler.java
index eb5080b..98c5f77 100644
--- a/src/org/wikimedia/lsearch/frontend/HttpHandler.java
+++ b/src/org/wikimedia/lsearch/frontend/HttpHandler.java
@@ -52,7 +52,7 @@
protected String charset = "none";
boolean headersSent;
- protected HashMap headers;
+ protected HashMap<String,Object> headers;
protected static HttpMonitor monitor = null;
@@ -149,7 +149,7 @@
* and the POST content is article text
*/
protected void handle() {
- headers = new HashMap();
+ headers = new HashMap<String,Object>();
// parse first line
String request = readInputLine();
diff --git a/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
b/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
index 91bfc62..3bd1240 100644
--- a/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
+++ b/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
@@ -101,7 +101,7 @@
try{
long start = System.currentTimeMillis();
SearchEngine search = new SearchEngine();
- HashMap query = new QueryStringMap(uri);
+ HashMap<String,Object> query = new QueryStringMap(uri);
double version = getVersion(query);
SearchResults res =
search.search(dbname,what,searchterm,query,version);
@@ -258,7 +258,7 @@
}
- private double getVersion(HashMap query) {
+ private double getVersion(HashMap<String,Object> query) {
String v = (String)query.get("version");
if(v == null)
v = (String)query.get("ver");
diff --git a/src/org/wikimedia/lsearch/importer/DumpImporter.java
b/src/org/wikimedia/lsearch/importer/DumpImporter.java
index be331ef..1c7ca53 100644
--- a/src/org/wikimedia/lsearch/importer/DumpImporter.java
+++ b/src/org/wikimedia/lsearch/importer/DumpImporter.java
@@ -112,8 +112,8 @@
}
/** Process LQT properties, convert titles into correct format */
- public static Hashtable<String, String>
processLiquidThreadInfo(Hashtable info){
- Enumeration e = info.keys();
+ public static Hashtable<String, String>
processLiquidThreadInfo(Hashtable<String,Object> info){
+ Enumeration<String> e = info.keys();
Hashtable<String,String> res = new Hashtable<String,String>();
while (e.hasMoreElements()) {
String key = (String)e.nextElement();
@@ -137,9 +137,9 @@
// nop
}
public void writeSiteinfo(Siteinfo info) throws IOException {
- Iterator it = info.Namespaces.orderedEntries();
+ Iterator<Entry<Integer, String>> it =
info.Namespaces.orderedEntries();
while(it.hasNext()){
- Entry<Integer,String> pair =
(Entry<Integer,String>)it.next();
+ Entry<Integer,String> pair = it.next();
Localization.addCustomMapping(pair.getValue(),pair.getKey(),iid.getDBname());
}
}
diff --git a/src/org/wikimedia/lsearch/index/WikiIndexModifier.java
b/src/org/wikimedia/lsearch/index/WikiIndexModifier.java
index 3bfe9ea..106ca23 100644
--- a/src/org/wikimedia/lsearch/index/WikiIndexModifier.java
+++ b/src/org/wikimedia/lsearch/index/WikiIndexModifier.java
@@ -11,6 +11,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
@@ -769,7 +770,7 @@
doc.add(rtitle);
// Threading information
- java.util.Enumeration e =
article.DiscussionThreadingInfo.keys();
+ Enumeration<String> e =
article.DiscussionThreadingInfo.keys();
while (e.hasMoreElements()) {
String key = (String)e.nextElement();
String value =
article.DiscussionThreadingInfo.get(key);
diff --git a/src/org/wikimedia/lsearch/oai/IndexUpdatesCollector.java
b/src/org/wikimedia/lsearch/oai/IndexUpdatesCollector.java
index 0eece97..a9706cd 100755
--- a/src/org/wikimedia/lsearch/oai/IndexUpdatesCollector.java
+++ b/src/org/wikimedia/lsearch/oai/IndexUpdatesCollector.java
@@ -94,9 +94,9 @@
RMIMessengerClient messenger = new RMIMessengerClient(true);
// write to localization
HashMap<Integer,String> map = new HashMap<Integer,String>();
- Iterator it = info.Namespaces.orderedEntries();
+ Iterator<Entry<Integer, String>> it =
info.Namespaces.orderedEntries();
while(it.hasNext()){
- Entry<Integer,String> pair =
(Entry<Integer,String>)it.next();
+ Entry<Integer,String> pair = it.next();
map.put(pair.getKey(),pair.getValue());
}
messenger.addLocalizationCustomMapping(iid.getIndexHost(),map,iid.getDBname());
diff --git a/src/org/wikimedia/lsearch/ranks/LinkReader.java
b/src/org/wikimedia/lsearch/ranks/LinkReader.java
index 829fc41..b56589f 100644
--- a/src/org/wikimedia/lsearch/ranks/LinkReader.java
+++ b/src/org/wikimedia/lsearch/ranks/LinkReader.java
@@ -60,9 +60,9 @@
public void writeSiteinfo(Siteinfo info) throws IOException {
siteinfo = info;
// write siteinfo to localization
- Iterator it = info.Namespaces.orderedEntries();
+ Iterator<Entry<Integer, String>> it =
info.Namespaces.orderedEntries();
while(it.hasNext()){
- Entry<Integer,String> pair =
(Entry<Integer,String>)it.next();
+ Entry<Integer,String> pair = it.next();
Localization.addCustomMapping(pair.getValue(),pair.getKey(),iid.getDBname());
links.addToNamespaceMap(pair.getValue(),pair.getKey());
}
diff --git a/src/org/wikimedia/lsearch/related/TitleReader.java
b/src/org/wikimedia/lsearch/related/TitleReader.java
index 11b1c4d..518db67 100644
--- a/src/org/wikimedia/lsearch/related/TitleReader.java
+++ b/src/org/wikimedia/lsearch/related/TitleReader.java
@@ -55,9 +55,9 @@
}
public void writeSiteinfo(Siteinfo info) throws IOException {
// write siteinfo to localization
- Iterator it = info.Namespaces.orderedEntries();
+ Iterator<Entry<Integer, String>> it =
info.Namespaces.orderedEntries();
while(it.hasNext()){
- Entry<Integer,String> pair =
(Entry<Integer,String>)it.next();
+ Entry<Integer,String> pair = it.next();
Localization.addCustomMapping(pair.getValue(),pair.getKey(),iid.getDBname());
}
}
diff --git a/src/org/wikimedia/lsearch/search/MultiSearcherMul.java
b/src/org/wikimedia/lsearch/search/MultiSearcherMul.java
index ef191b2..e057c30 100644
--- a/src/org/wikimedia/lsearch/search/MultiSearcherMul.java
+++ b/src/org/wikimedia/lsearch/search/MultiSearcherMul.java
@@ -86,7 +86,7 @@
Query rewrittenQuery = rewrite(original);
// step 2
- Set terms = new HashSet();
+ Set<Term> terms = new HashSet<Term>();
rewrittenQuery.extractTerms(terms);
// step3
@@ -100,7 +100,7 @@
}
}
- HashMap dfMap = new HashMap();
+ HashMap<Term,Integer> dfMap = new HashMap<Term,Integer>();
for(int i=0; i<allTermsArray.length; i++) {
dfMap.put(allTermsArray[i], new Integer(aggregatedDfs[i]));
}
diff --git a/src/org/wikimedia/lsearch/search/SearchEngine.java
b/src/org/wikimedia/lsearch/search/SearchEngine.java
index 3cbace6..e66645f 100644
--- a/src/org/wikimedia/lsearch/search/SearchEngine.java
+++ b/src/org/wikimedia/lsearch/search/SearchEngine.java
@@ -100,7 +100,7 @@
}
/** Main search method, call this from the search frontend */
- public SearchResults search(String dbname, String what, String
searchterm, HashMap query, double version) {
+ public SearchResults search(String dbname, String what, String
searchterm, HashMap<String,Object> query, double version) {
IndexId iid = IndexId.get(dbname);
if (what.equals("search") || what.equals("explain")) {
int offset = 0, limit = 20; boolean exactCase = false;
diff --git a/src/org/wikimedia/lsearch/spell/CleanIndexImporter.java
b/src/org/wikimedia/lsearch/spell/CleanIndexImporter.java
index 89d35a6..1227e6c 100644
--- a/src/org/wikimedia/lsearch/spell/CleanIndexImporter.java
+++ b/src/org/wikimedia/lsearch/spell/CleanIndexImporter.java
@@ -91,9 +91,9 @@
// nop
}
public void writeSiteinfo(Siteinfo info) throws IOException {
- Iterator it = info.Namespaces.orderedEntries();
+ Iterator<Entry<Integer, String>> it =
info.Namespaces.orderedEntries();
while(it.hasNext()){
- Entry<Integer,String> pair =
(Entry<Integer,String>)it.next();
+ Entry<Integer,String> pair = it.next();
Localization.addCustomMapping(pair.getValue(),pair.getKey(),iid.getDB().getDBname());
}
}
diff --git a/src/org/wikimedia/lsearch/util/QueryStringMap.java
b/src/org/wikimedia/lsearch/util/QueryStringMap.java
index 6b67120..8a48328 100644
--- a/src/org/wikimedia/lsearch/util/QueryStringMap.java
+++ b/src/org/wikimedia/lsearch/util/QueryStringMap.java
@@ -35,7 +35,7 @@
import java.util.StringTokenizer;
/** Extract parameters from an URL */
-public class QueryStringMap extends LinkedHashMap implements Map {
+public class QueryStringMap extends LinkedHashMap<String,Object> implements
Map<String,Object> {
private static final long serialVersionUID = 1L;
public QueryStringMap(URI uri) {
@@ -102,8 +102,8 @@
private static void testURI(String uri) throws URISyntaxException {
QueryStringMap map = new QueryStringMap(new URI(uri));
System.out.println(uri);
- Set keys = map.keySet();
- for (Iterator i = keys.iterator(); i.hasNext();) {
+ Set<String> keys = map.keySet();
+ for (Iterator<String> i = keys.iterator(); i.hasNext();) {
String key = (String)i.next();
System.out.println(" \"" + key + "\" => \"" +
map.get(key) + "\"");
}
diff --git a/test/org/wikimedia/lsearch/analyzers/AnalysisTest.java
b/test/org/wikimedia/lsearch/analyzers/AnalysisTest.java
index 18e18f7..5ec2c96 100755
--- a/test/org/wikimedia/lsearch/analyzers/AnalysisTest.java
+++ b/test/org/wikimedia/lsearch/analyzers/AnalysisTest.java
@@ -98,7 +98,7 @@
public static Token[] tokensFromAnalysis(Analyzer analyzer, String
text, String field) throws IOException {
TokenStream stream = analyzer.tokenStream(field, text);
- ArrayList tokenList = new ArrayList();
+ ArrayList<Token> tokenList = new ArrayList<Token>();
while (true) {
Token token = stream.next();
if (token == null) break;
diff --git a/test/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
b/test/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
index a5b6b86..c1690fd 100644
--- a/test/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
+++ b/test/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
@@ -39,30 +39,30 @@
public void testReadURL(){
// database
- Hashtable database = global.database;
- Hashtable roles = (Hashtable) database.get("entest");
+ Hashtable<String, Hashtable<String, Hashtable<String, String>>>
database = global.database;
+ Hashtable<String, Hashtable<String, String>> roles =
database.get("entest");
assertNotNull(roles.get("mainsplit"));
assertNotNull(roles.get("mainpart"));
assertNotNull(roles.get("restpart"));
- Hashtable mainpart = (Hashtable) roles.get("mainpart");
+ Hashtable<String, String> mainpart = roles.get("mainpart");
assertEquals("false",mainpart.get("optimize"));
assertEquals("2",mainpart.get("mergeFactor"));
assertEquals("10",mainpart.get("maxBufDocs"));
- Hashtable splitroles = (Hashtable) database.get("frtest");
+ Hashtable<String, Hashtable<String, String>> splitroles =
database.get("frtest");
assertNotNull(splitroles.get("split"));
assertNotNull(splitroles.get("part1"));
assertNotNull(splitroles.get("part2"));
assertNotNull(splitroles.get("part3"));
- Hashtable nspart1 = (Hashtable) ((Hashtable)
database.get("njawiki")).get("nspart1");
+ Hashtable<String, String> nspart1 =
database.get("njawiki").get("nspart1");
assertEquals("false",nspart1.get("optimize"));
assertEquals("5",nspart1.get("mergeFactor"));
// search
- Hashtable search = global.search;
- ArrayList sr = (ArrayList) search.get("192.168.0.2");
+ Hashtable<String,ArrayList<String>> search = global.search;
+ ArrayList<String> sr = search.get("192.168.0.2");
String[] ssr = (String[]) sr.toArray(new String [] {} );
@@ -81,8 +81,8 @@
// index
- Hashtable index = global.index;
- ArrayList ir = (ArrayList) index.get("192.168.0.5");
+ Hashtable<String,ArrayList<String>> index = global.index;
+ ArrayList<String> ir = index.get("192.168.0.5");
String[] sir = (String[]) ir.toArray(new String [] {} );
@@ -98,7 +98,7 @@
assertEquals(17,sir.length);
// indexLocation
- Hashtable indexLocation = global.indexLocation;
+ Hashtable<String,String> indexLocation = global.indexLocation;
assertEquals("192.168.0.5",indexLocation.get("entest.mainpart"));
assertEquals("192.168.0.2",indexLocation.get("entest.ngram"));
--
To view, visit https://gerrit.wikimedia.org/r/52894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1dd6add7f0868d73b662e817843b8558a0f3866
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
