You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/05/18 05:46:58 UTC
svn commit: r1679923 - in /subversion/trunk/subversion/libsvn_fs_fs:
temp_serializer.c temp_serializer.h transaction.c
Author: stefan2
Date: Mon May 18 03:46:58 2015
New Revision: 1679923
URL: http://svn.apache.org/r1679923
Log:
Continue work on the fs-test 44 issue in FSFS:
Begin work on the cache updater code. Remove stale cache entries from cache,
i.e. those who got changed on disk by 3rd parties, from cache instead of
"updating" them.
At this point, only the updater code needs to be completed (write new file
size to cache) and the partial reader for single entries must be updated
to check for the file size by further patches.
* subversion/libsvn_fs_fs/temp_serializer.h
(svn_fs_fs__extract_dir_filesize): Declare accessor function that reads
the txn-filesize of a cached directory.
* subversion/libsvn_fs_fs/temp_serializer.c
(svn_fs_fs__extract_dir_filesize): Implement.
* subversion/libsvn_fs_fs/transaction.c
(svn_fs_fs__set_entry): Detect stale cache entries and remove them.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1679923&r1=1679922&r2=1679923&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Mon May 18 03:46:58 2015
@@ -814,6 +814,20 @@ svn_fs_fs__get_sharded_offset(void **out
return SVN_NO_ERROR;
}
+svn_error_t *
+svn_fs_fs__extract_dir_filesize(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool)
+{
+ const dir_data_t *dir_data = data;
+
+ *(svn_filesize_t *)out = dir_data->txn_filesize;
+
+ return SVN_NO_ERROR;
+}
+
/* Utility function that returns the lowest index of the first entry in
* *ENTRIES that points to a dir entry with a name equal or larger than NAME.
* If an exact match has been found, *FOUND will be set to TRUE. COUNT is
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h?rev=1679923&r1=1679922&r2=1679923&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h Mon May 18 03:46:58 2015
@@ -221,6 +221,18 @@ svn_fs_fs__get_sharded_offset(void **out
apr_pool_t *pool);
/**
+ * Implements #svn_cache__partial_getter_func_t.
+ * Set (svn_filesize_t) @a *out to the filesize info stored with the
+ * serialized directory in @a data of @a data_len. @a baton is unused.
+ */
+svn_error_t *
+svn_fs_fs__extract_dir_filesize(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool);
+
+/**
* Implements #svn_cache__partial_getter_func_t for a single
* #svn_fs_dirent_t within a serialized directory contents hash,
* identified by its name (const char @a *baton).
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1679923&r1=1679922&r2=1679923&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Mon May 18 03:46:58 2015
@@ -1524,10 +1524,43 @@ svn_fs_fs__set_entry(svn_fs_t *fs,
}
else
{
+ const svn_io_dirent2_t *dirent;
+
/* The directory rep is already mutable, so just open it for append. */
SVN_ERR(svn_io_file_open(&file, filename, APR_WRITE | APR_APPEND,
APR_OS_DEFAULT, subpool));
out = svn_stream_from_aprfile2(file, TRUE, subpool);
+
+ /* If the cache contents is stale, drop it.
+ *
+ * Note that the directory file is append-only, i.e. if the size
+ * did not change, the contents didn't either. */
+ if (ffd->txn_dir_cache)
+ {
+ const char *key
+ = svn_fs_fs__id_unparse(parent_noderev->id, subpool)->data;
+ svn_boolean_t found;
+ svn_filesize_t filesize;
+
+ /* Get the file size that corresponds to the cached contents
+ * (if any). */
+ SVN_ERR(svn_cache__get_partial((void **)&filesize, &found,
+ ffd->txn_dir_cache, key,
+ svn_fs_fs__extract_dir_filesize,
+ NULL, subpool));
+
+ /* File size info still matches?
+ * If not, we need to drop the cache entry. */
+ if (found)
+ {
+ SVN_ERR(svn_io_stat_dirent2(&dirent, filename, FALSE, FALSE,
+ subpool, subpool));
+
+ if (filesize != dirent->filesize)
+ SVN_ERR(svn_cache__set(ffd->txn_dir_cache, key, NULL,
+ subpool));
+ }
+ }
}
/* Append an incremental hash entry for the entry change. */