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 09:16:15 UTC
svn commit: r1788074 - in /jackrabbit/oak/branches/1.4: ./
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 09:16:14 2017
New Revision: 1788074
URL: http://svn.apache.org/viewvc?rev=1788074&view=rev
Log:
OAK-5707 - avoid negative solr index cost (branch 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 22 09:16:14 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778
423,1778968,1779137,1779478,1780388,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784574,1784689,1785283,1787074,1787217
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778
423,1778968,1779137,1779478,1780388,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1783066,1783089,1783104-1783105,1783619,1783720,1783738,1783855,1784023,1784130,1784251,1784574,1784689,1785283,1787074,1787217
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/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.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java?rev=1788074&r1=1788073&r2=1788074&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java Wed Mar 22 09:16:14 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.4/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.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1788074&r1=1788073&r2=1788074&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed Mar 22 09:16:14 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.4/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.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java?rev=1788074&r1=1788073&r2=1788074&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java Wed Mar 22 09:16:14 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.4/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.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java?rev=1788074&r1=1788073&r2=1788074&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java Wed Mar 22 09:16:14 2017
@@ -16,20 +16,17 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.query;
-import javax.annotation.Nonnull;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
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.QueryEngineSettings;
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
@@ -45,10 +42,8 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.common.SolrInputDocument;
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;
@@ -315,15 +310,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 = new SelectorImpl(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() {
@@ -336,20 +328,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 = new SelectorImpl(root, "a");
String sqlQuery = "select [jcr:path], [jcr:score] from [nt:base] as a where" +
" contains([jcr:content/*], 'founded')";
@@ -375,13 +368,67 @@ 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 = new SelectorImpl(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 class CountingResponse extends QueryResponse {