boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

migration to Solr 4.5.0

Browse Source
pull/1/head
Michael Peter Christen 12 years ago
parent ef31d0f279
commit 21aa6a0321
26 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File

34
.classpath
Unescape View File

@ -50,27 +50,27 @@
<classpathentry kind="lib" path="lib/httpmime-4.3.jar"/> <classpathentry kind="lib" path="lib/httpmime-4.3.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.5.jar"/> <classpathentry kind="lib" path="lib/noggit-0.5.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/> <classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/> <classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.8.2.jar"/> <classpathentry kind="lib" path="lib/fontbox-1.8.2.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.8.2.jar"/> <classpathentry kind="lib" path="lib/jempbox-1.8.2.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.8.2.jar"/> <classpathentry kind="lib" path="lib/pdfbox-1.8.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.5.0.jar" sourcepath="/Volumes/Tres/noBackup/Downloads/solr-4.5.0/solr/core/src/java"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.5.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/> <classpathentry kind="lib" path="lib/icu4j-core.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/> <classpathentry kind="lib" path="lib/htmllexer.jar"/>

34
addon/YaCy.app/Contents/Info.plist
Unescape View File

@ -68,21 +68,21 @@
<string>$JAVAROOT/lib/jsch-0.1.42.jar</string> <string>$JAVAROOT/lib/jsch-0.1.42.jar</string>
<string>$JAVAROOT/lib/json-simple-1.1.jar</string> <string>$JAVAROOT/lib/json-simple-1.1.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string> <string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-common-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-classification-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-codecs-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-core-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-facet-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-grouping-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-highlighter-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-join-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-memory-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-misc-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-queries-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-queryparser-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-spatial-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.4.0.jar</string> <string>$JAVAROOT/lib/lucene-suggest-4.5.0.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string> <string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string>
<string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string> <string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string>
<string>$JAVAROOT/lib/noggit-0.5.jar</string> <string>$JAVAROOT/lib/noggit-0.5.jar</string>
@ -93,8 +93,8 @@
<string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string> <string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
<string>$JAVAROOT/lib/solr-core-4.4.0.jar</string> <string>$JAVAROOT/lib/solr-core-4.5.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.4.0.jar</string> <string>$JAVAROOT/lib/solr-solrj-4.5.0.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.3.jar</string> <string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string> <string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string> <string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>

34
build.xml
Unescape View File

@ -193,21 +193,21 @@
<pathelement location="${lib}/json-simple-1.1.jar" /> <pathelement location="${lib}/json-simple-1.1.jar" />
<pathelement location="${lib}/jsoup-1.6.3.jar" /> <pathelement location="${lib}/jsoup-1.6.3.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" /> <pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.4.0.jar" /> <pathelement location="${lib}/lucene-analyzers-common-4.5.0.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.4.0.jar" /> <pathelement location="${lib}/lucene-analyzers-phonetic-4.5.0.jar" />
<pathelement location="${lib}/lucene-classification-4.4.0.jar" /> <pathelement location="${lib}/lucene-classification-4.5.0.jar" />
<pathelement location="${lib}/lucene-codecs-4.4.0.jar" /> <pathelement location="${lib}/lucene-codecs-4.5.0.jar" />
<pathelement location="${lib}/lucene-core-4.4.0.jar" /> <pathelement location="${lib}/lucene-core-4.5.0.jar" />
<pathelement location="${lib}/lucene-facet-4.4.0.jar" /> <pathelement location="${lib}/lucene-facet-4.5.0.jar" />
<pathelement location="${lib}/lucene-grouping-4.4.0.jar" /> <pathelement location="${lib}/lucene-grouping-4.5.0.jar" />
<pathelement location="${lib}/lucene-highlighter-4.4.0.jar" /> <pathelement location="${lib}/lucene-highlighter-4.5.0.jar" />
<pathelement location="${lib}/lucene-join-4.4.0.jar" /> <pathelement location="${lib}/lucene-join-4.5.0.jar" />
<pathelement location="${lib}/lucene-memory-4.4.0.jar" /> <pathelement location="${lib}/lucene-memory-4.5.0.jar" />
<pathelement location="${lib}/lucene-misc-4.4.0.jar" /> <pathelement location="${lib}/lucene-misc-4.5.0.jar" />
<pathelement location="${lib}/lucene-queries-4.4.0.jar" /> <pathelement location="${lib}/lucene-queries-4.5.0.jar" />
<pathelement location="${lib}/lucene-queryparser-4.4.0.jar" /> <pathelement location="${lib}/lucene-queryparser-4.5.0.jar" />
<pathelement location="${lib}/lucene-spatial-4.4.0.jar" /> <pathelement location="${lib}/lucene-spatial-4.5.0.jar" />
<pathelement location="${lib}/lucene-suggest-4.4.0.jar" /> <pathelement location="${lib}/lucene-suggest-4.5.0.jar" />
<pathelement location="${lib}/metadata-extractor-2.6.2.jar" /> <pathelement location="${lib}/metadata-extractor-2.6.2.jar" />
<pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" /> <pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" />
<pathelement location="${lib}/noggit-0.5.jar" /> <pathelement location="${lib}/noggit-0.5.jar" />
@ -218,8 +218,8 @@
<pathelement location="${lib}/servlet-api-2.5-20081211.jar" /> <pathelement location="${lib}/servlet-api-2.5-20081211.jar" />
<pathelement location="${lib}/slf4j-api-1.7.2.jar" /> <pathelement location="${lib}/slf4j-api-1.7.2.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" /> <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
<pathelement location="${lib}/solr-core-4.4.0.jar" /> <pathelement location="${lib}/solr-core-4.5.0.jar" />
<pathelement location="${lib}/solr-solrj-4.4.0.jar" /> <pathelement location="${lib}/solr-solrj-4.5.0.jar" />
<pathelement location="${lib}/spatial4j-0.3.jar" /> <pathelement location="${lib}/spatial4j-0.3.jar" />
<pathelement location="${lib}/webcat-0.1-swf.jar" /> <pathelement location="${lib}/webcat-0.1-swf.jar" />
<pathelement location="${lib}/wstx-asl-3.2.9.jar" /> <pathelement location="${lib}/wstx-asl-3.2.9.jar" />

