Author: catholicon
Date: Wed Sep 21 14:57:46 2016
New Revision: 1761762
URL: http://svn.apache.org/viewvc?rev=1761762&view=rev
Log:
OAK-4805: Misconfigured lucene index definition can render the whole system
unusable
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1761762&r1=1761761&r2=1761762&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Wed Sep 21 14:57:46 2016
@@ -244,6 +244,9 @@ public class LucenePropertyIndex impleme
plans.add(plan);
}
}
+ } catch (Exception e) {
+ LOG.error("Error getting plan for {}", path);
+ LOG.error("Exception:", e);
} finally {
if (indexNode != null) {
indexNode.release();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1761762&r1=1761761&r2=1761762&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Wed Sep 21 14:57:46 2016
@@ -32,6 +32,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_MAPPINGS;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.ASYNC_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
@@ -241,6 +242,27 @@ public class LucenePropertyIndexTest ext
assertQuery("select * from [nt:base] where CONTAINS(*, 'fox was
jumping')", asList("/test"));
}
+ //OAK-4805
+ @Test
+ public void badIndexDefinitionShouldLetQEWork() throws Exception {
+ Tree idx = createFulltextIndex(root.getTree("/"), "badIndex");
+ TestUtil.useV2(idx);
+
+ //This would allow index def to get committed. Else bad index def
can't be created.
+ idx.setProperty(ASYNC_PROPERTY_NAME, "async");
+
+ Tree anl =
idx.addChild(LuceneIndexConstants.ANALYZERS).addChild(LuceneIndexConstants.ANL_DEFAULT);
+
anl.addChild(LuceneIndexConstants.ANL_TOKENIZER).setProperty(LuceneIndexConstants.ANL_NAME,
"Standard");
+ Tree synFilter =
anl.addChild(LuceneIndexConstants.ANL_FILTERS).addChild("Synonym");
+ synFilter.setProperty("synonyms", "syn.txt");
+ // Don't add syn.txt to make analyzer (and hence index def) invalid
+ //
synFilter.addChild("syn.txt").addChild(JCR_CONTENT).setProperty(JCR_DATA,
"blah, foo, bar");
+ root.commit();
+
+ //Using this version of executeQuery as we don't want a result row
quoting the exception
+ executeQuery("SELECT * FROM [nt:base] where a='b'", SQL2, NO_BINDINGS);
+ }
+
private Tree createFulltextIndex(Tree index, String name) throws
CommitFailedException {
return TestUtil.createFulltextIndex(index, name);
}
