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/22 13:03:24 UTC
svn commit: r1073306 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c
wc-queries.sql wc_db_pristine.c
Author: julianfoad
Date: Tue Feb 22 12:03:24 2011
New Revision: 1073306
URL: http://svn.apache.org/viewvc?rev=1073306&view=rev
Log:
Rename some pristine store SQLite statements with a view to making future
changes easier.
* subversion/libsvn_wc/wc-queries.sql
(STMT_INSERT_PRISTINE): Rename to STMT_INSERT_OR_IGNORE_PRISTINE.
(STMT_SELECT_PRISTINE_MD5_CHECKSUM): Rename to STMT_SELECT_PRISTINE.
(STMT_SELECT_PRISTINE_SHA1_CHECKSUM): Rename to STMT_SELECT_PRISTINE_BY_MD5.
* subversion/libsvn_wc/upgrade.c
(migrate_text_bases): Adjust accordingly.
* subversion/libsvn_wc/wc_db_pristine.c
(svn_wc__db_pristine_install, svn_wc__db_pristine_get_md5,
svn_wc__db_pristine_get_sha1, svn_wc__db_pristine_check): Adjust accordingly.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1073306&r1=1073305&r2=1073306&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Feb 22 12:03:24 2011
@@ -1020,7 +1020,8 @@ migrate_text_bases(apr_hash_t **text_bas
SVN_ERR(svn_io_stat(&finfo, text_base_path, APR_FINFO_SIZE, iterpool));
/* Insert a row into the pristine table. */
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_INSERT_PRISTINE));
+ SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
+ STMT_INSERT_OR_IGNORE_PRISTINE));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 1, sha1_checksum, iterpool));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 2, md5_checksum, iterpool));
SVN_ERR(svn_sqlite__bind_int64(stmt, 3, finfo.size));
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1073306&r1=1073305&r2=1073306&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Tue Feb 22 12:03:24 2011
@@ -435,16 +435,16 @@ SELECT id, work FROM work_queue ORDER BY
-- STMT_DELETE_WORK_ITEM
DELETE FROM work_queue WHERE id = ?1;
--- STMT_INSERT_PRISTINE
+-- STMT_INSERT_OR_IGNORE_PRISTINE
INSERT OR IGNORE INTO pristine (checksum, md5_checksum, size, refcount)
VALUES (?1, ?2, ?3, 0);
--- STMT_SELECT_PRISTINE_MD5_CHECKSUM
+-- STMT_SELECT_PRISTINE
SELECT md5_checksum
FROM pristine
WHERE checksum = ?1
--- STMT_SELECT_PRISTINE_SHA1_CHECKSUM
+-- STMT_SELECT_PRISTINE_BY_MD5
SELECT checksum
FROM pristine
WHERE md5_checksum = ?1
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c?rev=1073306&r1=1073305&r2=1073306&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c Tue Feb 22 12:03:24 2011
@@ -288,7 +288,7 @@ svn_wc__db_pristine_install(svn_wc__db_t
scratch_pool));
SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
- STMT_INSERT_PRISTINE));
+ STMT_INSERT_OR_IGNORE_PRISTINE));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 1, sha1_checksum, scratch_pool));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 2, md5_checksum, scratch_pool));
SVN_ERR(svn_sqlite__bind_int64(stmt, 3, finfo.size));
@@ -321,7 +321,7 @@ svn_wc__db_pristine_get_md5(const svn_ch
VERIFY_USABLE_WCROOT(pdh->wcroot);
SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
- STMT_SELECT_PRISTINE_MD5_CHECKSUM));
+ STMT_SELECT_PRISTINE));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 1, sha1_checksum, scratch_pool));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (!have_row)
@@ -361,7 +361,7 @@ svn_wc__db_pristine_get_sha1(const svn_c
VERIFY_USABLE_WCROOT(pdh->wcroot);
SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
- STMT_SELECT_PRISTINE_SHA1_CHECKSUM));
+ STMT_SELECT_PRISTINE_BY_MD5));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 1, md5_checksum, scratch_pool));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (!have_row)
@@ -538,7 +538,7 @@ svn_wc__db_pristine_check(svn_boolean_t
/* Check that there is an entry in the PRISTINE table. */
SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
- STMT_SELECT_PRISTINE_MD5_CHECKSUM));
+ STMT_SELECT_PRISTINE));
SVN_ERR(svn_sqlite__bind_checksum(stmt, 1, sha1_checksum, scratch_pool));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
SVN_ERR(svn_sqlite__reset(stmt));