subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1658522 - in /subversion/branches/fsx-1.10/subversion/libsvn_fs_x: dag_cache.h tree.c
Date Mon, 09 Feb 2015 18:43:39 GMT
Author: stefan2
Date: Mon Feb  9 18:43:38 2015
New Revision: 1658522

URL: http://svn.apache.org/r1658522
Log:
On the fsx-1.10 branch: Make the former dag_node_cache_invalidate part of
the internal DAG cache API.

* subversion/libsvn_fs_x/dag_cache.h
  (svn_fs_x__create_dag_cache): Rename and move declaration here from tree.c .

* subversion/libsvn_fs_x/tree.c
  (dag_node_cache_invalidate): Rename to ...
  (svn_fs_x__invalidate_dag_cache): ... this and make it non-static.
  (x_delete_node,
   copy_helper): Update callers.

Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h?rev=1658522&r1=1658521&r2=1658522&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h Mon Feb  9 18:43:38 2015
@@ -33,6 +33,13 @@ extern "C" {
 svn_fs_x__dag_cache_t*
 svn_fs_x__create_dag_cache(apr_pool_t *result_pool);
 
+/* Invalidate cache entries for PATH and any of its children.  This
+   should *only* be called on a transaction root! */
+svn_error_t *
+svn_fs_x__invalidate_dag_cache(svn_fs_root_t *root,
+                               const char *path,
+                               apr_pool_t *scratch_pool);
+
 /* Flag type used in svn_fs_x__dag_path_t to determine where the
    respective node got its copy ID from. */
 typedef enum svn_fs_x__copy_id_inherit_t

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c?rev=1658522&r1=1658521&r2=1658522&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c Mon Feb  9 18:43:38 2015
@@ -464,12 +464,10 @@ find_descendants_in_cache(void *baton,
   return SVN_NO_ERROR;
 }
 
-/* Invalidate cache entries for PATH and any of its children.  This
-   should *only* be called on a transaction root! */
-static svn_error_t *
-dag_node_cache_invalidate(svn_fs_root_t *root,
-                          const char *path,
-                          apr_pool_t *scratch_pool)
+svn_error_t *
+svn_fs_x__invalidate_dag_cache(svn_fs_root_t *root,
+                               const char *path,
+                               apr_pool_t *scratch_pool)
 {
   fdic_baton_t b;
   svn_cache__t *cache;
@@ -2426,9 +2424,9 @@ x_delete_node(svn_fs_root_t *root,
                                txn_id, subpool));
 
   /* Remove this node and any children from the path cache. */
-  SVN_ERR(dag_node_cache_invalidate(root, parent_path_path(dag_path,
-                                                           subpool),
-                                    subpool));
+  SVN_ERR(svn_fs_x__invalidate_dag_cache(root,
+                                         parent_path_path(dag_path, subpool),
+                                         subpool));
 
   /* Update mergeinfo counts for parents */
   if (mergeinfo_count > 0)
@@ -2562,10 +2560,10 @@ copy_helper(svn_fs_root_t *from_root,
                                  txn_id, scratch_pool));
 
       if (kind != svn_fs_path_change_add)
-        SVN_ERR(dag_node_cache_invalidate(to_root,
-                                          parent_path_path(to_dag_path,
-                                                           scratch_pool),
-                                          scratch_pool));
+        SVN_ERR(svn_fs_x__invalidate_dag_cache(to_root,
+                                               parent_path_path(to_dag_path,
+                                                                scratch_pool),
+                                               scratch_pool));
 
       if (mergeinfo_start != mergeinfo_end)
         SVN_ERR(increment_mergeinfo_up_tree(to_dag_path->parent,



Mime
View raw message