You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2018/05/30 11:39:28 UTC
svn commit: r1832538 - in /jackrabbit/oak/branches/1.8: ./
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/
Author: tommaso
Date: Wed May 30 11:39:28 2018
New Revision: 1832538
URL: http://svn.apache.org/viewvc?rev=1832538&view=rev
Log:
OAK-7513 - minor fixes, adjusted some log statements (branch 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 30 11:39:28 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java?rev=1832538&r1=1832537&r2=1832538&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookup.java Wed May 30 11:39:28 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/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1832538&r1=1832537&r2=1832538&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed May 30 11:39:28 2018
@@ -547,9 +547,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/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java?rev=1832538&r1=1832537&r2=1832538&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java Wed May 30 11:39:28 2018
@@ -87,4 +87,12 @@ public class OakSolrServer extends SolrS
// do nothing
}
}
+
+ @Override
+ public String toString() {
+ return "OakSolrServer{" +
+ "solrServerConfiguration=" + solrServerConfiguration +
+ ", solrServerProvider=" + solrServerProvider +
+ '}';
+ }
}