diff options
Diffstat (limited to 'subversion/libsvn_wc')
| -rw-r--r-- | subversion/libsvn_wc/deprecated.c | 2 | ||||
| -rw-r--r-- | subversion/libsvn_wc/wc-checks.h | 2 | ||||
| -rw-r--r-- | subversion/libsvn_wc/wc-metadata.h | 2 | ||||
| -rw-r--r-- | subversion/libsvn_wc/wc-queries.h | 5 | ||||
| -rw-r--r-- | subversion/libsvn_wc/wc-queries.sql | 5 | ||||
| -rw-r--r-- | subversion/libsvn_wc/wc_db_pristine.c | 9 |
6 files changed, 17 insertions, 8 deletions
diff --git a/subversion/libsvn_wc/deprecated.c b/subversion/libsvn_wc/deprecated.c index e6db56887660..dcb5e42f749b 100644 --- a/subversion/libsvn_wc/deprecated.c +++ b/subversion/libsvn_wc/deprecated.c @@ -2051,7 +2051,7 @@ svn_wc_get_diff_editor6(const svn_delta_editor_t **editor, wc_ctx, anchor_abspath, target, depth, - use_git_diff_format, use_text_base, + ignore_ancestry, use_text_base, reverse_order, server_performs_filtering, changelist_filter, diff_processor, diff --git a/subversion/libsvn_wc/wc-checks.h b/subversion/libsvn_wc/wc-checks.h index 5888626ac030..35f15336f3fd 100644 --- a/subversion/libsvn_wc/wc-checks.h +++ b/subversion/libsvn_wc/wc-checks.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.9.2/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.9.4/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_VERIFICATION_TRIGGERS 0 diff --git a/subversion/libsvn_wc/wc-metadata.h b/subversion/libsvn_wc/wc-metadata.h index 8367adc6ec37..7b74d83740d5 100644 --- a/subversion/libsvn_wc/wc-metadata.h +++ b/subversion/libsvn_wc/wc-metadata.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.9.2/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.9.4/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA 0 diff --git a/subversion/libsvn_wc/wc-queries.h b/subversion/libsvn_wc/wc-queries.h index 523a6a169076..ad5ccb57355d 100644 --- a/subversion/libsvn_wc/wc-queries.h +++ b/subversion/libsvn_wc/wc-queries.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.9.2/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.9.4/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_SELECT_NODE_INFO 0 @@ -1623,7 +1623,8 @@ #define STMT_PRAGMA_LOCKING_MODE 151 #define STMT_151_INFO {"STMT_PRAGMA_LOCKING_MODE", NULL} #define STMT_151 \ - "PRAGMA locking_mode = exclusive " \ + "PRAGMA locking_mode = exclusive; " \ + "PRAGMA journal_mode = DELETE " \ "" #define STMT_INSERT_ACTUAL_NODE 152 diff --git a/subversion/libsvn_wc/wc-queries.sql b/subversion/libsvn_wc/wc-queries.sql index 5d8dbe375c74..3a8bf92a2776 100644 --- a/subversion/libsvn_wc/wc-queries.sql +++ b/subversion/libsvn_wc/wc-queries.sql @@ -1286,7 +1286,10 @@ WHERE (wc_id = ?1 AND local_relpath = ?2) OR (wc_id = ?1 AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)) -- STMT_PRAGMA_LOCKING_MODE -PRAGMA locking_mode = exclusive +PRAGMA locking_mode = exclusive; +/* Testing shows DELETE is faster than TRUNCATE on NFS and + exclusive-locking is mostly used on remote file systems. */ +PRAGMA journal_mode = DELETE /* ------------------------------------------------------------------------- */ diff --git a/subversion/libsvn_wc/wc_db_pristine.c b/subversion/libsvn_wc/wc_db_pristine.c index bdfd46aa5c9a..9118d7068810 100644 --- a/subversion/libsvn_wc/wc_db_pristine.c +++ b/subversion/libsvn_wc/wc_db_pristine.c @@ -870,6 +870,7 @@ pristine_cleanup_wcroot(svn_wc__db_wcroot_t *wcroot, { svn_sqlite__stmt_t *stmt; svn_error_t *err = NULL; + apr_pool_t *iterpool = svn_pool_create(scratch_pool); /* Find each unreferenced pristine in the DB and remove it. */ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, @@ -879,16 +880,20 @@ pristine_cleanup_wcroot(svn_wc__db_wcroot_t *wcroot, svn_boolean_t have_row; const svn_checksum_t *sha1_checksum; + svn_pool_clear(iterpool); + SVN_ERR(svn_sqlite__step(&have_row, stmt)); if (! have_row) break; SVN_ERR(svn_sqlite__column_checksum(&sha1_checksum, stmt, 0, - scratch_pool)); + iterpool)); err = pristine_remove_if_unreferenced(wcroot, sha1_checksum, - scratch_pool); + iterpool); } + svn_pool_destroy(iterpool); + return svn_error_trace( svn_error_compose_create(err, svn_sqlite__reset(stmt))); } |