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 2015/07/22 15:54:33 UTC
svn commit: r1692275 - in /jackrabbit/oak/branches/1.2: ./
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/
oak-solr-core/src/test/java/org/ap...
Author: tommaso
Date: Wed Jul 22 13:54:33 2015
New Revision: 1692275
URL: http://svn.apache.org/r1692275
Log:
OAK-3135 - solr should be used for path restrictions only with ft/property restrictions (branch 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParserTest.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 22 13:54:33 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692274
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java?rev=1692275&r1=1692274&r2=1692275&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java Wed Jul 22 13:54:33 2015
@@ -78,8 +78,6 @@ public class SolrServerProviderService i
private String serverType;
private SolrServer cachedSolrServer;
- private SolrServer cachedSearchingSolrServer;
- private SolrServer cachedIndexingSolrServer;
@Activate
protected void activate(ComponentContext context) throws Exception {
Modified: jackrabbit/oak/branches/1.2/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.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1692275&r1=1692274&r2=1692275&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed Jul 22 13:54:33 2015
@@ -126,11 +126,20 @@ public class SolrQueryIndex implements F
match++; // full text queries have usually a significant recall
}
+ // property restriction OR native language property restriction defined AND property restriction handled
+ if (filter.getPropertyRestrictions() != null && filter.getPropertyRestrictions().size() > 0
+ && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null || filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
+ || configuration.useForPropertyRestrictions()) && !hasIgnoredProperties(filter.getPropertyRestrictions(), configuration)) {
+ match++;
+ }
+
// path restriction defined AND path restrictions handled
if (filter.getPathRestriction() != null &&
!Filter.PathRestriction.NO_RESTRICTION.equals(filter.getPathRestriction())
&& configuration.useForPathRestrictions()) {
- match++;
+ if (match > 0) {
+ match++;
+ }
}
// primary type restriction defined AND primary type restriction handled
@@ -138,12 +147,7 @@ public class SolrQueryIndex implements F
match++;
}
- // property restriction OR native language property restriction defined AND property restriction handled
- if (filter.getPropertyRestrictions() != null && filter.getPropertyRestrictions().size() > 0
- && (filter.getPropertyRestriction(NATIVE_SOLR_QUERY) != null || filter.getPropertyRestriction(NATIVE_LUCENE_QUERY) != null
- || configuration.useForPropertyRestrictions()) && !hasIgnoredProperties(filter.getPropertyRestrictions(), configuration)) {
- match++;
- }
+
return match;
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java?rev=1692275&r1=1692274&r2=1692275&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java Wed Jul 22 13:54:33 2015
@@ -123,6 +123,27 @@ public class QueryFulltextTest extends A
assertEquals("/testroot", getResult(q.execute(), "path"));
}
+ public void testInValues() throws Exception {
+
+ Session session = superuser;
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ Node n1 = testRootNode.addNode("node1");
+ n1.setProperty("text", "hello");
+ Node n2 = testRootNode.addNode("node2");
+ n2.setProperty("text", "hallo");
+ Node n3 = testRootNode.addNode("node3");
+ n3.setProperty("text", "hello hallo");
+ session.save();
+
+ String sql2 = "select [jcr:path] as [path], [jcr:score], * from [nt:base] as a " +
+ "where [text] in('hello', 'hallo')";
+
+ Query q = qm.createQuery(sql2, Query.JCR_SQL2);
+ String path = getResult(q.execute(), "path");
+ assertEquals("/testroot/node1, /testroot/node2", path);
+
+ }
+
static String getResult(QueryResult result, String propertyName) throws RepositoryException {
StringBuilder buff = new StringBuilder();
RowIterator it = result.getRows();
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParserTest.java?rev=1692275&r1=1692274&r2=1692275&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParserTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParserTest.java Wed Jul 22 13:54:33 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.query;
+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.spi.query.Filter;
import org.apache.solr.client.solrj.SolrQuery;
@@ -24,6 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Testcase for {@link org.apache.jackrabbit.oak.plugins.index.solr.query.FilterQueryParser}
@@ -39,4 +41,25 @@ public class FilterQueryParserTest {
assertEquals("*:*", solrQuery.getQuery());
}
+ @Test
+ public void testAllChildrenQueryParsing() throws Exception {
+ String query = "select [jcr:path], [jcr:score], * from [nt:hierarchy] as a where isdescendantnode(a, '/')";
+ Filter filter = mock(Filter.class);
+ OakSolrConfiguration configuration = new DefaultSolrConfiguration(){
+ @Override
+ public boolean useForPathRestrictions() {
+ return true;
+ }
+ };
+ when(filter.getQueryStatement()).thenReturn(query);
+ Filter.PathRestriction pathRestriction = Filter.PathRestriction.ALL_CHILDREN;
+ when(filter.getPathRestriction()).thenReturn(pathRestriction);
+ when(filter.getPath()).thenReturn("/");
+ SolrQuery solrQuery = FilterQueryParser.getQuery(filter, null, configuration);
+ assertNotNull(solrQuery);
+ assertEquals(configuration.getFieldForPathRestriction(pathRestriction)+":\\/", solrQuery.get("q"));
+ }
+
+
+
}
Modified: jackrabbit/oak/branches/1.2/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.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java?rev=1692275&r1=1692274&r2=1692275&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java Wed Jul 22 13:54:33 2015
@@ -51,7 +51,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex}
+ * Tests for {@link org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex}
*/
public class SolrQueryIndexTest {
@@ -66,7 +66,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "", new QueryEngineSettings());
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(Double.POSITIVE_INFINITY == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
}
@Test
@@ -82,11 +82,11 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where isdescendantnode(a, '/test')", new QueryEngineSettings());
filter.restrictPath("/test", Filter.PathRestriction.ALL_CHILDREN);
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(Double.POSITIVE_INFINITY == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
}
@Test
- public void testCostWithPathRestrictionsEnabled() throws Exception {
+ public void testCostWithOnlyPathRestrictionsEnabled() throws Exception {
NodeState root = mock(NodeState.class);
when(root.getNames(any(String.class))).thenReturn(Collections.<String>emptySet());
SelectorImpl selector = new SelectorImpl(root, "a");
@@ -103,7 +103,34 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where isdescendantnode(a, '/test')", new QueryEngineSettings());
filter.restrictPath("/test", Filter.PathRestriction.ALL_CHILDREN);
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(10 == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
+ }
+
+ @Test
+ public void testCostWithPropertyAndPathRestrictionsEnabled() throws Exception {
+ NodeState root = mock(NodeState.class);
+ when(root.getNames(any(String.class))).thenReturn(Collections.<String>emptySet());
+ SelectorImpl selector = new SelectorImpl(root, "a");
+
+ SolrServer solrServer = mock(SolrServer.class);
+ OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
+ @Override
+ public boolean useForPathRestrictions() {
+ return true;
+ }
+
+ @Override
+ public boolean useForPropertyRestrictions() {
+ return true;
+ }
+ };
+ SolrQueryIndex solrQueryIndex = new SolrQueryIndex("solr", solrServer, configuration);
+
+ FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where isdescendantnode(a, '/test')", new QueryEngineSettings());
+ filter.restrictPath("/test", Filter.PathRestriction.ALL_CHILDREN);
+ filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar"));
+ double cost = solrQueryIndex.getCost(filter, root);
+ assertEquals(5, cost, 0);
}
@Test
@@ -119,7 +146,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where name = 'hello')", new QueryEngineSettings());
filter.restrictProperty("name", Operator.EQUAL, PropertyValues.newString("hello"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(Double.POSITIVE_INFINITY == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
}
@Test
@@ -140,7 +167,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where name = 'hello')", new QueryEngineSettings());
filter.restrictProperty("name", Operator.EQUAL, PropertyValues.newString("hello"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(10 == cost);
+ assertEquals(10, cost, 0);
}
@Test
@@ -156,7 +183,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where jcr:primaryType = 'nt:unstructured')", new QueryEngineSettings());
filter.restrictProperty("jcr:primaryType", Operator.EQUAL, PropertyValues.newString("nt:unstructured"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(Double.POSITIVE_INFINITY == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
}
@Test
@@ -177,7 +204,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where jcr:primaryType = 'nt:unstructured')", new QueryEngineSettings());
filter.restrictProperty("jcr:primaryType", Operator.EQUAL, PropertyValues.newString("nt:unstructured"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(10 == cost);
+ assertEquals(10, cost, 0);
}
@Test
@@ -204,7 +231,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where name = 'hello')", new QueryEngineSettings());
filter.restrictProperty("name", Operator.EQUAL, PropertyValues.newString("hello"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(Double.POSITIVE_INFINITY == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
}
@Test
@@ -231,7 +258,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where name = 'hello')", new QueryEngineSettings());
filter.restrictProperty("name", Operator.EQUAL, PropertyValues.newString("hello"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(Double.POSITIVE_INFINITY == cost);
+ assertEquals(Double.POSITIVE_INFINITY, cost, 0);
}
@Test
@@ -258,7 +285,7 @@ public class SolrQueryIndexTest {
FilterImpl filter = new FilterImpl(selector, "select * from [nt:base] as a where name = 'hello')", new QueryEngineSettings());
filter.restrictProperty("name", Operator.EQUAL, PropertyValues.newString("hello"));
double cost = solrQueryIndex.getCost(filter, root);
- assertTrue(10 == cost);
+ assertEquals(10, cost, 0);
}
@Test