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/12/22 11:54:23 UTC
svn commit: r1721341 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
test/java/org/apache/jackrabbit/oak/jcr/query/
Author: tommaso
Date: Tue Dec 22 10:54:23 2015
New Revision: 1721341
URL: http://svn.apache.org/viewvc?rev=1721341&view=rev
Log:
OAK-2511 - applied Chetan's patch to adjust facet configuration design
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1721341&r1=1721340&r2=1721341&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Tue Dec 22 10:54:23 2015
@@ -273,7 +273,7 @@ class IndexDefinition implements Aggrega
this.queryPaths = getQueryPaths(defn);
this.saveDirListing = getOptionalValue(defn, LuceneIndexConstants.SAVE_DIR_LISTING, true);
this.suggestAnalyzed = getOptionalValue(defn, LuceneIndexConstants.SUGGEST_ANALYZED, false);
- this.secureFacets = defn.hasChildNode(PROP_FACET) && getOptionalValue(defn.getChildNode(PROP_FACET), PROP_SECURE_FACETS, true);
+ this.secureFacets = defn.hasChildNode(FACETS) && getOptionalValue(defn.getChildNode(FACETS), PROP_SECURE_FACETS, true);
}
public NodeState getDefinitionNodeState() {
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java?rev=1721341&r1=1721340&r2=1721341&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Tue Dec 22 10:54:23 2015
@@ -287,9 +287,9 @@ public interface LuceneIndexConstants {
String INDEX_PATH = "indexPath";
/**
- * Optional property definition subnode holding configuration for facets.
+ * Optional subnode holding configuration for facets.
*/
- String PROP_FACET = "facets";
+ String FACETS = "facets";
/**
* Optional property to set the suggest field to be analyzed and therefore allow more fine
@@ -301,5 +301,11 @@ public interface LuceneIndexConstants {
* Optional (index definition) property indicating whether facets should be ACL checked.
* Default is true
*/
- String PROP_SECURE_FACETS = "secureFacets";
+ String PROP_SECURE_FACETS = "secure";
+
+ /**
+ * Optional (property definition) property indicating whether facets should be created
+ * for this property
+ */
+ String PROP_FACETS = "facets";
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java?rev=1721341&r1=1721340&r2=1721341&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java Tue Dec 22 10:54:23 2015
@@ -36,7 +36,6 @@ import static com.google.common.collect.
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.FIELD_BOOST;
-import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PROP_FACET;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PROP_IS_REGEX;
import static org.apache.jackrabbit.oak.plugins.index.lucene.util.ConfigUtil.getOptionalValue;
@@ -131,7 +130,7 @@ class PropertyDefinition {
this.notNullCheckEnabled = getOptionalValueIfIndexed(defn, LuceneIndexConstants.PROP_NOT_NULL_CHECK_ENABLED, false);
this.nonRelativeName = determineNonRelativeName();
this.ancestors = computeAncestors(name);
- this.facet = defn.hasChildNode(PROP_FACET) && getOptionalValue(defn.getChildNode(PROP_FACET), "enabled", false);
+ this.facet = getOptionalValueIfIndexed(defn, LuceneIndexConstants.PROP_FACETS, false);
validate();
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1721341&r1=1721340&r2=1721341&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Tue Dec 22 10:54:23 2015
@@ -38,15 +38,14 @@ import javax.jcr.query.RowIterator;
*/
public class FacetTest extends AbstractQueryTest {
- public static final String FACET_CONFING_NODE_PATH = "/oak:index/luceneGlobal/indexRules/nt:base/properties/allProps/facets";
+ public static final String FACET_CONFING_PROP_PATH = "/oak:index/luceneGlobal/indexRules/nt:base/properties/allProps/facets";
@Before
protected void setUp() throws Exception {
super.setUp();
- if (!superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
+ if (!superuser.itemExists(FACET_CONFING_PROP_PATH)) {
Node node = superuser.getNode("/oak:index/luceneGlobal/indexRules/nt:base/properties/allProps");
- Node facetConfig = node.addNode(LuceneIndexConstants.PROP_FACET, "nt:unstructured");
- facetConfig.setProperty("enabled", true);
+ node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
superuser.save();
superuser.refresh(true);
}
@@ -54,8 +53,8 @@ public class FacetTest extends AbstractQ
@After
protected void tearDown() throws Exception {
- if (superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
- superuser.getNode(FACET_CONFING_NODE_PATH).remove();
+ if (superuser.nodeExists(FACET_CONFING_PROP_PATH)) {
+ superuser.getProperty(LuceneIndexConstants.PROP_FACETS).remove();
superuser.save();
superuser.refresh(true);
}
@@ -63,8 +62,8 @@ public class FacetTest extends AbstractQ
}
public void testFacetsNA() throws Exception {
- if (superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
- superuser.getNode(FACET_CONFING_NODE_PATH).remove();
+ if (superuser.itemExists(FACET_CONFING_PROP_PATH)) {
+ superuser.getItem(FACET_CONFING_PROP_PATH).remove();
}
Session session = superuser;
QueryManager qm = session.getWorkspace().getQueryManager();