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 ch...@apache.org on 2016/12/08 05:16:55 UTC
svn commit: r1773173 - in
/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query:
FacetTest.java SuggestTest.java
Author: chetanm
Date: Thu Dec 8 05:16:55 2016
New Revision: 1773173
URL: http://svn.apache.org/viewvc?rev=1773173&view=rev
Log:
OAK-4400 - Correlate index with the index definition used to build it
Modify test to reindex an index if index definition changes. This is done in preparation for OAK-4400 as after that such changes would be read from stored nodestate and hence would not be effective
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
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=1773173&r1=1773172&r2=1773173&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 Thu Dec 8 05:16:55 2016
@@ -33,6 +33,8 @@ import org.apache.jackrabbit.oak.query.f
import org.junit.After;
import org.junit.Before;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+
/**
* Test for faceting capabilities via JCR API
*/
@@ -48,6 +50,7 @@ public class FacetTest extends AbstractQ
if (!superuser.itemExists(FACET_CONFING_PROP_PATH)) {
Node node = superuser.getNode("/oak:index/luceneGlobal/indexRules/nt:base/properties/allProps");
node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
+ markIndexForReindex();
superuser.save();
superuser.refresh(true);
}
@@ -55,6 +58,7 @@ public class FacetTest extends AbstractQ
if (!superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
Node node = superuser.getNode(INDEX_CONFING_NODE_PATH);
node.addNode(LuceneIndexConstants.FACETS);
+ markIndexForReindex();
superuser.save();
superuser.refresh(true);
}
@@ -80,6 +84,8 @@ public class FacetTest extends AbstractQ
public void testFacetsNA() throws Exception {
if (superuser.itemExists(FACET_CONFING_PROP_PATH)) {
superuser.getItem(FACET_CONFING_PROP_PATH).remove();
+ markIndexForReindex();
+ superuser.save();
}
Session session = superuser;
QueryManager qm = session.getWorkspace().getQueryManager();
@@ -364,6 +370,7 @@ public class FacetTest extends AbstractQ
Node facetsConfig = superuser.getNode(FACET_CONFING_NODE_PATH);
facetsConfig.setProperty(LuceneIndexConstants.PROP_FACETS_TOP_CHILDREN, 11);
+ markIndexForReindex();
superuser.save();
superuser.refresh(true);
@@ -414,6 +421,7 @@ public class FacetTest extends AbstractQ
Node facetsConfig = superuser.getNode(FACET_CONFING_NODE_PATH);
facetsConfig.setProperty(LuceneIndexConstants.PROP_FACETS_TOP_CHILDREN, 7);
+ markIndexForReindex();
superuser.save();
superuser.refresh(true);
@@ -459,4 +467,8 @@ public class FacetTest extends AbstractQ
assertNotNull(facets);
assertEquals(7, facets.size());
}
+
+ private void markIndexForReindex() throws RepositoryException {
+ superuser.getNode("/oak:index/luceneGlobal").setProperty(REINDEX_PROPERTY_NAME, true);
+ }
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java?rev=1773173&r1=1773172&r2=1773173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java Thu Dec 8 05:16:55 2016
@@ -33,6 +33,7 @@ import org.apache.jackrabbit.core.query.
import org.junit.After;
import org.junit.Before;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.SUGGESTION_CONFIG;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES;
@@ -48,6 +49,7 @@ public class SuggestTest extends Abstrac
// change suggester update frequency
superuser.getNode("/oak:index/luceneGlobal/" + SUGGESTION_CONFIG)
.setProperty(SUGGEST_UPDATE_FREQUENCY_MINUTES, 0);
+ superuser.getNode("/oak:index/luceneGlobal").setProperty(REINDEX_PROPERTY_NAME, true);
}
@After