diff --git a/build.xml b/build.xml index 375112e6e..4655f3177 100644 --- a/build.xml +++ b/build.xml @@ -188,7 +188,7 @@ - + @@ -226,21 +226,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -252,8 +252,8 @@ - - + + diff --git a/lib/guava-18.0.jar b/lib/guava-18.0.jar deleted file mode 100644 index 8f89e4901..000000000 Binary files a/lib/guava-18.0.jar and /dev/null differ diff --git a/lib/guava-30.1-jre.jar b/lib/guava-30.1-jre.jar new file mode 100644 index 000000000..dab80f395 Binary files /dev/null and b/lib/guava-30.1-jre.jar differ diff --git a/lib/lucene-analyzers-common-7.7.3.jar b/lib/lucene-analyzers-common-8.8.1.jar similarity index 78% rename from lib/lucene-analyzers-common-7.7.3.jar rename to lib/lucene-analyzers-common-8.8.1.jar index 47b9b1374..31670494f 100644 Binary files a/lib/lucene-analyzers-common-7.7.3.jar and b/lib/lucene-analyzers-common-8.8.1.jar differ diff --git a/lib/lucene-analyzers-phonetic-7.7.3.jar b/lib/lucene-analyzers-phonetic-7.7.3.jar deleted file mode 100644 index 31bb241fc..000000000 Binary files a/lib/lucene-analyzers-phonetic-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-analyzers-phonetic-8.8.1.jar b/lib/lucene-analyzers-phonetic-8.8.1.jar new file mode 100644 index 000000000..f8ceb1f7d Binary files /dev/null and b/lib/lucene-analyzers-phonetic-8.8.1.jar differ diff --git a/lib/lucene-backward-codecs-7.7.3.jar b/lib/lucene-backward-codecs-7.7.3.jar deleted file mode 100644 index 4bfa858e6..000000000 Binary files a/lib/lucene-backward-codecs-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-backward-codecs-8.8.1.jar b/lib/lucene-backward-codecs-8.8.1.jar new file mode 100644 index 000000000..3775fcb1a Binary files /dev/null and b/lib/lucene-backward-codecs-8.8.1.jar differ diff --git a/lib/lucene-classification-7.7.3.jar b/lib/lucene-classification-7.7.3.jar deleted file mode 100644 index b46656e5c..000000000 Binary files a/lib/lucene-classification-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-classification-8.8.1.jar b/lib/lucene-classification-8.8.1.jar new file mode 100644 index 000000000..1caac6d11 Binary files /dev/null and b/lib/lucene-classification-8.8.1.jar differ diff --git a/lib/lucene-codecs-7.7.3.jar b/lib/lucene-codecs-7.7.3.jar deleted file mode 100644 index 3b06aaa0e..000000000 Binary files a/lib/lucene-codecs-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-codecs-8.8.1.jar b/lib/lucene-codecs-8.8.1.jar new file mode 100644 index 000000000..2c20bc314 Binary files /dev/null and b/lib/lucene-codecs-8.8.1.jar differ diff --git a/lib/lucene-core-7.7.3.jar b/lib/lucene-core-7.7.3.jar deleted file mode 100644 index 463f757a6..000000000 Binary files a/lib/lucene-core-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-core-8.8.1.jar b/lib/lucene-core-8.8.1.jar new file mode 100644 index 000000000..4eed338a6 Binary files /dev/null and b/lib/lucene-core-8.8.1.jar differ diff --git a/lib/lucene-grouping-7.7.3.jar b/lib/lucene-grouping-7.7.3.jar deleted file mode 100644 index f84112ef9..000000000 Binary files a/lib/lucene-grouping-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-grouping-8.8.1.jar b/lib/lucene-grouping-8.8.1.jar new file mode 100644 index 000000000..7435fc837 Binary files /dev/null and b/lib/lucene-grouping-8.8.1.jar differ diff --git a/lib/lucene-highlighter-7.7.3.jar b/lib/lucene-highlighter-7.7.3.jar deleted file mode 100644 index 456dbb2cc..000000000 Binary files a/lib/lucene-highlighter-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-highlighter-8.8.1.jar b/lib/lucene-highlighter-8.8.1.jar new file mode 100644 index 000000000..3a391bc19 Binary files /dev/null and b/lib/lucene-highlighter-8.8.1.jar differ diff --git a/lib/lucene-join-7.7.3.jar b/lib/lucene-join-7.7.3.jar deleted file mode 100644 index 50c041ccb..000000000 Binary files a/lib/lucene-join-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-join-8.8.1.jar b/lib/lucene-join-8.8.1.jar new file mode 100644 index 000000000..7f22f9e1f Binary files /dev/null and b/lib/lucene-join-8.8.1.jar differ diff --git a/lib/lucene-memory-7.7.3.jar b/lib/lucene-memory-7.7.3.jar deleted file mode 100644 index 47c0d933f..000000000 Binary files a/lib/lucene-memory-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-memory-8.8.1.jar b/lib/lucene-memory-8.8.1.jar new file mode 100644 index 000000000..72ddc6039 Binary files /dev/null and b/lib/lucene-memory-8.8.1.jar differ diff --git a/lib/lucene-misc-7.7.3.jar b/lib/lucene-misc-7.7.3.jar deleted file mode 100644 index 604e76cd2..000000000 Binary files a/lib/lucene-misc-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-misc-8.8.1.jar b/lib/lucene-misc-8.8.1.jar new file mode 100644 index 000000000..af7c40081 Binary files /dev/null and b/lib/lucene-misc-8.8.1.jar differ diff --git a/lib/lucene-queries-7.7.3.jar b/lib/lucene-queries-7.7.3.jar deleted file mode 100644 index 14a16ea89..000000000 Binary files a/lib/lucene-queries-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-queries-8.8.1.jar b/lib/lucene-queries-8.8.1.jar new file mode 100644 index 000000000..9c7aadd3b Binary files /dev/null and b/lib/lucene-queries-8.8.1.jar differ diff --git a/lib/lucene-queryparser-7.7.3.jar b/lib/lucene-queryparser-8.8.1.jar similarity index 72% rename from lib/lucene-queryparser-7.7.3.jar rename to lib/lucene-queryparser-8.8.1.jar index e1f012f8f..0a08fbff1 100644 Binary files a/lib/lucene-queryparser-7.7.3.jar and b/lib/lucene-queryparser-8.8.1.jar differ diff --git a/lib/lucene-spatial-extras-7.7.3.jar b/lib/lucene-spatial-extras-8.8.1.jar similarity index 57% rename from lib/lucene-spatial-extras-7.7.3.jar rename to lib/lucene-spatial-extras-8.8.1.jar index b2dc3253b..0160b90e2 100644 Binary files a/lib/lucene-spatial-extras-7.7.3.jar and b/lib/lucene-spatial-extras-8.8.1.jar differ diff --git a/lib/lucene-suggest-7.7.3.jar b/lib/lucene-suggest-7.7.3.jar deleted file mode 100644 index 6a0ac6f4a..000000000 Binary files a/lib/lucene-suggest-7.7.3.jar and /dev/null differ diff --git a/lib/lucene-suggest-8.8.1.jar b/lib/lucene-suggest-8.8.1.jar new file mode 100644 index 000000000..a187526e2 Binary files /dev/null and b/lib/lucene-suggest-8.8.1.jar differ diff --git a/lib/solr-core-7.7.3.jar b/lib/solr-core-7.7.3.jar deleted file mode 100644 index 6e8da4da7..000000000 Binary files a/lib/solr-core-7.7.3.jar and /dev/null differ diff --git a/lib/solr-core-8.8.1.jar b/lib/solr-core-8.8.1.jar new file mode 100644 index 000000000..d603454c9 Binary files /dev/null and b/lib/solr-core-8.8.1.jar differ diff --git a/lib/solr-solrj-7.7.3.jar b/lib/solr-solrj-7.7.3.jar deleted file mode 100644 index b95072e9b..000000000 Binary files a/lib/solr-solrj-7.7.3.jar and /dev/null differ diff --git a/lib/solr-solrj-8.8.1.jar b/lib/solr-solrj-8.8.1.jar new file mode 100644 index 000000000..3e66c8bce Binary files /dev/null and b/lib/solr-solrj-8.8.1.jar differ diff --git a/pom.xml b/pom.xml index 8c5204d45..9f5ece3af 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.8 1.8 - 6.6.6 + 8.8.1 9.4.35.v20201120 @@ -366,7 +366,7 @@ junit junit - 4.13 + 4.13.1 test diff --git a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java index 2e96e77f5..058cccb4c 100644 --- a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java @@ -39,6 +39,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexableField; import org.apache.lucene.search.Query; +import org.apache.lucene.search.TotalHits; import org.apache.lucene.util.BytesRef; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServerException; @@ -232,7 +233,7 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo SolrDocumentList sdl = new SolrDocumentList(); NamedList nl = rsp.getValues(); ResultContext resultContext = (ResultContext) nl.get("response"); - DocList response = resultContext == null ? new DocSlice(0, 0, new int[0], new float[0], 0, 0.0f) : resultContext.getDocList(); + DocList response = resultContext == null ? new DocSlice(0, 0, new int[0], new float[0], 0, 0.0f, TotalHits.Relation.EQUAL_TO) : resultContext.getDocList(); sdl.setNumFound(response == null ? 0 : response.matches()); sdl.setStart(response == null ? 0 : response.offset()); String originalName = Thread.currentThread().getName(); @@ -364,7 +365,6 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo return SolrQueryResponse2SolrDocumentList(req, response); } finally { req.close(); - SolrRequestInfo.clearRequestInfo(); } } @@ -383,7 +383,7 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo NamedList nl = rsp.getValues(); ResultContext resultContext = (ResultContext) nl.get("response"); if (resultContext == null) log.warn("DocListSearcher: no response for query '" + querystring + "'"); - this.response = resultContext == null ? new DocSlice(0, 0, new int[0], new float[0], 0, 0.0f) : resultContext.getDocList(); + this.response = resultContext == null ? new DocSlice(0, 0, new int[0], new float[0], 0, 0.0f, TotalHits.Relation.EQUAL_TO) : resultContext.getDocList(); } @Override diff --git a/source/net/yacy/cora/protocol/Domains.java b/source/net/yacy/cora/protocol/Domains.java index 9a1c9836f..c57647361 100644 --- a/source/net/yacy/cora/protocol/Domains.java +++ b/source/net/yacy/cora/protocol/Domains.java @@ -51,6 +51,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -836,7 +837,7 @@ public class Domains { final private static ExecutorService getByNameService = Executors .newCachedThreadPool(new NamePrefixThreadFactory("InetAddress.getByName")); - final private static TimeLimiter timeLimiter = new SimpleTimeLimiter(getByNameService); + final private static TimeLimiter timeLimiter = SimpleTimeLimiter.create(getByNameService); /** * strip off any parts of an url, address string (containing host/ip:port) or raw IPs/Hosts, @@ -992,9 +993,9 @@ public class Domains { public InetAddress call() throws Exception { return InetAddress.getByName(host); } - }, 3000L, TimeUnit.MILLISECONDS, false); + }, 3000L, TimeUnit.MILLISECONDS); //ip = TimeoutRequest.getByName(host, 1000); // this makes the DNS request to backbone - } catch (final UncheckedTimeoutException e) { + } catch (final InterruptedException | TimeoutException e) { // in case of a timeout - maybe cause of massive requests - do not fill NAME_CACHE_MISS LOOKUP_SYNC.remove(host); return null; diff --git a/source/net/yacy/search/index/Fulltext.java b/source/net/yacy/search/index/Fulltext.java index d795c76ee..98cd37b64 100644 --- a/source/net/yacy/search/index/Fulltext.java +++ b/source/net/yacy/search/index/Fulltext.java @@ -85,6 +85,8 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.lucene.util.Version; +import org.apache.solr.core.SolrConfig; +import org.apache.solr.schema.IndexSchema; public final class Fulltext { @@ -150,7 +152,9 @@ public final class Fulltext { } 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}); - Version luceneVersion = localCollectionInstance.getDefaultCore().getSolrConfig().getLuceneVersion("luceneMatchVersion"); + SolrConfig config = localCollectionInstance.getDefaultCore().getSolrConfig(); + String versionValue = config.getVal(IndexSchema.LUCENE_MATCH_VERSION_PARAM, true); + Version luceneVersion = SolrConfig.parseLuceneVersionString(versionValue); String lvn = luceneVersion.major + "_" + luceneVersion.minor; ConcurrentLog.info("Fulltext", "using lucene version " + lvn); assert SOLR_PATH.endsWith(lvn) : "luceneVersion = " + lvn + ", solrPath = " + SOLR_PATH + ", check defaults/solr/solrconfig.xml";