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 09:02:34 UTC
svn commit: r1689584 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Author: amitj
Date: Tue Jul 7 07:02:34 2015
New Revision: 1689584
URL: http://svn.apache.org/r1689584
Log:
OAK-2999: Index updation fails on updating multivalued property
Merged revision 1689581 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 7 07:02:34 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,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,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,1685370,1685552,1685589-1685590
,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688636,1688817,1689003,1689577
+/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,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,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,1685370,1685552,1685589-1685590
,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688636,1688817,1689003,1689577,1689581
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1689584&r1=1689583&r2=1689584&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Tue Jul 7 07:02:34 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
@@ -575,7 +584,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/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1689584&r1=1689583&r2=1689584&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Tue Jul 7 07:02:34 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());