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 2016/04/25 14:22:26 UTC
lucene-solr:apiv2: SOLR-8029: give sub path info at _introspect
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 52aa4478d -> 474141ea4
SOLR-8029: give sub path info at _introspect
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/474141ea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/474141ea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/474141ea
Branch: refs/heads/apiv2
Commit: 474141ea4342636080a9c34b76badcb0db542757
Parents: 52aa447
Author: Noble Paul <no...@apache.org>
Authored: Mon Apr 25 17:52:16 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Apr 25 17:52:16 2016 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/api/V2HttpCall.java | 3 ++-
solr/core/src/test/org/apache/solr/api/TestPathTrie.java | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/474141ea/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index 515f572..4cba5ec 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -188,8 +188,9 @@ public class V2HttpCall extends HttpSolrCall {
}
}
if (api instanceof ApiBag.IntrospectApi) {
+ String newPath = path.substring(0, path.length() - ApiBag.INTROSPECT.length());
api = mergeIntrospect(requestHandlers, path, parts,
- getSubPathImpl(getSubPaths(requestHandlers, path,cores,fullPath, containerHandlerLookup), path, true ));
+ getSubPathImpl(getSubPaths(requestHandlers, newPath, cores, fullPath, containerHandlerLookup), newPath, false));
}
return api;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/474141ea/solr/core/src/test/org/apache/solr/api/TestPathTrie.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/api/TestPathTrie.java b/solr/core/src/test/org/apache/solr/api/TestPathTrie.java
index d53122b..e370ed8 100644
--- a/solr/core/src/test/org/apache/solr/api/TestPathTrie.java
+++ b/solr/core/src/test/org/apache/solr/api/TestPathTrie.java
@@ -19,6 +19,8 @@ package org.apache.solr.api;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.apache.solr.SolrTestCaseJ4;
@@ -48,6 +50,9 @@ public class TestPathTrie extends SolrTestCaseJ4 {
assertEquals("b", pathTrie.lookup("/aa/bb/hello/world", parts, null));
assertEquals("hello", parts.get("cc"));
assertEquals("world", parts.get("xx"));
+ Set<String> subPaths = new HashSet<>();
+ pathTrie.lookup("/aa",parts, subPaths);
+ assertEquals(3, subPaths.size());
}