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 ch...@apache.org on 2016/06/05 17:33:16 UTC

svn commit: r1746936 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateTest.java

Author: chetanm
Date: Sun Jun  5 17:33:16 2016
New Revision: 1746936

URL: http://svn.apache.org/viewvc?rev=1746936&view=rev
Log:
OAK-4380 - DocumentNodeState should override getPropertyCount

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1746936&r1=1746935&r2=1746936&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Sun Jun  5 17:33:16 2016
@@ -277,6 +277,11 @@ public class DocumentNodeState extends A
         }
     }
 
+    @Override
+    public long getPropertyCount() {
+        return properties.size();
+    }
+
     @Nonnull
     @Override
     public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateTest.java?rev=1746936&r1=1746935&r2=1746936&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateTest.java Sun Jun  5 17:33:16 2016
@@ -16,6 +16,10 @@
  */
 package org.apache.jackrabbit.oak.plugins.document;
 
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -33,4 +37,17 @@ public class DocumentNodeStateTest {
         DocumentNodeState state = new DocumentNodeState(store, "/foo", rv);
         assertEquals(232, state.getMemory());
     }
+
+    @Test
+    public void propertyCount() throws Exception{
+        DocumentNodeStore store = builderProvider.newBuilder().getNodeStore();
+        NodeBuilder builder = store.getRoot().builder();
+        builder.child("a").setProperty("x", 1);
+        builder.child("a").setProperty("y", 1);
+        store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+        NodeState ns = store.getRoot().getChildNode("a");
+        assertEquals(2, ns.getPropertyCount());
+
+    }
 }