? .project Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.226 diff -u -p -r1.226 locale.inc --- includes/locale.inc 22 Aug 2009 14:34:17 -0000 1.226 +++ includes/locale.inc 24 Aug 2009 15:08:01 -0000 @@ -2275,6 +2275,7 @@ function _locale_translate_seek() { } $sql_query = $sql_query->extend('PagerDefault')->limit(50); + $sql_query->addTag('locale_translate_seek'); $locales = $sql_query->execute(); $groups = module_invoke_all('locale', 'groups'); Index: modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.22 diff -u -p -r1.22 blog.pages.inc --- modules/blog/blog.pages.inc 10 Aug 2009 22:39:24 -0000 1.22 +++ modules/blog/blog.pages.inc 24 Aug 2009 15:08:02 -0000 @@ -30,6 +30,7 @@ function blog_page_user($account) { ); $query = db_select('node', 'n')->extend('PagerDefault'); + $query->addTag('blog_page_user'); $nids = $query ->fields('n', array('nid', 'sticky', 'created')) ->condition('type', 'blog') @@ -80,6 +81,7 @@ function blog_page_last() { } $query = db_select('node', 'n')->extend('PagerDefault'); + $query->addTag('blog_page_last'); $nids = $query ->fields('n', array('nid', 'sticky', 'created')) ->condition('type', 'blog') Index: modules/comment/comment.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v retrieving revision 1.30 diff -u -p -r1.30 comment.admin.inc --- modules/comment/comment.admin.inc 31 Jul 2009 19:44:09 -0000 1.30 +++ modules/comment/comment.admin.inc 24 Aug 2009 15:08:02 -0000 @@ -67,6 +67,7 @@ function comment_admin_overview($type = ); $query = db_select('comment', 'c')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('comment_admin_overview'); $query->join('users', 'u', 'u.uid = c.uid'); $query->join('node', 'n', 'n.nid = c.nid'); $query->addField('u', 'name', 'registered_name'); Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.759 diff -u -p -r1.759 comment.module --- modules/comment/comment.module 24 Aug 2009 00:14:19 -0000 1.759 +++ modules/comment/comment.module 24 Aug 2009 15:08:05 -0000 @@ -676,6 +676,7 @@ function comment_node_page_additions($no $comments_per_page = _comment_get_display_setting('comments_per_page', $node); $query = db_select('comment', 'c')->extend('PagerDefault'); + $query->addTag('comment_get_thread'); $query->addField('c', 'cid'); $query ->condition('c.nid', $node->nid) Index: modules/dblog/dblog.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v retrieving revision 1.28 diff -u -p -r1.28 dblog.admin.inc --- modules/dblog/dblog.admin.inc 24 Aug 2009 00:14:19 -0000 1.28 +++ modules/dblog/dblog.admin.inc 24 Aug 2009 15:08:06 -0000 @@ -46,6 +46,7 @@ function dblog_overview() { ); $query = db_select('watchdog', 'w')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('dblog_overview'); $query->join('users', 'u', 'w.uid = u.uid'); $query ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link')) @@ -104,6 +105,7 @@ function dblog_top($type) { $count_query->condition('type', $type); $query = db_select('watchdog', 'w')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('dblog_top'); $query->addExpression('COUNT(wid)', 'count'); $query = $query ->fields('w', array('message', 'variables')) Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.514 diff -u -p -r1.514 forum.module --- modules/forum/forum.module 24 Aug 2009 00:14:20 -0000 1.514 +++ modules/forum/forum.module 24 Aug 2009 15:08:07 -0000 @@ -685,6 +685,7 @@ function forum_get_topics($tid, $sortby, } $query = db_select('node_comment_statistics', 'ncs')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('forum_get_topics'); $query->join('node', 'n', 'n.nid = ncs.nid'); $query->join('users', 'cu', 'ncs.last_comment_uid = cu.uid'); $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $tid)); Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.63 diff -u -p -r1.63 node.admin.inc --- modules/node/node.admin.inc 23 Aug 2009 04:37:52 -0000 1.63 +++ modules/node/node.admin.inc 24 Aug 2009 15:08:08 -0000 @@ -410,6 +410,7 @@ function node_admin_nodes() { ); $query = db_select('node', 'n')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('node_admin_nodes'); $query->join('users', 'u', 'n.uid = u.uid'); node_build_filter_query($query); Index: modules/path/path.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.admin.inc,v retrieving revision 1.28 diff -u -p -r1.28 path.admin.inc --- modules/path/path.admin.inc 22 Aug 2009 14:34:21 -0000 1.28 +++ modules/path/path.admin.inc 24 Aug 2009 15:08:09 -0000 @@ -28,6 +28,7 @@ function path_admin_overview($keys = NUL } $query = db_select('url_alias')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('path_admin_overview'); if ($keys) { // Replace wildcards with PDO wildcards. $query->condition('dst', '%' . preg_replace('!\*+!', '%', $keys) . '%', 'LIKE'); Index: modules/poll/poll.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v retrieving revision 1.20 diff -u -p -r1.20 poll.pages.inc --- modules/poll/poll.pages.inc 29 Jul 2009 06:39:34 -0000 1.20 +++ modules/poll/poll.pages.inc 24 Aug 2009 15:08:09 -0000 @@ -58,6 +58,7 @@ function poll_votes($node) { $header[] = array('data' => t('Timestamp'), 'field' => 'pv.timestamp', 'sort' => 'desc'); $select = db_select('poll_vote', 'pv')->extend('PagerDefault')->extend('TableSort'); + $select->addTag('poll_votes'); $select->join('poll_choice', 'pc', 'pv.chid = pc.chid'); $select->join('users', 'u', 'pv.uid = u.uid'); $queried_votes = $select Index: modules/profile/profile.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v retrieving revision 1.18 diff -u -p -r1.18 profile.pages.inc --- modules/profile/profile.pages.inc 26 May 2009 10:41:06 -0000 1.18 +++ modules/profile/profile.pages.inc 24 Aug 2009 15:08:09 -0000 @@ -34,6 +34,7 @@ function profile_browse() { ))->fetchAll(); $query = db_select('users')->extend('PagerDefault'); + $query->addTag('profile_browse_users_field'); $query->join('profile_value', 'v', 'u.uid = v.uid'); $query ->fields('u', array('uid', 'access')) @@ -95,6 +96,7 @@ function profile_browse() { // Extract the affected users: $query = db_select('users', 'u')->extend('PagerDefault'); + $query->addTag('profile_browse_userlist'); $uids = $query ->fields('u', array('uid', 'access')) ->condition('u.uid', 0, '>') Index: modules/statistics/statistics.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.admin.inc,v retrieving revision 1.30 diff -u -p -r1.30 statistics.admin.inc --- modules/statistics/statistics.admin.inc 24 Aug 2009 12:32:10 -0000 1.30 +++ modules/statistics/statistics.admin.inc 24 Aug 2009 15:08:10 -0000 @@ -18,6 +18,7 @@ function statistics_recent_hits() { ); $query = db_select('accesslog', 'a')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('statistics_recent_hits'); $query->join('users', 'u', 'a.uid = u.uid'); $query ->fields('a', array('aid', 'timestamp', 'path', 'title', 'uid')) @@ -60,6 +61,7 @@ function statistics_top_pages() { ); $query = db_select('accesslog')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('statistics_top_pages'); $query->addExpression('COUNT(path)', 'hits'); // MAX(title) avoids having empty node titles which otherwise causes duplicates in the top pages list $query->addExpression('MAX(title)', 'title'); @@ -108,6 +110,7 @@ function statistics_top_visitors() { array('data' => user_access('block IP addresses') ? t('Operations') : '', 'colspan' => 2), ); $query = db_select('accesslog', 'a')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('statistics_top_visitors'); $query->leftJoin('blocked_ips', 'bl', 'a.hostname = bl.ip'); $query->leftJoin('users', 'u', 'a.uid = u.uid'); @@ -162,6 +165,7 @@ function statistics_top_referrers() { array('data' => t('Last visit'), 'field' => 'last'), ); $query = db_select('accesslog', 'a')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('statistics_top_referrers'); $query->addExpression('COUNT(url)', 'hits'); $query->addExpression('MAX(timestamp)', 'last'); Index: modules/statistics/statistics.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.pages.inc,v retrieving revision 1.15 diff -u -p -r1.15 statistics.pages.inc --- modules/statistics/statistics.pages.inc 22 Aug 2009 14:34:22 -0000 1.15 +++ modules/statistics/statistics.pages.inc 24 Aug 2009 15:08:10 -0000 @@ -16,6 +16,7 @@ function statistics_node_tracker() { array('data' => t('Operations'))); $query = db_select('accesslog', 'a')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('statistics_node_tracker'); $query->join('users', 'u', 'a.uid = u.uid'); $query @@ -65,6 +66,7 @@ function statistics_user_tracker() { array('data' => t('Operations'))); $query = db_select('accesslog', 'a')->extend('PagerDefault')->extend('TableSort'); $query + ->addTag('statistics_user_tracker') ->fields('a', array('aid', 'timestamp', 'path', 'title')) ->condition('uid', $account->uid) ->limit(30) Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.767 diff -u -p -r1.767 system.module --- modules/system/system.module 24 Aug 2009 12:32:10 -0000 1.767 +++ modules/system/system.module 24 Aug 2009 15:08:15 -0000 @@ -2507,6 +2507,7 @@ function system_actions_manage() { array('data' => $instances_present ? t('Operations') : '', 'colspan' => '2') ); $query = db_select('actions')->extend('PagerDefault')->extend('TableSort'); + $query->addTag('system_actions'); $result = $query ->fields('actions') ->limit(50) Index: modules/taxonomy/taxonomy.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v retrieving revision 1.66 diff -u -p -r1.66 taxonomy.admin.inc --- modules/taxonomy/taxonomy.admin.inc 23 Aug 2009 01:05:12 -0000 1.66 +++ modules/taxonomy/taxonomy.admin.inc 24 Aug 2009 15:08:16 -0000 @@ -298,6 +298,7 @@ function taxonomy_overview_terms(&$form_ // We are not calling taxonomy_get_tree because that might fail with a big // number of tags in the freetagging vocabulary. $query = db_select('taxonomy_term_data', 't')->extend('PagerDefault'); + $query->addTag('taxonomy_overview_terms'); $query->join('taxonomy_term_hierarchy', 'h', 't.tid = h.tid'); $query->addTag('term_access'); $query->condition('t.vid', $vocabulary->vid); Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.503 diff -u -p -r1.503 taxonomy.module --- modules/taxonomy/taxonomy.module 24 Aug 2009 00:14:22 -0000 1.503 +++ modules/taxonomy/taxonomy.module 24 Aug 2009 15:08:19 -0000 @@ -1643,6 +1643,7 @@ function taxonomy_select_nodes($tids = a $query = $query ->extend('PagerDefault') ->limit(variable_get('default_nodes_main', 10)); + $query->addTag('taxonomy_select_nodes'); $query->setCountQuery($count_query); } else { Index: modules/tracker/tracker.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v retrieving revision 1.23 diff -u -p -r1.23 tracker.pages.inc --- modules/tracker/tracker.pages.inc 22 Aug 2009 14:34:23 -0000 1.23 +++ modules/tracker/tracker.pages.inc 24 Aug 2009 15:08:19 -0000 @@ -13,6 +13,7 @@ function tracker_page($account = NULL, $set_title = FALSE) { // TODO: These queries are very expensive, see http://drupal.org/node/105639 $query = db_select('node', 'n', array('target' => 'slave'))->extend('PagerDefault'); + $query->addTag('tracker_page'); $query->join('users', 'u', 'n.uid = u.uid'); $query->join('node_comment_statistics', 'l', 'n.nid = l.nid'); $query->addExpression('GREATEST(n.changed, l.last_comment_timestamp)', 'last_updated'); Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.75 diff -u -p -r1.75 user.admin.inc --- modules/user/user.admin.inc 24 Aug 2009 00:14:23 -0000 1.75 +++ modules/user/user.admin.inc 24 Aug 2009 15:08:21 -0000 @@ -146,6 +146,7 @@ function user_admin_account() { $count_query->addExpression('COUNT(DISTINCT u.uid)'); $query = $query->extend('PagerDefault')->extend('TableSort'); + $query->addTag('user_admin_account'); $query ->fields('u', array('uid', 'name', 'status', 'created', 'access')) ->limit(50) Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1030 diff -u -p -r1.1030 user.module --- modules/user/user.module 24 Aug 2009 00:14:23 -0000 1.1030 +++ modules/user/user.module 24 Aug 2009 15:08:26 -0000 @@ -872,6 +872,7 @@ function user_search($op = 'search', $ke // Replace wildcards with MySQL/PostgreSQL wildcards. $keys = preg_replace('!\*+!', '%', $keys); $query = db_select('users')->extend('PagerDefault'); + $query->addTag('user_search'); $query->fields('users', array('name', 'uid', 'mail')); if (user_access('administer users')) { // Administrators can also search in the otherwise private email field.