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 am...@apache.org on 2015/07/07 08:39:02 UTC
svn commit: r1689581 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Author: amitj
Date: Tue Jul 7 06:39:01 2015
New Revision: 1689581
URL: http://svn.apache.org/r1689581
Log:
OAK-2999: Index updation fails on updating multivalued property
Add empty lucene document if node having single property deleted or emptied
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1689581&r1=1689580&r2=1689581&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Tue Jul 7 06:39:01 2015
@@ -100,6 +100,8 @@ public class LuceneIndexEditor implement
private boolean propertiesChanged = false;
+ private List<PropertyState> propertiesModified = Lists.newArrayList();
+
private final NodeState root;
/**
@@ -222,12 +224,14 @@ public class LuceneIndexEditor implement
@Override
public void propertyChanged(PropertyState before, PropertyState after) {
markPropertyChanged(before.getName());
+ propertiesModified.add(before);
checkAggregates(before.getName());
}
@Override
public void propertyDeleted(PropertyState before) {
markPropertyChanged(before.getName());
+ propertiesModified.add(before);
checkAggregates(before.getName());
}
@@ -332,6 +336,11 @@ public class LuceneIndexEditor implement
dirty |= indexAggregates(path, fields, state);
dirty |= indexNullCheckEnabledProps(path, fields, state);
dirty |= indexNotNullCheckEnabledProps(path, fields, state);
+
+ // Check if a node having a single property was modified/deleted
+ if (!dirty) {
+ dirty = indexIfSinglePropertyRemoved();
+ }
if (isUpdate && !dirty) {
// updated the state but had no relevant changes
@@ -578,7 +587,22 @@ public class LuceneIndexEditor implement
}
return fieldAdded;
}
-
+
+ private boolean indexIfSinglePropertyRemoved() {
+ boolean dirty = false;
+ for (PropertyState ps : propertiesModified) {
+ PropertyDefinition pd = indexingRule.getConfig(ps.getName());
+ if (pd != null
+ && pd.index
+ && (pd.includePropertyType(ps.getType().tag())
+ || indexingRule.includePropertyType(ps.getType().tag()))) {
+ dirty = true;
+ break;
+ }
+ }
+ return dirty;
+ }
+
/**
* Determine if the property as defined by PropertyDefinition exists or not.
*
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1689581&r1=1689580&r2=1689581&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Tue Jul 7 06:39:01 2015
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
@@ -27,6 +28,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.spi.commit.Observer;
@@ -35,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.junit.Ignore;
import org.junit.Test;
+import static com.google.common.collect.ImmutableList.of;
import static java.util.Arrays.asList;
import static junit.framework.Assert.assertEquals;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -472,7 +475,34 @@ public class LuceneIndexQueryTest extend
assertQuery(statement, SQL2, expected);
}
-
+
+ @Test
+ public void testMultiValuedPropUpdate() throws Exception {
+ Tree test = root.getTree("/").addChild("test");
+ String child = "child";
+ String mulValuedProp = "prop";
+ test.addChild(child).setProperty(mulValuedProp, of("foo","bar"), Type.STRINGS);
+ root.commit();
+ assertQuery(
+ "/jcr:root//*[jcr:contains(@" + mulValuedProp + ", 'foo')]",
+ "xpath", of("/test/" + child));
+ test.getChild(child).setProperty(mulValuedProp, new ArrayList<String>(), Type.STRINGS);
+ root.commit();
+ assertQuery("/jcr:root//*[jcr:contains(@" + mulValuedProp + ", 'foo')]", "xpath", new ArrayList<String>());
+
+ test.getChild(child).setProperty(mulValuedProp, of("bar"), Type.STRINGS);
+ root.commit();
+ assertQuery(
+ "/jcr:root//*[jcr:contains(@" + mulValuedProp + ", 'foo')]",
+ "xpath", new ArrayList<String>());
+
+ test.getChild(child).removeProperty(mulValuedProp);
+ root.commit();
+ assertQuery(
+ "/jcr:root//*[jcr:contains(@" + mulValuedProp + ", 'foo')]",
+ "xpath", new ArrayList<String>());
+ }
+
@SuppressWarnings("unused")
private static void walktree(final Tree t) {
System.out.println("+ " + t.getPath());