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 th...@apache.org on 2019/09/10 13:17:56 UTC
svn commit: r1866752 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/
Author: thomasm
Date: Tue Sep 10 13:17:56 2019
New Revision: 1866752
URL: http://svn.apache.org/viewvc?rev=1866752&view=rev
Log:
OAK-8579 Composite Node Store: Allow creating an index in the read-only repo first
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreLuceneIndexTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java?rev=1866752&r1=1866751&r2=1866752&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java Tue Sep 10 13:17:56 2019
@@ -30,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.Validator;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -172,7 +173,9 @@ class NameValidator extends DefaultValid
@Override
public Validator childNodeAdded(String name, NodeState after)
throws CommitFailedException {
- checkValidName(name);
+ if (!NodeStateUtils.isHidden(name)) {
+ checkValidName(name);
+ }
return this;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1866752&r1=1866751&r2=1866752&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java Tue Sep 10 13:17:56 2019
@@ -475,6 +475,9 @@ public class TypeEditor extends DefaultE
}
if (!names.isEmpty()) {
for (String name : names) {
+ if (NodeStateUtils.isHidden(name)) {
+ continue;
+ }
NodeState child = after.getChildNode(name);
String primary = child.getName(JCR_PRIMARYTYPE);
Iterable<String> mixins = child.getNames(JCR_MIXINTYPES);
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreLuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreLuceneIndexTest.java?rev=1866752&r1=1866751&r2=1866752&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreLuceneIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreLuceneIndexTest.java Tue Sep 10 13:17:56 2019
@@ -48,7 +48,6 @@ import static org.apache.jackrabbit.oak.
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
@SuppressWarnings("ConstantConditions")
public class CompositeNodeStoreLuceneIndexTest extends CompositeNodeStoreQueryTestBase {
@@ -103,20 +102,13 @@ public class CompositeNodeStoreLuceneInd
}
/**
- * Given a composite node store , trying to create an index in read-write part
- * with the same index node already existing in the read only part already
- * we should get OakConstraint001 . This is the current behaviour,
- * but can be worked upon (improved) in the future .
+ * Given a composite node store , create an index in read-write part
+ * with the same index node already existing in the read-only part already.
*/
@Test
- public void tryAddIndexInReadWriteWithIndexExistinginReadOnly() {
- try {
- repoV1.setupIndexAndContentInRepo("luceneTest", "foo", true, VERSION_1);
- assertTrue(false);
- } catch (Exception e) {
- assert (e.getLocalizedMessage().contains(
- "OakConstraint0001: /oak:index/luceneTest/:oak:mount-readOnlyV1-index-data[[]]: The primary type null does not exist"));
- }
+ public void addIndexInReadWriteWithIndexExistinginReadOnly() throws Exception {
+ repoV1.setupIndexAndContentInRepo("luceneTest", "foo", true, VERSION_1);
+ repoV1.cleanup();
}
/**