You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/02/21 15:55:05 UTC
svn commit: r1072997 - in /subversion/trunk/subversion:
include/private/svn_sqlite.h libsvn_subr/sqlite.c
Author: julianfoad
Date: Mon Feb 21 14:55:04 2011
New Revision: 1072997
URL: http://svn.apache.org/viewvc?rev=1072997&view=rev
Log:
Create a new function similar to svn_sqlite__with_transaction() but that
immediately acquires a 'RESERVED' lock rather than using the default
deferred locking scheme.
* subversion/include/private/svn_sqlite.h,
subversion/libsvn_subr/sqlite.c
(svn_sqlite__with_immediate_transaction): New function.
Modified:
subversion/trunk/subversion/include/private/svn_sqlite.h
subversion/trunk/subversion/libsvn_subr/sqlite.c
Modified: subversion/trunk/subversion/include/private/svn_sqlite.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_sqlite.h?rev=1072997&r1=1072996&r2=1072997&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_sqlite.h (original)
+++ subversion/trunk/subversion/include/private/svn_sqlite.h Mon Feb 21 14:55:04 2011
@@ -317,6 +317,14 @@ svn_sqlite__with_transaction(svn_sqlite_
svn_sqlite__transaction_callback_t cb_func,
void *cb_baton, apr_pool_t *scratch_pool);
+/* Like svn_sqlite__with_transaction(), but takes out a 'RESERVED' lock
+ immediately, instead of using the default deferred locking scheme. */
+svn_error_t *
+svn_sqlite__with_immediate_transaction(svn_sqlite__db_t *db,
+ svn_sqlite__transaction_callback_t cb_func,
+ void *cb_baton,
+ apr_pool_t *scratch_pool);
+
/* Helper function to handle several SQLite operations inside a shared lock.
This callback is similar to svn_sqlite__with_transaction(), but can be
Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1072997&r1=1072996&r2=1072997&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Mon Feb 21 14:55:04 2011
@@ -999,15 +999,16 @@ svn_sqlite__close(svn_sqlite__db_t *db)
return svn_error_wrap_apr(result, NULL);
}
-svn_error_t *
-svn_sqlite__with_transaction(svn_sqlite__db_t *db,
- svn_sqlite__transaction_callback_t cb_func,
- void *cb_baton,
- apr_pool_t *scratch_pool /* NULL allowed */)
+/* The body of svn_sqlite__with_transaction() and
+ svn_sqlite__with_immediate_transaction(), which see. */
+static svn_error_t *
+with_transaction(svn_sqlite__db_t *db,
+ svn_sqlite__transaction_callback_t cb_func,
+ void *cb_baton,
+ apr_pool_t *scratch_pool /* NULL allowed */)
{
svn_error_t *err;
- SVN_ERR(exec_sql(db, "BEGIN TRANSACTION;"));
err = cb_func(cb_baton, db, scratch_pool);
/* Commit or rollback the sqlite transaction. */
@@ -1063,6 +1064,28 @@ svn_sqlite__with_transaction(svn_sqlite_
}
svn_error_t *
+svn_sqlite__with_transaction(svn_sqlite__db_t *db,
+ svn_sqlite__transaction_callback_t cb_func,
+ void *cb_baton,
+ apr_pool_t *scratch_pool /* NULL allowed */)
+{
+ SVN_ERR(exec_sql(db, "BEGIN TRANSACTION;"));
+ return svn_error_return(with_transaction(db, cb_func, cb_baton,
+ scratch_pool));
+}
+
+svn_error_t *
+svn_sqlite__with_immediate_transaction(svn_sqlite__db_t *db,
+ svn_sqlite__transaction_callback_t cb_func,
+ void *cb_baton,
+ apr_pool_t *scratch_pool /* NULL allowed */)
+{
+ SVN_ERR(exec_sql(db, "BEGIN IMMEDIATE TRANSACTION;"));
+ return svn_error_return(with_transaction(db, cb_func, cb_baton,
+ scratch_pool));
+}
+
+svn_error_t *
svn_sqlite__with_lock(svn_sqlite__db_t *db,
svn_sqlite__transaction_callback_t cb_func,
void *cb_baton,