Author: davide Date: Thu Dec 18 10:05:43 2014 New Revision: 1646424 URL: http://svn.apache.org/r1646424 Log: OAK-2362: Remove entryCount from NodeType Index
- removed entry count - amended unit tests Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java?rev=1646424&r1=1646423&r2=1646424&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java Thu Dec 18 10:05:43 2014 @@ -80,11 +80,8 @@ public class InitialContent implements R IndexUtils.createIndexDefinition(index, "uuid", true, true, ImmutableList.<String>of(JCR_UUID), null); - NodeBuilder nt = - IndexUtils.createIndexDefinition(index, "nodetype", true, false, + IndexUtils.createIndexDefinition(index, "nodetype", true, false, ImmutableList.of(JCR_PRIMARYTYPE, JCR_MIXINTYPES), null); - // the cost of using the property index for "@primaryType is not null" is very high - nt.setProperty(IndexConstants.ENTRY_COUNT_PROPERTY_NAME, Long.valueOf(Long.MAX_VALUE)); IndexUtils.createReferenceIndex(index); index.child("counter") Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java?rev=1646424&r1=1646423&r2=1646424&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java Thu Dec 18 10:05:43 2014 @@ -214,6 +214,8 @@ public class QueryPlanTest extends Abstr public void nodeType() throws Exception { Session session = getAdminSession(); QueryManager qm = session.getWorkspace().getQueryManager(); + Node nodetype = session.getRootNode().getNode("oak:index").getNode("nodetype"); + nodetype.setProperty("entryCount", 100000); Node testRootNode = session.getRootNode().addNode("testroot"); Node n1 = testRootNode.addNode("node1"); Node n2 = n1.addNode("node2"); Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java?rev=1646424&r1=1646423&r2=1646424&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java Thu Dec 18 10:05:43 2014 @@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.jcr.qu import static com.google.common.collect.Sets.newHashSet; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; +import static org.apache.jackrabbit.JcrConstants.NT_FOLDER; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -80,8 +81,8 @@ public class QueryTest extends AbstractR // disable the nodetype index Node nodeTypeIndex = root.getNode("oak:index").getNode("nodetype"); - nodeTypeIndex.setProperty("declaringNodeTypes", new String[] { - }, PropertyType.NAME); + nodeTypeIndex.setProperty("declaringNodeTypes", new String[] { NT_FOLDER }, + PropertyType.NAME); // add 10 nodes Node test = root.addNode("test");