Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'apache-https-master' into jira/solr-8593

This commit is contained in:
Kevin Risden 2017-01-13 14:35:53 -05:00
parent 737194712f 5b3565ed7e
commit 483bfa6423
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -20,7 +20,7 @@
<project name="lucene-solr" default="-projecthelp" basedir=".">
<import file="lucene/common-build.xml"/>
<property name="jgit-version" value="4.4.1.201607150455-r"/>
<property name="jgit-version" value="4.6.0.201612231935-r"/>
<property name="tests.heap-dump-dir" location="heapdumps"/>

3
lucene/CHANGES.txt
View File

@ -270,6 +270,9 @@ Build
Lucene and Solr DOAP RDF files into the Git source repository under
dev-tools/doap/ and then pulling release dates from those files, rather than
from JIRA. (Mano Kovacs, hossman, Steve Rowe)
* LUCENE-7596: Update Groovy to version 2.4.8 to allow building with Java 9
build 148+. Also update JGit version for working-copy checks. (Uwe Schindler)
======================= Lucene 6.3.0 =======================

2
lucene/common-build.xml
View File

@ -2332,7 +2332,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<!-- GROOVY scripting engine for ANT tasks -->
<target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
<ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.6"
<ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.8"
inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
<taskdef name="groovy"
classname="org.codehaus.groovy.ant.Groovy"

10
solr/contrib/ltr/README.md
View File

@ -8,17 +8,17 @@ deploy that model to Solr and use it to rerank your top X search results.
# Getting Started With Solr Learning To Rank
For information on how to get started with solr ltr please see:
[Solr Reference Guide's section on Result Reranking](https://cwiki.apache.org/confluence/display/solr/Result+Reranking)
* [Solr Reference Guide's section on Learning To Rank](https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank)
# Getting Started With Solr
For information on how to get started with solr please see:
[solr/README.txt](../../README.txt)
[Solr Quick Start](http://lucene.apache.org/solr/quickstart.html)
* [solr/README.txt](../../README.txt)
* [Solr Quick Start](http://lucene.apache.org/solr/quickstart.html)
# How To Contribute
For information on how to contribute see:
http://wiki.apache.org/lucene-java/HowToContribute
http://wiki.apache.org/solr/HowToContribute
* http://wiki.apache.org/lucene-java/HowToContribute
* http://wiki.apache.org/solr/HowToContribute

2
solr/contrib/ltr/example/README.md
View File

@ -1,6 +1,6 @@
This README file is only about this example directory's content.
Please refer to the Solr Reference Guide's section on [Result Reranking](https://cwiki.apache.org/confluence/display/solr/Result+Reranking) section for broader information on Learning to Rank (LTR) with Apache Solr.
Please refer to the Solr Reference Guide's section on [Learning To Rank](https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank) section for broader information on Learning to Rank (LTR) with Apache Solr.
# Start Solr with the LTR plugin enabled

6
solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
View File

@ -515,7 +515,7 @@
when running solr to run with ltr enabled:
-Dsolr.ltr.enabled=true
https://cwiki.apache.org/confluence/display/solr/Result+Reranking
https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank
-->
<cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV"
class="solr.search.LRUCache"
@ -1613,7 +1613,7 @@
when running solr to run with ltr enabled:
-Dsolr.ltr.enabled=true
https://cwiki.apache.org/confluence/display/solr/Result+Reranking
https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank
Query parser is used to rerank top docs with a provided model
-->
@ -1654,7 +1654,7 @@
when running solr to run with ltr enabled:
-Dsolr.ltr.enabled=true
https://cwiki.apache.org/confluence/display/solr/Result+Reranking
https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank
-->
<transformer enable="${solr.ltr.enabled:false}" name="features" class="org.apache.solr.ltr.response.transform.LTRFeatureLoggerTransformerFactory">
<str name="fvCacheName">QUERY_DOC_FV</str>

4
solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
View File

@ -431,7 +431,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
for (String adminPath : adminPathToMbean.keySet()) {
long errorsBefore = 0;
for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "QUERY", adminPathToMbean.get(adminPath), true);
Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "ADMIN", adminPathToMbean.get(adminPath), true);
errorsBefore += numRequests;
log.info("Found {} requests to {} on {}", numRequests, adminPath, runner.getBaseUrl());
}
@ -448,7 +448,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
}
long errorsAfter = 0;
for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "QUERY", adminPathToMbean.get(adminPath), true);
Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "ADMIN", adminPathToMbean.get(adminPath), true);
errorsAfter += numRequests;
log.info("Found {} requests to {} on {}", numRequests, adminPath, runner.getBaseUrl());
}