#324313 by catch, Damien Tournoud, chx: performance improvement, load multiple nodes and terms at once. From: Damien Tournoud --- modules/book/book.module | 19 +- modules/book/book.test | 2 modules/comment/comment.module | 25 ++- modules/dblog/dblog.test | 2 modules/filter/filter.test | 2 modules/forum/forum.module | 31 ++- modules/forum/forum.test | 2 modules/node/node.module | 223 +++++++++++++++++-------- modules/node/node.test | 84 +++++++++ modules/path/path.module | 14 +- modules/path/path.test | 6 - modules/poll/poll.module | 55 +++--- modules/poll/poll.test | 2 modules/simpletest/drupal_web_test_case.php | 16 ++ modules/simpletest/tests/taxonomy_test.module | 6 - modules/system/system.test | 2 modules/taxonomy/taxonomy.module | 167 +++++++++++++++++-- modules/taxonomy/taxonomy.test | 62 +++++++ modules/translation/translation.test | 4 modules/trigger/trigger.test | 4 modules/upload/upload.module | 9 + 21 files changed, 566 insertions(+), 171 deletions(-) diff --git modules/book/book.module modules/book/book.module index 599a964..85e3b66 100644 --- modules/book/book.module +++ modules/book/book.module @@ -705,18 +705,13 @@ function book_build_active_trail($book_link) { /** * Implementation of hook_nodeapi_load(). */ -function book_nodeapi_load(&$node, $teaser, $page) { - // Note - we cannot use book_link_load() because it will call node_load(). - $info['book'] = db_query('SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid = :nid', array( - ':nid' => $node->nid - ))->fetchAssoc(); - - if ($info['book']) { - $info['book']['href'] = $info['book']['link_path']; - $info['book']['title'] = $info['book']['link_title']; - $info['book']['options'] = unserialize($info['book']['options']); - - return $info; +function book_nodeapi_load($nodes) { + $result = db_query("SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid IN (" . db_placeholders(array_keys($nodes)) . ")", array_keys($nodes), array('fetch' => PDO::FETCH_ASSOC)); + foreach ($result as $record) { + $nodes[$record['nid']]->book = $record; + $nodes[$record['nid']]->book['href'] = $record['link_path']; + $nodes[$record['nid']]->book['title'] = $record['link_title']; + $nodes[$record['nid']]->book['options'] = unserialize($record['options']); } } diff --git modules/book/book.test modules/book/book.test index 5d0f668..ab1c825 100644 --- modules/book/book.test +++ modules/book/book.test @@ -152,7 +152,7 @@ class BookTestCase extends DrupalWebTestCase { } // Check to make sure the book node was created. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertNotNull(($node === FALSE ? NULL : $node), t('Book node found in database.')); $number++; diff --git modules/comment/comment.module modules/comment/comment.module index 0706850..0acfb50 100644 --- modules/comment/comment.module +++ modules/comment/comment.module @@ -579,11 +579,28 @@ function comment_form_alter(&$form, $form_state, $form_id) { /** * Implementation of hook_nodeapi_load(). */ -function comment_nodeapi_load(&$node, $arg = 0) { - if ($node->comment != COMMENT_NODE_DISABLED) { - return db_query('SELECT last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid = :nid', array(':nid' => $node->nid))->fetchAssoc(); +function comment_nodeapi_load($nodes, $types) { + $comments_enabled = array(); + + // If comments are disabled, add some default values. + foreach ($nodes as $node) { + $node->last_comment_timestamp = $node->created; + $node->last_comment_name = ''; + $node->comment_count = 0; + if ($node->comment != COMMENT_NODE_DISABLED) { + $comments_enabled[] = $node->nid; + } + } + + // If comments are enabled, fetch information from the database. + if (!empty($comments_enabled)) { + $result = db_query('SELECT nid, last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid IN(' . db_placeholders($comments_enabled) . ')', $comments_enabled); + foreach ($result as $record) { + $nodes[$record->nid]->last_comment_timestamp = $record->last_comment_timestamp; + $nodes[$record->nid]->last_comment_name = $record->last_comment_name; + $nodes[$record->nid]->comment_count = $record->comment_count; + } } - return array('last_comment_timestamp' => $node->created, 'last_comment_name' => '', 'comment_count' => 0); } /** diff --git modules/dblog/dblog.test modules/dblog/dblog.test index ec20437..da60fd7 100644 --- modules/dblog/dblog.test +++ modules/dblog/dblog.test @@ -265,7 +265,7 @@ class DBLogTestCase extends DrupalWebTestCase { $this->drupalPost('node/add/' . $type, $edit, t('Save')); $this->assertResponse(200); // Retrieve node object. - $node = node_load(array('title' => $title)); + $node = $this->drupalGetNodeByTitle($title); $this->assertTrue($node != null, t('Node @title was loaded', array('@title' => $title))); // Edit node. $edit = $this->getContentUpdate($type); diff --git modules/filter/filter.test modules/filter/filter.test index 6bfc39c..4791720 100644 --- modules/filter/filter.test +++ modules/filter/filter.test @@ -117,7 +117,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { $this->drupalPost('node/add/page', $edit, t('Save')); $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Filtered node created.')); - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); $this->drupalGet('node/' . $node->nid); diff --git modules/forum/forum.module modules/forum/forum.module index ac82a1d..fd05051 100644 --- modules/forum/forum.module +++ modules/forum/forum.module @@ -341,11 +341,25 @@ function forum_nodeapi_delete(&$node, $teaser, $page) { /** * Implementation of hook_nodeapi_load(). */ -function forum_nodeapi_load(&$node, $teaser, $page) { +function forum_nodeapi_load($nodes, $types) { $vid = variable_get('forum_nav_vocabulary', ''); - $vocabulary = taxonomy_vocabulary_load($vid); - if (_forum_nodeapi_check_node_type($node, $vocabulary)) { - return db_fetch_array(db_query('SELECT tid AS forum_tid FROM {forum} WHERE vid = %d', $node->vid)); + // If no forum vocabulary is set up, return. + if (!$vocabulary = taxonomy_vocabulary_load($vid)) { + return; + } + + $vids = array(); + foreach ($nodes as $node) { + if (isset($vocabulary->nodes[$node->type])) { + $vids[] = $node->vid; + $node->forum = array(); + } + } + if (!empty($vids)) { + $result = db_query('SELECT nid, tid FROM {forum} WHERE vid IN(' . db_placeholders($vids) . ')', $vids); + foreach ($result as $record) { + $nodes[$record->nid]->forum_tid = $record->tid; + } } } @@ -452,15 +466,6 @@ function forum_form_alter(&$form, $form_state, $form_id) { } /** - * Implementation of hook_load(). - */ -function forum_load($node) { - $forum = db_fetch_object(db_query('SELECT * FROM {term_node} WHERE vid = %d', $node->vid)); - - return $forum; -} - -/** * Implementation of hook_block(). * * Generates a block containing the currently active forum topics and the diff --git modules/forum/forum.test modules/forum/forum.test index 7d0aeeb..9fe590d 100644 --- modules/forum/forum.test +++ modules/forum/forum.test @@ -240,7 +240,7 @@ class ForumTestCase extends DrupalWebTestCase { } // Retrieve node object. - $node = node_load(array('title' => $title), null, true); // Are these last two parameters necessary? + $node = $this->drupalGetNodeByTitle($title); $this->assertTrue($node != null, t('Node @title was loaded', array('@title' => $title))); // View forum topic. diff --git modules/node/node.module modules/node/node.module index 422ab62..156e9d7 100644 --- modules/node/node.module +++ modules/node/node.module @@ -730,93 +730,169 @@ function node_invoke_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) { } /** - * Load a node object from the database. + * Load node objects from the database. + * + * This function should be used whenever you need to load more than one node + * from the database. Nodes are loaded into memory and will not require + * database access if loaded again during the same page request. + * If you need to display the nodes in a specific order, you should use + * the $nids array passed in to the function to access the objects once they're + * loaded, since the $nodes array itself may not be ordered consistently. * - * @param $param - * Either the nid of the node or an array of conditions to match against in the database query - * @param $revision - * Which numbered revision to load. Defaults to the current version. + * @param $nids + * An array of node IDs. + * @param $conditions + * An array of conditions on the {node} table in the form 'field' => $value. * @param $reset * Whether to reset the internal node_load cache. * * @return - * A fully-populated node object. + * An array of node objects indexed by nid. */ -function node_load($param = array(), $revision = NULL, $reset = NULL) { - static $nodes = array(); - +function node_load_multiple($nids = array(), $conditions = array(), $reset = FALSE) { + static $node_cache = array(); if ($reset) { - $nodes = array(); + $node_cache = array(); + } + $nodes = array(); + + // Revisions are not statically cached, and require a different query to + // other conditions, so separate vid into its own variable. + $vid = isset($conditions['vid']) ? $conditions['vid'] : FALSE; + unset($conditions['vid']); + + // Load any available nodes from the internal cache. + // Store whether $nids was passed, so that if all specified nodes are + // already in the cache we can return them without hitting the database. + $nids_was_passed = !empty($nids) ? TRUE : FALSE; + if ($nids_was_passed && $node_cache && !$vid) { + foreach ($nids as $key => $nid) { + if (isset($node_cache[$nid])) { + $nodes[$nid] = $node_cache[$nid]; + // Remove from the remaining nodes to be loaded. + unset($nids[$key]); + } + } } - $cachable = ($revision == NULL); - $arguments = array(); - if (is_numeric($param)) { - if ($cachable) { - // Is the node statically cached? - if (isset($nodes[$param])) { - return is_object($nodes[$param]) ? clone $nodes[$param] : $nodes[$param]; + // If there are conditions to query against, load nodes from the cache + // where possible, then remove any which don't match. + if ($conditions && $node_cache && !$vid) { + // Since nids and conditions are ANDed together in the database + // query, only load nodes from cache if no nids were passed. + if (!$nids_was_passed) { + $nodes = $node_cache; + } + // Conditions are ANDed together, so exclude nodes that fail to match + // any individual condition. + foreach ($nodes as $node) { + $node_values = (array) $node; + if (array_diff_assoc($conditions, $node_values)) { + unset($nodes[$node->nid]); } } - $cond = 'n.nid = %d'; - $arguments[] = $param; } - elseif (is_array($param)) { - // Turn the conditions into a query. - foreach ($param as $key => $value) { - $cond[] = 'n.' . db_escape_table($key) . " = '%s'"; - $arguments[] = $value; + + // Load any remaining nodes from the database. This is the case if there are + // any $nids left to load, if loading a revision, or if $conditions was + // passed without $nids. + if ($nids || $vid || ($conditions && !$nids_was_passed)) { + $query = db_select('node', 'n'); + + if ($vid) { + $query->join('node_revisions', 'r', 'r.nid = n.nid AND r.vid = :vid', array(':vid' => $vid)); } - $cond = implode(' AND ', $cond); - } - else { - return FALSE; - } + else { + $query->join('node_revisions', 'r', 'r.vid = n.vid'); + } + $query->join('users', 'u', 'u.uid = n.uid'); - // Retrieve a field list based on the site's schema. - $fields = drupal_schema_fields_sql('node', 'n'); - $fields = array_merge($fields, drupal_schema_fields_sql('node_revisions', 'r')); - $fields = array_merge($fields, array('u.name', 'u.picture', 'u.data')); - // Remove fields not needed in the query: n.vid and r.nid are redundant, - // n.title is unnecessary because the node title comes from the - // node_revisions table. We'll keep r.vid, r.title, and n.nid. - $fields = array_diff($fields, array('n.vid', 'n.title', 'r.nid')); - $fields = implode(', ', $fields); - // Rename timestamp field for clarity. - $fields = str_replace('r.timestamp', 'r.timestamp AS revision_timestamp', $fields); - // Change name of revision uid so it doesn't conflict with n.uid. - $fields = str_replace('r.uid', 'r.uid AS revision_uid', $fields); - - // Retrieve the node. - // No db_rewrite_sql is applied so as to get complete indexing for search. - if ($revision) { - array_unshift($arguments, $revision); - $node = db_fetch_object(db_query('SELECT ' . $fields . ' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.nid = n.nid AND r.vid = %d WHERE ' . $cond, $arguments)); - } - else { - $node = db_fetch_object(db_query('SELECT ' . $fields . ' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE ' . $cond, $arguments)); - } + // Add fields from the {node} table. + $node_fields = drupal_schema_fields_sql('node'); + + // vid and title are provided by node_revisions, so remove them. + unset($node_fields['vid']); + unset($node_fields['title']); + $query->fields('n', $node_fields); - if ($node && $node->nid) { - // Call the node specific callback (if any) and piggy-back the - // results to the node or overwrite some values. - if ($extra = node_invoke($node, 'load')) { - foreach ($extra as $key => $value) { - $node->$key = $value; + // Add all fields from the {node_revisions} table. + $node_revision_fields = drupal_schema_fields_sql('node_revisions'); + + // nid is provided by node, so remove it. + unset($node_revision_fields['nid']); + + // Change timestamp to revisions_timestamp before adding it to the query. + unset($node_revision_fields['timestamp']); + $query->addField('r', 'timestamp', 'revision_timestamp'); + $query->fields('r', $node_revision_fields); + + // Add fields from the {users} table. + $user_fields = array('name', 'picture', 'data'); + $query->fields('u', $user_fields); + + if ($nids) { + $query->condition('n.nid', $nids, 'IN'); + } + if ($conditions) { + foreach ($conditions as $field => $value) { + $query->condition('n.' . $field, $value); } } + $queried_nodes = $query->execute()->fetchAllAssoc('nid'); + } - if ($extra = node_invoke_nodeapi($node, 'load')) { - foreach ($extra as $key => $value) { - $node->$key = $value; + // Pass all nodes loaded from the database through the node type specific + // callbacks and hook_nodeapi_load(), then add them to the internal cache. + if (!empty($queried_nodes)) { + // Create an array of nodes for each content type and pass this to the + // node type specific callback. + $typed_nodes = array(); + foreach ($queried_nodes as $nid => $node) { + $typed_nodes[$node->type][$nid] = $node; + } + + // Call node type specific callbacks on each typed array of nodes. + foreach ($typed_nodes as $type => $nodes_of_type) { + if (node_hook($type, 'load')) { + $function = node_get_types('base', $type) . '_load'; + $function($nodes_of_type); } } - if ($cachable) { - $nodes[$node->nid] = is_object($node) ? clone $node : $node; + + // Call hook_nodeapi_load(), pass the node types so modules can return early + // if not acting on types in the array. + foreach (module_implements('nodeapi_load') as $module) { + $function = $module . '_nodeapi_load'; + $function($queried_nodes, array_keys($typed_nodes)); + } + $nodes += $queried_nodes; + // Add nodes to the cache if we're not loading a revision. + if (!$vid) { + $node_cache += $queried_nodes; } } - return $node; + return $nodes; +} + +/** + * Load a node object from the database. + * + * @param $nid + * The node ID. + * @param $vid + * The revision ID. + * @param $reset + * Whether to reset the internal node_load cache. + * + * @return + * A fully-populated node object. + */ +function node_load($nid, $vid = array(), $reset = FALSE) { + $vid = isset($vid) ? array('vid' => $vid) : NULL; + $node = node_load_multiple(array($nid), $vid, $reset); + + return $node ? $node[$nid] : FALSE; } /** @@ -1822,16 +1898,17 @@ function node_feed($nids = FALSE, $channel = array()) { * Menu callback; Generate a listing of promoted nodes. */ function node_page_default() { - $result = pager_query(db_rewrite_sql('SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10)); - - $output = ''; - $num_rows = FALSE; - while ($node = db_fetch_object($result)) { - $output .= node_view(node_load($node->nid), 1); - $num_rows = TRUE; - } + $nids = pager_query(db_rewrite_sql('SELECT n.nid FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10))->fetchCol(); + if (!empty($nids)) { + $nodes = node_load_multiple($nids); + $output = ''; + // We need to keep the order of $nids intact, which cannot be guaranteed with the nodes returned from node_load_multiple(). + foreach ($nids as $nid) { + if (isset($nodes[$nid])) { + $output .= node_view($nodes[$nid], TRUE); + } + } - if ($num_rows) { $feed_url = url('rss.xml', array('absolute' => TRUE)); drupal_add_feed($feed_url, variable_get('site_name', 'Drupal') . ' ' . t('RSS')); $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); diff --git modules/node/node.test modules/node/node.test index f212598..a2f6562 100644 --- modules/node/node.test +++ modules/node/node.test @@ -1,6 +1,86 @@ t('Load multiple nodes'), + 'description' => t('Test the loading of multiple nodes.'), + 'group' => t('Node'), + ); + } + + function setUp() { + parent::setUp(); + $web_user = $this->drupalCreateUser(array('create article content', 'create page content')); + $this->drupalLogin($web_user); + } + + /** + * Create four nodes and ensure they're loaded correctly. + */ + function testNodeMultipleLoad() { + $node1 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1)); + $node2 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1)); + $node3 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 0)); + $node4 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0)); + + // Confirm that promoted nodes appear in the default node listing. + $this->drupalGet('node'); + $this->assertText($node1->title, t('Node title appears on the default listing.')); + $this->assertText($node2->title, t('Node title appears on the default listing.')); + $this->assertNoText($node3->title, t('Node title does not appear in the default listing.')); + $this->assertNoText($node4->title, t('Node title does not appear in the default listing.')); + + // Load nodes with only a condition. Nodes 3 and 4 will be loaded. + $nodes = node_load_multiple(NULL, array('promote' => 0)); + $this->assertEqual($node3->title, $nodes[$node3->nid]->title, t('Node was loaded.')); + $this->assertEqual($node4->title, $nodes[$node4->nid]->title, t('Node was loaded.')); + $count = count($nodes); + $this->assertTrue($count == 2, t('@count nodes loaded.', array('@count' => $count))); + + // Load nodes by nid. Nodes 1, 2 and 4 will be loaded. + $nodes = node_load_multiple(array(1, 2, 4)); + $count = count($nodes); + $this->assertTrue(count($nodes) == 3, t('@count nodes loaded', array('@count' => $count))); + $this->assertTrue(isset($nodes[$node1->nid]), t('Node is correctly keyed in the array')); + $this->assertTrue(isset($nodes[$node2->nid]), t('Node is correctly keyed in the array')); + $this->assertTrue(isset($nodes[$node4->nid]), t('Node is correctly keyed in the array')); + foreach ($nodes as $node) { + $this->assertTrue(is_object($node), t('Node is an object')); + } + + // Load nodes by nid, where type = article. Nodes 1, 2 and 3 will be loaded. + $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article')); + $count = count($nodes); + $this->assertTrue($count == 3, t('@count nodes loaded', array('@count' => $count))); + $this->assertEqual($nodes[$node1->nid]->title, $node1->title, t('Node successfully loaded.')); + $this->assertEqual($nodes[$node2->nid]->title, $node2->title, t('Node successfully loaded.')); + $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded.')); + $this->assertFalse(isset($nodes[$node4->nid])); + + // Now that all nodes have been loaded into the static cache, ensure that + // they are loaded correctly again when a condition is passed. + $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article')); + $count = count($nodes); + $this->assertTrue($count == 3, t('@count nodes loaded.', array('@count' => $count))); + $this->assertEqual($nodes[$node1->nid]->title, $node1->title, t('Node successfully loaded')); + $this->assertEqual($nodes[$node2->nid]->title, $node2->title, t('Node successfully loaded')); + $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded')); + $this->assertFalse(isset($nodes[$node4->nid]), t('Node was not loaded')); + + // Load nodes by nid, where type = article and promote = 0. + $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article', 'promote' => 0)); + $count = count($nodes); + $this->assertTrue($count == 1, t('@count node loaded', array('@count' => $count))); + $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded.')); + } +} + class NodeRevisionsTestCase extends DrupalWebTestCase { protected $nodes; protected $logs; @@ -273,7 +353,7 @@ class PageEditTestCase extends DrupalWebTestCase { $this->drupalPost('node/add/page', $edit, t('Save')); // Check that the node exists in the database. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); // Check that "edit" link points to correct page. @@ -379,7 +459,7 @@ class PageCreationTestCase extends DrupalWebTestCase { $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit['title'])), t('Page created.')); // Check that the node exists in the database. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); } } diff --git modules/path/path.module modules/path/path.module index 06f7d0a..f27f124 100644 --- modules/path/path.module +++ modules/path/path.module @@ -135,12 +135,14 @@ function path_nodeapi_validate(&$node, $arg) { /** * Implementation of hook_nodeapi_load(). */ -function path_nodeapi_load(&$node, $arg) { - $language = isset($node->language) ? $node->language : ''; - $path = 'node/' . $node->nid; - $alias = drupal_get_path_alias($path, $language); - if ($path != $alias) { - $node->path = $alias; +function path_nodeapi_load($nodes, $types) { + foreach($nodes as $node) { + $language = isset($node->language) ? $node->language : ''; + $path = 'node/' . $node->nid; + $alias = drupal_get_path_alias($path, $language); + if ($path != $alias) { + $node->path = $alias; + } } } diff --git modules/path/path.test modules/path/path.test index 0c66d04..809e647 100644 --- modules/path/path.test +++ modules/path/path.test @@ -131,7 +131,7 @@ class PathTestCase extends DrupalWebTestCase { $this->drupalPost('node/add/page', $edit, t('Save')); // Check to make sure the node was created. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertNotNull(($node === FALSE ? NULL : $node), 'Node found in database. %s'); @@ -188,7 +188,7 @@ class PathLanguageTestCase extends DrupalWebTestCase { $this->drupalPost('node/add/page', $edit, t('Save')); // Check to make sure the node was created. - $english_node = node_load(array('title' => $edit['title'])); + $english_node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue(($english_node), 'Node found in database.'); // Confirm that the alias works. @@ -209,7 +209,7 @@ class PathLanguageTestCase extends DrupalWebTestCase { // Ensure the node was created. // Check to make sure the node was created. - $french_node = node_load(array('title' => $edit['title'])); + $french_node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue(($french_node), 'Node found in database.'); // Confirm that the alias works. diff --git modules/poll/poll.module modules/poll/poll.module index 91e1ea7..988d6e4 100644 --- modules/poll/poll.module +++ modules/poll/poll.module @@ -148,11 +148,10 @@ function poll_block($op = 'list', $delta = '') { } elseif ($op == 'view') { // Retrieve the latest poll. - $sql = db_rewrite_sql("SELECT MAX(n.created) FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = 1 AND p.active = 1"); - $timestamp = db_result(db_query($sql)); - if ($timestamp) { - $poll = node_load(array('type' => 'poll', 'created' => $timestamp, 'status' => 1)); - + $sql = db_rewrite_sql("SELECT MAX(n.created), n.nid FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = 1 AND p.active = 1 GROUP BY n.nid"); + $record = db_query($sql)->fetch(); + if ($record) { + $poll = node_load($record->nid); if ($poll->nid) { $poll = poll_view($poll, TRUE, FALSE, TRUE); } @@ -451,35 +450,35 @@ function poll_validate($node) { /** * Implementation of hook_load(). */ -function poll_load($node) { +function poll_load($nodes) { global $user; + foreach ($nodes as $node) { + $poll = db_query("SELECT runtime, active FROM {poll} WHERE nid = :nid", array(':nid' => $node->nid))->fetch(); - $poll = db_fetch_object(db_query("SELECT runtime, active FROM {poll} WHERE nid = %d", $node->nid)); - - // Load the appropriate choices into the $poll object. - $result = db_query("SELECT chid, chtext, chvotes, weight FROM {poll_choices} WHERE nid = %d ORDER BY weight", $node->nid); - while ($choice = db_fetch_array($result)) { - $poll->choice[$choice['chid']] = $choice; - } + // Load the appropriate choices into the $poll object. + $poll->choice = db_query("SELECT chid, chtext, chvotes, weight FROM {poll_choices} WHERE nid = :nid ORDER BY weight", array(':nid' => $node->nid))->fetchAllAssoc('chid', PDO::FETCH_ASSOC); - // Determine whether or not this user is allowed to vote. - $poll->allowvotes = FALSE; - if (user_access('vote on polls') && $poll->active) { - if ($user->uid) { - $result = db_fetch_object(db_query('SELECT chid FROM {poll_votes} WHERE nid = %d AND uid = %d', $node->nid, $user->uid)); - } - else { - $result = db_fetch_object(db_query("SELECT chid FROM {poll_votes} WHERE nid = %d AND hostname = '%s'", $node->nid, ip_address())); - } - if (isset($result->chid)) { - $poll->vote = $result->chid; + // Determine whether or not this user is allowed to vote. + $poll->allowvotes = FALSE; + if (user_access('vote on polls') && $poll->active) { + if ($user->uid) { + $result = db_query('SELECT chid FROM {poll_votes} WHERE nid = :nid AND uid = :uid', array(':nid' => $node->nid, ':uid' => $user->uid))->fetch(); + } + else { + $result = db_query("SELECT chid FROM {poll_votes} WHERE nid = :nid AND hostname = :hostname", array(':nid' => $node->nid, ':hostname' => ip_address()))->fetch(); + } + if ($result) { + $poll->vote = $result->chid; + } + else { + $poll->vote = -1; + $poll->allowvotes = TRUE; + } } - else { - $poll->vote = -1; - $poll->allowvotes = TRUE; + foreach ($poll as $key => $value) { + $nodes[$node->nid]->$key = $value; } } - return $poll; } /** diff --git modules/poll/poll.test modules/poll/poll.test index a63cce6..a9a8928 100644 --- modules/poll/poll.test +++ modules/poll/poll.test @@ -40,7 +40,7 @@ class PollTestCase extends DrupalWebTestCase { } $this->drupalPost(NULL, $edit, t('Save')); - $node = node_load(array('title' => $title)); + $node = $this->drupalGetNodeByTitle($title); $this->assertRaw(t('@type %title has been created.', array('@type' => node_get_types('name', 'poll'), '%title' => $title)), 'Poll has been created.'); $this->assertTrue($node->nid, t('Poll has been found in the database')); diff --git modules/simpletest/drupal_web_test_case.php modules/simpletest/drupal_web_test_case.php index 2c60f05..c0f4691 100644 --- modules/simpletest/drupal_web_test_case.php +++ modules/simpletest/drupal_web_test_case.php @@ -357,6 +357,22 @@ class DrupalWebTestCase { } /** + * Get a node from the database based on its title. + * + * @param title + * A node title, usually generated by $this->randomName(). + * + * @return + * A node object matching $title. + */ + function drupalGetNodeByTitle($title) { + $nodes = node_load_multiple(array(), array('title' => $title)); + // Load the first node returned from the database. + $returned_node = reset($nodes); + return $returned_node; + } + + /** * Creates a node based on default settings. * * @param $settings diff --git modules/simpletest/tests/taxonomy_test.module modules/simpletest/tests/taxonomy_test.module index e470dad..dd2aba1 100644 --- modules/simpletest/tests/taxonomy_test.module +++ modules/simpletest/tests/taxonomy_test.module @@ -9,8 +9,10 @@ /** * Implementation of hook_taxonomy_term_load(). */ -function taxonomy_test_taxonomy_term_load($term) { - $term->antonyms = taxonomy_test_get_antonyms($term->tid); +function taxonomy_test_taxonomy_term_load(&$terms) { + foreach ($terms as $term) { + $term->antonyms = taxonomy_test_get_antonyms($term->tid); + } } /** diff --git modules/system/system.test modules/system/system.test index 9e05950..d5f946d 100644 --- modules/system/system.test +++ modules/system/system.test @@ -570,7 +570,7 @@ class PageTitleFiltering extends DrupalWebTestCase { // Create the node with HTML in the title. $this->drupalPost('node/add/page', $edit, t('Save')); - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertNotNull($node, 'Node created and found in database'); $this->drupalGet("node/" . $node->nid); $this->assertText(check_plain($edit['title']), 'Check to make sure tags in the node title are converted.'); diff --git modules/taxonomy/taxonomy.module modules/taxonomy/taxonomy.module index 4a3c0c7..b14b915 100644 --- modules/taxonomy/taxonomy.module +++ modules/taxonomy/taxonomy.module @@ -621,6 +621,33 @@ function taxonomy_node_get_terms_by_vocabulary($node, $vid, $key = 'tid') { } /** + * Find all term IDs associated with a set of nodes. + * + * @param $nodes + * An array of node objects. + * + * @return + * An array of term and node IDs ordered by vocabulary and term weight. + */ +function taxonomy_get_tids_from_nodes($nodes) { + $vids = array(); + foreach ($nodes as $node) { + $vids[] = $node->vid; + } + $query = db_select('term_node', 'r'); + $query->fields('r', array('tid', 'nid', 'vid')); + $query->join('term_data', 't', 'r.tid = t.tid'); + $query->join('vocabulary', 'v', 't.vid = v.vid'); + $query->condition('r.vid', $vids, 'IN'); + $query->orderBy('v.weight'); + $query->orderBy('t.weight'); + $query->orderBy('t.name'); + $query->addTag('term_access'); + + return $query->execute()->fetchAll(); +} + +/** * Find all terms associated with the given node, ordered by vocabulary and term weight. */ function taxonomy_node_get_terms($node, $key = 'tid') { @@ -1048,24 +1075,115 @@ function taxonomy_terms_load($str_tids) { } /** + * Load multiple taxonomy terms based on certain conditions. + * + * This function should be used whenever you need to load more than one term + * from the database. Terms are loaded into memory and will not require + * database access if loaded again during the same page request. + * If you need to display the terms in a specific order, you should use + * the $tids array passed in to the function to access the objects once they're + * loaded, since the $terms array itself may not be ordered consistently. + * + * @param $tids + * An array of taxonomy term IDs. + * @param $conditions + * An array of conditions to add to the query. + * @param $reset + * Whether to reset the internal cache. + * + * @return + * An array of term objects, indexed by tid. + */ +function taxonomy_term_load_multiple($tids = array(), $conditions = array(), $reset = FALSE) { + static $term_cache = array(); + + if ($reset) { + $term_cache = array(); + } + + $terms = array(); + + // Load any available terms from the internal cache. + // Store whether $tids was passed, so that if all specified terms are + // already in the cache we can return them without hitting the database. + $tids_was_passed = !empty($tids) ? TRUE : FALSE; + if ($tids_was_passed && $term_cache) { + foreach ($tids as $key => $tid) { + if (isset($term_cache[$tid])) { + $terms[$tid] = $term_cache[$tid]; + // Remove from the remaining terms to be loaded. + unset($tids[$key]); + } + } + } + + // If there are any conditions to query against, load terms from the cache + // where possible and remove any already loaded which don't match. + if ($conditions && $term_cache) { + // Since tids and conditions are ANDed together in the query, only load + // terms from cache if no tids were passed. + if (!$tids_was_passed) { + $terms = $term_cache; + } + foreach ($terms as $term) { + $term_values = (array) $term; + if (array_diff_assoc($conditions, $term_values)) { + unset($terms[$term->tid]); + } + } + } + + // Load any remaining terms from the database, this is necessary if we have + // $tids still to load, or if $conditions was passed without $tids. + if ($tids || (!$tids_was_passed && $conditions)) { + $query = db_select('term_data', 't'); + $term_data = drupal_schema_fields_sql('term_data'); + $query->fields('t', $term_data); + + // If the $tids array is populated, add those to the query. + if ($tids) { + $query->condition('t.tid', $tids, 'IN'); + } + + // If the conditions array is populated, add those to the query. + if ($conditions) { + foreach ($conditions as $field => $value) { + $query->conditions('t.' . $field, $value); + } + } + $queried_terms = $query->execute()->fetchAllAssoc('tid'); + // Invoke hook_taxonomy_term_load() on the terms loaded from the database + // and add them to the static cache. + if (!empty($queried_terms)) { + foreach (module_implements('taxonomy_term_load') as $module) { + $function = $module . '_taxonomy_term_load'; + $function($queried_terms); + } + $terms += $queried_terms; + $term_cache += $queried_terms; + } + } + + return $terms; +} + +/** * Return the term object matching a term ID. * * @param $tid * A term's ID + * @param $reset + * Whether to reset the static cache. * - * @return Object + * @return * A term object. Results are statically cached. */ function taxonomy_term_load($tid, $reset = FALSE) { if (!is_numeric($tid)) { return FALSE; } - static $terms = array(); - if (!isset($terms[$tid]) || $reset) { - $terms[$tid] = taxonomy_get_term_data($tid, $reset); - module_invoke_all('taxonomy_term_load', $terms[$tid]); - } - return $terms[$tid]; + $term = taxonomy_term_load_multiple(array($tid), array(), $reset); + return $term ? $term[$tid] : FALSE; } /** @@ -1192,11 +1310,17 @@ function taxonomy_select_nodes($tids = array(), $operator = 'or', $depth = 0, $p function taxonomy_render_nodes($result) { $output = ''; $has_rows = FALSE; - while ($node = db_fetch_object($result)) { - $output .= node_view(node_load($node->nid), 1); - $has_rows = TRUE; + $nids = array(); + foreach ($result as $record) { + $nids[] = $record->nid; } + $has_rows = !empty($nids) ? TRUE : FALSE; if ($has_rows) { + $nodes = node_load_multiple($nids); + + foreach ($nodes as $node) { + $output .= node_view($node, 1); + } $output .= theme('pager', NULL, variable_get('default_nodes_main', 10), 0); } else { @@ -1208,9 +1332,26 @@ function taxonomy_render_nodes($result) { /** * Implementation of hook_nodeapi_load(). */ -function taxonomy_nodeapi_load($node, $arg = 0) { - $output['taxonomy'] = taxonomy_node_get_terms($node); - return $output; +function taxonomy_nodeapi_load($nodes) { + // Get an array of tid, vid associations ordered by vocabulary and term + // weight. + $tids = taxonomy_get_tids_from_nodes($nodes); + + // Build an array consisting of only the unique tids. + $term_ids = array(); + foreach ($tids as $term) { + $term_ids[$term->tid] = $term->tid; + } + // Load the full term objects for these tids. + $terms = taxonomy_term_load_multiple($term_ids); + foreach ($tids as $term) { + $nodes[$term->nid]->taxonomy[$term->tid] = $terms[$term->tid]; + } + foreach ($nodes as $node) { + if (!isset($nodes[$node->nid]->taxonomy)) { + $node->taxonomy = array(); + } + } } /** diff --git modules/taxonomy/taxonomy.test modules/taxonomy/taxonomy.test index 8ee361a..7c96e06 100644 --- modules/taxonomy/taxonomy.test +++ modules/taxonomy/taxonomy.test @@ -337,7 +337,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase { $this->drupalPost('node/add/article', $edit, t('Save')); // Check that the term is displayed when the node is viewed. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->drupalGet('node/' . $node->nid); $this->assertText($term1->name, t('Term is displayed when viewing the node.')); @@ -426,3 +426,63 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase { $this->assertText($edit['description'], t('The randomly generated term description is present.')); } } + +/** + * Test the taxonomy_term_load_multiple() function. + */ +class TaxonomyLoadMultipleUnitTest extends TaxonomyWebTestCase { + + function getInfo() { + return array( + 'name' => t('Taxonomy term multiple loading'), + 'description' => t('Test the loading of multiple taxonomy terms at once'), + 'group' => t('Taxonomy'), + ); + } + + function setUp() { + parent::setUp(); + $this->taxonomy_admin = $this->drupalCreateUser(array('administer taxonomy')); + $this->drupalLogin($this->taxonomy_admin); + } + + /** + * Create a vocabulary and some taxonomy terms, ensuring they're loaded + * correctly using taxonomy_term_load_multiple(). + */ + function testTaxonomyTermMultipleLoad() { + // Create a vocabulary. + $vocabulary = $this->createVocabulary(); + + // Create five terms in the vocabulary. + $i = 0; + while ($i < 5) { + $i++; + $this->createTerm($vocabulary->vid); + } + // Load the terms from the vocabulary. + $terms = taxonomy_term_load_multiple(NULL, array('vid' => $vocabulary->vid)); + $count = count($terms); + $this->assertTrue($count == 5, t('Correct number of terms were loaded. !count terms.', array('!count' => $count))); + + // Load the same terms again by tid. + $terms2 = taxonomy_term_load_multiple(array_keys($terms)); + $this->assertTrue($count == count($terms2), t('Five terms were loaded by tid')); + $this->assertEqual($terms, $terms2, t('Both arrays contain the same terms')); + + // Load the terms by tid, with a condition on vid. + $terms3 = taxonomy_term_load_multiple(array_keys($terms2), array('vid' => $vocabulary->vid)); + $this->assertEqual($terms2, $terms3); + + // Remove one term from the array, then delete it. + $deleted = array_shift($terms3); + taxonomy_term_delete($deleted->tid); + $deleted_term = taxonomy_term_load($deleted->tid, TRUE); + $this->assertFalse($deleted_term); + + // Load terms from the vocabulary by vid. + $terms4 = taxonomy_term_load_multiple(NULL, array('vid' => $vocabulary->vid), TRUE); + $this->assertTrue(count($terms4 == 4), t('Correct number of terms were loaded.')); + $this->assertFalse(isset($terms4[$deleted->tid])); + } +} diff --git modules/translation/translation.test modules/translation/translation.test index 076d1c8..e87853d 100644 --- modules/translation/translation.test +++ modules/translation/translation.test @@ -123,7 +123,7 @@ class TranslationTestCase extends DrupalWebTestCase { $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Page created.')); // Check to make sure the node was created. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); return $node; @@ -147,7 +147,7 @@ class TranslationTestCase extends DrupalWebTestCase { $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Translation created.')); // Check to make sure that translation was successfull. - $node = node_load(array('title' => $edit['title'])); + $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); return $node; diff --git modules/trigger/trigger.test modules/trigger/trigger.test index 80b19a2..900e270 100644 --- modules/trigger/trigger.test +++ modules/trigger/trigger.test @@ -47,7 +47,7 @@ class TriggerContentTestCase extends DrupalWebTestCase { // Make sure the text we want appears. $this->assertRaw(t('!post %title has been created.', array ('!post' => 'Page', '%title' => $edit['title'])), t('Make sure the page has actually been created')); // Action should have been fired. - $loaded_node = node_load(array('title' => $edit['title']), NULL, TRUE); + $loaded_node = $this->drupalGetNodeByTitle($edit['title']);; $this->assertTrue($loaded_node->$info['property'] == $info['expected'], t('Make sure the @action action fired.', array('@action' => $info['name']))); // Leave action assigned for next test @@ -111,4 +111,4 @@ class TriggerContentTestCase extends DrupalWebTestCase { ); return $info[$action]; } -} \ No newline at end of file +} diff --git modules/upload/upload.module modules/upload/upload.module index e42d861..076f97c 100644 --- modules/upload/upload.module +++ modules/upload/upload.module @@ -300,10 +300,11 @@ function upload_file_delete(&$file) { /** * Implementation of hook_nodeapi_load(). */ -function upload_nodeapi_load(&$node, $teaser) { - if (variable_get("upload_$node->type", 1) == 1) { - $output = array('files' => upload_load($node)); - return $output; +function upload_nodeapi_load($nodes, $types) { + foreach ($nodes as $node) { + if (variable_get("upload_$node->type", 1) == 1) { + $node->files = upload_load($node); + } } }