svn commit: r1104285 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

[hw...@apache.org]

Author: hwright
Date: Tue May 17 14:36:23 2011
New Revision: 1104285

URL: http://svn.apache.org/viewvc?rev=1104285&view=rev
Log:
Drop an unused column from the properties fetching code.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_RELEVANT_PROPS_FROM_CACHE): Drop kind column.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_props_streamily): Adjust column number.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1104285&r1=1104284&r2=1104285&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Tue May 17 14:36:23 2011
@@ -1051,7 +1051,7 @@ INSERT INTO temp__node_props_cache (loca
     AND presence IN ('normal', 'incomplete')
 
 -- STMT_SELECT_RELEVANT_PROPS_FROM_CACHE
-SELECT local_relpath, kind, properties FROM temp__node_props_cache
+SELECT local_relpath, properties FROM temp__node_props_cache
 ORDER BY local_relpath
 
 -- STMT_DROP_NODE_PROPS_CACHE

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1104285&r1=1104284&r2=1104285&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue May 17 14:36:23 2011
@@ -7755,7 +7755,7 @@ svn_wc__db_read_props_streamily(svn_wc__
       if (cancel_func)
         SVN_ERR(cancel_func(cancel_baton));
 
-      SVN_ERR(svn_sqlite__column_properties(&props, stmt, 2, iterpool,
+      SVN_ERR(svn_sqlite__column_properties(&props, stmt, 1, iterpool,
                                             iterpool));
       if (props && apr_hash_count(props) != 0)
         {