Author: tommaso
Date: Mon May 28 11:50:16 2018
New Revision: 1832382
URL: http://svn.apache.org/viewvc?rev=1832382&view=rev
Log:
OAK-7513 - avoid NPE in exact size calculation, 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/configuration/nodestate/NodeStateSolrServersObserver.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 28 11:50:16 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
+/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/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.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/configuration/nodestate/NodeStateSolrServersObserver.java?rev=1832382&r1=1832381&r2=1832382&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
Mon May 28 11:50:16 2018
@@ -117,7 +117,6 @@ public class NodeStateSolrServersObserve
}
private boolean isSolrServerNode(String name, NodeState nodeState) {
- log.info("checking {} in {}", name, nodeState);
return "server".equals(name) &&
nodeState.hasProperty("solrServerType");
}
Modified:
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.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/FilterQueryParser.java?rev=1832382&r1=1832381&r2=1832382&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
Mon May 28 11:50:16 2018
@@ -65,8 +65,8 @@ class FilterQueryParser {
}
}
- List<QueryIndex.OrderEntry> sortOrder = plan.getSortOrder();
- if (sortOrder != null) {
+ if (plan != null && plan.getSortOrder() != null) {
+ List<QueryIndex.OrderEntry> sortOrder = plan.getSortOrder();
for (QueryIndex.OrderEntry orderEntry : sortOrder) {
SolrQuery.ORDER order;
if
(QueryIndex.OrderEntry.Order.ASCENDING.equals(orderEntry.getOrder())) {
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=1832382&r1=1832381&r2=1832382&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
Mon May 28 11:50:16 2018
@@ -153,7 +153,7 @@ public class SolrQueryIndex implements F
match++;
}
}
-
+ log.debug("{}Â matched restrictions for filter {} and configuration
{}", match, filter, configuration);
return match;
}
@@ -588,12 +588,14 @@ public class SolrQueryIndex implements F
private IndexPlan getIndexPlan(Filter filter, OakSolrConfiguration
configuration, LMSEstimator estimator,
List<OrderEntry> sortOrder, String path) {
if (getMatchingFilterRestrictions(filter, configuration) > 0) {
- return planBuilder(filter)
- .setEstimatedEntryCount(estimator.estimate(filter))
- .setSortOrder(sortOrder)
- .setPlanName(path)
- .setPathPrefix(getPathPrefix(path))
- .build();
+ IndexPlan indexPlan = planBuilder(filter)
+ .setEstimatedEntryCount(estimator.estimate(filter))
+ .setSortOrder(sortOrder)
+ .setPlanName(path)
+ .setPathPrefix(getPathPrefix(path))
+ .build();
+ log.debug("index plan {}", indexPlan);
+ return indexPlan;
} else {
return null;
}
@@ -793,7 +795,7 @@ public class SolrQueryIndex implements F
switch (precision) {
case EXACT:
// query solr
- SolrQuery countQuery =
FilterQueryParser.getQuery(plan.getFilter(), null, this.configuration);
+ SolrQuery countQuery =
FilterQueryParser.getQuery(plan.getFilter(), plan, this.configuration);
countQuery.setRows(0);
try {
estimate =
this.solrServer.query(countQuery).getResults().getNumFound();
