subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1388205 - in /subversion/branches/10Gb/subversion: libsvn_ra_local/ra_plugin.c mod_dav_svn/reports/update.c tests/libsvn_repos/repos-test.c
Date Thu, 20 Sep 2012 20:38:33 GMT
Author: stefan2
Date: Thu Sep 20 20:38:33 2012
New Revision: 1388205

URL: http://svn.apache.org/viewvc?rev=1388205&view=rev
Log:
On the 10Gb branch:
update remaining callers to use svn_repos_begin_report3.

* subversion/libsvn_ra_local/ra_plugin.c
  (make_reporter): use a large-ish threshold for local access

* subversion/mod_dav_svn/reports/update.c
  (dav_svn__update_report): disable zero-copy code for HTTP

* subversion/tests/libsvn_repos/repos-test.c
  (rmlocks, 
   reporter_depth_exclude): use different limits to increase test coverage

Modified:
    subversion/branches/10Gb/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/10Gb/subversion/mod_dav_svn/reports/update.c
    subversion/branches/10Gb/subversion/tests/libsvn_repos/repos-test.c

Modified: subversion/branches/10Gb/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/10Gb/subversion/libsvn_ra_local/ra_plugin.c?rev=1388205&r1=1388204&r2=1388205&view=diff
==============================================================================
--- subversion/branches/10Gb/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/10Gb/subversion/libsvn_ra_local/ra_plugin.c Thu Sep 20 20:38:33 2012
@@ -337,7 +337,7 @@ make_reporter(svn_ra_session_t *session,
                                               pool));
 
   /* Build a reporter baton. */
-  SVN_ERR(svn_repos_begin_report2(&rbaton,
+  SVN_ERR(svn_repos_begin_report3(&rbaton,
                                   revision,
                                   sess->repos,
                                   sess->fs_path->data,
@@ -351,6 +351,8 @@ make_reporter(svn_ra_session_t *session,
                                   edit_baton,
                                   NULL,
                                   NULL,
+                                  1024 * 1024,  /* process-local transfers
+                                                   should be fast */
                                   pool));
 
   /* Wrap the report baton given us by the repos layer with our own

Modified: subversion/branches/10Gb/subversion/mod_dav_svn/reports/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/10Gb/subversion/mod_dav_svn/reports/update.c?rev=1388205&r1=1388204&r2=1388205&view=diff
==============================================================================
--- subversion/branches/10Gb/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/branches/10Gb/subversion/mod_dav_svn/reports/update.c Thu Sep 20 20:38:33 2012
@@ -1219,7 +1219,7 @@ dav_svn__update_report(const dav_resourc
   editor->close_file = upd_close_file;
   editor->absent_file = upd_absent_file;
   editor->close_edit = upd_close_edit;
-  if ((serr = svn_repos_begin_report2(&rbaton, revnum,
+  if ((serr = svn_repos_begin_report3(&rbaton, revnum,
                                       repos->repos,
                                       src_path, target,
                                       dst_path,
@@ -1230,6 +1230,7 @@ dav_svn__update_report(const dav_resourc
                                       editor, &uc,
                                       dav_svn__authz_read_func(&arb),
                                       &arb,
+                                      0,  /* disable zero-copy for now */
                                       resource->pool)))
     {
       return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,

Modified: subversion/branches/10Gb/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/10Gb/subversion/tests/libsvn_repos/repos-test.c?rev=1388205&r1=1388204&r2=1388205&view=diff
==============================================================================
--- subversion/branches/10Gb/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/10Gb/subversion/tests/libsvn_repos/repos-test.c Thu Sep 20 20:38:33
2012
@@ -1077,9 +1077,10 @@ rmlocks(const svn_test_opts_t *opts,
     SVN_ERR(create_rmlocks_editor(&editor, &edit_baton, &removed, subpool));
 
     /* Report what we have. */
-    SVN_ERR(svn_repos_begin_report2(&report_baton, 1, repos, "/", "", NULL,
+    SVN_ERR(svn_repos_begin_report3(&report_baton, 1, repos, "/", "", NULL,
                                     FALSE, svn_depth_infinity, FALSE, FALSE,
-                                    editor, edit_baton, NULL, NULL, subpool));
+                                    editor, edit_baton, NULL, NULL, 1024,
+                                    subpool));
     SVN_ERR(svn_repos_set_path3(report_baton, "", 1,
                                 svn_depth_infinity,
                                 FALSE, NULL, subpool));
@@ -2065,9 +2066,10 @@ reporter_depth_exclude(const svn_test_op
   SVN_ERR(dir_delta_get_editor(&editor, &edit_baton, fs,
                                txn_root, "", subpool));
 
-  SVN_ERR(svn_repos_begin_report2(&report_baton, 2, repos, "/", "", NULL,
+  SVN_ERR(svn_repos_begin_report3(&report_baton, 2, repos, "/", "", NULL,
                                   TRUE, svn_depth_infinity, FALSE, FALSE,
-                                  editor, edit_baton, NULL, NULL, subpool));
+                                  editor, edit_baton, NULL, NULL, 16,
+                                  subpool));
   SVN_ERR(svn_repos_set_path3(report_baton, "", 1,
                               svn_depth_infinity,
                               FALSE, NULL, subpool));
@@ -2122,9 +2124,10 @@ reporter_depth_exclude(const svn_test_op
   SVN_ERR(dir_delta_get_editor(&editor, &edit_baton, fs,
                                txn_root, "", subpool));
 
-  SVN_ERR(svn_repos_begin_report2(&report_baton, 2, repos, "/", "", NULL,
+  SVN_ERR(svn_repos_begin_report3(&report_baton, 2, repos, "/", "", NULL,
                                   TRUE, svn_depth_infinity, FALSE, FALSE,
-                                  editor, edit_baton, NULL, NULL, subpool));
+                                  editor, edit_baton, NULL, NULL, 20,
+                                  subpool));
   SVN_ERR(svn_repos_set_path3(report_baton, "", 1,
                               svn_depth_infinity,
                               FALSE, NULL, subpool));



Mime
View raw message