Author: chetanm
Date: Thu Dec 8 05:17:08 2016
New Revision: 1773174
URL: http://svn.apache.org/viewvc?rev=1773174&view=rev
Log:
OAK-4400 - Correlate index with the index definition used to build it
Utility class to clone the visible portion of NodeState
Added:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateCloner.java
(with props)
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateClonerTest.java
(with props)
Added:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateCloner.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateCloner.java?rev=1773174&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateCloner.java
(added)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateCloner.java
Thu Dec 8 05:17:08 2016
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index.lucene;
+
+import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+
+import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+
+class NodeStateCloner {
+
+ public static NodeState cloneVisibleState(NodeState state){
+ NodeBuilder builder = EMPTY_NODE.builder();
+ new ApplyVisibleDiff(builder).apply(state);
+ return builder.getNodeState();
+ }
+
+ private static class ApplyVisibleDiff extends ApplyDiff {
+ public ApplyVisibleDiff(NodeBuilder builder) {
+ super(builder);
+ }
+
+ @Override
+ public boolean childNodeAdded(String name, NodeState after) {
+ if (NodeStateUtils.isHidden(name)){
+ return true;
+ }
+ return after.compareAgainstBaseState(
+ EMPTY_NODE, new ApplyVisibleDiff(builder.child(name)));
+ }
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateCloner.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateClonerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateClonerTest.java?rev=1773174&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateClonerTest.java
(added)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateClonerTest.java
Thu Dec 8 05:17:08 2016
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index.lucene;
+
+import org.apache.jackrabbit.oak.plugins.index.lucene.NodeStateCloner;
+import org.apache.jackrabbit.oak.spi.state.EqualsDiff;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import org.junit.Test;
+
+import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+import static org.junit.Assert.*;
+
+public class NodeStateClonerTest {
+
+ @Test
+ public void simple() throws Exception{
+ NodeBuilder builder = EMPTY_NODE.builder();
+ builder.child("a").child("b");
+ builder.child("a").setProperty("foo", "bar");
+
+ NodeState state = builder.getNodeState();
+ assertTrue(EqualsDiff.equals(state,
NodeStateCloner.cloneVisibleState(state)));
+ }
+
+ @Test
+ public void excludeHidden() throws Exception{
+ NodeBuilder builder = EMPTY_NODE.builder();
+ builder.child("a").child(":b").child("e");
+ builder.child("a").child("c").child(":d");
+ builder.child("a").setProperty("foo", "bar");
+
+ NodeState source = builder.getNodeState();
+ NodeState cloned = NodeStateCloner.cloneVisibleState(source);
+
+ assertFalse(NodeStateUtils.getNode(cloned, "/a/:b").exists());
+ assertFalse(NodeStateUtils.getNode(cloned, "/a/:b/e").exists());
+ assertFalse(NodeStateUtils.getNode(cloned, "/a/c/:d").exists());
+
+ assertTrue(NodeStateUtils.getNode(cloned, "/a/c").exists());
+ assertTrue(NodeStateUtils.getNode(cloned, "/a").hasProperty("foo"));
+
+ assertFalse(EqualsDiff.equals(source, cloned));
+ }
+
+}
\ No newline at end of file
Propchange:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateClonerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
