Author: rhuijben
Date: Thu Dec 13 13:38:45 2012
New Revision: 1421289
URL: http://svn.apache.org/viewvc?rev=1421289&view=rev
Log:
Move an upgrade only sql statement to the upgrade file to avoid having to
classify it as a slow statement (and to avoid reusing it as proper statement).
* subversion/libsvn_wc/upgrade.c
(bump_to_23): Update caller.
* subversion/libsvn_wc/wc-metadata.sql
(STMT_UPGRADE_23_HAS_WORKING_NODES): New statement based on ...
* subversion/libsvn_wc/wc-queries.sql
(STMT_HAS_WORKING_NODES): ... this statement.
* subversion/tests/libsvn_wc/wc-queries-test.c
(slow_statements): Remove STMT_HAS_WORKING_NODES.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1421289&r1=1421288&r2=1421289&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Dec 13 13:38:45 2012
@@ -1169,7 +1169,8 @@ bump_to_23(void *baton, svn_sqlite__db_t
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_HAS_WORKING_NODES));
+ SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
+ STMT_UPGRADE_23_HAS_WORKING_NODES));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
SVN_ERR(svn_sqlite__reset(stmt));
if (have_row)
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1421289&r1=1421288&r2=1421289&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Dec 13 13:38:45
2012
@@ -670,6 +670,9 @@ PRAGMA user_version = 22;
-- STMT_UPGRADE_TO_23
PRAGMA user_version = 23;
+-- STMT_UPGRADE_23_HAS_WORKING_NODES
+SELECT 1 FROM nodes WHERE op_depth > 0
+LIMIT 1
/* ------------------------------------------------------------------------- */
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1421289&r1=1421288&r2=1421289&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Dec 13 13:38:45
2012
@@ -1078,10 +1078,6 @@ WHERE wc_id = ?1 AND parent_relpath = ?2
UPDATE nodes SET properties = ?4
WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3
--- STMT_HAS_WORKING_NODES
-SELECT 1 FROM nodes WHERE op_depth > 0
-LIMIT 1
-
/* --------------------------------------------------------------------------
* Complex queries for callback walks, caching results in a temporary table.
*
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1421289&r1=1421288&r2=1421289&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Thu Dec 13
13:38:45 2012
@@ -87,7 +87,6 @@ static const int slow_statements[] =
/* Is there a record? ### Can we somehow check for LIMIT 1? */
STMT_LOOK_FOR_WORK,
- STMT_HAS_WORKING_NODES,
/* Full temporary table read */
STMT_INSERT_ACTUAL_EMPTIES,
