Author: hwright
Date: Wed Oct 19 12:11:06 2011
New Revision: 1186139
URL: http://svn.apache.org/viewvc?rev=1186139&view=rev
Log:
Merge r1164426, r1164614 from trunk:
* r1164426, r1164614
Fix STMT_SELECT_NODE_CHILDREN_WALKER_INFO for correctness and speed.
Justification:
Recursive info and propset don't scale well with large working copies
and may possibly act on the wrong nodes. Correctness discussion:
http://colabti.org/irclogger/irclogger_log/svn-dev?date=2011-09-02#l214
On a Linux machine with a Subversion trunk working copy on a local disk
running 'svn info --depth infinity' shows it to be 2 or 3 times faster.
On a larger working copy it's orders of magnitude faster.
Votes:
+1: philip, stsp
+1: rhuijben (works better than the original code, but there are better
ways for 1.8+)
+0: peters, gstein (looks correct, but I didn't test, and while
performance should be better, I wonder if that's
been tested at all)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 12:11:06 2011
@@ -64,4 +64,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,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,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,1156085,115
6098,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,1158924,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,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909,1183054,1183263,1183347,1185730
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,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,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,1156085,115
6098,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,1158924,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,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909,1183054,1183263,
1183347,1185730
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186139&r1=1186138&r2=1186139&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:11:06 2011
@@ -108,23 +108,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1164426, r1164614
- Fix STMT_SELECT_NODE_CHILDREN_WALKER_INFO for correctness and speed.
- Justification:
- Recursive info and propset don't scale well with large working copies
- and may possibly act on the wrong nodes. Correctness discussion:
- http://colabti.org/irclogger/irclogger_log/svn-dev?date=2011-09-02#l214
- On a Linux machine with a Subversion trunk working copy on a local disk
- running 'svn info --depth infinity' shows it to be 2 or 3 times faster.
- On a larger working copy it's orders of magnitude faster.
- Votes:
- +1: philip, stsp
- +1: rhuijben (works better than the original code, but there are better
- ways for 1.8+)
- +0: peters, gstein (looks correct, but I didn't test, and while
- performance should be better, I wonder if that's
- been tested at all)
-
* r1178942, r1182527
Fix issue #4009, "Big trivial text files merged MUCH slower than binary"
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql?rev=1186139&r1=1186138&r2=1186139&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql Wed Oct 19
12:11:06 2011
@@ -126,13 +126,9 @@ LEFT OUTER JOIN lock ON nodes.repos_id =
WHERE wc_id = ?1 AND parent_relpath = ?2
-- STMT_SELECT_NODE_CHILDREN_WALKER_INFO
-/* ### See comment at STMT_SELECT_NODE_CHILDREN_INFO.
- ### Should C code handle GROUP BY local_relpath ORDER BY op_depths DESC? */
SELECT local_relpath, op_depth, presence, kind
-FROM nodes
+FROM nodes_current
WHERE wc_id = ?1 AND parent_relpath = ?2
-GROUP BY local_relpath
-ORDER BY op_depth DESC
-- STMT_SELECT_ACTUAL_CHILDREN_INFO
SELECT prop_reject, changelist, conflict_old, conflict_new,
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=1186139&r1=1186138&r2=1186139&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 Oct 19 12:11:06
2011
@@ -6737,7 +6737,8 @@ struct read_children_info_baton_t
apr_pool_t *result_pool;
};
-/* What we really want to store about a node */
+/* What we really want to store about a node. This relies on the
+ offset of svn_wc__db_info_t being zero. */
struct read_children_info_item_t
{
struct svn_wc__db_info_t info;
@@ -7165,7 +7166,6 @@ svn_wc__db_read_children_walker_info(apr
const char *dir_relpath;
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
- apr_int64_t op_depth;
SVN_ERR_ASSERT(svn_dirent_is_absolute(dir_abspath));
@@ -7185,13 +7185,10 @@ svn_wc__db_read_children_walker_info(apr
struct svn_wc__db_walker_info_t *child;
const char *child_relpath = svn_sqlite__column_text(stmt, 0, NULL);
const char *name = svn_relpath_basename(child_relpath, NULL);
+ apr_int64_t op_depth = svn_sqlite__column_int(stmt, 1);
svn_error_t *err;
- child = apr_hash_get(*nodes, name, APR_HASH_KEY_STRING);
- if (child == NULL)
- child = apr_palloc(result_pool, sizeof(*child));
-
- op_depth = svn_sqlite__column_int(stmt, 1);
+ child = apr_palloc(result_pool, sizeof(*child));
child->status = svn_sqlite__column_token(stmt, 2, presence_map);
if (op_depth > 0)
{
