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 2011/02/20 12:29:53 UTC
svn commit: r1072564 - in
/subversion/branches/integrate-partial-getter/subversion:
libsvn_fs_fs/fs_fs.c libsvn_subr/cache-membuffer.c
Author: stefan2
Date: Sun Feb 20 11:29:53 2011
New Revision: 1072564
URL: http://svn.apache.org/viewvc?rev=1072564&view=rev
Log:
Fix merge artifacts.
* subversion/libsvn_fs_fs/fs_fs.c:
add missing include
* subversion/libsvn_subr/cache-membuffer.c
(membuffer_cache_get_partial): remove duplicate definition
Modified:
subversion/branches/integrate-partial-getter/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/integrate-partial-getter/subversion/libsvn_subr/cache-membuffer.c
Modified: subversion/branches/integrate-partial-getter/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-partial-getter/subversion/libsvn_fs_fs/fs_fs.c?rev=1072564&r1=1072563&r2=1072564&view=diff
==============================================================================
--- subversion/branches/integrate-partial-getter/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/integrate-partial-getter/subversion/libsvn_fs_fs/fs_fs.c Sun Feb 20 11:29:53 2011
@@ -64,6 +64,7 @@
#include "../libsvn_fs/fs-loader.h"
#include "svn_private_config.h"
+#include "temp_serializer.h"
/* An arbitrary maximum path length, so clients can't run us out of memory
* by giving us arbitrarily large paths. */
Modified: subversion/branches/integrate-partial-getter/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-partial-getter/subversion/libsvn_subr/cache-membuffer.c?rev=1072564&r1=1072563&r2=1072564&view=diff
==============================================================================
--- subversion/branches/integrate-partial-getter/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/integrate-partial-getter/subversion/libsvn_subr/cache-membuffer.c Sun Feb 20 11:29:53 2011
@@ -1029,48 +1029,6 @@ membuffer_cache_get_partial(svn_membuffe
return unlock_cache(cache, err);
}
-svn_error_t*
-membuffer_cache_get_partial(svn_membuffer_t *cache,
- const void *key,
- apr_size_t key_len,
- void **item,
- svn_cache__partial_getter_func_t deserializer,
- void *baton,
- apr_pool_t *pool)
-{
- apr_uint32_t group_index;
- unsigned char to_find[KEY_SIZE];
- entry_t *entry;
- svn_error_t *err = SVN_NO_ERROR;
-
- group_index = get_group_index(cache, key, key_len, to_find, pool);
-
- SVN_ERR(lock_cache(cache));
-
- entry = find_entry(cache, group_index, to_find, FALSE);
- cache->total_reads++;
- if (entry == NULL)
- {
- *item = NULL;
- }
- else
- {
- entry->hit_count++;
- cache->hit_count++;
- cache->total_hits++;
-
- err = deserializer(item,
- (const char*)cache->data + entry->offset,
- entry->size,
- baton,
- pool);
- }
-
- /* done here -> unlock the cache
- */
- return unlock_cache(cache, err);
-}
-
/* Implement the svn_cache__t interface on top of a shared membuffer cache.
*
* Because membuffer caches tend to be very large, there will be rather few