Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53572
Change subject: Redoing this as a maven project
......................................................................
Redoing this as a maven project
- Use upstream libraries for everything except lucene-core, mwdumper
- Update mwdumper to latest (1.16)
Change-Id: I3c7f360da20c79de81adaf22c87f33e8247257cf
---
D .classpath
M .gitignore
D .project
D build
D build.properties
D build.xml
M debian/control
D lib/commons-logging-1.1.jar
D lib/highlighter.jar
D lib/junit-4.1.jar
D lib/log4j-1.2.14.jar
D lib/lucene-analyzers.jar
M lib/mwdumper.jar
D lib/mysql-connector-java-3.0.17-ga-bin.jar
D lib/snowball.jar
D lib/ws-commons-util-1.0.1.jar
D lib/xmlrpc-client-3.0.jar
D lib/xmlrpc-common-3.0.jar
D lib/xmlrpc-server-3.0.jar
A pom.xml
M src/org/apache/lucene/search/ArticleQueryWrap.java
M src/org/apache/lucene/search/CustomBoostQuery.java
M src/org/apache/lucene/search/PositionalQuery.java
M src/org/apache/lucene/search/RelevanceQuery.java
M src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
25 files changed, 130 insertions(+), 258 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/lucene-search-2
refs/changes/72/53572/1
diff --git a/.classpath b/.classpath
deleted file mode 100644
index 069e7f4..0000000
--- a/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="src" path="resources"/>
- <classpathentry kind="lib" path="lib/junit-4.1.jar"
sourcepath="/home/rainman/lucene/junit-4.1-src.jar"/>
- <classpathentry kind="lib" path="lib/lucene-analyzers.jar"/>
- <classpathentry kind="lib" path="lib/ws-commons-util-1.0.1.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc-client-3.0.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc-common-3.0.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc-server-3.0.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/mwdumper.jar"
sourcepath="/mwdumper"/>
- <classpathentry kind="lib"
path="lib/mysql-connector-java-3.0.17-ga-bin.jar"/>
- <classpathentry kind="lib" path="lib/snowball.jar"
sourcepath="/lucene-2.3/contrib/snowball/src"/>
- <classpathentry kind="lib" path="lib/lucene-core-2.3.jar"
sourcepath="/home/rainman/Documents/packages/lucene-2.3.2"/>
- <classpathentry kind="output" path="bin"/>
- <classpathentry kind="lib" path="/usr/share/java/log4j-1.2.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/slf4j-api.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/slf4j-log4j12.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/commons-logging.jar"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 2b2caa6..4c04fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
.classpath
.project
.settings
-bin/
-LuceneSearch.jar
+target/
diff --git a/.project b/.project
deleted file mode 100644
index e269667..0000000
--- a/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>search-2</name>
- <comment>JavaCC Nature</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>sf.eclipse.javacc.javaccbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>sf.eclipse.javacc.javaccnature</nature>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
diff --git a/build b/build
deleted file mode 100755
index 8a1a16f..0000000
--- a/build
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-source ./config.inc
-
-if [ -n "$1" ]; then
- dumpfile="$1"
-else
- dumps="$base/dumps"
- [ -e $dumps ] || mkdir $dumps
- dumpfile="$dumps/dump-$dbname.xml"
- timestamp=`date -u +%Y-%m-%d`
- slave=`php $mediawiki/maintenance/getSlaveServer.php \
- $dbname \
- --conf $mediawiki/LocalSettings.php \
- --aconf $mediawiki/AdminSettings.php`
- echo "Dumping $dbname..."
- cd $mediawiki && php maintenance/dumpBackup.php \
- $dbname \
- --conf $mediawiki/LocalSettings.php \
- --aconf $mediawiki/AdminSettings.php \
- --current \
- --server=$slave > $dumpfile
- [ -e $indexes/status ] || mkdir -p $indexes/status
- echo "timestamp=$timestamp" > $indexes/status/$dbname
-fi
-
-cd $base &&
-java -cp LuceneSearch.jar org.wikimedia.lsearch.importer.BuildAll $dumpfile
$dbname
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 12f2937..0000000
--- a/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-version=2.1.3
-pack.name=lucene-search
-pack.src.name=lucene-search-src
-binary.name=lucene-search-bin
-jar.name=LuceneSearch.jar
-
-lib.dir=lib
-dest.dir=bin
-src.dir=src
-test.dir=test
-dist.dir=dist
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 508bced..0000000
--- a/build.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="LuceneSearch" default="alljar" basedir=".">
- <property file="build.properties"/>
- <property name="junit.class.dir" value="${test.dir}/classes"/>
- <property name="include" value="src/** lib/** sql/** test-data/**
webinterface/** *-example *.txt
- lsearch* build.xml scripts/* VERSION
configure build update
- resources/** test/** udplogger/**"/>
- <property name="include.src" value="src/** sql/** build.xml scripts/*
webinterface/* VERSION
- configure build update test/**
udplogger/**"/>
- <property name="include.bin" value="*.log4j *.txt config.inc
template/** udplogger/**"/>
- <property name="include.sh" value="configure build update lsearchd"/>
-
- <path id="classpath">
- <fileset dir="${lib.dir}" includes="*.jar"/>
- <file name="${jar.name}"/>
- </path>
-
- <target name="run">
- <java jar="${jar.name}" fork="yes">
- <sysproperty key="java.rmi.server.codebase"
value="file://${basedir}/${jar.name}"/>
- <sysproperty key="java.rmi.server.hostname"
value="${hostname}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </java>
- </target>
-
- <target name="makejar" depends="build">
- <jar destfile="${basedir}/${jar.name}">
- <manifest>
- <attribute name="Main-Class"
value="org.wikimedia.lsearch.config.StartupManager"/>
- <attribute name="Class-Path" value="${jar.name}
lib/xmlrpc-common-3.0.jar
-
lib/xmlrpc-client-3.0.jar lib/xmlrpc-server-3.0.jar
-
lib/ws-commons-util-1.0.1.jar lib/lucene-core-2.3.jar
-
lib/lucene-analyzers.jar lib/snowball.jar lib/mwdumper.jar
-
lib/mysql-connector-java-3.0.17-ga-bin.jar /usr/share/java/commons-logging.jar
/usr/share/java/log4j-1.2.jar /usr/share/java/slf4j-api.jar
/usr/share/java/slf4j-log4j12.jar"/>
- </manifest>
- <zipfileset dir="${dest.dir}" prefix="">
- <include name="org/**"/>
- </zipfileset>
- </jar>
- </target>
-
- <target name="alljar" depends="build" description="All-in-one jar">
- <jar jarfile="${jar.name}" compress="true">
- <manifest>
- <attribute name="Main-Class"
value="org.wikimedia.lsearch.config.StartupManager" />
- </manifest>
- <fileset dir="bin" includes="org/**" />
-
- <!-- pack libraries as well -->
- <zipfileset src="lib/xmlrpc-common-3.0.jar" />
- <zipfileset src="lib/xmlrpc-client-3.0.jar" />
- <zipfileset src="lib/xmlrpc-server-3.0.jar" />
- <zipfileset src="lib/ws-commons-util-1.0.1.jar" />
- <zipfileset src="lib/lucene-core-2.3.jar" />
- <zipfileset src="lib/lucene-analyzers.jar" />
- <zipfileset src="lib/snowball.jar" />
- <zipfileset src="lib/mwdumper.jar" />
- <zipfileset
src="lib/mysql-connector-java-3.0.17-ga-bin.jar" />
- <zipfileset src="/usr/share/java/commons-logging.jar" />
- <zipfileset src="/usr/share/java/log4j-1.2.jar" />
- <zipfileset src="/usr/share/java/slf4j-api.jar" />
- <zipfileset src="/usr/share/java/slf4j-log4j12.jar" />
-
- <fileset dir="resources" includes="*/**" />
- </jar>
- </target>
-
-
- <target name="build" description="Compile classes">
- <mkdir dir="${dest.dir}"/>
- <javac srcdir="${src.dir}/org/" debug="on" encoding="UTF-8"
includes="**/*.java" destdir="${dest.dir}/">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <target name="clean-dist" description="Clean up the dist dir">
- <mkdir dir="${dist.dir}"/>
- <delete file="${dist.dir}/*.tar"/>
- <delete file="${dist.dir}/*.tar.gz"/>
- </target>
-
- <target name="pack" depends="clean-dist" description="Make tar.gz
distribution">
- <tar tarfile="${dist.dir}/${pack.name}-${version}.tar">
- <tarfileset prefix="${pack.name}-${version}" dir="."
includes="${include}"/>
- </tar>
- <gzip zipfile="${dist.dir}/${pack.name}-${version}.tar.gz"
src="${dist.dir}/${pack.name}-${version}.tar"/>
- <delete file="${dist.dir}/${pack.name}-${version}.tar"/>
- </target>
-
- <target name="pack-src" depends="alljar, clean-dist" description="Make
tar.gz distribution of only core source files">
- <tar tarfile="${dist.dir}/${src.name}-${version}.tar">
- <tarfileset prefix="${pack.name}-${version}" dir="."
includes="${include.src}"/>
- </tar>
-
- <gzip zipfile="${dist.dir}/${src.name}-${version}.tar.gz"
src="${dist.dir}/${src.name}-${version}.tar"/>
- <delete file="${dist.dir}/${src.name}-${version}.tar"/>
- </target>
-
-
- <target name="binary" depends="alljar, clean-dist" description="Make
binary tar.gz distribution">
- <tar tarfile="${dist.dir}/${binary.name}-${version}.tar">
- <tarfileset prefix="${pack.name}-${version}" dir="."
includes="${jar.name} ${include.bin}"
- excludes="template/backup/**"/>
- <tarfileset prefix="${pack.name}-${version}" mode="755"
dir="." includes="${include.sh}"/>
- </tar>
-
- <gzip zipfile="${dist.dir}/${binary.name}-${version}.tar.gz"
src="${dist.dir}/${binary.name}-${version}.tar"/>
- <delete file="${dist.dir}/${binary.name}-${version}.tar"/>
- </target>
-
- <target name="test-build" depends="alljar" description="Compile the
junit tests">
- <mkdir dir="${junit.class.dir}"/>
- <javac srcdir="${test.dir}" destdir="${junit.class.dir}">
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${collector.dir}"/>
- <pathelement path="${jar.name}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="test" depends="test-build">
- <property name="collector.dir" value="${test.dir}"/>
-
- <junit haltonerror="false" haltonfailure="false"
printsummary="yes"
- errorProperty="tests.failed"
failureproperty="tests.failed">
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${junit.class.dir}"/>
- <pathelement location="${collector.dir}"/>
- <pathelement path="${jar.name}"/>
- </classpath>
-
- <batchtest fork="yes" todir="${collector.dir}">
- <fileset dir="${collector.dir}"
includes="**/*.java"/>
- <formatter type="plain" usefile="false"/>
- </batchtest>
- </junit>
- <fail if="tests.failed" message="Test(s) failed."/>
- </target>
-
- <target name="clean"
- description="Destroys all generated files and dirs.">
- <delete dir="${dest.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="${junit.class.dir}"/>
- <delete dir="dumps"/>
- <delete dir="indexes"/>
- <delete file="${basedir}/${jar.name}"/>
- <delete file="lsearch.log4j"/>
- <delete file="lsearch-global.conf"/>
- <delete file="lsearch.conf"/>
- <delete file="config.inc"/>
- </target>
-</project>
diff --git a/debian/control b/debian/control
index 4f1f951..3589ef5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@
Section: web
Priority: optional
Maintainer: Peter Youngmeister <[email protected]>
-Build-Depends: default-jdk | sun-java6-jdk | oracle-j2sdk1.6, ant, debhelper
(>= 7.0.50~), javahelper (>=0.25), libcommons-logging-java, liblog4j1.2-java,
libslf4j-java
+Build-Depends: openjdk-7-jdk, maven, debhelper (>= 7.0.50~), javahelper
(>=0.25)
Standards-Version: 3.8.4
Package: lucene-search-2
Architecture: all
-Depends: default-jdk | sun-java6-jdk | oracle-j2sdk1.6
+Depends: openjdk-7-jdk
Description: Wikimedia Backend Search
Implementation of Lucene that handles wiki
search indexing and serving of search results.
diff --git a/lib/commons-logging-1.1.jar b/lib/commons-logging-1.1.jar
deleted file mode 100644
index 2ff9bbd..0000000
--- a/lib/commons-logging-1.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/highlighter.jar b/lib/highlighter.jar
deleted file mode 100644
index 934b94a..0000000
--- a/lib/highlighter.jar
+++ /dev/null
Binary files differ
diff --git a/lib/junit-4.1.jar b/lib/junit-4.1.jar
deleted file mode 100644
index 2c46d67..0000000
--- a/lib/junit-4.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/log4j-1.2.14.jar b/lib/log4j-1.2.14.jar
deleted file mode 100644
index 6251307..0000000
--- a/lib/log4j-1.2.14.jar
+++ /dev/null
Binary files differ
diff --git a/lib/lucene-analyzers.jar b/lib/lucene-analyzers.jar
deleted file mode 100644
index dc2ad6b..0000000
--- a/lib/lucene-analyzers.jar
+++ /dev/null
Binary files differ
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/lib/mysql-connector-java-3.0.17-ga-bin.jar
b/lib/mysql-connector-java-3.0.17-ga-bin.jar
deleted file mode 100644
index e2e901b..0000000
--- a/lib/mysql-connector-java-3.0.17-ga-bin.jar
+++ /dev/null
Binary files differ
diff --git a/lib/snowball.jar b/lib/snowball.jar
deleted file mode 100644
index 75b6a35..0000000
--- a/lib/snowball.jar
+++ /dev/null
Binary files differ
diff --git a/lib/ws-commons-util-1.0.1.jar b/lib/ws-commons-util-1.0.1.jar
deleted file mode 100644
index 3769ee5..0000000
--- a/lib/ws-commons-util-1.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/xmlrpc-client-3.0.jar b/lib/xmlrpc-client-3.0.jar
deleted file mode 100644
index 2068c24..0000000
--- a/lib/xmlrpc-client-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/xmlrpc-common-3.0.jar b/lib/xmlrpc-common-3.0.jar
deleted file mode 100644
index e7aebd2..0000000
--- a/lib/xmlrpc-common-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/xmlrpc-server-3.0.jar b/lib/xmlrpc-server-3.0.jar
deleted file mode 100644
index 246ff6f..0000000
--- a/lib/xmlrpc-server-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..8bb2d61
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,122 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>search-2</name>
+ <groupId>org.wikimedia</groupId>
+ <artifactId>lucene-search-2</artifactId>
+ <version>2.3.0wm1</version>
+ <packaging>jar</packaging>
+ <url>http://www.mediawiki.org/wiki/Search</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <luceneVersion>2.3.0</luceneVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${luceneVersion}</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/lucene-core-2.3.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>${luceneVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>${luceneVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-server</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wikimedia</groupId>
+ <artifactId>mwdumper</artifactId>
+ <version>1.16</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/mwdumper.jar</systemPath>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <directory>target</directory>
+ <!-- where the jar goes -->
+ <sourceDirectory>src</sourceDirectory>
+ <!-- where the source files are -->
+ <testSourceDirectory>src</testSourceDirectory>
+ <!-- where the test source files are -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <source>1.6</source>
+ <!-- enable assertions -->
+ <target>1.6</target>
+ <excludes>
+ <!-- exclude tests here -->
+ <exclude>**/*Test.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.4</version>
+ <configuration>
+ <includes>
+ <!-- select only tests -->
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.6</version>
+ <configuration>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <!-- include all non-java files as resources -->
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
diff --git a/src/org/apache/lucene/search/ArticleQueryWrap.java
b/src/org/apache/lucene/search/ArticleQueryWrap.java
index 4db3685..debb35a 100644
--- a/src/org/apache/lucene/search/ArticleQueryWrap.java
+++ b/src/org/apache/lucene/search/ArticleQueryWrap.java
@@ -65,7 +65,7 @@
return exp;
}
- protected Weight createWeight(Searcher searcher) throws IOException {
+ public Weight createWeight(Searcher searcher) throws IOException {
return new ArticleQueryWeight(searcher);
}
diff --git a/src/org/apache/lucene/search/CustomBoostQuery.java
b/src/org/apache/lucene/search/CustomBoostQuery.java
index b6ef6f7..14e1b1c 100644
--- a/src/org/apache/lucene/search/CustomBoostQuery.java
+++ b/src/org/apache/lucene/search/CustomBoostQuery.java
@@ -313,7 +313,7 @@
}
/*(non-Javadoc) @see
org.apache.lucene.search.Query#createWeight(org.apache.lucene.search.Searcher)
*/
- protected Weight createWeight(Searcher searcher) throws IOException {
+ public Weight createWeight(Searcher searcher) throws IOException {
return new CustomWeight(searcher);
}
diff --git a/src/org/apache/lucene/search/PositionalQuery.java
b/src/org/apache/lucene/search/PositionalQuery.java
index 1e8c2e6..a6033d2 100644
--- a/src/org/apache/lucene/search/PositionalQuery.java
+++ b/src/org/apache/lucene/search/PositionalQuery.java
@@ -41,7 +41,7 @@
return "(P "+s+")";
}
- protected Weight createWeight(Searcher searcher) throws IOException {
+ public Weight createWeight(Searcher searcher) throws IOException {
return new PositionalWeight(searcher);
}
diff --git a/src/org/apache/lucene/search/RelevanceQuery.java
b/src/org/apache/lucene/search/RelevanceQuery.java
index a3c0aa1..cee7d33 100644
--- a/src/org/apache/lucene/search/RelevanceQuery.java
+++ b/src/org/apache/lucene/search/RelevanceQuery.java
@@ -273,7 +273,7 @@
}
/*(non-Javadoc) @see
org.apache.lucene.search.Query#createWeight(org.apache.lucene.search.Searcher)
*/
- protected Weight createWeight(Searcher searcher) throws IOException {
+ public Weight createWeight(Searcher searcher) throws IOException {
return new RelevanceWeight(searcher);
}
diff --git a/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
b/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
index 3168013..fcd0993 100644
--- a/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
+++ b/src/org/wikimedia/lsearch/search/MatchAllTitlesQuery.java
@@ -138,7 +138,7 @@
}
}
- protected Weight createWeight(Searcher searcher) {
+ public Weight createWeight(Searcher searcher) {
return new MatchAllDocsWeight(searcher);
}
--
To view, visit https://gerrit.wikimedia.org/r/53572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c7f360da20c79de81adaf22c87f33e8247257cf
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
