Author: tommaso
Date: Wed May 30 11:31:40 2018
New Revision: 1832535
URL: http://svn.apache.org/viewvc?rev=1832535&view=rev
Log:
OAK-7513 - minor fixes, adjusted some log statements
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java?rev=1832535&r1=1832534&r2=1832535&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java
Wed May 30 11:31:40 2018
@@ -27,6 +27,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer.isSolrIndexNode;
@@ -35,13 +37,16 @@ import static org.apache.jackrabbit.oak.
* Lookup for Solr indexes to be used for a given {@link Filter}.
*/
class SolrIndexLookup {
+
+ private static final Logger log =
LoggerFactory.getLogger(SolrIndexLookup.class);
+
private final NodeState root;
- public SolrIndexLookup(NodeState root) {
+ SolrIndexLookup(NodeState root) {
this.root = root;
}
- public Collection<String> collectIndexNodePaths(Filter filter) {
+ Collection<String> collectIndexNodePaths(Filter filter) {
return collectIndexNodePaths(filter, true);
}
@@ -68,7 +73,9 @@ class SolrIndexLookup {
NodeState state = nodeState.getChildNode(INDEX_DEFINITIONS_NAME);
for (ChildNodeEntry entry : state.getChildNodeEntries()) {
if (isSolrIndexNode(entry.getNodeState())) {
- paths.add(createIndexNodePath(parentPath, entry.getName()));
+ String indexNodePath = createIndexNodePath(parentPath,
entry.getName());
+ log.debug("found Solr index node at {}", indexNodePath);
+ paths.add(indexNodePath);
}
}
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1832535&r1=1832534&r2=1832535&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Wed May 30 11:31:40 2018
@@ -546,9 +546,11 @@ public class SolrQueryIndex implements F
Collection<String> indexPaths = new
SolrIndexLookup(rootState).collectIndexNodePaths(filter);
List<IndexPlan> plans =
Lists.newArrayListWithCapacity(indexPaths.size());
+ log.debug("looking for plans for paths : {}", indexPaths);
for (String path : indexPaths) {
OakSolrConfiguration configuration = getConfiguration(path,
rootState);
SolrClient solrServer = getServer(path, rootState);
+ log.debug("building plan for server {} and configuration {}",
solrServer, configuration);
// only provide the plan if both valid configuration and server
exist
if (configuration != null && solrServer != null) {
LMSEstimator estimator = getEstimator(path);
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java?rev=1832535&r1=1832534&r2=1832535&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
Wed May 30 11:31:40 2018
@@ -87,4 +87,12 @@ public class OakSolrServer extends SolrS
// do nothing
}
}
+
+ @Override
+ public String toString() {
+ return "OakSolrServer{" +
+ "solrServerConfiguration=" + solrServerConfiguration +
+ ", solrServerProvider=" + solrServerProvider +
+ '}';
+ }
}
