You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/06/24 06:00:31 UTC
svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql
subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Author: svn-role
Date: Wed Jun 24 04:00:31 2015
New Revision: 1687152
URL: http://svn.apache.org/r1687152
Log:
Merge the 1.7.x-r1542765 branch:
* r1542765, r1571214
Add Sqlite index information.
Justification:
Adding this information explains to Sqlite how we use our indexes. While
Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
queries as much at that time, this information will make several queries
use indexes instead of table scans.
Branch:
^/subversion/branches/1.7.x-r1542765
Votes:
+1: rhuijben, stefan2, brane
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c
subversion/branches/1.7.x/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.h
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 24 04:00:31 2015
@@ -82,6 +82,7 @@
/subversion/branches/1.7.x-r1507044:1507300-1511568
/subversion/branches/1.7.x-r1527103:1527110-1541378
/subversion/branches/1.7.x-r1541790:1541792-1542083
+/subversion/branches/1.7.x-r1542765:1571488-1687151
/subversion/branches/1.7.x-r1551579:1551587-1589566
/subversion/branches/1.7.x-r1564215:1564280-1564618
/subversion/branches/1.7.x-r1568872-neon+serf:1568942-1569623
@@ -155,4 +156,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,115
6085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,
1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,1212476,12124
82,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,1292296,12
92322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,1367498
,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1462041,1462293,1462300,1462302,1462
321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1544295,1544302-1544303,1544316,1545835,1545845,1550691,1550772,1551579,1557320,1560690,1561237,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567492,1567494,1568180,1568349,1568872,1569069,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972,1644158,1644530,1644595,1644599,1646785-1646786,1646797,1651759,1652744,1664612,1667233,1667235,1667260-1667261,1667485,1667941,1667976,1
668618,1671388
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,115
6085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,
1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,1212476,12124
82,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,1292296,12
92322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,1367498
,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1462041,1462293,1462300,1462302,1462
321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1542765,1544295,1544302-1544303,1544316,1545835,1545845,1550691,1550772,1551579,1557320,1560690,1561237,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567492,1567494,1568180,1568349,1568872,1569069,1571214,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972,1644158,1644530,1644595,1644599,1646785-1646786,1646797,1651759,1652744,1664612,1667233,1667235,1667260-1667261,1667485,1
667941,1667976,1668618,1671388
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1687152&r1=1687151&r2=1687152&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jun 24 04:00:31 2015
@@ -131,18 +131,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1542765, r1571214
- Add Sqlite index information.
- Justification:
- Adding this information explains to Sqlite how we use our indexes. While
- Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
- queries as much at that time, this information will make several queries
- use indexes instead of table scans.
- Branch:
- ^/subversion/branches/1.7.x-r1542765
- Votes:
- +1: rhuijben, stefan2, brane
-
* r1652182, r1652195, r1652200, r1653622, r1653623, r1653988, r1654039, r1654162, r1654186, r1654271
Fix issue #4551 "svnrdump load commits wrong properties, or fails, on a
non-deltas dumpfile".
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c?rev=1687152&r1=1687151&r2=1687152&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c Wed Jun 24 04:00:31 2015
@@ -1364,7 +1364,14 @@ bump_to_29(void *baton, svn_sqlite__db_t
return SVN_NO_ERROR;
}
-
+/* Wrapper around svn_wc__db_install_schema_statistics for transaction */
+static svn_error_t *
+install_stats(void *baton, svn_sqlite__db_t *sdb, apr_pool_t *scratch_pool)
+{
+ SVN_ERR(svn_wc__db_install_schema_statistics(sdb, scratch_pool));
+ return SVN_NO_ERROR;
+}
+
struct upgrade_data_t {
svn_sqlite__db_t *sdb;
const char *root_abspath;
@@ -1645,6 +1652,12 @@ svn_wc__upgrade_sdb(int *result_format,
*result_format = XXX;
/* FALLTHROUGH */
#endif
+ case SVN_WC__VERSION:
+ /* already upgraded */
+ *result_format = SVN_WC__VERSION;
+
+ SVN_ERR(svn_sqlite__with_transaction(sdb, install_stats, NULL,
+ scratch_pool));
}
#ifdef SVN_DEBUG
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc-metadata.sql?rev=1687152&r1=1687151&r2=1687152&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc-metadata.sql Wed Jun 24 04:00:31 2015
@@ -571,6 +571,56 @@ CREATE UNIQUE INDEX I_EXTERNALS_DEFINED
def_local_relpath,
local_relpath);
+/* ------------------------------------------------------------------------- */
+/* This statement provides SQLite with the necessary information about our
+ indexes to make better decisions in the query planner.
+
+ For every interesting index this contains a number of rows where the
+ statistics ar calculated for and then for every column in the index the
+ average number of rows with the same value in all columns left of this
+ column including the column itself.
+
+ See http://www.sqlite.org/fileformat2.html#stat1tab for more details.
+
+ The important thing here is that this tells Sqlite that the wc_id column
+ of the NODES and ACTUAL_NODE table is usually a single value, so queries
+ should use more than one column for index usage.
+
+ The current hints describe NODES+ACTUAL_NODE as a working copy with
+ 8000 nodes in 1 a single working copy(=wc_id), 10 nodes per directory
+ and an average of 2 op-depth layers per node.
+
+ The number of integers must be number of index columns + 1, which is
+ verified via the test_schema_statistics() test.
+ */
+-- STMT_INSTALL_SCHEMA_STATISTICS
+ANALYZE sqlite_master; /* Creates empty sqlite_stat1 if necessary */
+
+DELETE FROM sqlite_stat1
+WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1');
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_PARENT', '8000 8000 10 2 1');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'sqlite_autoindex_ACTUAL_NODE_1', '8000 8000 1');
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'I_ACTUAL_PARENT', '8000 8000 10 1');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('LOCK', 'sqlite_autoindex_LOCK_1', '100 100 1');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
+/* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+ a INTEGER PRIMARY KEY AUTOINCREMENT table */
+
+ANALYZE sqlite_master; /* Loads sqlite_stat1 data for query optimizer */
+/* ------------------------------------------------------------------------- */
+
/* Format 20 introduces NODES and removes BASE_NODE and WORKING_NODE */
-- STMT_UPGRADE_TO_20
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c?rev=1687152&r1=1687151&r2=1687152&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c Wed Jun 24 04:00:31 2015
@@ -1373,6 +1373,14 @@ does_node_exist(svn_boolean_t *exists,
return svn_error_trace(svn_sqlite__reset(stmt));
}
+svn_error_t *
+svn_wc__db_install_schema_statistics(svn_sqlite__db_t *sdb,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_INSTALL_SCHEMA_STATISTICS));
+
+ return SVN_NO_ERROR;
+}
/* Create an sqlite database at DIR_ABSPATH/SDB_FNAME and insert
records for REPOS_ID (using REPOS_ROOT_URL and REPOS_UUID) into
@@ -1401,6 +1409,8 @@ create_db(svn_sqlite__db_t **sdb,
SVN_ERR(svn_sqlite__exec_statements(*sdb, STMT_CREATE_NODES));
SVN_ERR(svn_sqlite__exec_statements(*sdb, STMT_CREATE_NODES_TRIGGERS));
SVN_ERR(svn_sqlite__exec_statements(*sdb, STMT_CREATE_EXTERNALS));
+
+ SVN_ERR(svn_wc__db_install_schema_statistics(*sdb, scratch_pool));
/* Insert the repository. */
SVN_ERR(create_repos_id(repos_id, repos_root_url, repos_uuid, *sdb,
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.h?rev=1687152&r1=1687151&r2=1687152&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.h Wed Jun 24 04:00:31 2015
@@ -2591,6 +2591,16 @@ svn_wc__db_scan_deletion(const char **ba
@{
*/
+/* Installs or updates Sqlite schema statistics for the current (aka latest)
+ working copy schema.
+
+ This function should be called once on initializing the database and after
+ an schema update completes */
+svn_error_t *
+svn_wc__db_install_schema_statistics(svn_sqlite__db_t *sdb,
+ apr_pool_t *scratch_pool);
+
+
/* Create a new wc.db file for LOCAL_DIR_ABSPATH, which is going to be a
working copy for the repository REPOS_ROOT_URL with uuid REPOS_UUID.
Return the raw sqlite handle, repository id and working copy id
Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql subversion/libsvn_wc/wc_db.c
subversion/libsvn_wc/wc_db.h
Posted by Branko Čibej <br...@wandisco.com>.
On 22.07.2015 17:23, Philip Martin wrote:
> Ivan Zhakov <iv...@visualsvn.com> writes:
>
>> Also comment for STMT_INSERT_DELETE_FROM_NODE_RECURSIVE query says
>> that STMT_INSERT_DELETE_LIST query also should be updates for any
>> modification of recursive query.
> I see we did that on trunk but I don't believe it is necessary for
> STMT_INSERT_DELETE_LIST to be ordered. All that is necessary is that
> the same rows are selected (so that the correct notifications are
> generated).
I reverted the original backport on the 1.7.x branch and with r1692666
reinstated it so that it includes the fix proposed in this thread.
-- Brane
Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Posted by Philip Martin <ph...@wandisco.com>.
Ivan Zhakov <iv...@visualsvn.com> writes:
> Also comment for STMT_INSERT_DELETE_FROM_NODE_RECURSIVE query says
> that STMT_INSERT_DELETE_LIST query also should be updates for any
> modification of recursive query.
I see we did that on trunk but I don't believe it is necessary for
STMT_INSERT_DELETE_LIST to be ordered. All that is necessary is that
the same rows are selected (so that the correct notifications are
generated).
--
Philip Martin
WANdisco
Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql
subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 21 July 2015 at 20:39, Philip Martin <ph...@wandisco.com> wrote:
> Ivan Zhakov <iv...@visualsvn.com> writes:
>
>> On 24 June 2015 at 07:00, <sv...@apache.org> wrote:
>>> Author: svn-role
>>> Date: Wed Jun 24 04:00:31 2015
>>> New Revision: 1687152
>>>
>>> URL: http://svn.apache.org/r1687152
>>> Log:
>>> Merge the 1.7.x-r1542765 branch:
>>>
>>> * r1542765, r1571214
>>> Add Sqlite index information.
>>> Justification:
>>> Adding this information explains to Sqlite how we use our indexes. While
>>> Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
>>> queries as much at that time, this information will make several queries
>>> use indexes instead of table scans.
>>> Branch:
>>> ^/subversion/branches/1.7.x-r1542765
>>> Votes:
>>> +1: rhuijben, stefan2, brane
>>>
>> I'm getting a lot of test failures like this:
>> [[[
>> CMD: C:\Ivan\SVN\test\subversion\svn\svn.exe delete
>> svn-test-work\working_copies\update_tests-49.wc2\A --config-dir
>> C:\Ivan\SVN\test\subversion\tests\cmdline\svn-test-work\local_tmp\config
>> --password rayjandom --no-auth-cache --username jrandom exited with 1
>> <TIME = 0.035000>
>> C:\Ivan\SVN\1.7.x\subversion\svn\delete-cmd.c:92: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\svn\util.c:913: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_client\delete.c:461: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:225: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:209: (apr_err=200035)
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:245: (apr_err=200035)
>> svn: E200035: sqlite: constraint failed
>> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:575: (apr_err=200035)
>> svn: E200035: sqlite: WC DB validity check 03 failed
>> ]]]
>>
>> But all tests pass if I revert this revision.
>>
>> I'm using sqlite 3.7.5, Windows 8.1 x64.
>
> That only occurs in an SVN_DEBUG build. I can reproduce the problem
> with 3.7.5 on Linux but not with 3.8.7.1. It's
> STMT_INSERT_DELETE_FROM_NODE_RECURSIVE that is triggering the problem
> and r1567080 does say that that stmt does violate the verification
> triggers. r1567080 doesn't apply directly to 1.7.x but patching like so
> works:
>
> Index: subversion/libsvn_wc/wc-queries.sql
> ===================================================================
> --- subversion/libsvn_wc/wc-queries.sql (revision 1692140)
> +++ subversion/libsvn_wc/wc-queries.sql (working copy)
> @@ -818,6 +818,7 @@ WHERE wc_id = ?1
> OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
> AND op_depth = ?3
> AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
> +ORDER BY local_relpath
>
> -- STMT_INSERT_WORKING_NODE_FROM_BASE_COPY
> INSERT INTO nodes (
>
Hi Philip,
Your patch fixes test failures in maintainer build for me. But
r1567080 has other changes in STMT_INSERT_DELETE_FROM_NODE_RECURSIVE
query. Do we need them in 1.7.x branch?
Also comment for STMT_INSERT_DELETE_FROM_NODE_RECURSIVE query says
that STMT_INSERT_DELETE_LIST query also should be updates for any
modification of recursive query.
Index: subversion/libsvn_wc/wc-queries.sql
===================================================================
--- subversion/libsvn_wc/wc-queries.sql (revision 1692272)
+++ subversion/libsvn_wc/wc-queries.sql (working copy)
@@ -818,6 +818,7 @@
OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = ?3
AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
+ORDER BY local_relpath
-- STMT_INSERT_WORKING_NODE_FROM_BASE_COPY
INSERT INTO nodes (
@@ -1213,6 +1214,7 @@
AND op_depth = (SELECT MAX(op_depth) FROM nodes s
WHERE s.wc_id = n.wc_id
AND s.local_relpath = n.local_relpath)
+ORDER BY local_relpath
-- STMT_SELECT_DELETE_LIST
SELECT local_relpath FROM delete_list
--
Ivan Zhakov
Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Posted by Philip Martin <ph...@wandisco.com>.
"Bert Huijben" <be...@qqmail.nl> writes:
>> Index: subversion/libsvn_wc/wc-queries.sql
>> ================================================================
>> ===
>> --- subversion/libsvn_wc/wc-queries.sql (revision 1692140)
>> +++ subversion/libsvn_wc/wc-queries.sql (working copy)
>> @@ -818,6 +818,7 @@ WHERE wc_id = ?1
>> OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
>> AND op_depth = ?3
>> AND presence NOT IN ('base-deleted', 'not-present', 'excluded',
> 'absent')
>> +ORDER BY local_relpath
>>
>> -- STMT_INSERT_WORKING_NODE_FROM_BASE_COPY
>> INSERT INTO nodes (
>
> Yes this is the right fix for that problem.
>
> While the code that processes this query result doesn't rely on the ordering
> of the result, the maintainer mode checks do rely on that ordering.
>
> This fix (r1567080) is part of a batch of fixes that I found by asking
> Sqlite to return result rows backwards in all cases where queries didn't ask
> for an explicit ordering. (Now triggered by setting
> SVN_SQLITE_REVERSE_UNORDERED_SELECTS during compilation of libsvn_subr; but
> I don't think that support was already available in 1.7)
I backported SVN_SQLITE_REVERSE_UNORDERED_SELECTS to 1.7 and the above
fix to STMT_INSERT_DELETE_FROM_NODE_RECURSIVE is sufficient to PASS the
regression tests when reverse is enabled. Reverting r1687152 is the
most reliable way to avoid a regression but fixing
STMT_INSERT_DELETE_FROM_NODE_RECURSIVE is probably sufficient.
--
Philip Martin
WANdisco
RE: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Philip Martin [mailto:philip.martin@wandisco.com]
> Sent: dinsdag 21 juli 2015 19:40
> To: Ivan Zhakov <iv...@visualsvn.com>
> Cc: dev@subversion.apache.org
> Subject: Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./
STATUS
> subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql
> subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
>
> Ivan Zhakov <iv...@visualsvn.com> writes:
>
> > On 24 June 2015 at 07:00, <sv...@apache.org> wrote:
> >> Author: svn-role
> >> Date: Wed Jun 24 04:00:31 2015
> >> New Revision: 1687152
> >>
> >> URL: http://svn.apache.org/r1687152
> >> Log:
> >> Merge the 1.7.x-r1542765 branch:
> >>
> >> * r1542765, r1571214
> >> Add Sqlite index information.
> >> Justification:
> >> Adding this information explains to Sqlite how we use our indexes.
While
> >> Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't
tune
> the
> >> queries as much at that time, this information will make several
queries
> >> use indexes instead of table scans.
> >> Branch:
> >> ^/subversion/branches/1.7.x-r1542765
> >> Votes:
> >> +1: rhuijben, stefan2, brane
> >>
> > I'm getting a lot of test failures like this:
> > [[[
> > CMD: C:\Ivan\SVN\test\subversion\svn\svn.exe delete
> > svn-test-work\working_copies\update_tests-49.wc2\A --config-dir
> > C:\Ivan\SVN\test\subversion\tests\cmdline\svn-test-work\local_tmp\config
> > --password rayjandom --no-auth-cache --username jrandom exited with 1
> > <TIME = 0.035000>
> > C:\Ivan\SVN\1.7.x\subversion\svn\delete-cmd.c:92: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\svn\util.c:913: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_client\delete.c:461:
(apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:225: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:209: (apr_err=200035)
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:245: (apr_err=200035)
> > svn: E200035: sqlite: constraint failed
> > C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:575: (apr_err=200035)
> > svn: E200035: sqlite: WC DB validity check 03 failed
> > ]]]
> >
> > But all tests pass if I revert this revision.
> >
> > I'm using sqlite 3.7.5, Windows 8.1 x64.
>
> That only occurs in an SVN_DEBUG build. I can reproduce the problem
> with 3.7.5 on Linux but not with 3.8.7.1. It's
> STMT_INSERT_DELETE_FROM_NODE_RECURSIVE that is triggering the
> problem
> and r1567080 does say that that stmt does violate the verification
> triggers. r1567080 doesn't apply directly to 1.7.x but patching like so
> works:
>
> Index: subversion/libsvn_wc/wc-queries.sql
> ================================================================
> ===
> --- subversion/libsvn_wc/wc-queries.sql (revision 1692140)
> +++ subversion/libsvn_wc/wc-queries.sql (working copy)
> @@ -818,6 +818,7 @@ WHERE wc_id = ?1
> OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
> AND op_depth = ?3
> AND presence NOT IN ('base-deleted', 'not-present', 'excluded',
'absent')
> +ORDER BY local_relpath
>
> -- STMT_INSERT_WORKING_NODE_FROM_BASE_COPY
> INSERT INTO nodes (
Yes this is the right fix for that problem.
While the code that processes this query result doesn't rely on the ordering
of the result, the maintainer mode checks do rely on that ordering.
This fix (r1567080) is part of a batch of fixes that I found by asking
Sqlite to return result rows backwards in all cases where queries didn't ask
for an explicit ordering. (Now triggered by setting
SVN_SQLITE_REVERSE_UNORDERED_SELECTS during compilation of libsvn_subr; but
I don't think that support was already available in 1.7)
Bert
Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Posted by Philip Martin <ph...@wandisco.com>.
Ivan Zhakov <iv...@visualsvn.com> writes:
> On 24 June 2015 at 07:00, <sv...@apache.org> wrote:
>> Author: svn-role
>> Date: Wed Jun 24 04:00:31 2015
>> New Revision: 1687152
>>
>> URL: http://svn.apache.org/r1687152
>> Log:
>> Merge the 1.7.x-r1542765 branch:
>>
>> * r1542765, r1571214
>> Add Sqlite index information.
>> Justification:
>> Adding this information explains to Sqlite how we use our indexes. While
>> Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
>> queries as much at that time, this information will make several queries
>> use indexes instead of table scans.
>> Branch:
>> ^/subversion/branches/1.7.x-r1542765
>> Votes:
>> +1: rhuijben, stefan2, brane
>>
> I'm getting a lot of test failures like this:
> [[[
> CMD: C:\Ivan\SVN\test\subversion\svn\svn.exe delete
> svn-test-work\working_copies\update_tests-49.wc2\A --config-dir
> C:\Ivan\SVN\test\subversion\tests\cmdline\svn-test-work\local_tmp\config
> --password rayjandom --no-auth-cache --username jrandom exited with 1
> <TIME = 0.035000>
> C:\Ivan\SVN\1.7.x\subversion\svn\delete-cmd.c:92: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\svn\util.c:913: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_client\delete.c:461: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:225: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:209: (apr_err=200035)
> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:245: (apr_err=200035)
> svn: E200035: sqlite: constraint failed
> C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:575: (apr_err=200035)
> svn: E200035: sqlite: WC DB validity check 03 failed
> ]]]
>
> But all tests pass if I revert this revision.
>
> I'm using sqlite 3.7.5, Windows 8.1 x64.
That only occurs in an SVN_DEBUG build. I can reproduce the problem
with 3.7.5 on Linux but not with 3.8.7.1. It's
STMT_INSERT_DELETE_FROM_NODE_RECURSIVE that is triggering the problem
and r1567080 does say that that stmt does violate the verification
triggers. r1567080 doesn't apply directly to 1.7.x but patching like so
works:
Index: subversion/libsvn_wc/wc-queries.sql
===================================================================
--- subversion/libsvn_wc/wc-queries.sql (revision 1692140)
+++ subversion/libsvn_wc/wc-queries.sql (working copy)
@@ -818,6 +818,7 @@ WHERE wc_id = ?1
OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = ?3
AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
+ORDER BY local_relpath
-- STMT_INSERT_WORKING_NODE_FROM_BASE_COPY
INSERT INTO nodes (
--
Philip Martin
WANdisco
Re: svn commit: r1687152 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc-metadata.sql
subversion/libsvn_wc/wc_db.c subversion/libsvn_wc/wc_db.h
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 24 June 2015 at 07:00, <sv...@apache.org> wrote:
> Author: svn-role
> Date: Wed Jun 24 04:00:31 2015
> New Revision: 1687152
>
> URL: http://svn.apache.org/r1687152
> Log:
> Merge the 1.7.x-r1542765 branch:
>
> * r1542765, r1571214
> Add Sqlite index information.
> Justification:
> Adding this information explains to Sqlite how we use our indexes. While
> Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
> queries as much at that time, this information will make several queries
> use indexes instead of table scans.
> Branch:
> ^/subversion/branches/1.7.x-r1542765
> Votes:
> +1: rhuijben, stefan2, brane
>
I'm getting a lot of test failures like this:
[[[
CMD: C:\Ivan\SVN\test\subversion\svn\svn.exe delete
svn-test-work\working_copies\update_tests-49.wc2\A --config-dir
C:\Ivan\SVN\test\subversion\tests\cmdline\svn-test-work\local_tmp\config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.035000>
C:\Ivan\SVN\1.7.x\subversion\svn\delete-cmd.c:92: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\svn\util.c:913: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_client\delete.c:461: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\adm_ops.c:678: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:2578: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:1135: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_wc\wc_db.c:6277: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:225: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:209: (apr_err=200035)
C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:245: (apr_err=200035)
svn: E200035: sqlite: constraint failed
C:\Ivan\SVN\1.7.x\subversion\libsvn_subr\sqlite.c:575: (apr_err=200035)
svn: E200035: sqlite: WC DB validity check 03 failed
]]]
But all tests pass if I revert this revision.
I'm using sqlite 3.7.5, Windows 8.1 x64.
--
Ivan Zhakov