Author: chetanm
Date: Wed Jan 6 05:36:11 2016
New Revision: 1723231
URL: http://svn.apache.org/viewvc?rev=1723231&view=rev
Log:
OAK-3830 - Provide size for properties for PropertyItearator returned in
Node#getProperties(namePattern)
Merging 1723227
Added:
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/PropertyTest.java
(with props)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 6 05:36:11 2016
@@ -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,1673713,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,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,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
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,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,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,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
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1723231&r1=1723230&r2=1723231&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Wed Jan 6 05:36:11 2016
@@ -659,16 +659,19 @@ public class NodeImpl<T extends NodeDele
@Nonnull
@Override
public PropertyIterator perform() throws RepositoryException {
- Iterator<PropertyDelegate> properties = Iterators.filter(
- node.getProperties(),
- new Predicate<PropertyDelegate>() {
- @Override
- public boolean apply(PropertyDelegate entry) {
- // TODO: use Oak names
- return
ItemNameMatcher.matches(toJcrPath(entry.getName()), namePattern);
- }
- });
- return new
PropertyIteratorAdapter(propertyIterator(properties));
+ final PropertyIteratorDelegate delegate = new
PropertyIteratorDelegate(node, new Predicate<PropertyDelegate>() {
+ @Override
+ public boolean apply(PropertyDelegate entry) {
+ // TODO: use Oak names
+ return
ItemNameMatcher.matches(toJcrPath(entry.getName()), namePattern);
+ }
+ });
+ return new
PropertyIteratorAdapter(propertyIterator(delegate.iterator())){
+ @Override
+ public long getSize() {
+ return delegate.getSize();
+ }
+ };
}
});
}
@@ -680,16 +683,19 @@ public class NodeImpl<T extends NodeDele
@Nonnull
@Override
public PropertyIterator perform() throws RepositoryException {
- Iterator<PropertyDelegate> propertyNames = Iterators.filter(
- node.getProperties(),
- new Predicate<PropertyDelegate>() {
- @Override
- public boolean apply(PropertyDelegate entry) {
- // TODO: use Oak names
- return
ItemNameMatcher.matches(toJcrPath(entry.getName()), nameGlobs);
- }
- });
- return new
PropertyIteratorAdapter(propertyIterator(propertyNames));
+ final PropertyIteratorDelegate delegate = new
PropertyIteratorDelegate(node, new Predicate<PropertyDelegate>() {
+ @Override
+ public boolean apply(PropertyDelegate entry) {
+ // TODO: use Oak names
+ return
ItemNameMatcher.matches(toJcrPath(entry.getName()), nameGlobs);
+ }
+ });
+ return new
PropertyIteratorAdapter(propertyIterator(delegate.iterator())){
+ @Override
+ public long getSize() {
+ return delegate.getSize();
+ }
+ };
}
});
}
@@ -1572,4 +1578,28 @@ public class NodeImpl<T extends NodeDele
}
});
}
+
+ private static class PropertyIteratorDelegate {
+ private final NodeDelegate node;
+ private final Predicate<PropertyDelegate> predicate;
+
+ PropertyIteratorDelegate(NodeDelegate node,
Predicate<PropertyDelegate> predicate) {
+ this.node = node;
+ this.predicate = predicate;
+ }
+
+ public Iterator<PropertyDelegate> iterator() throws
InvalidItemStateException {
+ return Iterators.filter(node.getProperties(), predicate);
+ }
+
+ public long getSize() {
+ try {
+ return Iterators.size(iterator());
+ } catch (InvalidItemStateException e) {
+ throw new IllegalStateException(
+ "This iterator is no longer valid", e);
+ }
+ }
+
+ }
}
Added:
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/PropertyTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/PropertyTest.java?rev=1723231&view=auto
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/PropertyTest.java
(added)
+++
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/PropertyTest.java
Wed Jan 6 05:36:11 2016
@@ -0,0 +1,88 @@
+/*
+ * 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.jcr;
+
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
+import javax.jcr.PropertyType;
+import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
+import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.nodetype.NodeTypeTemplate;
+import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
+
+import com.google.common.collect.Iterators;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+public class PropertyTest extends AbstractJCRTest {
+
+ private static final String NT_NAME = "PropertyTest_Type";
+ private static final String BOOLEAN_PROP_NAME = "booleanProperty";
+ private static final String LONG_PROP_NAME = "longProperty";
+ private Node node;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ NodeTypeManager ntMgr = superuser.getWorkspace().getNodeTypeManager();
+ NodeTypeTemplate template = ntMgr.createNodeTypeTemplate();
+ template.setName(NT_NAME);
+ template.setDeclaredSuperTypeNames(new String[]
{JcrConstants.NT_BASE});
+ template.setMixin(false);
+
+ PropertyDefinitionTemplate pdt =
ntMgr.createPropertyDefinitionTemplate();
+ pdt.setName(BOOLEAN_PROP_NAME);
+ pdt.setRequiredType(PropertyType.BOOLEAN);
+ template.getPropertyDefinitionTemplates().add(pdt);
+
+ pdt = ntMgr.createPropertyDefinitionTemplate();
+ pdt.setName(LONG_PROP_NAME);
+ pdt.setRequiredType(PropertyType.LONG);
+ template.getPropertyDefinitionTemplates().add(pdt);
+
+ ntMgr.registerNodeType(template, true);
+
+ node = testRootNode.addNode(nodeName2, NT_NAME);
+ assertEquals(NT_NAME, node.getPrimaryNodeType().getName());
+ }
+
+ public void testPropertyIteratorSize() throws Exception{
+ Node n = testRootNode.addNode("unstructured",
JcrConstants.NT_UNSTRUCTURED);
+ n.setProperty("foo", "a");
+ n.setProperty("foo-1", "b");
+ n.setProperty("bar", "b");
+ n.setProperty("cat", "c");
+ superuser.save();
+
+ //Extra 1 for jcr:primaryType
+ PropertyIterator pitr = n.getProperties();
+ assertEquals(4 + 1, pitr.getSize());
+ assertEquals(4 + 1, Iterators.size(pitr));
+
+ pitr = n.getProperties("foo*");
+ assertEquals(2, pitr.getSize());
+ assertEquals(2, Iterators.size(pitr));
+
+ pitr = n.getProperties(new String[] {"foo*", "cat*"});
+ assertEquals(3, pitr.getSize());
+ assertEquals(3, Iterators.size(pitr));
+ }
+}
Propchange:
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/PropertyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