2
defaults/solr/solrconfig.xml
Unescape View File

@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can that you fully re-index after changing this setting as it can
affect both how text is indexed and queried. affect both how text is indexed and queried.
--> -->
<luceneMatchVersion>4.4</luceneMatchVersion> <luceneMatchVersion>4.5</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars <!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in identified and use them to resolve any "plugins" specified in

BIN
lib/lucene-analyzers-common-4.4.0.jar → lib/lucene-analyzers-common-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-phonetic-4.4.0.jar → lib/lucene-analyzers-phonetic-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-classification-4.4.0.jar → lib/lucene-classification-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-codecs-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-codecs-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-core-4.4.0.jar → lib/lucene-core-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-facet-4.4.0.jar → lib/lucene-facet-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-grouping-4.4.0.jar → lib/lucene-grouping-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-highlighter-4.4.0.jar → lib/lucene-highlighter-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-join-4.4.0.jar → lib/lucene-join-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-misc-4.4.0.jar → lib/lucene-misc-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queries-4.4.0.jar → lib/lucene-queries-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queryparser-4.4.0.jar → lib/lucene-queryparser-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-spatial-4.4.0.jar → lib/lucene-spatial-4.5.0.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.4.0.jar → lib/lucene-suggest-4.5.0.jar
View File

Binary file not shown.

BIN
lib/solr-core-4.4.0.jar → lib/solr-core-4.5.0.jar
View File

Binary file not shown.

0
lib/solr-solrj-4.4.0.License → lib/solr-solrj-4.5.0.License
Unescape View File

BIN
lib/solr-solrj-4.4.0.jar → lib/solr-solrj-4.5.0.jar
View File

Binary file not shown.

6
source/net/yacy/search/index/Fulltext.java
Unescape View File

@ -81,12 +81,11 @@ import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.apache.lucene.util.Version; import org.apache.lucene.util.Version;
import org.apache.solr.core.CoreContainer;
public final class Fulltext { public final class Fulltext {
private static final String SOLR_PATH = "solr_44"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml private static final String SOLR_PATH = "solr_45"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml
private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40"}; private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44"};
// class objects // class objects
private final File segmentPath; private final File segmentPath;
@ -167,7 +166,6 @@ public final class Fulltext {
File oldLocation = new File(this.segmentPath, oldVersion); File oldLocation = new File(this.segmentPath, oldVersion);
if (oldLocation.exists()) oldLocation.renameTo(solrLocation); if (oldLocation.exists()) oldLocation.renameTo(solrLocation);
} }
assert CoreContainer.DEFAULT_DEFAULT_CORE_NAME.equals(CollectionSchema.CORE_NAME); // check that solr and we use the same default core name
EmbeddedInstance localCollectionInstance = new EmbeddedInstance(new File(new File(Switchboard.getSwitchboard().appPath, "defaults"), "solr"), solrLocation, CollectionSchema.CORE_NAME, new String[]{CollectionSchema.CORE_NAME, WebgraphSchema.CORE_NAME}); EmbeddedInstance localCollectionInstance = new EmbeddedInstance(new File(new File(Switchboard.getSwitchboard().appPath, "defaults"), "solr"), solrLocation, CollectionSchema.CORE_NAME, new String[]{CollectionSchema.CORE_NAME, WebgraphSchema.CORE_NAME});
EmbeddedSolrConnector localCollectionConnector = new EmbeddedSolrConnector(localCollectionInstance); EmbeddedSolrConnector localCollectionConnector = new EmbeddedSolrConnector(localCollectionInstance);

2
source/net/yacy/search/schema/CollectionSchema.java
Unescape View File

@ -214,7 +214,7 @@ public enum CollectionSchema implements SchemaDeclaration {
ext_title_txt(SolrType.text_general, true, true, true, false, false, "names matching title expressions"), ext_title_txt(SolrType.text_general, true, true, true, false, false, "names matching title expressions"),
ext_title_val(SolrType.num_integer, true, true, true, false, false, "number of matching title expressions"); ext_title_val(SolrType.num_integer, true, true, true, false, false, "number of matching title expressions");
public final static String CORE_NAME = "collection1"; public final static String CORE_NAME = "collection1"; // this was the default core name up to Solr 4.4.0. This default name was stored in CoreContainer.DEFAULT_DEFAULT_CORE_NAME but was removed in Solr 4.5.0
public final static String VOCABULARY_PREFIX = "vocabulary_"; public final static String VOCABULARY_PREFIX = "vocabulary_";
public final static String VOCABULARY_SUFFIX = "_sxt"; public final static String VOCABULARY_SUFFIX = "_sxt";

Write Preview
Loading…
Cancel
Save