Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C0C669765 for ; Wed, 19 Oct 2011 03:56:13 +0000 (UTC) Received: (qmail 19453 invoked by uid 500); 19 Oct 2011 03:56:13 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 19428 invoked by uid 500); 19 Oct 2011 03:56:12 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 19419 invoked by uid 99); 19 Oct 2011 03:56:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 03:56:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 03:56:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 24E1C2388A32 for ; Wed, 19 Oct 2011 03:55:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1185958 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/mergeinfo.c Date: Wed, 19 Oct 2011 03:55:45 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111019035546.24E1C2388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Oct 19 03:55:45 2011 New Revision: 1185958 URL: http://svn.apache.org/viewvc?rev=1185958&view=rev Log: Merge r1167681 from trunk: * r1167681 Don't invoke quicksort unnecessarily when combining mergeinfo rangelists. Justification: This speeds up --reintegrate merges, especially the pathological case described here: http://svn.haxx.se/dev/archive-2011-09/0247.shtml Votes: +1: stsp, rhuijben, pburba Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 03:55:45 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,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1179680,1179767,1181155,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,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,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=1185958&r1=1185957&r2=1185958&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Oct 19 03:55:45 2011 @@ -148,14 +148,6 @@ Veto-blocked changes: Approved changes: ================= - * r1167681 - Don't invoke quicksort unnecessarily when combining mergeinfo rangelists. - Justification: - This speeds up --reintegrate merges, especially the pathological case - described here: http://svn.haxx.se/dev/archive-2011-09/0247.shtml - Votes: - +1: stsp, rhuijben, pburba - * r1181609 Fill in the repos_* fields of svn_wc_status3_t for nodes that only exist in the repository. Modified: subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c?rev=1185958&r1=1185957&r2=1185958&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c Wed Oct 19 03:55:45 2011 @@ -300,6 +300,7 @@ combine_with_lastrange(const svn_merge_r intersect but have differing inheritability. Check for the first case as that is easy to handle. */ intersection_type_t intersection_type; + svn_boolean_t sorted = FALSE; SVN_ERR(get_type_of_intersection(new_range, lastrange, &intersection_type)); @@ -311,12 +312,15 @@ combine_with_lastrange(const svn_merge_r just push NEW_RANGE only RANGELIST. */ APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = svn_merge_range_dup(new_range, result_pool); + sorted = (svn_sort_compare_ranges(&lastrange, + &new_range) < 0); break; case svn__equal_intersection: /* They range are equal so all we do is force the inheritability of lastrange to true. */ lastrange->inheritable = TRUE; + sorted = TRUE; break; case svn__adjoining_intersection: @@ -324,6 +328,8 @@ combine_with_lastrange(const svn_merge_r onto RANGELIST. */ APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = svn_merge_range_dup(new_range, result_pool); + sorted = (svn_sort_compare_ranges(&lastrange, + &new_range) < 0); break; case svn__overlapping_intersection: @@ -358,8 +364,11 @@ combine_with_lastrange(const svn_merge_r /* Push everything back onto RANGELIST. */ APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r1; + sorted = (svn_sort_compare_ranges(&lastrange, + &r1) < 0); APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r2; - + if (sorted) + sorted = (svn_sort_compare_ranges(&r1, &r2) < 0); break; } @@ -424,19 +433,35 @@ combine_with_lastrange(const svn_merge_r /* Push everything back onto RANGELIST. */ APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r1; + sorted = (svn_sort_compare_ranges(&lastrange, &r1) < 0); if (r2) - APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r2; + { + APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r2; + if (sorted) + sorted = (svn_sort_compare_ranges(&r1, &r2) < 0); + } if (r3) - APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r3; - + { + APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = r3; + if (sorted) + { + if (r2) + sorted = (svn_sort_compare_ranges(&r2, + &r3) < 0); + else + sorted = (svn_sort_compare_ranges(&r1, + &r3) < 0); + } + } break; } } /* Some of the above cases might have put *RANGELIST out of order, so re-sort.*/ - qsort(rangelist->elts, rangelist->nelts, rangelist->elt_size, - svn_sort_compare_ranges); + if (!sorted) + qsort(rangelist->elts, rangelist->nelts, rangelist->elt_size, + svn_sort_compare_ranges); } }