[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH][merge-tracking]Remove svn_fs_merge_info__create_index thanks to r22885

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-01-04 16:36:05 CET

Hi All,
Find the attached patch and log.

With regards
Kamesh Jayachandran

[[[

r22885 made the mergeinfo creation part of regular database open
operation. So we don't need 'svn_fs_merge_info__create_index' anymore.

* subversion/libsvn_fs_util/merge-info-sqlite-index.c
  (global): Remove svn_fs_merge_info__create_index implementation.

* subversion/include/private/svn_fs_merge_info.h
  (global): Remove prototype declaration of 'svn_fs_merge_info__create_index'.

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__create):
   Remove call to 'svn_fs_merge_info__create_index'.

* subversion/libsvn_fs_base/fs.c
  (base_create):
   Remove call to 'svn_fs_merge_info__create_index'.

Patch by: kameshj
]]]

Index: subversion/libsvn_fs_base/fs.c
===================================================================
--- subversion/libsvn_fs_base/fs.c (revision 22899)
+++ subversion/libsvn_fs_base/fs.c (working copy)
@@ -645,7 +645,6 @@
     (svn_path_join(fs->path, FORMAT_FILE, pool), format, pool);
   if (svn_err) goto error;
 
- SVN_ERR(svn_fs_merge_info__create_index(path, pool));
   return SVN_NO_ERROR;
 
 error:
Index: subversion/libsvn_fs_util/merge-info-sqlite-index.c
===================================================================
--- subversion/libsvn_fs_util/merge-info-sqlite-index.c (revision 22899)
+++ subversion/libsvn_fs_util/merge-info-sqlite-index.c (working copy)
@@ -169,17 +169,6 @@
   return err;
 }
 
-/* Create an sqlite DB for our merge info index under PATH. Use POOL
- for temporary allocations. */
-svn_error_t *
-svn_fs_merge_info__create_index(const char *path, apr_pool_t *pool)
-{
- sqlite3 *db;
- SVN_ERR(open_db(&db, path, pool));
- SQLITE_ERR(sqlite3_close(db), db);
- return SVN_NO_ERROR;
-}
-
 /* Insert the necessary indexing data into the DB for all the merges
    on PATH as of NEW_REV, which is provided (unparsed) in MINFOSTRING.
    Use POOL for temporary allocations.*/
Index: subversion/include/private/svn_fs_merge_info.h
===================================================================
--- subversion/include/private/svn_fs_merge_info.h (revision 22899)
+++ subversion/include/private/svn_fs_merge_info.h (working copy)
@@ -27,11 +27,6 @@
 /* The name of the sqlite merge info database. */
 #define SVN_FS_MERGE_INFO__DB_NAME "mergeinfo.db"
 
-/* Create the merge info index under PATH. Use POOL for any temporary
- allocations. */
-svn_error_t *
-svn_fs_merge_info__create_index(const char *path, apr_pool_t *pool);
-
 /* Update the merge info index according to the changes made in
    transaction TXN for revision NEW_REV, if TXN_CONTAINS_MERGE_INFO is
    TRUE. Use POOL for any temporary allocations. */
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c (revision 22899)
+++ subversion/libsvn_fs_fs/fs_fs.c (working copy)
@@ -4574,7 +4574,6 @@
           (path_format(fs, pool), format, pool));
   ((fs_fs_data_t *) fs->fsap_data)->format = format;
  
- SVN_ERR(svn_fs_merge_info__create_index(path, pool));
   return SVN_NO_ERROR;
 }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 4 16:35:48 2007

This is an archived mail posted to the Subversion Dev mailing list.