Author: reschke
Date: Mon Jun 15 12:17:04 2015
New Revision: 1685567
URL: http://svn.apache.org/r1685567
Log:
OAK-2982: BasicDocumentStoreTest: separate actual unit tests from performance
tests (ported to 1.0)
Added:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
- copied unchanged from r1685552,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
- copied unchanged from r1685552,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 15 12:17:04 2015
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609
165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1
627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,1641350,1641352,1641541,1641596-164159
9,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656303,1656394,1656400,1656425,165
6427,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,
1670030,1670693,1670705,1671489,1671512,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673644,1673662-1673663,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174,1684376,1684442,1684561,1684570,1684618,1684836,1684868,1685023,1685370
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609
165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1
627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,1641350,1641352,1641541,1641596-164159
9,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656303,1656394,1656400,1656425,165
6427,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,
1670030,1670693,1670705,1671489,1671512,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673644,1673662-1673663,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174,1684376,1684442,1684561,1684570,1684618,1684836,1684868,1685023,1685370,1685552
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java?rev=1685567&r1=1685566&r2=1685567&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
Mon Jun 15 12:17:04 2015
@@ -93,4 +93,19 @@ public abstract class AbstractDocumentSt
return result;
}
+
+ /**
+ * Generate a random string of given size, with or without non-ASCII
characters.
+ */
+ public static String generateString(int length, boolean asciiOnly) {
+ char[] s = new char[length];
+ for (int i = 0; i < length; i++) {
+ if (asciiOnly) {
+ s[i] = (char) (32 + (int) (95 * Math.random()));
+ } else {
+ s[i] = (char) (32 + (int) ((0xd7ff - 32) * Math.random()));
+ }
+ }
+ return new String(s);
+ }
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1685567&r1=1685566&r2=1685567&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Mon Jun 15 12:17:04 2015
@@ -24,22 +24,12 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import java.io.UnsupportedEncodingException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.UUID;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -47,6 +37,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
public class BasicDocumentStoreTest extends AbstractDocumentStoreTest {
private static final Logger LOG =
LoggerFactory.getLogger(BasicDocumentStoreTest.class);
@@ -448,274 +441,6 @@ public class BasicDocumentStoreTest exte
return result;
}
- @Test
- public void testCreatePerfSmall() {
- createPerf(16, 1);
- }
-
- @Test
- public void testCreatePerfSmallBatch() {
- createPerf(16, 64);
- }
-
- @Test
- public void testCreatePerfBig() {
- createPerf(32 * 1024, 1);
- }
-
- private void createPerf(int size, int amount) {
- String pval = generateString(size, true);
- long duration = 1000;
- long end = System.currentTimeMillis() + duration;
- long cnt = 0;
- List<String> ids = new ArrayList<String>();
-
- while (System.currentTimeMillis() < end) {
- List<UpdateOp> ups = new ArrayList<UpdateOp>();
- for (int i = 0; i < amount; i++) {
- String id = this.getClass().getName() + ".testCreatePerf-" +
size + "-" + cnt + "-" + i;
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- up.set("foo", pval);
- ups.add(up);
- ids.add(id);
- }
- boolean success = super.ds.create(Collection.NODES, ups);
- removeMe.addAll(ids);
- assertTrue("documents with " + ids + " not created", success);
- cnt += 1;
- }
-
- LOG.info("document creation with property of size " + size + " and
batch size " + amount + " for " + super.dsname + " was " + cnt + " in " +
duration + "ms (" + (cnt / (duration / 1000f)) + "/s)");
- }
-
- @Test
- public void testPerfCollectionPaging() {
- testPerfCollectionPaging(this.getClass().getName() +
".testPerfCollectionPaging", false);
- }
-
- @Test
- public void testPerfCollectionPagingUnCached() {
- testPerfCollectionPaging(this.getClass().getName() +
".testPerfCollectionPagingUnCached", true);
- }
-
- private void testPerfCollectionPaging(String name, boolean
invalidateCache) {
- String cid = name;
- int nodecount = 20000;
- int initialFetchCount = 100;
- int maxFetchCount = 1600;
- int fetchcount = initialFetchCount;
- long duration = 2000;
- int cnt = 0;
- List<UpdateOp> ups = new ArrayList<UpdateOp>();
-
- UpdateOp container = new UpdateOp(cid, true);
- container.set("_id", cid);
- ups.add(container);
- removeMe.add(cid);
- for (int i = 0; i < nodecount; i++) {
- String id = String.format("%s/%08d", cid, i);
- removeMe.add(id);
- UpdateOp u = new UpdateOp(id, true);
- u.set("_id", id);
- ups.add(u);
- }
-
- boolean success = super.ds.create(Collection.NODES, ups);
- assertTrue(success);
- super.ds.invalidateCache();
-
- long end = System.currentTimeMillis() + duration;
- String sid = cid;
- int found = 0;
- while (System.currentTimeMillis() < end) {
- long now = System.currentTimeMillis();
- List<NodeDocument> result = super.ds.query(Collection.NODES, sid,
cid + "X", fetchcount);
- if (super.ds.getCacheStats() != null && result.size() > 0) {
- // check freshness of returned documents
- long created = result.get(0).getLastCheckTime();
- assertTrue(
- "'getLastCheckTime' timestamp of NodeDocument too old
(" + created + " vs " + now + ") (on " + super.dsname + ")",
- created >= now);
- }
- found += result.size();
- if (result.size() < fetchcount) {
- if (sid.equals(cid)) {
- fail("first page must not be empty");
- }
- sid = cid;
- assertEquals(nodecount, found);
- found = 0;
- fetchcount = initialFetchCount;
- }
- else {
- sid = result.get(result.size() -1).getId();
- if (fetchcount < maxFetchCount) {
- fetchcount *= 2;
- }
- }
- cnt += 1;
- if (invalidateCache) {
- super.ds.invalidateCache();
- }
- }
-
- LOG.info("collection lookups " + (invalidateCache ? "(uncached) " :
"") + super.dsname + " was " + cnt + " in " + duration
- + "ms (" + (cnt / (duration / 1000f)) + "/s)");
- }
-
- @Test
- public void testPerfLastRevBatch() {
- String bid = this.getClass().getName() + ".testPerfLastRevBatch";
- int nodecount = 100;
- long duration = 5000;
- int cnt = 0;
- List<String> ids = new ArrayList<String>();
- Revision cr = Revision.fromString("r0-0-1");
-
- // create test nodes
- for (int i = 0; i < nodecount; i++) {
- String id = bid + "-" + i;
- super.ds.remove(Collection.NODES, id);
- removeMe.add(id);
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- up.set("testprop", generateString(100 * i, true));
- up.setMapEntry("_lastRev", cr, "setup");
- up.set("_modified",
NodeDocument.getModifiedInSecs(System.currentTimeMillis()));
- boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
- assertTrue("creation failed for " + id + " in " + super.dsname,
success);
- ids.add(id);
- }
-
- long end = System.currentTimeMillis() + duration;
- while (System.currentTimeMillis() < end) {
- UpdateOp up = new UpdateOp(bid, true);
- up.setMapEntry("_lastRev", cr, "iteration-" + cnt);
- up.max("_modified",
NodeDocument.getModifiedInSecs(System.currentTimeMillis()));
- super.ds.update(Collection.NODES, ids, up);
- cnt += 1;
- }
-
- // check postcondition
- super.ds.invalidateCache();
- for (int i = 0; i < nodecount; i++) {
- NodeDocument d = super.ds.find(Collection.NODES, bid + "-" + i);
- assertNotNull(d);
- Map<Revision, String> m = (Map<Revision, String>)d.get("_lastRev");
- assertEquals("iteration-" + (cnt - 1), m.get(cr));
- }
-
- LOG.info("batch update for _lastRev for " + super.dsname + " was "
- + cnt + " in " + duration + "ms (" + (cnt / (duration /
1000f)) + "/s)");
- }
-
- @Test
- public void testPerfReadBigDocCached() {
- perfReadBigDoc(true, this.getClass().getName() +
".testReadBigDocCached");
- }
-
- @Test
- public void testPerfReadBigDocAfterInvalidate() {
- perfReadBigDoc(false, this.getClass().getName() +
".testReadBigDocAfterInvalidate");
- }
-
- private void perfReadBigDoc(boolean cached, String name) {
- String id = name;
- long duration = 1000;
- int cnt = 0;
-
- super.ds.remove(Collection.NODES, Collections.singletonList(id));
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- for (int i = 0; i < 100; i++) {
- up.set("foo" + i, generateString(1024, true));
- }
- assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(up)));
- removeMe.add(id);
-
- long end = System.currentTimeMillis() + duration;
- while (System.currentTimeMillis() < end) {
- if (!cached) {
- super.ds.invalidateCache(Collection.NODES, id);
- }
- NodeDocument d = super.ds.find(Collection.NODES, id, 10);
- cnt += 1;
- }
-
- LOG.info("big doc read " + (cached ? "" : "(after invalidate) ") +
"from " + super.dsname + " was " + cnt + " in "
- + duration + "ms (" + (cnt / (duration / 1000f)) + "/s)");
- }
-
- @Test
- public void testUpdatePerfSmall() {
- updatePerf(16, false);
- }
-
- @Test
- public void testUpdatePerfSmallGrowing() {
- updatePerf(16, true);
- }
-
- @Test
- public void testUpdatePerfBig() {
- updatePerf(32 * 1024, false);
- }
-
- private void updatePerf(int size, boolean growing) {
- String pval = generateString(size, true);
- long duration = 1000;
- long end = System.currentTimeMillis() + duration;
- long cnt = 0;
- Set<Revision> expectedRevs = new HashSet<Revision>();
-
- String id = this.getClass().getName() + ".testUpdatePerf" + (growing ?
"Growing" : "") + "-" + size;
- removeMe.add(id);
-
- while (System.currentTimeMillis() < end) {
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- if (growing) {
- Revision r = new Revision(System.currentTimeMillis(), (int)
cnt, 1);
- up.setMapEntry("foo", r, pval);
- up.setMapEntry("_commitRoot", r, "1");
- up.increment("c", 1);
- up.max("max", System.currentTimeMillis());
- expectedRevs.add(r);
- } else {
- up.set("foo", pval);
- }
- NodeDocument old = super.ds.createOrUpdate(Collection.NODES, up);
- if (cnt == 0) {
- assertNull("expect null on create", old);
- } else {
- assertNotNull("fail on update " + cnt, old);
- }
- cnt += 1;
- }
-
- if (growing) {
- NodeDocument result = super.ds.find(Collection.NODES, id, 0);
- Map<Revision, Object> m = (Map<Revision, Object>)result.get("foo");
- assertEquals("number of revisions", expectedRevs.size(), m.size());
- assertTrue(m.keySet().equals(expectedRevs));
- }
-
- LOG.info("document updates with property of size " + size + (growing ?
" (growing)" : "") + " for " + super.dsname + " was " + cnt + " in " + duration
+ "ms (" + (cnt / (duration / 1000f)) + "/s)");
- }
-
- private static String generateString(int length, boolean ascii) {
- char[] s = new char[length];
- for (int i = 0; i < length; i++) {
- if (ascii) {
- s[i] = (char) (32 + (int) (95 * Math.random()));
- } else {
- s[i] = (char) (32 + (int) ((0xd7ff - 32) * Math.random()));
- }
- }
- return new String(s);
- }
-
private static String generateId(int length, boolean ascii) {
StringBuffer sb = new StringBuffer();
for (int i = 0; i < length; i++) {
@@ -729,243 +454,6 @@ public class BasicDocumentStoreTest exte
return sb.toString();
}
- @Test
- public void testPerfUpdateLimit() throws SQLException,
UnsupportedEncodingException {
- internalTestPerfUpdateLimit("testPerfUpdateLimit", "raw row update
(set long)", 0);
- }
-
- @Test
- public void testPerfUpdateLimitString() throws SQLException,
UnsupportedEncodingException {
- internalTestPerfUpdateLimit("testPerfUpdateLimitString", "raw row
update (set long/string)", 1);
- }
-
- @Test
- public void testPerfUpdateLimitStringBlob() throws SQLException,
UnsupportedEncodingException {
- internalTestPerfUpdateLimit("testPerfUpdateLimitStringBlob", "raw row
update (set long/string/blob)", 2);
- }
-
- @Test
- public void testPerfUpdateAppendString() throws SQLException,
UnsupportedEncodingException {
- internalTestPerfUpdateLimit("testPerfUpdateAppendString", "raw row
update (append string)", 3);
- }
-
- @Test
- public void testPerfUpdateGrowingDoc() throws SQLException,
UnsupportedEncodingException {
- internalTestPerfUpdateLimit("testPerfUpdateGrowingDoc", "raw row
update (string + blob)", 4);
- }
-
- private void internalTestPerfUpdateLimit(String name, String desc, int
mode) throws SQLException, UnsupportedEncodingException {
- if (super.rdbDataSource != null) {
- String key = name;
- Connection connection = null;
- String table = DocumentStoreFixture.TABLEPREFIX + "NODES";
-
- // create test node
- try {
- connection = super.rdbDataSource.getConnection();
- connection.setAutoCommit(false);
- // we use the same pool as the document store, and the
connection might have been returned in read-only mode
- connection.setReadOnly(false);
- PreparedStatement stmt = connection.prepareStatement("insert
into " + table
- + " (ID, MODCOUNT, DATA) values (?, ?, ?)");
- try {
- setIdInStatement(stmt, 1, key);
- stmt.setLong(2, 0);
- stmt.setString(3, "X");
- stmt.executeUpdate();
- connection.commit();
- } finally {
- stmt.close();
- }
- } catch (SQLException ex) {
- // ignored
- // ex.printStackTrace();
- } finally {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- // ignored
- }
- }
- }
-
- removeMe.add(key);
- StringBuffer expect = new StringBuffer("X");
-
- String appendString = generateString(512, true);
-
- long duration = 1000;
- long end = System.currentTimeMillis() + duration;
- long cnt = 0;
- byte bdata[] = new byte[65536];
- String sdata = appendString;
- boolean needsConcat = super.dsname.contains("MySQL");
- boolean needsSQLStringConcat = super.dsname.contains("MSSql");
- int dataInChars = ((super.dsname.contains("Oracle") ||
(super.dsname.contains("MSSql"))) ? 4000 : 16384);
- int dataInBytes = dataInChars / 3;
-
- while (System.currentTimeMillis() < end) {
-
- try {
- connection = super.rdbDataSource.getConnection();
- connection.setAutoCommit(false);
-
- if (mode == 0) {
- PreparedStatement stmt =
connection.prepareStatement("update " + table + " set MODCOUNT = ? where ID =
?");
- try {
- stmt.setLong(1, cnt);
- setIdInStatement(stmt, 2, key);
- assertEquals(1, stmt.executeUpdate());
- connection.commit();
- } finally {
- stmt.close();
- }
- } else if (mode == 1) {
- PreparedStatement stmt =
connection.prepareStatement("update " + table
- + " set MODCOUNT = ?, DATA = ? where ID = ?");
- try {
- stmt.setLong(1, cnt);
- stmt.setString(2, "JSON data " +
UUID.randomUUID());
- setIdInStatement(stmt, 3, key);
- assertEquals(1, stmt.executeUpdate());
- connection.commit();
- } finally {
- stmt.close();
- }
- } else if (mode == 2) {
- PreparedStatement stmt =
connection.prepareStatement("update " + table
- + " set MODCOUNT = ?, DATA = ?, BDATA = ?
where ID = ?");
- try {
- stmt.setLong(1, cnt);
- stmt.setString(2, "JSON data " +
UUID.randomUUID());
- bdata[(int) cnt % bdata.length] = (byte) (cnt &
0xff);
- stmt.setString(2, "JSON data " +
UUID.randomUUID());
- stmt.setBytes(3, bdata);
- setIdInStatement(stmt, 4, key);
- assertEquals(1, stmt.executeUpdate());
- connection.commit();
- } finally {
- stmt.close();
- }
- } else if (mode == 3) {
- String t = "update " + table + " ";
-
- t += "set DATA = ";
- if (needsConcat) {
- t += "CONCAT(DATA, ?) ";
- } else if (needsSQLStringConcat) {
- t += "CASE WHEN LEN(DATA) <= " + (dataInChars -
appendString.length()) + " THEN (DATA + CAST(? AS nvarchar(" + 4000
- + "))) ELSE (DATA + CAST(DATA AS
nvarchar(max))) END";
- } else {
- t += "DATA || CAST(? as varchar(" + dataInChars +
"))";
- }
-
- t += " where ID = ?";
-
- PreparedStatement stmt =
connection.prepareStatement(t);
- try {
- stmt.setString(1, appendString);
- setIdInStatement(stmt, 2, key);
- assertEquals(1, stmt.executeUpdate());
- connection.commit();
- expect.append(appendString);
- } catch (SQLException ex) {
- // ex.printStackTrace();
- String state = ex.getSQLState();
- if ("22001".equals(state) /* everybody */ ||
("72000".equals(state) && 1489 == ex.getErrorCode()) /* Oracle */) {
- // overflow
- connection.rollback();
- stmt = connection.prepareStatement("update " +
table
- + " set MODCOUNT = MODCOUNT + 1, DATA
= ? where ID = ?");
- stmt.setString(1, "X");
- setIdInStatement(stmt, 2, key);
- assertEquals(1, stmt.executeUpdate());
- connection.commit();
- expect = new StringBuffer("X");
- } else {
- // ex.printStackTrace();
- throw (ex);
- }
- } finally {
- stmt.close();
- }
- } else if (mode == 4) {
- PreparedStatement stmt =
connection.prepareStatement("update " + table
- + " set MODIFIED = ?, HASBINARY = ?, MODCOUNT
= ?, CMODCOUNT = ?, DSIZE = ?, DATA = ?, BDATA = ? where ID = ?");
- try {
- int si = 1;
- stmt.setObject(si++, System.currentTimeMillis() /
5, Types.BIGINT);
- stmt.setObject(si++, 0, Types.SMALLINT);
- stmt.setObject(si++, cnt, Types.BIGINT);
- stmt.setObject(si++, null, Types.BIGINT);
- stmt.setObject(si++, sdata.length(), Types.BIGINT);
-
- if (sdata.length() < dataInBytes) {
- stmt.setString(si++, sdata);
- stmt.setBinaryStream(si++, null, 0);
- }
- else {
- stmt.setString(si++, "null");
- stmt.setBytes(si++, sdata.getBytes("UTF-8"));
- }
- setIdInStatement(stmt, si++, key);
- assertEquals(1, stmt.executeUpdate());
- connection.commit();
- sdata += appendString;
- } finally {
- stmt.close();
- }
-
- }
- } catch (SQLException ex) {
- LOG.error(ex.getMessage() + " " + ex.getSQLState() + " " +
ex.getErrorCode(), ex);
- } finally {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- // ignored
- }
- }
- }
-
- cnt += 1;
- }
-
- // check persisted values
- if (mode == 3) {
- try {
- connection = super.rdbDataSource.getConnection();
- connection.setAutoCommit(false);
- PreparedStatement stmt =
connection.prepareStatement("select DATA, MODCOUNT from " + table + " where ID
= ?");
- try {
- setIdInStatement(stmt, 1, key);
- ResultSet rs = stmt.executeQuery();
- assertTrue("test record " + key + " not found in " +
super.dsname, rs.next());
- String got = rs.getString(1);
- long modc = rs.getLong(2);
- LOG.info("column reset " + modc + " times");
- assertEquals(expect.toString(), got);
- } finally {
- stmt.close();
- }
- } finally {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- // ignored
- }
- }
- }
- }
-
- LOG.info(desc + " for " + super.dsname + " was " + cnt + " in " +
duration + "ms (" + (cnt / (duration / 1000f))
- + "/s)");
- }
- }
-
// make sure _collisionsModCount property is maintained properly when it
exists
@Test
public void testCollisionsModCount() {
@@ -1022,20 +510,6 @@ public class BasicDocumentStoreTest exte
}
}
- private void setIdInStatement(PreparedStatement stmt, int idx, String id)
throws SQLException {
- boolean binaryId = super.dsname.contains("MySQL") ||
super.dsname.contains("MSSql");
- if (binaryId) {
- try {
- stmt.setBytes(idx, id.getBytes("UTF-8"));
- } catch (UnsupportedEncodingException ex) {
- LOG.error("UTF-8 not supported??", ex);
- throw new DocumentStoreException(ex);
- }
- } else {
- stmt.setString(idx, id);
- }
- }
-
@Test
public void description() throws Exception{
Map<String, String> desc = ds.getMetadata();
