You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/01/31 12:40:40 UTC
[1/2] lucene-solr:master: SOLR-8029: test failures fixed
Repository: lucene-solr
Updated Branches:
refs/heads/master 0ccce22fc -> d9edc0b74
SOLR-8029: test failures fixed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eb428346
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eb428346
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eb428346
Branch: refs/heads/master
Commit: eb42834617a6fde7bc5f7a0c1ccbf1c9cce10e83
Parents: 71abe13
Author: Noble Paul <no...@apache.org>
Authored: Tue Jan 31 22:40:44 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jan 31 22:40:44 2017 +1030
----------------------------------------------------------------------
.../org/apache/solr/core/TestSolrConfigHandler.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb428346/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 021efac..3f85a79 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -201,7 +201,8 @@ public class TestSolrConfigHandler extends RestTestBase {
10);
payload = "{\n" +
- "'update-requesthandler' : { 'name' : '/x', 'class': 'org.apache.solr.handler.DumpRequestHandler' , 'startup' : 'lazy' , 'a':'b' , 'defaults': {'def_a':'def A val', 'multival':['a','b','c']}}\n" +
+ "'update-requesthandler' : { 'name' : '/x', 'class': 'org.apache.solr.handler.DumpRequestHandler' ,registerPath :'/,/v2', " +
+ " 'startup' : 'lazy' , 'a':'b' , 'defaults': {'def_a':'def A val', 'multival':['a','b','c']}}\n" +
"}";
runConfigCommand(writeHarness, "/config?wt=json", payload);
@@ -441,7 +442,8 @@ public class TestSolrConfigHandler extends RestTestBase {
payload = "{\n" +
" 'add-requesthandler': {\n" +
" name : '/dump100',\n" +
- " class : 'org.apache.solr.handler.DumpRequestHandler'," +
+ " registerPath :'/,/v2',"+
+ " class : 'org.apache.solr.handler.DumpRequestHandler'," +
" suggester: [{name: s1,lookupImpl: FuzzyLookupFactory, dictionaryImpl : DocumentDictionaryFactory}," +
" {name: s2,lookupImpl: FuzzyLookupFactory , dictionaryImpl : DocumentExpressionDictionaryFactory}]" +
" }\n" +
@@ -457,13 +459,15 @@ public class TestSolrConfigHandler extends RestTestBase {
map = getRespMap("/dump100?wt=json&json.nl=arrmap&initArgs=true", writeHarness);
List initArgs = (List) map.get("initArgs");
+ assertNotNull(initArgs);
assertTrue(initArgs.size() >= 2);
- assertTrue(((Map)initArgs.get(0)).containsKey("suggester"));
+ assertTrue(((Map)initArgs.get(2)).containsKey("suggester"));
assertTrue(((Map)initArgs.get(1)).containsKey("suggester"));
payload = "{\n" +
"'add-requesthandler' : { 'name' : '/dump101', 'class': " +
- "'" + CacheTest.class.getName() + "' " +
+ "'" + CacheTest.class.getName() + "', " +
+ " registerPath :'/,/v2'"+
", 'startup' : 'lazy'}\n" +
"}";
runConfigCommand(writeHarness, "/config?wt=json", payload);
[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d9edc0b7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d9edc0b7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d9edc0b7
Branch: refs/heads/master
Commit: d9edc0b74107144d2af0a43db5d9deeae6c90c98
Parents: eb42834 0ccce22
Author: Noble Paul <no...@apache.org>
Authored: Tue Jan 31 23:10:33 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jan 31 23:10:33 2017 +1030
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +
.../analyzing/AnalyzingInfixSuggester.java | 4 +-
.../analyzing/AnalyzingInfixSuggesterTest.java | 13 +++-
.../org/apache/solr/core/TestLazyCores.java | 75 ++++++++++++++++++++
4 files changed, 91 insertions(+), 4 deletions(-)
----------------------------------------------------------------------