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 2017/03/22 08:52:04 UTC
svn commit: r1788068 - in /jackrabbit/oak/branches/1.6: ./
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/
oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/
Author: tommaso
Date: Wed Mar 22 08:52:04 2017
New Revision: 1788068
URL: http://svn.apache.org/viewvc?rev=1788068&view=rev
Log:
OAK-5707 - avoid negative solr index cost (branch 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 22 08:52:04 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java?rev=1788068&r1=1788067&r2=1788068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java (original)
+++ jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java Wed Mar 22 08:52:04 2017
@@ -49,11 +49,12 @@ class LMSEstimator {
double[] updatedWeights = new double[weights.length];
long estimate = estimate(filter);
long numFound = docs.getNumFound();
- double delta = Math.pow(numFound - estimate, 2) / 2;
+ long diff = numFound - estimate;
+ double delta = Math.pow(diff, 2) / 2;
if (Math.abs(delta) > threshold) {
for (int i = 0; i < updatedWeights.length; i++) {
double errors = delta * getInput(filter, i);
- updatedWeights[i] = weights[i] + alpha * errors;
+ updatedWeights[i] = weights[i] + (diff > 0 ? 1 : -1) * alpha * errors;
}
// weights updated
weights = Arrays.copyOf(updatedWeights, 5);
@@ -65,7 +66,7 @@ class LMSEstimator {
for (int i = 0; i < 5; i++) {
estimatedEntryCount += weights[i] * getInput(filter, i);
}
- return estimatedEntryCount + 1; // smoothing
+ return Math.max(0, estimatedEntryCount);
}
/**
Modified: jackrabbit/oak/branches/1.6/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.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1788068&r1=1788067&r2=1788068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed Mar 22 08:52:04 2017
@@ -90,8 +90,6 @@ public class SolrQueryIndex implements F
private static double MIN_COST = 2.3;
- private static double COST_FOR_SINGLE_RESTRICTION = 10;
-
private final Logger log = LoggerFactory.getLogger(SolrQueryIndex.class);
private final NodeAggregator aggregator;
Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java?rev=1788068&r1=1788067&r2=1788068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java Wed Mar 22 08:52:04 2017
@@ -72,6 +72,6 @@ public class LMSEstimatorTest {
LMSEstimator lmsEstimator = new LMSEstimator();
Filter filter = mock(Filter.class);
long estimate = lmsEstimator.estimate(filter);
- assertEquals(1L, estimate);
+ assertEquals(0L, estimate);
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java?rev=1788068&r1=1788067&r2=1788068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java Wed Mar 22 08:52:04 2017
@@ -22,11 +22,11 @@ import java.util.List;
import org.apache.jackrabbit.oak.api.Result;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.index.solr.TestUtils;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
+import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.query.ast.NodeTypeInfo;
@@ -47,7 +47,6 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.SolrParams;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -314,15 +313,12 @@ public class SolrQueryIndexTest {
assertEquals(0, plans.size());
}
- @Ignore
@Test
public void testSize() throws Exception {
- NodeState root = mock(NodeState.class);
- when(root.getNames(any(String.class))).thenReturn(Collections.<String>emptySet());
+ NodeState root = InitialContent.INITIAL_CONTENT;
SelectorImpl selector = newSelector(root, "a");
String sqlQuery = "select [jcr:path], [jcr:score] from [nt:base] as a where" +
" contains([jcr:content/*], 'founded')";
- SolrServer solrServer = TestUtils.createSolrServer();
SolrServerProvider solrServerProvider = mock(SolrServerProvider.class);
OakSolrConfigurationProvider configurationProvider = mock(OakSolrConfigurationProvider.class);
OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
@@ -335,20 +331,21 @@ public class SolrQueryIndexTest {
SolrQueryIndex solrQueryIndex = new SolrQueryIndex(null, configurationProvider, solrServerProvider);
FilterImpl filter = new FilterImpl(selector, sqlQuery, new QueryEngineSettings());
- Cursor cursor = solrQueryIndex.query(filter, root);
- assertNotNull(cursor);
- long sizeExact = cursor.getSize(Result.SizePrecision.EXACT, 100000);
- long sizeApprox = cursor.getSize(Result.SizePrecision.APPROXIMATION, 100000);
- long sizeFastApprox = cursor.getSize(Result.SizePrecision.FAST_APPROXIMATION, 100000);
- assertTrue(Math.abs(sizeExact - sizeApprox) < 10);
- assertTrue(Math.abs(sizeExact - sizeFastApprox) > 10000);
+ List<QueryIndex.IndexPlan> plans = solrQueryIndex.getPlans(filter, null, root);
+ for (QueryIndex.IndexPlan p : plans) {
+ Cursor cursor = solrQueryIndex.query(p, root);
+ assertNotNull(cursor);
+ long sizeExact = cursor.getSize(Result.SizePrecision.EXACT, 100000);
+ long sizeApprox = cursor.getSize(Result.SizePrecision.APPROXIMATION, 100000);
+ long sizeFastApprox = cursor.getSize(Result.SizePrecision.FAST_APPROXIMATION, 100000);
+ assertTrue(Math.abs(sizeExact - sizeApprox) < 10);
+ assertTrue(Math.abs(sizeExact - sizeFastApprox) > 10000);
+ }
}
- @Ignore
@Test
public void testNoMoreThanThreeSolrRequests() throws Exception {
- NodeState root = mock(NodeState.class);
- when(root.getNames(any(String.class))).thenReturn(Collections.<String>emptySet());
+ NodeState root = InitialContent.INITIAL_CONTENT;
SelectorImpl selector = newSelector(root, "a");
String sqlQuery = "select [jcr:path], [jcr:score] from [nt:base] as a where" +
" contains([jcr:content/*], 'founded')";
@@ -374,13 +371,66 @@ public class SolrQueryIndexTest {
CountingResponse response = new CountingResponse(0);
when(solrServer.query(any(SolrParams.class))).thenReturn(response);
- Cursor cursor = solrQueryIndex.query(filter, root);
- assertNotNull(cursor);
- while (cursor.hasNext()) {
- IndexRow row = cursor.next();
- assertNotNull(row);
+ List<QueryIndex.IndexPlan> plans = solrQueryIndex.getPlans(filter, null, root);
+ for (QueryIndex.IndexPlan p : plans) {
+ Cursor cursor = solrQueryIndex.query(p, root);
+ assertNotNull(cursor);
+ while (cursor.hasNext()) {
+ IndexRow row = cursor.next();
+ assertNotNull(row);
+ }
+ assertEquals(3, response.getCounter());
+ }
+ }
+
+ @Test
+ public void testNoNegativeCost() throws Exception {
+ NodeState root = InitialContent.INITIAL_CONTENT;
+ NodeBuilder builder = root.builder();
+ builder.child("oak:index").child("solr")
+ .setProperty("usedProperties", Collections.singleton("name"), Type.STRINGS)
+ .setProperty("propertyRestrictions", true)
+ .setProperty("type", "solr");
+ nodeState = builder.getNodeState();
+ SelectorImpl selector = newSelector(root, "a");
+ String query = "select * from [nt:base] as a where native('solr','select?q=searchKeywords:\"foo\"^20 text:\"foo\"^1 " +
+ "description:\"foo\"^8 something:\"foo\"^3 headline:\"foo\"^5 title:\"foo\"^10 &q.op=OR'";
+ String sqlQuery = "select * from [nt:base] a where native('solr','" + query + "'";
+ SolrServer solrServer = mock(SolrServer.class);
+ SolrServerProvider solrServerProvider = mock(SolrServerProvider.class);
+ when(solrServerProvider.getSearchingSolrServer()).thenReturn(solrServer);
+ OakSolrConfigurationProvider configurationProvider = mock(OakSolrConfigurationProvider.class);
+ OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
+ @Override
+ public boolean useForPropertyRestrictions() {
+ return true;
+ }
+
+ @Override
+ public int getRows() {
+ return 10;
+ }
+ };
+ when(configurationProvider.getConfiguration()).thenReturn(configuration);
+
+ SolrQueryIndex solrQueryIndex = new SolrQueryIndex(null, configurationProvider, solrServerProvider);
+ FilterImpl filter = new FilterImpl(selector, sqlQuery, new QueryEngineSettings());
+ filter.restrictProperty("native*solr", Operator.EQUAL, PropertyValues.newString(query));
+ CountingResponse response = new CountingResponse(0);
+ when(solrServer.query(any(SolrParams.class))).thenReturn(response);
+
+ List<QueryIndex.IndexPlan> plans = solrQueryIndex.getPlans(filter, null, nodeState);
+ for (QueryIndex.IndexPlan p : plans) {
+ double costPerEntry = p.getCostPerEntry();
+ assertTrue(costPerEntry >= 0);
+ double costPerExecution = p.getCostPerExecution();
+ assertTrue(costPerExecution >= 0);
+ long estimatedEntryCount = p.getEstimatedEntryCount();
+ assertTrue(estimatedEntryCount >= 0);
+
+ double c = p.getCostPerExecution() + estimatedEntryCount * p.getCostPerEntry();
+ assertTrue(c >= 0);
}
- assertEquals(3, response.getCounter());
}
private static SelectorImpl newSelector(NodeState root, String name) {