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/29 10:38:41 UTC
svn commit: r1693211 - in /jackrabbit/oak/branches/1.2: ./
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/
oak-sol...
Author: tommaso
Date: Wed Jul 29 08:38:40 2015
New Revision: 1693211
URL: http://svn.apache.org/r1693211
Log:
OAK-3147 - adding depth field, more precise/perf collapsing, improved IT testing configurability (branch 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/oak/core.properties
- copied unchanged from r1693209, jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/core.properties
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/configuration/DefaultSolrConfiguration.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml
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/SolrIndexQueryTestIT.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/solr.xml
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 08:38:40 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,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030
+/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,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.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/configuration/DefaultSolrConfiguration.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java Wed Jul 29 08:38:40 2015
@@ -133,4 +133,9 @@ public class DefaultSolrConfiguration im
return SolrServerConfigurationDefaults.COLLAPSED_PATH_FIELD;
}
+ @Override
+ public String getPathDepthField() {
+ return SolrServerConfigurationDefaults.PATH_DEPTH_FIELD;
+ }
+
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.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/configuration/OakSolrConfiguration.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java Wed Jul 29 08:38:40 2015
@@ -151,6 +151,13 @@ public interface OakSolrConfiguration {
String getCollapsedPathField();
/**
+ * Provide the name of the field containing information about the depth of a certain path / node
+ *
+ * @return the name of the Solr field to be used for indexing and searching on path depth.
+ */
+ String getPathDepthField();
+
+ /**
* Enum for describing Solr commit policy used in a certain instance
*/
enum CommitPolicy {
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.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/configuration/SolrServerConfigurationDefaults.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java Wed Jul 29 08:38:40 2015
@@ -51,5 +51,5 @@ public class SolrServerConfigurationDefa
public static final String PROPERTY_MAPPINGS = "";
public static final boolean COLLAPSE_JCR_CONTENT_NODES = false;
public static final String COLLAPSED_PATH_FIELD = "path_collapsed";
-
+ public static final String PATH_DEPTH_FIELD = "path_depth";
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.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/configuration/SolrServerConfigurationProvider.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java Wed Jul 29 08:38:40 2015
@@ -32,5 +32,5 @@ public interface SolrServerConfiguration
* @return the {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration} holding the configuration parameters
*/
@Nonnull
- public SolrServerConfiguration<S> getSolrServerConfiguration();
+ SolrServerConfiguration<S> getSolrServerConfiguration();
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.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/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java Wed Jul 29 08:38:40 2015
@@ -125,7 +125,7 @@ public class OakSolrNodeStateConfigurati
@Nonnull
@Override
public CommitPolicy getCommitPolicy() {
- return CommitPolicy.valueOf(getStringValueFor(Properties.COMMIT_POLICY, CommitPolicy.SOFT.toString()));
+ return CommitPolicy.valueOf(getStringValueFor(Properties.COMMIT_POLICY, CommitPolicy.SOFT.toString()).toUpperCase());
}
@Override
@@ -191,6 +191,12 @@ public class OakSolrNodeStateConfigurati
return getStringValueFor(Properties.COLLAPSED_PATH_FIELD, SolrServerConfigurationDefaults.COLLAPSED_PATH_FIELD);
}
+ @Nonnull
+ @Override
+ public String getPathDepthField() {
+ return getStringValueFor(Properties.DEPTH_FIELD, SolrServerConfigurationDefaults.PATH_DEPTH_FIELD);
+ }
+
private boolean getBooleanValueFor(String propertyName, boolean defaultValue) {
boolean value = defaultValue;
PropertyState property = definition.getProperty(propertyName);
@@ -255,5 +261,6 @@ public class OakSolrNodeStateConfigurati
public static final String PROPERTY_MAPPINGS = "propertyMappings";
public static final String USED_PROPERTIES = "usedProperties";
public static final String COLLAPSE_JCR_CONTENT_NODES = "collapseJcrContentNodes";
+ public static final String DEPTH_FIELD= "depthField";
}
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.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/index/SolrIndexEditor.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java Wed Jul 29 08:38:40 2015
@@ -211,6 +211,7 @@ class SolrIndexEditor implements IndexEd
SolrInputDocument inputDocument = new SolrInputDocument();
String path = getPath();
inputDocument.addField(configuration.getPathField(), path);
+ inputDocument.addField(configuration.getPathDepthField(), PathUtils.getDepth(path));
if (configuration.collapseJcrContentNodes()) {
int jcrContentIndex = path.lastIndexOf(JcrConstants.JCR_CONTENT);
@@ -218,8 +219,6 @@ class SolrIndexEditor implements IndexEd
int index = jcrContentIndex + JcrConstants.JCR_CONTENT.length();
String collapsedPath = path.substring(0, index);
inputDocument.addField(configuration.getCollapsedPathField(), collapsedPath);
- } else {
- inputDocument.addField(configuration.getCollapsedPathField(), path);
}
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.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/OakSolrConfigurationProviderService.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java Wed Jul 29 08:38:40 2015
@@ -63,6 +63,9 @@ public class OakSolrConfigurationProvide
@Property(value = SolrServerConfigurationDefaults.COLLAPSED_PATH_FIELD, label = "field for collapsing jcr:content paths")
private static final String COLLAPSED_PATH_FIELD = "collapsed.path.field";
+ @Property(value = SolrServerConfigurationDefaults.PATH_DEPTH_FIELD, label = "field for path depth")
+ private static final String PATH_DEPTH_FIELD = "path.depth.field";
+
@Property(options = {
@PropertyOption(name = "HARD",
value = "Hard commit"
@@ -125,6 +128,7 @@ public class OakSolrConfigurationProvide
private String[] typeMappings;
private String[] propertyMappings;
private boolean collapseJcrContentNodes;
+ private String depthField;
private OakSolrConfiguration oakSolrConfiguration;
@@ -136,6 +140,7 @@ public class OakSolrConfigurationProvide
collapsedPathField= String.valueOf(componentContext.getProperties().get(COLLAPSED_PATH_FIELD));
pathDescendantsFieldName = String.valueOf(componentContext.getProperties().get(PATH_DESCENDANTS_FIELD));
catchAllField = String.valueOf(componentContext.getProperties().get(CATCH_ALL_FIELD));
+ depthField = String.valueOf(componentContext.getProperties().get(PATH_DEPTH_FIELD));
rows = Integer.parseInt(String.valueOf(componentContext.getProperties().get(ROWS)));
commitPolicy = OakSolrConfiguration.CommitPolicy.valueOf(String.valueOf(componentContext.getProperties().get(COMMIT_POLICY)));
useForPathRestrictions = Boolean.valueOf(String.valueOf(componentContext.getProperties().get(PATH_RESTRICTIONS)));
@@ -283,6 +288,11 @@ public class OakSolrConfigurationProvide
public String getCollapsedPathField() {
return collapsedPathField;
}
+
+ @Override
+ public String getPathDepthField() {
+ return depthField;
+ }
};
}
return oakSolrConfiguration;
Modified: jackrabbit/oak/branches/1.2/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.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java Wed Jul 29 08:38:40 2015
@@ -236,7 +236,8 @@ class FilterQueryParser {
}
if (configuration.collapseJcrContentNodes()) {
- solrQuery.addFilterQuery("{!collapse field=" + configuration.getCollapsedPathField() + "}");
+ solrQuery.addFilterQuery("{!collapse field=" + configuration.getCollapsedPathField() + " min=" +
+ configuration.getPathDepthField() + " hint=top_fc nullPolicy=expand}");
}
if (queryBuilder.length() == 0) {
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml Wed Jul 29 08:38:40 2015
@@ -119,6 +119,7 @@
<field name=":suggest-weight" type="tint" indexed="false" stored="false" default="1" docValues="true"/>
<field name=":suggest" type="string" indexed="true" stored="true" multiValued="true" />
<field name="path_collapsed" type="string" indexed="true" stored="false"/>
+ <field name="path_depth" type="tint" indexed="true" stored="false"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
<!-- sorting dynamic fields -->
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=1693211&r1=1693210&r2=1693211&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 29 08:38:40 2015
@@ -79,7 +79,8 @@ public class FilterQueryParserTest {
SolrQuery solrQuery = FilterQueryParser.getQuery(filter, null, configuration);
assertNotNull(solrQuery);
String[] filterQueries = solrQuery.getFilterQueries();
- assertTrue(Arrays.asList(filterQueries).contains("{!collapse field=" + configuration.getCollapsedPathField() + "}"));
+ assertTrue(Arrays.asList(filterQueries).contains("{!collapse field=" + configuration.getCollapsedPathField()
+ + " min=" + configuration.getPathDepthField() + " hint=top_fc nullPolicy=expand}"));
assertEquals("*:*", solrQuery.get("q"));
}
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.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/SolrIndexQueryTestIT.java?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java Wed Jul 29 08:38:40 2015
@@ -16,31 +16,25 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.query;
-import java.util.Iterator;
-
import com.google.common.collect.ImmutableList;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
-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.DefaultSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.server.DefaultSolrServerProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
-import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
-import org.apache.solr.client.solrj.SolrServer;
-import org.junit.After;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TestName;
import javax.jcr.query.Query;
+import java.util.Iterator;
import static java.util.Arrays.asList;
import static junit.framework.Assert.assertEquals;
@@ -52,38 +46,35 @@ import static org.junit.Assume.assumeTru
/**
* General query extensive testcase for {@link SolrQueryIndex}
*/
-public class SolrIndexQueryTestIT extends AbstractQueryTest {
+ public class SolrIndexQueryTestIT extends AbstractQueryTest {
- private SolrServer solrServer;
-
- @After
- public void tearDown() throws Exception {
- solrServer.deleteByQuery("*:*");
- solrServer.commit();
- }
+ @Rule
+ public TestName name = new TestName();
@Override
protected void createTestIndexNode() throws Exception {
Tree index = root.getTree("/");
- createTestIndexNode(index, SolrQueryIndex.TYPE);
+ Tree solrIndexNode = createTestIndexNode(index, SolrQueryIndex.TYPE);
+ solrIndexNode.setProperty("pathRestrictions",true);
+ solrIndexNode.setProperty("propertyRestrictions",true);
+ solrIndexNode.setProperty("primaryTypes",true);
+ solrIndexNode.setProperty("commitPolicy","hard");
+ Tree server = solrIndexNode.addChild("server");
+ server.setProperty("solrServerType", "embedded");
+ server.setProperty("solrHomePath", "target/" + name.getMethodName());
+
root.commit();
}
@Override
protected ContentRepository createRepository() {
- TestUtils provider = new TestUtils();
- solrServer = provider.getSolrServer();
try {
+ DefaultSolrServerProvider solrServerProvider = new DefaultSolrServerProvider();
+ DefaultSolrConfigurationProvider oakSolrConfigurationProvider = new DefaultSolrConfigurationProvider();
return new Oak().with(new InitialContent())
.with(new OpenSecurityProvider())
- .with(new CompositeQueryIndexProvider(
- new SolrQueryIndexProvider(provider, provider),
- new PropertyIndexProvider()
- ))
- .with(new CompositeIndexEditorProvider(
- new SolrIndexEditorProvider(provider, provider),
- new PropertyIndexEditorProvider()
- ))
+ .with(new SolrQueryIndexProvider(solrServerProvider, oakSolrConfigurationProvider))
+ .with(new SolrIndexEditorProvider(solrServerProvider, oakSolrConfigurationProvider))
.createContentRepository();
} catch (Exception e) {
throw new RuntimeException(e);
@@ -508,7 +499,6 @@ public class SolrIndexQueryTestIT extend
Tree index = root.getTree("/oak:index/" + TEST_INDEX_NAME);
assertTrue(index.exists());
- index.setProperty("pathRestrictions", true);
index.setProperty("rows", 10000);
index.setProperty("reindex", true);
root.commit();
@@ -532,8 +522,15 @@ public class SolrIndexQueryTestIT extend
}
@Test
- @Ignore("need to be able to inject configuration")
public void testCollapsedJcrContentNodeDescandants() throws Exception {
+
+ Tree index = root.getTree("/oak:index/" + TEST_INDEX_NAME);
+ assertTrue(index.exists());
+
+ index.setProperty("collapseJcrContentNodes", true);
+ index.setProperty("reindex", true);
+ root.commit();
+
Tree test = root.getTree("/").addChild("test");
Tree content = test.addChild("content");
Tree content1 = content.addChild("sample1").addChild("jcr:content");
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml Wed Jul 29 08:38:40 2015
@@ -131,6 +131,7 @@
<field name=":suggest-weight" type="tint" indexed="false" stored="false" default="1" docValues="true"/>
<field name=":suggest" type="string" indexed="true" stored="true" multiValued="true" />
<field name="path_collapsed" type="string" indexed="true" stored="true"/>
+ <field name="path_depth" type="tint" indexed="true" stored="false"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
<!-- sorting dynamic fields -->
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/solr.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/solr.xml?rev=1693211&r1=1693210&r2=1693211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/solr.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/resources/solr/solr.xml Wed Jul 29 08:38:40 2015
@@ -17,23 +17,29 @@
-->
<!--
- All (relative) paths are relative to the installation path
-
- persistent: Save changes made via the API to this file
- sharedLib: path to a lib directory that will be shared across all cores
+ This is an example of a simple "solr.xml" file for configuring one or
+ more Solr Cores, as well as allowing Cores to be added, removed, and
+ reloaded via HTTP requests.
+
+ More information about options available in this configuration file,
+ and Solr Core administration can be found online:
+ http://wiki.apache.org/solr/CoreAdmin
-->
-<solr persistent="false">
- <!--
- adminPath: RequestHandler path to manage cores.
- If 'null' (or absent), cores will not be manageable via request handler
- -->
- <cores adminPath="/admin/cores" defaultCoreName="oak"
- host="127.0.0.1" hostPort="${hostPort:8080}" hostContext="solr"
- zkClientTimeout="8000" numShards="${numShards:1}">
- <core name="oak" instanceDir="oak" shard="${shard:shard1}"
- collection="${collection:oak}"
- config="${solrconfig:solrconfig.xml}"
- schema="${schema:schema.xml}"/>
- </cores>
+<solr>
+
+ <solrcloud>
+ <str name="host">${host:}</str>
+ <int name="hostPort">${jetty.port:8983}</int>
+ <str name="hostContext">${hostContext:solr}</str>
+ <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+ </solrcloud>
+
+ <shardHandlerFactory name="shardHandlerFactory"
+ class="HttpShardHandlerFactory">
+ <int name="socketTimeout">${socketTimeout:0}</int>
+ <int name="connTimeout">${connTimeout:0}</int>
+ </shardHandlerFactory>
+
</solr>