Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Solr 6.4 #26

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Upgrade to Solr 6.4 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a93f22
Upgrade dependencies for SOLR 5.4
vedina Jan 16, 2016
6c2b10d
Upgrade dependencies for SOLR 5.4.1
kerberizer Feb 19, 2016
8caadb3
Update the deps to Solr 6.1.0
kerberizer Sep 4, 2016
129a850
Updates and fixes for Solr 6.2.0
kerberizer Sep 8, 2016
f362381
Update the deps to Solr 6.2.1
kerberizer Oct 25, 2016
298b84e
Merge pull request #1 from kerberizer/master
vedina Nov 21, 2016
3f88240
Update to Solr 6.3.0 & SLF4J 1.7.21
kerberizer Nov 27, 2016
e9ee2b5
Merge pull request #2 from kerberizer/master
vedina Nov 27, 2016
66b68fc
Update to Solr 6.4.0 & SLF4J 1.7.22
kerberizer Jan 29, 2017
79ed25c
Merge pull request #3 from kerberizer/master
vedina Feb 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
</configurations>

<dependencies>
<dependency org="org.apache.lucene" name="lucene-analyzers-common" rev="4.10.3" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-core" rev="4.10.3" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-codecs" rev="4.10.3" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-test-framework" rev="4.10.3" conf="test->default"/>
<dependency org="org.apache.solr" name="solr-core" rev="4.10.3" conf="compile->default" />
<dependency org="org.apache.solr" name="solr-solrj" rev="4.10.3" conf="compile->default" />
<dependency org="org.apache.solr" name="solr-test-framework" rev="4.10.3" conf="test->default" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.6" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-analyzers-common" rev="6.4.0" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-core" rev="6.4.0" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-codecs" rev="6.4.0" conf="compile->default"/>
<dependency org="org.apache.lucene" name="lucene-test-framework" rev="6.4.0" conf="test->default"/>
<dependency org="org.apache.solr" name="solr-core" rev="6.4.0" conf="compile->default" />
<dependency org="org.apache.solr" name="solr-solrj" rev="6.4.0" conf="compile->default" />
<dependency org="org.apache.solr" name="solr-test-framework" rev="6.4.0" conf="test->default" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.22" conf="compile->default"/>
</dependencies>
</ivy-module>
13 changes: 10 additions & 3 deletions ivy/ivy-settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@

<ivysettings>
<settings defaultResolver="central"/>
<settings defaultResolver="my-chain"/>
<resolvers>
<ibiblio name="central" m2compatible="true"/>
<chain name="my-chain">
<ibiblio name="restlet" m2compatible="true" root="http://maven.restlet.com"/>
<ibiblio name="central" m2compatible="true"/>
</chain>
</resolvers>
<modules>
<module organization="org.restlet.jee" resolver="restlet"/>
<module organization="restlet" resolver="restlet"/>
<module organization="org.restlet" resolver="restlet"/>
</modules>
</ivysettings>
14 changes: 8 additions & 6 deletions src/main/java/com/lucidworks/analysis/AutoPhrasingQParserPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
import java.util.Collections;
import java.util.List;

import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.WordlistLoader;
import org.apache.lucene.analysis.WordlistLoader;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
Expand Down Expand Up @@ -110,7 +110,9 @@ private String filter( String qStr ) {
}

private String autophrase( String input ) throws IOException {
WhitespaceTokenizer wt = new WhitespaceTokenizer( new StringReader( input ));

WhitespaceTokenizer wt = new WhitespaceTokenizer( );
wt.setReader(new StringReader(input));
TokenStream ts = wt;
if (ignoreCase) {
ts = new LowerCaseFilter( wt );
Expand Down Expand Up @@ -167,4 +169,4 @@ private List<String> splitFileNames(String fileNames) {

return result;
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/lucidworks/analysis/AutoPhrasingTokenFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.CharArrayMap;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.CharArrayMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/lucidworks/analysis/AutoPhrasingTokenFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.Map;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
Expand Down
23 changes: 15 additions & 8 deletions src/test/com/lucidworks/analysis/TestAutoPhrasingTokenFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import junit.framework.TestCase;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.CharArraySet;

public class TestAutoPhrasingTokenFilter extends TestCase {

Expand All @@ -18,7 +18,8 @@ public void testAutoPhrase( ) throws Exception {


StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);
AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, false );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
CharTermAttribute term = aptf.addAttribute(CharTermAttribute.class);
Expand Down Expand Up @@ -61,7 +62,8 @@ public void testAutoPhraseEmitSingle( ) throws Exception {
final String input = "what is my income tax refund this year now that my property tax is so high";

StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);

AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, true );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
Expand Down Expand Up @@ -115,7 +117,8 @@ public void testOverlappingAtBeginning( ) throws Exception {
final String input = "new york city is great";

StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);

AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, false );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
Expand All @@ -137,7 +140,8 @@ public void testOverlappingAtBeginningEmitSingle( ) throws Exception {
final String input = "new york city is great";

StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);

AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, true );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
Expand Down Expand Up @@ -167,7 +171,8 @@ public void testOverlappingAtEndEmitSingle( ) throws Exception {
final String input = "the great city of new york";

StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);

AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, true );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
Expand Down Expand Up @@ -199,7 +204,8 @@ public void testOverlappingAtEnd( ) throws Exception {
final String input = "the great city of new york";

StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);

AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, false );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
Expand All @@ -221,7 +227,8 @@ public void testIncompletePhrase( ) throws Exception {
final String input = "some new york";

StringReader reader = new StringReader(input);
final WhitespaceTokenizer in = new WhitespaceTokenizer( reader );
final WhitespaceTokenizer in = new WhitespaceTokenizer( );
in.setReader(reader);

AutoPhrasingTokenFilter aptf = new AutoPhrasingTokenFilter( in, phraseSets, false );
aptf.setReplaceWhitespaceWith( new Character( '_' ) );
Expand Down