May 2005 - Development - lists.drupal.org

[drupal-devel] [feature] introducing theme_term_link()
by Kobus 18 May '05

18 May '05

Issue status update for http://drupal.org/node/12154 Project: Drupal Version: cvs Component: taxonomy.module Category: feature requests Priority: normal Assigned to: Anonymous Reported by: Bèr Kessels Updated by: Kobus Status: patch Hi, If you look at my site Humour Authority (www.humourauthority.com) you'll see that I have images instead of the term names as a link. This cost me to hardcode taxonomy module so that it works. It is very neat if I can theme it by means of an extra function in my theme, so I am for the principle of allowing the theming hereof. I didn't look at the patch, and can't comment on it, or even if the patch will allow what I did on HA, but still, the idea (as I see it) is not much different. I give this patch a +1. Kobus Kobus Previous comments: ------------------------------------------------------------------------ October 26, 2004 - 22:40 : Bèr Kessels Attachment: http://drupal.org/files/issues/drupal_84 (1.28 KB) There currently is *no* way to theme a term link. Thats not good [tm]. Because I think this is not just a simple featurem, but required for good themeing (note that even "silly-er" functions have extremely complex theme functions) I categorise it as a Bug and not a task or a feature! This patch allows themes to override the term-links by themeing a very simple function. ------------------------------------------------------------------------ October 27, 2004 - 00:02 : moshe weitzman why would someone want to theme a term link? how is this different from links to users or links to nodes. ------------------------------------------------------------------------ October 27, 2004 - 00:25 : Bèr Kessels I want it for one: <?php function remixreading_term_link($term) { return taxonomy_image_display($term->tid)." ".l($term->name, 'taxonomy/term/'. $term->tid); } ?> and other might want fancy opportunities here: <?php function mytheme_term_link($term) { if(in_array($term->vid, $array_of_fancy_vocs)) { return '<div id=voc-'.$term->vid.'">'.l($term->name, 'taxonomy/term/'. $term->tid).'</div>; } else { return l($term->name, 'taxonomy/term/'. $term->tid); } } ?> so Yes!, i believe its areal useable issue here! ------------------------------------------------------------------------ October 27, 2004 - 02:12 : drumm Setting status to patch. +1 for what is here and another request: The image and forum modules should be able to make the links go to the image and forum modules. Although this could easily fit into http://drupal.org/node/10425. ------------------------------------------------------------------------ October 27, 2004 - 07:50 : Eric Scouten "The image and forum modules should be able to make the links go to the image and forum modules. " I strongly agree here. Related suggestion: I'd like it if taxonomy_menu could "hijack" the term listings so that clicking on a term caused the menus to update properly. (IOW, the term link should be to taxonomy_menu/(vid)/(tid), not to taxonomy/(tid). This may or may not fit with the patch provided here. (I didn't read the patch.) ------------------------------------------------------------------------ October 27, 2004 - 14:28 : moshe weitzman i guess folks want image and forum links to be rewritten because thos modules output their nodes using a display that differs from node/x. that is image/x looks different from node/x. the right way to fix that is to do what we did for book.module. unify the look of image/x and node/x such that we no longer have an imagex. see how book.module accomplishes this. i am still -1 for this patch since i see many other types of links that could be themed in this way (users, forum nodes, recipe nodes, polls, etc.). on the other hand, it is a pretty small change. ------------------------------------------------------------------------ October 27, 2004 - 14:30 : moshe weitzman i guess folks want image and forum links to be rewritten because thos modules output their nodes using a display that differs from node/x. that is image/x looks different from node/x. the right way to fix that is to do what we did for book.module. unify the look of image/x and node/x such that we no longer have an imagex. see how book.module accomplishes this. i am still -1 for this patch since i see many other types of links that could be themed in this way (users, forum nodes, recipe nodes, polls, etc.). on the other hand, it is a pretty small change. ------------------------------------------------------------------------ October 27, 2004 - 19:39 : Eric Scouten No, false assumption. There is no image/x URL for displaying a single image. The issue is not how to display a *single* node (we all agree that node/x is correct), but how to display a *list* of nodes. For certain kinds of nodes, there are far better ways to do it than offered by taxonomy_render_nodes, so it makes sense to allow an override of that list display. (Note: This is straying from the original discussion. If I didn't have to leave ASAP, I'd start a new thread.) ------------------------------------------------------------------------ November 15, 2004 - 12:47 : Bèr Kessels bringing this back to the original discussion: pass the taxonomy links trough a theme function, so that people can, for example, add icons to the links. The patch sill applies (hint,hint!) ------------------------------------------------------------------------ November 15, 2004 - 17:24 : moshe weitzman Perhaps we do this themeing not for every taxo link but rather for lists of links. In other words, do like theme_node_list() and theme_user_list(). more consistent with existing practice. ------------------------------------------------------------------------ March 13, 2005 - 22:49 : killes(a)www.drop.org What did the usability meeting say about this? ------------------------------------------------------------------------ March 14, 2005 - 15:16 : Anonymous What did the usability meeting say about this? Nothing. Has not been discussed there. I personally still think that *all* HTML should pass through a theme function, and so should this listing. And no, passing it trough one of the two listing theme functions is not a good idea. Because this is not suc a list. This is the list of terms that show up with a node. Not a list that shows up in blocks or boxes! Its useage is completely different from these listings. Bèr ------------------------------------------------------------------------ May 18, 2005 - 15:39 : Bèr Kessels Nearly two months since the patch. If there is no need for this I will mark it won't fix.

1 0

[drupal-devel] [feature] introducing theme_term_link()
by Bèr Kessels 18 May '05

18 May '05

Issue status update for http://drupal.org/node/12154 Project: Drupal -Version: 4.5.0 +Version: cvs Component: taxonomy.module Category: feature requests Priority: normal Assigned to: Anonymous Reported by: Bèr Kessels Updated by: Bèr Kessels Status: patch Nearly two months since the patch. If there is no need for this I will mark it won't fix. Bèr Kessels Previous comments: ------------------------------------------------------------------------ October 26, 2004 - 21:40 : Bèr Kessels Attachment: http://drupal.org/files/issues/drupal_84 (1.28 KB) There currently is *no* way to theme a term link. Thats not good [tm]. Because I think this is not just a simple featurem, but required for good themeing (note that even "silly-er" functions have extremely complex theme functions) I categorise it as a Bug and not a task or a feature! This patch allows themes to override the term-links by themeing a very simple function. ------------------------------------------------------------------------ October 26, 2004 - 23:02 : moshe weitzman why would someone want to theme a term link? how is this different from links to users or links to nodes. ------------------------------------------------------------------------ October 26, 2004 - 23:25 : Bèr Kessels I want it for one: <?php function remixreading_term_link($term) { return taxonomy_image_display($term->tid)." ".l($term->name, 'taxonomy/term/'. $term->tid); } ?> and other might want fancy opportunities here: <?php function mytheme_term_link($term) { if(in_array($term->vid, $array_of_fancy_vocs)) { return '<div id=voc-'.$term->vid.'">'.l($term->name, 'taxonomy/term/'. $term->tid).'</div>; } else { return l($term->name, 'taxonomy/term/'. $term->tid); } } ?> so Yes!, i believe its areal useable issue here! ------------------------------------------------------------------------ October 27, 2004 - 01:12 : drumm Setting status to patch. +1 for what is here and another request: The image and forum modules should be able to make the links go to the image and forum modules. Although this could easily fit into http://drupal.org/node/10425. ------------------------------------------------------------------------ October 27, 2004 - 06:50 : Eric Scouten "The image and forum modules should be able to make the links go to the image and forum modules. " I strongly agree here. Related suggestion: I'd like it if taxonomy_menu could "hijack" the term listings so that clicking on a term caused the menus to update properly. (IOW, the term link should be to taxonomy_menu/(vid)/(tid), not to taxonomy/(tid). This may or may not fit with the patch provided here. (I didn't read the patch.) ------------------------------------------------------------------------ October 27, 2004 - 13:28 : moshe weitzman i guess folks want image and forum links to be rewritten because thos modules output their nodes using a display that differs from node/x. that is image/x looks different from node/x. the right way to fix that is to do what we did for book.module. unify the look of image/x and node/x such that we no longer have an imagex. see how book.module accomplishes this. i am still -1 for this patch since i see many other types of links that could be themed in this way (users, forum nodes, recipe nodes, polls, etc.). on the other hand, it is a pretty small change. ------------------------------------------------------------------------ October 27, 2004 - 13:30 : moshe weitzman i guess folks want image and forum links to be rewritten because thos modules output their nodes using a display that differs from node/x. that is image/x looks different from node/x. the right way to fix that is to do what we did for book.module. unify the look of image/x and node/x such that we no longer have an imagex. see how book.module accomplishes this. i am still -1 for this patch since i see many other types of links that could be themed in this way (users, forum nodes, recipe nodes, polls, etc.). on the other hand, it is a pretty small change. ------------------------------------------------------------------------ October 27, 2004 - 18:39 : Eric Scouten No, false assumption. There is no image/x URL for displaying a single image. The issue is not how to display a *single* node (we all agree that node/x is correct), but how to display a *list* of nodes. For certain kinds of nodes, there are far better ways to do it than offered by taxonomy_render_nodes, so it makes sense to allow an override of that list display. (Note: This is straying from the original discussion. If I didn't have to leave ASAP, I'd start a new thread.) ------------------------------------------------------------------------ November 15, 2004 - 11:47 : Bèr Kessels bringing this back to the original discussion: pass the taxonomy links trough a theme function, so that people can, for example, add icons to the links. The patch sill applies (hint,hint!) ------------------------------------------------------------------------ November 15, 2004 - 16:24 : moshe weitzman Perhaps we do this themeing not for every taxo link but rather for lists of links. In other words, do like theme_node_list() and theme_user_list(). more consistent with existing practice. ------------------------------------------------------------------------ March 13, 2005 - 21:49 : killes(a)www.drop.org What did the usability meeting say about this? ------------------------------------------------------------------------ March 14, 2005 - 14:16 : Anonymous What did the usability meeting say about this? Nothing. Has not been discussed there. I personally still think that *all* HTML should pass through a theme function, and so should this listing. And no, passing it trough one of the two listing theme functions is not a good idea. Because this is not suc a list. This is the list of terms that show up with a node. Not a list that shows up in blocks or boxes! Its useage is completely different from these listings. Bèr

1 0

[drupal-devel] [feature] List of bloggers
by Bèr Kessels 18 May '05

18 May '05

Issue status update for http://drupal.org/node/17030 Project: Drupal Version: cvs Component: blog.module Category: feature requests Priority: normal Assigned to: Anonymous Reported by: Bèr Kessels Updated by: Bèr Kessels Status: patch Nearly two months since the patch. If there is no need for this I will mark it won't fix. Bèr Kessels Previous comments: ------------------------------------------------------------------------ February 9, 2005 - 00:27 : Bèr Kessels Attachment: http://drupal.org/files/issues/blog_bloggers_list.patch (1.66 KB) Small patch to show a list of bloggers. We all should know that blog.module is not meant for personal blogging, but that set aside, we do not have a way to show all bloggers, on a site as a list. This patch ads a few lines that will allow you to show that overview of blogging users. It ads a menu item, disabled by default that shows such a list. ------------------------------------------------------------------------ February 9, 2005 - 00:31 : Bèr Kessels Attachment: http://drupal.org/files/issues/blog_bloggers_list.png (4.02 KB) Here is a small screeny that shows what this is about. ------------------------------------------------------------------------ February 9, 2005 - 00:34 : Bèr Kessels Attachment: http://drupal.org/files/issues/list_bloggers_2.png (2.25 KB) hmm. error in my png file. Here is a correct one. ------------------------------------------------------------------------ February 19, 2005 - 21:13 : Emiliano Hi Bèr Kessels! Thanks for the patch! It's really useful! :-) I just noticed what I think is a little mistake in this line: $items[] = l($row->name, 'blog/'.$row->uid)." ".theme('xml_icon', url('blog/'.$row->uid.'/feed'), TRUE); Which I believe should end like: $items[] = l($row->name, 'blog/'.$row->uid)." ".theme('xml_icon', url*('blog/feed/'.$row->uid)*, TRUE); Ah, and BTW, "db_rewrite_sql" didn't work for me... I just cut it off... ;-) Cheers, Emiliano. ------------------------------------------------------------------------ March 17, 2005 - 23:17 : Bèr Kessels Attachment: http://drupal.org/files/issues/blog_bloggers_list_2.patch (1.81 KB) and here is the actual patch. (i think i really need some script that tells me i did not attach a patch ;) ) ------------------------------------------------------------------------ March 17, 2005 - 23:19 : Bèr Kessels Attachment: http://drupal.org/files/issues/blog_bloggers_list_2_0.patch (1.71 KB) sigh. something tells me i should stop working.... a silly "F" sneaked into the previous patch. ------------------------------------------------------------------------ March 24, 2005 - 21:25 : Anonymous I applied the patch, reuploaded the blog.module and then deactivated and reactivated it. I cannot see a difference. How do I access the blog users page? Drupal 4.6rc thanks for the help. ------------------------------------------------------------------------ March 24, 2005 - 21:53 : Bèr Kessels look in the menu admin.

1 0

[drupal-devel] [bug] Put revisions in their own table
by Dries 18 May '05

18 May '05

Issue status update for http://drupal.org/node/7582 Project: Drupal Version: cvs Component: node system Category: bug reports Priority: normal Assigned to: killes(a)www.drop.org Reported by: killes(a)www.drop.org Updated by: Dries Status: patch I did another round of tests on _another_ machine and it is not looking good: Before upgrade After upgrade ?q= (main page) 218 ms/request 340 ms/request ?q=forum (forum overview) 754 ms/request 1520 ms/request ?q=about (book page) 375 ms/request 5400 ms/request The upgrade process itself gave me a number of 'query was empty' and 'sprintf(): too few arguments' reports. Everything seems to work fine though. Looking at the ?q=about page, I see that the following query is executed twice _and_ that each time, it take more than 2 seconds to complete: SELECT n.nid, n.title, b.parent, b.weight FROM node n INNER JOIN book b ON n.vid = b.vid WHERE n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title; --8 SHOW INDEX FROM book; +-------+------------+-------------+--------------+-------------+-----------+-------------+----------+--------+------+------------+---------+ | Table | Non_unique | Key_name | Seq_in_index | Column_name | Collation | Cardinality | Sub_part | Packed | Null | Index_type | Comment | +-------+------------+-------------+--------------+-------------+-----------+-------------+----------+--------+------+------------+---------+ | book | 1 | book_parent | 1 | parent | A | 92 | NULL | NULL | | BTREE | | | book | 1 | nid | 1 | nid | A | 369 | NULL | NULL | | BTREE | | +-------+------------+-------------+--------------+-------------+-----------+-------------+----------+--------+------+------------+---------+ 2 rows in set (0.00 sec) The book module does not appear to have a primary key? Sounds like a bad idea so I added one: mysql> ALTER TABLE book ADD PRIMARY KEY nid (nid); Query OK, 369 rows affected (0.02 sec) Records: 369 Duplicates: 0 Warnings: 0 Next, I wanted to make the vid column a unique key in all node tables: mysql> ALTER TABLE node ADD UNIQUE vid (vid); Query OK, 20392 rows affected (0.81 sec) Records: 20392 Duplicates: 0 Warnings: 0 mysql> ALTER TABLE book ADD UNIQUE vid (vid); ERROR 1062: Duplicate entry '0' for key 2 mysql> ALTER TABLE forum ADD UNIQUE vid (vid); Query OK, 10806 rows affected (0.10 sec) Records: 10806 Duplicates: 0 Warnings: 0 As you can see, it fails for the book table which makes me believe there is some inconsistent data ... I set out to fix that: mysql> SELECT nid, COUNT(nid) AS vids FROM book GROUP BY vid HAVING vids > 1; +-----+------+ | nid | vids | +-----+------+ | 871 | 2 | +-----+------+ 1 row in set (0.00 sec) mysql> SELECT title FROM node WHERE nid = 871; Empty set (0.00 sec) mysql> DELETE FROM book WHERE nid = 871; Query OK, 1 row affected (0.00 sec) mysql> ALTER TABLE book ADD UNIQUE vid (vid); Query OK, 368 rows affected (0.01 sec) Records: 368 Duplicates: 0 Warnings: 0 Looks like everything is well now. Ran some new benchmarks: Before upgrade After upgrade With indices ?q= (main page) 218 ms/request 340 ms/request 336 ms/request ?q=forum (forum overview) 754 ms/request 1520 ms/request 1531 ms/request ?q=about (book page) 375 ms/request 5400 ms/request 475 ms/request Unfortunately, we're still slower than the original code. Dries Previous comments: ------------------------------------------------------------------------ May 5, 2004 - 18:25 : killes(a)www.drop.org Currently all node revisions are stored in a serialized field in node.table and retrieved for _each_ page view although they are rarely needed. However, we have agreed that serializing data is bad and that we should try to keep the memory foot print pf Drupal small. Therefore I propose to create a separate revisions table which would be in principle identical to the node table, only that it could have several old copies of the same node. Extra data added by other modules could be added in a serialized field unless we find a better solution. ------------------------------------------------------------------------ May 5, 2004 - 19:06 : jhriggs I too think the serialized approach is less than desirable, but here's an alternative. This would likely take some considerable rework in core and contrib, but the following is how we handle similar types of situations in our databases at work. It is more elegant that a separate table, and avoids the (almost exact) duplication of a table. Instead of separate tables, keep all revisions of nodes in the node table as follows: * add field: active (0/1 or Y/N) * add field: revision * every revision of a node is stored in the node table; however, only one revision can be active at any given time * nid can no longer be unique -- primary/unique key becomes (nid, active) * any time a node is loaded, updated (without revision), etc., the active version is used. Thoughts? ------------------------------------------------------------------------ May 5, 2004 - 19:57 : killes(a)www.drop.org I am not opposed to your scheme, but I want to stress the following: * Duplicating a table's structure is not bad (IMHO) as long as the content is different. * having two tables will allow us to have a rather small node table. This is (maybe) a performance gain. ------------------------------------------------------------------------ May 5, 2004 - 20:37 : jhriggs I don't necessarily think that duplicating a table's structure is _bad_. It just seems to be wasteful and a pain to maintain. (Every change to the node table is made twice...easy to do, but also easy to miss perhaps.) As for performance, as long as nid and the active indicator are indexed, there shouldn't be any performance loss. Also, archiving an old version when making a new revision will be much simpler: just change the active indicator rather than copying an entire node to another table (and ensuring everything gets copied...again a potential maintainance issue). To be honest, I would just like to see the serialized data go away, regarless of what approach is taken. ------------------------------------------------------------------------ July 30, 2004 - 21:49 : Nick Nassar Attachment: http://drupal.org/files/issues/Drupal-Improved_Revision_Schema_07-30-2004.p… (10.47 KB) I'm interested in using Drupal for a large scale wiki-type project. In order to do this, I need revisions to be in their own table. Attached is a patch to do just that. Most of the changes are pretty self explanatory. Spreading out node data across two tables meant that I had to add database functions to do locking/transactions. Without this, race conditions in which the database becomes corrupted are possible. ------------------------------------------------------------------------ July 30, 2004 - 21:54 : Nick Nassar Oh yeah... The patch is a diff against Drupal CVS ------------------------------------------------------------------------ July 31, 2004 - 02:00 : Anonymous Gerhard speaking. Nick, thanks a lot for your nice patch! It saves me a great deal of labour. I looked through it and immediately liked it. You not only put the old revisions into a new table but also the current one. Do you have an estimate how much more expensive the additional join is? Besides a few minor coding style issues I found a major one: Just a few hours before you uploaded your patch JonBob's node access patch hit core. That means your patch won't apply anymore as all the queries you change have been changed. Can I bug you to update your patch? ------------------------------------------------------------------------ July 31, 2004 - 03:11 : Anonymous Also I think that your upgrade path loses existing revisions. ------------------------------------------------------------------------ July 31, 2004 - 04:39 : drumm I think this is the proper way to do things. No columns are duplicated, there is no serialized data, and only the fields that are logically revised are stored. Nothing jumped out at me as a way to have my node modules be able to keep a table of revisions of additional fields. I'm guessing this could be done within the confines of _insert and _update. Assuming the upgrade path works and modules can extend it I give it a +1. ------------------------------------------------------------------------ July 31, 2004 - 16:40 : Nick Nassar It figures that just as I finish a big patch, another patch comes along and breaks it. Oh well, it should be a pretty easy to fix. I'll work on it. Fixing the upgrade path to keep revisions should be fairly painless. I found another issue that needs to be fixed before this patch gets merged. There format of a node needs to be stored for each revision. Otherwise, for modules that store a format for the nodes, such as page and book, if you write one revision in PHP and the next in HTML, the PHP revision will be displayed as HTML. This is part of a larger issue of how node modules should store revisions of additional fields. I think each module that wants to do this should create another table with (nid, revid) as the primary key. Just as when they want to add fields to a node they create another table with nid as the primary key. As far as performance goes, for sites that make heavy use of revisions, an extra join on primary keys is going to be a lot faster than grabbing all of the revisions from that database everytime. We would need to run benchmarks to determine is the overall difference in speed is for an average site is a gain or a loss. I'm guessing it's very minor either way. ------------------------------------------------------------------------ August 23, 2004 - 15:55 : Nick Nassar Attachment: http://drupal.org/files/issues/Drupal-Improved_Revision_Schema_08-23-2004.p… (10.92 KB) Here's an updated patch against CVS that puts revisions in their own table, provides an upgrade path, and fixes the format related bugs in the last patch. Hopefully, this can make it into CVS as soon as the freeze is over. ------------------------------------------------------------------------ August 23, 2004 - 16:10 : moshe weitzman Interesting patch ... drumm's question is still outstanding. how do modules store revisions of their fields? Are they expected to manage this on their own? Thats not how it works today. As an aside, i am seeing profile_ fields in my node.revisions column. One could argue that those need not be saved. They pertain to the node author, not to the node itself. ------------------------------------------------------------------------ August 23, 2004 - 18:14 : Nick Nassar Having modules be responsible for storing revisions of their own fields is a side-effect of storing revision data in tables. There's really no way around it. However, revisions generally don't make sense for node types that don't have PHP/HTML content, such as polls. I think it's going to be a pretty rare scenario for a new node type to want another field to change per-revision, so it's a pretty good trade-off. Storing fields that shouldn't be part of revisions, such as the profile_ fields, is a side-effect of storing revisions as serialized objects. Applying this patch will free up that wasted space. :) ------------------------------------------------------------------------ August 23, 2004 - 19:20 : Anonymous There should be a hook that let's the module choose whether it supports history. This way a module author can prevent the user from doing something that may break his module or just cause undefined behavior. If the module doesn't support history then don't let the user/admin choose to add history to nodes of that type. Craig ------------------------------------------------------------------------ August 23, 2004 - 21:23 : Nick Nassar I agree, there should be an API change to make specifying support for revisions easier. In the interests of keeping patches small and keeping to one change per patch, I think the API change should be a separate issue. A sort of ad-hoc API to decide whether or not a module supports revisions by default already exists. Instead of having a hook, modules set the default value of the "Create new revision" field in the edit form. The admin can change this option in admin/node/configure/defaults. This patch doesn't change that. Revisions are broken for node types that have their own database structure, like polls, even when storing them as serialized objects. This patch doesn't change that, either. ------------------------------------------------------------------------ October 26, 2004 - 04:35 : moshe weitzman I'm guessing that someone is going to have to demonstrate that this patch performs as well as current drupal before it gets comitted. i think this patch is a few benchmarks from being comitted. ------------------------------------------------------------------------ October 27, 2004 - 03:04 : Nick Nassar Attachment: http://drupal.org/files/issues/Drupal-Improved_Revision_Schema_10-26-2004.p… (11 KB) I ran some really unscientific benchmarks, and it looks like this patch has a negligible affect on performance. I used apache bench and the database from theregular.org, which doesn't contain any revisions (worst case scenario for this patch) and contains several hundred nodes. Both the patched and unpatched versions hovered between 2.36 and 2.38 requests per second. The command I used was: ab -n50 -C 'PHPSESSID=b01a9f92880ef215b0ed6f1314a5eba2' http://192.168.0.100/ An updated patch that should apply to CVS is attached. ------------------------------------------------------------------------ October 27, 2004 - 03:05 : Nick Nassar I ran some really unscientific benchmarks, and it looks like this patch has a negligible affect on performance. I used apache bench and the database from theregular.org, which doesn't contain any revisions (worst case scenario for this patch) and contains several hundred nodes. Both the patched and unpatched versions hovered between 2.36 and 2.38 requests per second. The command I used was: ab -n50 -C 'PHPSESSID=b01a9f92880ef215b0ed6f1314a5eba2' http://192.168.0.100/ An updated patch that should apply to CVS is attached. ------------------------------------------------------------------------ October 27, 2004 - 03:05 : Nick Nassar Attachment: http://drupal.org/files/issues/Drupal-Improved_Revision_Schema_10-26-2004.p… (11 KB) I ran some really unscientific benchmarks, and it looks like this patch has a negligible affect on performance. I used apache bench and the database from theregular.org, which doesn't contain any revisions (worst case scenario for this patch) and contains several hundred nodes. Both the patched and unpatched versions hovered between 2.36 and 2.38 requests per second. The command I used was: ab -n50 -C 'PHPSESSID=b01a9f92880ef215b0ed6f1314a5eba2' http://192.168.0.100/ An updated patch that should apply to CVS is attached. ------------------------------------------------------------------------ November 15, 2004 - 07:05 : elias1884 please overthink the revision system default workflow as well. don't look at the revision system as an isolated system but as a part of the whole workflow system! if you combine revisions with the moderation queue the most logic default workflow would be like that: auth user creates node (revision #0) admin approves the node (status = 1, moderation = 0) => node publicly available auth user finds typo and changes node (revision #1, status = 0, moderation = 1) ------- what happens at that point at the moment is, that the node is not accessible anymore at all until the new revision is approved by admin. of course the new revision should not go online until reviewed and approved, this is absolutely correct, but there is no reason to not take the old revision offline, since it was already approved and should therefore be online until the new revision is approved. it is not practical if a node disappears only because the author corrected a typo. ------- admin approves the node (status = 1, moderation = 0) eventhough I first thought a plain boolean active field would not be capable of providing that functionality if finally came to the conclusion, that it can. The only thing to do is to not set that bit, when a new revision is created, but when it is approved (in case moderation is activated under default workflow). Every revision should have its own moderation, status and active field and on approval they are set like this (status=1, moderation=0, active=Y). When you wanna rollback to an old revision, you can chose between all revisions that already have the moderation bit set back to 0 again and the published to 1. There should be an extra permission for rollback! another concern that I have about the default workflow is, that users can't see the content, they have just created, when moderation is enabled. Eventhough, there is a big fat "submission accepted" presented after submissions, unexperienced users tend to question the information those stupid tincans give them, if they can't find their content afterwards. Many users are really lazy bastards and they don't even read the status messages. The best feedback about whether his story was submitted successfully or not of course is, if he can find the story somewhere on the site, maybe with a status message on top of it, mentioning, that the content is currently not publicly available since it has not been approved yet. there should be a my content section under my account, like somebody is trying to do with the workspace module I guess. so my suggestion is to make (status=0, moderation=1) still available for the creator under a my content section somewhere! ------------------------------------------------------------------------ November 24, 2004 - 06:21 : Nick Nassar I agree. The current workflow for moderation queues and revisions needs to change, but this patch isn't the place for it. The patch is already too big, and it only does the backend stuff. Instead of adding more to this patch and making it take even longer to get into core, would you mind creating a new issue for your UI suggestions, so the those changes can be added as a separate patch? Thanks, Nick ------------------------------------------------------------------------ December 11, 2004 - 14:26 : Dries This patch is _much_ needed so I'd love to see someone revive it. In order for this patch to be accepted, the following needs to be done: Update this patch to CVS HEAD. Rename revid to vid. Rename node_rev to node_revisions. Rename node_rev.changed to node_revisions.timestamp. Rename $rnode to $revision. Fix the coding style to match Drupal's: proper spacing, single quotes where possible, proper variable names. Benchmark this patch with a large database with enough revisions. I'd be happy to benchmark this on my local copy of the drupal.org database. The book.log field should probably move to the node_revisions table. This can be done in a separate patch. Investigate whether transactions are well-supported. ------------------------------------------------------------------------ December 13, 2004 - 02:25 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/Drupal-Improved_Revision_Schema_10-26-2004-r… (11.02 KB) I've worked a bit on the patch (coding style issues as mentioned by Dries). One thing I noticed is that the patch uses REPLACE. IIRC this needs to be chagned to "UPDATE, if fail INSERT" for pgsql compatibility. Nick, are you still interested in working on that patch? I'd like to know how it works on your site and work on getting it into core. ------------------------------------------------------------------------ December 13, 2004 - 14:33 : Dries Gerhard: your patch does not apply. ------------------------------------------------------------------------ December 13, 2004 - 19:10 : killes(a)www.drop.org Yes, I know, that was the same version as I mailed to you earlier. ------------------------------------------------------------------------ December 13, 2004 - 23:02 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions.patch (52.96 KB) Ok, upüdated the patch to cvs. ------------------------------------------------------------------------ December 14, 2004 - 10:58 : Dries Some more comments: db_begin_transaction() and db_end_transaction() do not belong in database.inc, but in database.mysql.inc and database.pgsql.inc respectively. The node module calls node_revisionsision_list() which is not defined. (Fxed that on my local copy.) Do db_begin_transaction() and db_end_transaction() deprecate Jeremy's table locking patch? The upgrade path assigns the wrong user ID to each revision. The upgrade path assigns the wrong date to each revision (that or a node's revision page shows the wrong usernames/dates). The coding style needs a bit of work, but we can worry about that later. ------------------------------------------------------------------------ December 14, 2004 - 19:34 : Nick Nassar If you need any help getting those things fixed, just let me know. ------------------------------------------------------------------------ December 14, 2004 - 19:50 : Nick Nassar How this relates to Jeremy's node locking patch: There was lots of discussion, and node locking was decided against because from an end user point of view you never want a node to be locked. He's now advocating for a much simpler patch that warns users if their changes will overwrite someone elses. That patch still has a race condition, which might be fixed using db_begin_transaction(). http://drupal.org/node/6025 ------------------------------------------------------------------------ December 15, 2004 - 00:26 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_0.patch (55.96 KB) Here is an updated patch that tries to address Dries concerns. ------------------------------------------------------------------------ December 15, 2004 - 10:32 : Dries Attachment: http://drupal.org/files/issues/revisions-bug.png (76.06 KB) It didn't fix the aforementioned bugs. See attached screenshot. ------------------------------------------------------------------------ January 6, 2005 - 22:15 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_1.patch (51.77 KB) Ok, here is a new version. Dries and myself worked hart at it, so please have a look. what is still missing - database upgrades for the core modules with an own table - contrib modules need an upgrade too. - do we need nid and vid in both the node and the node_revisions table? - the amount of sql queries means a good stress testing for large databases. ------------------------------------------------------------------------ January 19, 2005 - 23:43 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_2.patch (49.49 KB) Here is an updated patch. We discussed to keep the current title in node module and also in the revisiosn table. This is content duplication but will save many joins as many queries only need the title of a node. Discussion is welcome. ------------------------------------------------------------------------ January 20, 2005 - 01:33 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_3.patch (29.93 KB) I've implemented the aforementioned solution. This makes the patch much smaller. The patch now also removes taxonomy_node_has_term() which wasn't used anywhere. I'd really apprciate if some people could test drive the patch. It will be another huge improvement for 4.6. ------------------------------------------------------------------------ January 20, 2005 - 02:05 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_4.patch (30 KB) Another revision. Steven didn't like my literal $node->vid in queries. ------------------------------------------------------------------------ January 20, 2005 - 03:10 : killes(a)www.drop.org - database upgrades for the core modules with an own table - contrib modules need an upgrade too. - do we need nid and vid in both the node and the node_revisions table? - the amount of sql queries means a good stress testing for large databases. These issues are still open, btw. Especially the first one needs to be tackled. ------------------------------------------------------------------------ January 25, 2005 - 22:11 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_5.patch (51.13 KB) Here is a patch that has the database tables updated for forum, book, and page module. ------------------------------------------------------------------------ January 30, 2005 - 00:55 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_6.patch (49.18 KB) Yet another update to keep it working with head. The patch now also removes the table definitons for the page table. ------------------------------------------------------------------------ January 30, 2005 - 00:57 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_7.patch (55.69 KB) Sorry, that was the old version, this is the right one. ------------------------------------------------------------------------ January 31, 2005 - 21:55 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_8.patch (55.71 KB) Updated once more. ------------------------------------------------------------------------ January 31, 2005 - 22:52 : Dries Anyone to help review/test this? ------------------------------------------------------------------------ January 31, 2005 - 23:22 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_9.patch (49.29 KB) Updated again, the update functions occurred twice. Thanks Bart. ------------------------------------------------------------------------ February 2, 2005 - 02:27 : killes(a)www.drop.org Don't know if the db I am using is corrupted or what. I still do have some didficulties. The latest patch is attached. ------------------------------------------------------------------------ February 2, 2005 - 02:27 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_10.patch (49.67 KB) I am probably slowly going mad ... ------------------------------------------------------------------------ February 2, 2005 - 03:54 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_11.patch (48.95 KB) The update issue still needs investigating. This patch is updated for cvs. ------------------------------------------------------------------------ February 2, 2005 - 22:20 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_12.patch (49.83 KB) Ok, here is a new version. I've solved my troubles with book.module. There are still some issues with forum module. Possibly due to inconsistent database. ------------------------------------------------------------------------ February 2, 2005 - 23:31 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_13.patch (49.83 KB) Turns out the drupal.org database had indeed some quirks. Please run this query in your oldest db and tell me the result: select nid,type from node where type like '%/%'; If you get a non-zero result we might need to add another security update. The patch could use still more testing, though. ------------------------------------------------------------------------ February 3, 2005 - 03:16 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_14.patch (49 KB) Ok, we are getting somewhere. At a first glance the update is working. There is a problem remaining: the revisions tab will be shown whether the node has revisions or not. Not sure we can/need to fix this. People with a drupal.org account can log in at http://killes.drupaldevs.org/revision/ and poke around. Your permissions will be the same as on drupal.org. Feel free to vreak everything but don't forget to file complaints here. (Note: this is only a pruned version of the drupal.org database with all project nodes and nodes with nids > 7000 dropped). ------------------------------------------------------------------------ February 3, 2005 - 06:19 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_15.patch (52.39 KB) There was some error in node_save and also the patches to the database.inc files got lost... ------------------------------------------------------------------------ February 3, 2005 - 09:07 : robertDouglass Submitting book pages doesn't work on your test site. It puts the entire content of the preview inside the body textarea. I wrote a sentence in the body and the log, and pressing preview put several lines of HTML containing both sentences in the body textarea on the preview page, plus the book page wouldn't submit. -R ------------------------------------------------------------------------ February 3, 2005 - 09:50 : Junyor 0 results here. I started using Drupal with version 4.4, though. ------------------------------------------------------------------------ February 4, 2005 - 01:56 : killes(a)www.drop.org @Junyor: Thanks, that's a good sign. Maybe somebody else has an older db to try. @robertDouglass: The first effect you describe is due to drupaldevs running on PHP 5. I am unsure why the second thing does not work. In node_save() the node object has a nid although there is none in the form. Very strange. I've enabled display of db queries on the testsite. ------------------------------------------------------------------------ February 4, 2005 - 21:17 : dmjossel No results here on the query: select nid,type from node where type like '%/%'; On a database that was put in place prior to Drupal 4 and is now running on 4.5.2. ------------------------------------------------------------------------ February 4, 2005 - 22:44 : killes(a)www.drop.org @dmjossel: thanks. @all. The strange problem I reported was apparently php 5 related. After applying Steven's php 5 patch it went away. One error is remaining: If I create a new forum topic it will be shown as part of the book on preview. Hmm, that was due to a db that got corrupted during testing so that is fixed too. Please poke around at the test site and look if you find more errors. ------------------------------------------------------------------------ February 5, 2005 - 09:16 : Steven By the way, I just remembered that Drupal.org has some blogs lingering on in the database even though blog.module is not enabled. Perhaps this is causing troubles? ------------------------------------------------------------------------ February 5, 2005 - 13:22 : Anonymous I can't see why it would. Drupal.org will need extra updates for images and project nodes because those have their own tables. GK. ------------------------------------------------------------------------ February 6, 2005 - 14:49 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_16.patch (52.49 KB) Updated to apply to cvs again. ------------------------------------------------------------------------ February 22, 2005 - 22:15 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_17.patch (49.64 KB) Updated again. All we need is a patch to upload module and an upgrade path for it. ------------------------------------------------------------------------ March 4, 2005 - 06:22 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_18.patch (52.31 KB) Updated once more. Moved log field from book to node_revisions table as discussed in Antwerp. upload module still missing. We need to decide under which circumstances the log field should be displayed. Should that be added to the workflow? Should it depend on the revisions setting? ------------------------------------------------------------------------ March 5, 2005 - 21:27 : Anonymous Attachment: http://drupal.org/files/issues/revisions_20.patch (75.52 KB) Ok, here it is: Yet another revision of this grrrrreat patch. Changes from previous versions: - supports versioning for uploaded files. A problem is that if you delete a file, it will be gone for all revisions. - the log field is now in the node_revsions table, but each module has to decide whether to show it or not. I've implemented it for the page and the book type odes. Also, the field can be edited when adding non-book nodes to the book. The log is displayed on the revisions page and if a node is moderated. - the revisions are moved to an old_revisions table to a) get the node table smaller and b) still leave the mavailable for contrib modules that want to retreive old version data. The patch has been applied to killes.drupaldevs.org/revision where it can be tested by anybody (especially people who have "site admin" rights on drupal.org) The database is from drupal.org and you should b able to log in with your pass or simply mail yourself a new one. Gerhard ------------------------------------------------------------------------ March 5, 2005 - 21:51 : Anonymous Attachment: http://drupal.org/files/issues/revisions_21.patch (59.42 KB) BTW, I marked this a bug because atm the revisions field can grow quite big. Neil has reported problems from some users who were not able to load some nodes due to to many large revisions. Also, som unrelated stuff crept into the patch. New version attached. ------------------------------------------------------------------------ March 8, 2005 - 07:56 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_22.patch (60.29 KB) Ok, I think I got it. Changes to last version: - uploads are no properly versioned. Missing are still pgsql checks and updates. ------------------------------------------------------------------------ March 10, 2005 - 18:58 : Anonymous Was able to get http://drupal.org/files/issues/revisions_21.patch to work with drupal-cvs.tar.gz (10 March 2005) by: - includes/database.mysql.inc: Commenting out duplicates for functions function db_begin_transaction and function db_commit_transaction - modules: node.module: Removing "'title' => $node->title," from $node_table_values variable declaration and removing "'title' => "'%s'"," from "$node_table_types" variable declaration. Happy to submit a patch if requested. I'll watch this thread. ------------------------------------------------------------------------ March 12, 2005 - 01:59 : killes(a)www.drop.org The duplicate function has been removed in rev 22 of this patch. Why do you think the changes in node_save are needed? Titles are saved in both tables for performance reasons. ------------------------------------------------------------------------ March 13, 2005 - 18:12 : jlerner Hi - I posted comment #62. The changes to node_save appear to be needed because recent patches (both 21 and 22) remove the field 'title' from table 'node'. So without the changes to node_save, node.module is broken and generates errors. Joshua ------------------------------------------------------------------------ March 13, 2005 - 18:29 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_23.patch (61.17 KB) Thanks, Joshua, for catching this. node:title is there to stay. ------------------------------------------------------------------------ April 13, 2005 - 18:29 : moshe weitzman since HEAD is open again, perhaps it is a good time to revisit this patch. once this is committed, lets address - http://drupal.org/node/11071 "node_validate does not respect group editing" ------------------------------------------------------------------------ April 18, 2005 - 17:43 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_24.patch (60.39 KB) Updated. ------------------------------------------------------------------------ April 18, 2005 - 18:16 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_24_0.patch (60.39 KB) Updated. ------------------------------------------------------------------------ April 19, 2005 - 07:19 : Dries I'll commit this patch later this week! If you haven't checked this patch already, I urge you to test/check it out because it will have significant impact on existing code and modules! ------------------------------------------------------------------------ April 19, 2005 - 07:21 : Dries Also, what do people think about the n.title being duplicated? ------------------------------------------------------------------------ April 19, 2005 - 07:26 : chx I won't lose any sleep because of duplicated titles... ------------------------------------------------------------------------ April 19, 2005 - 20:35 : killes(a)www.drop.org Let me explain why I have chosen to duplicate the title (and also the uid): If you look at all the queries in Drupal, you will find that most of them only need the title and th uid of a node. That is, by duplicating it, we save expensive joins on the node_revisions table. Due to this fact, this patch is actually a performance improvement. A note about updating contrib module: Strictly speaking they wouldn't need to be updated. They only need to if their authors decide that their info should be available for revisioning. The upgrade path for forum.module in my update.inc patch (+ the forum patch) should show you what needs to be done. I will write a note for the update page once the patch hits core. ------------------------------------------------------------------------ April 24, 2005 - 23:21 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_25.patch (60.38 KB) Updated to cvs. Dries: Based on some remarks in #drupal this is the last update I am going to do. Apply it or won't fix it. ------------------------------------------------------------------------ April 30, 2005 - 05:42 : Jeremy(a)kerneltrap.org Attachment: http://drupal.org/files/issues/revisions_25.patch.patch (528 bytes) That's a big patch. I've only started looking through it. I noticed one little typo, affecting updates. A patch to your last patch is attached. I'm running with the revision patch on my dev server now happily. I like the concept. What happens if you click 'stop' on your browser in the middle of a MySQL "transaction"? I assume that kills the connection to MySQL, and the lock is freed? But this then leaves changes only partially applied? What exactly does locking/unlocking the tables buy us in MySQL? I don't see anywhere that we detect if an apply fails part way through, and thus roll back...? What am I missing? ------------------------------------------------------------------------ April 30, 2005 - 09:11 : Dries Jeremy: many of us are worried about the performance ramifications this patch introduces. Early experiments showed a small performance improvement (while a performance regression might be expected). More performance reports from large sites like kerneltrap.org will certainly help this patch. Mind to do a quick performance comparision and to report back with some numbers? Thanks. ------------------------------------------------------------------------ April 30, 2005 - 14:38 : Jeremy(a)kerneltrap.org Dries: I'm not running HEAD on kerneltrap, so this really isn't a possibility. Furthermore, until I understand why we're locking tables, I don't like it. The idea of revisions in their own tables is great. The idea of locking tables to get (without any obvious benefit) there really worries me. ------------------------------------------------------------------------ April 30, 2005 - 16:16 : killes(a)www.drop.org @Jeremy: Thanks for looking at the patch! Also for catching the typo. :) Did you try to upgrade your database? If yes, how did it go? One of Dries' concerns is the complexity of the upgrade. How many nodes and revisions did the db have? About database locking: This part of the patch was created by Nick and I simply continued to use it. Maybe the code should rather be: if(db_begin_transaction(array('{node}', '{node_revisions}', '{watchdog}', '{sessions}', '{files}'))) { db_query($node_query, $node_table_values); db_query($revisions_query, $revisions_table_values); db_commit_transaction(); ... } The idea is probably to avoid two updates at the same time. I don't think the locking helps if you abort the script at an inconvenient time. Rollbacks aren't implemented in all mysql versions. We could omit the db locking if deemed inappropriate. Maybe Nick can explain his ideas behind this. @Dries: I wonder who the "many of us" are. They certainly haven't spoken to me. Moshe had some reservations about the upgrade path and project module, but the time that project module abused revisions to store issue updates was long ago and his reservations were resolved. Nobody else (besides you of course and now Jeremy) has voiced reservations in a way that was audible to me. If you grep through the patch you will notice that there are only four queries which have a join on the node_revisions table. Two of them are in node_load and in the other cases the join replaced a join on the node table. The two queries in node_load are the only ones that have both a join on the node and the revisions query. Thus, loading of individual nodes might become somewhat slower. All other queries will be faster since the node table is now much smaller. Also, node loading does not have to be slower, it depends on your node table. If you had a lot of revisions and thus a large table, then the new scheme will make your queries actually faster since we do not load the revisions on each and every node load anymore. If you didn't have many revisions your node_load migth be somewhat slower. WRT to the update script Karoly pointed out that we could use multiple insert queries instead one query per revision. This would probably make the update somewhat faster. I am willing to work on this iff you declare that you will commit the patch afterwards. I'd need to know if this will work on pgsql and on all supported mysql versions before I work on it. About locking: Database locking is dog slow, at least on mysql. I was using locks in an earlier version of the upgrade script but had to remove it for (serious!) performance reasons. ------------------------------------------------------------------------ May 9, 2005 - 17:07 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_26.patch (46.45 KB) Ok, another update, cause I need it myself. I've left out the transaction stuff for now. It is in principle unrelated to this patch and should be discussed elsewhere. This also makes the patch smaller and easier to review (hint, hint). ------------------------------------------------------------------------ May 9, 2005 - 22:32 : killes(a)www.drop.org The patch contained the update functions twice. ------------------------------------------------------------------------ May 9, 2005 - 22:32 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_27.patch (39.05 KB) The patch contained the update functions twice. ------------------------------------------------------------------------ May 9, 2005 - 23:23 : Dries Got one error during the upgrade path: ALTER TABLE {book} ADD PRIMARY KEY vid (vid) FAILED ------------------------------------------------------------------------ May 9, 2005 - 23:26 : killes(a)www.drop.org This had happend to me as well, when I tested this patch. The reason is that for some reason the vid is not unique. Most likely there are some entries with vid = 0 in there. Can you check which node types those have? it always was an error in the test database. See: http://drupal.org/node/7582#comment-20678 ------------------------------------------------------------------------ May 9, 2005 - 23:27 : Dries Actually, I got 2850 errors during the upgrade. Some of these: sprintf() [function.sprintf]: Too few arguments in drupal-cvs/includes/database.inc on line 154. Some of these: Query was empty query: in drupal-cvs/includes/database.mysql.inc on line 66. And this: Unknown table 'n' in field list query: SELECT n.nid, n.vid FROM node INNER JOIN files f ON n.nid = f.nid in drupal-cvs/includes/database.mysql.inc on line 66. :-) ------------------------------------------------------------------------ May 9, 2005 - 23:29 : Dries Or this: user error: Unknown column 'log' in 'field list' query: SELECT parent, weight, log FROM book WHERE nid = 1 in drupal-cvs/includes/database.mysql.inc on line 66 ------------------------------------------------------------------------ May 9, 2005 - 23:52 : Dries The time required to generate my main page went from 902 ms (before upgrade) to 2139 ms (after upgrade). The time required to generate a forum listing (?q=forum/x) went from 1872 ms (before upgrade) to 2874 ms (after upgrade). Maybe this is because my database is not consistent as the result of the upgrade errors (yet I don't see any errors on the pages I benchmarked). ------------------------------------------------------------------------ May 10, 2005 - 02:24 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_28.patch (53.47 KB) Ok, let me get to this from the bottom to the top: - my test runs indicated a different development wrt timing. If I had gotten your results, I had stopped working on this long ago. So your results are wrong for some reason. - user error: Unknown column 'log' in 'field list' Wasn't my day, the book patch got lost. It is contained now. First -R the old patch, then apply this one. - Unknown table 'n' in field list query: Walkah found this, but I forgot to fix it. Fixed now. - I've no idea where the other queries come from. I am hoping that either your test db is borken or they are follow ups from the other ones. If you let me have your test db, I'll try some debugging. Thanks for wasting your time, too. ------------------------------------------------------------------------ May 10, 2005 - 07:07 : Dries I double-checked and the numbers don't seem to lie. I'll test some more after work on another machine to make sure it is not platform-specific. ------------------------------------------------------------------------ May 11, 2005 - 05:32 : killes(a)www.drop.org Attachment: http://drupal.org/files/issues/revisions_29.patch (54.83 KB) Ok, here I am again. What I did: 1) Ask Dries to let me have drupal.org database 2) get 400MB of SQL inserts... 3) take 23 minutes to import said data 4) Remove all image and project nodes (don't want to install their modules), 11765 nodes left 5) back up data 6) take tests on non-cached /node page (as anonymous user). ab results: -c 1 -n 25: Requests per second: 1.29 [#/sec] (mean) Connection Times (ms) min mean[+/-sd] median max Total: 663 775 179.7 689 1264 7) Do the same for the tracker page: Requests per second: 0.83 [#/sec] (mean) Total: 1182 1199 7.4 1199 1217 8) Apply my patch (rev. 28). 9) run db update and hold breath 10) update times out... 11) play back backup from 5) 12) wait 13) getting annoyed and removing cache, watchdog, and accesslog before playing in backup. 14) wait again. Understand why Dries doesn't try this patch often. Maybe a smaller DB would do for testing? 15) wait more. get really annoyed. 16) Set time limit to 18000 in update.php 17) try again 18) fails again before the second update is completed. 19) curse. 20) delete search stuff from db. Ooops, sooo much smaller... 21) import again, below 2 minutes... 22) rewrite to use extended insert. Found a bug. 23) still does not complete. Mysql logging to the rescue! 24) tid = 0? Not good. 25) Well, the update works fine till node 10834. 5595 nodes done, 6136 to go. 26) Writing shell based update script. Discovery: 24MB aren't enough. Hopefully 64 are. Nope. extended inserts for revisions are apparently not the brightest idea: Huge memory consumption. Hmm, no, all updates got through. Selecting the revisions to put them into old_revisions table screwed it. Learned about CREATE TABLE old_revisions SELECT syntax. Yay! finally. 24 MB are just not enough the update.php script seems to still break. 27) Benchmarks! /node Requests per second: 1.54 [#/sec] (mean) Connection Times (ms) min mean[+/-sd] median max Total: 632 649 40.5 636 791 /tracker Requests per second: 0.86 [#/sec] (mean) Total: 1119 1165 65.8 1160 1461 Ok: So we get an improvement for many node_loads, but none for simple selects from node. More tests can be done. 28) roll new patch Ain't Drupal fun?

1 0

[drupal-devel] Trouble with tracker SQL queries
by K B 18 May '05

18 May '05

I have a troubling issue that I did partially solve, but need feedback from other developers before I determine if this is a general issue and open an issue for it, or just specific to my sites. Background: I have several sites that were upgraded from 4.5 to 4.6 a few days ago. These sites were originally started as 4.4 (or whatever the current version on Jan 2004 was), then moved to 4.5 then 4.6. I have never enabled comments on those sites, since I did not need to. Now that I have converted to 4.6, I found out that tracker does not work (displays headers and an empty list of nodes). The query in tracker that does that is: SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM be_node n INNER JOIN be_node_comment_statistics l ON n.nid = l.nid INNER JOIN be_users u ON n.uid = u.uid LEFT JOIN be_comments c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = 1 OR c.uid = 1) ORDER BY last_post DESC Since node_comment_statistics table is empty in my case, no rows were returned. Changing the first INNER to LEFT took care of this part. Then I found that the nodes were not sorted correctly. This was because last_post returned NULL. I changed the ORDER BY to be "n.changed" instead of last_post and that took care of the sorting. So, the SQL now becomes: SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM be_node n LEFT JOIN be_node_comment_statistics l ON n.nid = l.nid INNER JOIN be_users u ON n.uid = u.uid LEFT JOIN be_comments c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = 1 OR c.uid = 1) ORDER BY n.changed DESC However, the last post column now has "35 years 20 weeks ago" because the tracker.module tries to do "time() - last_posted", and since last_posted is NULL, it gives the number of years since the epoch. I overcame this by checking of last_post is null, and printing a - instead of an interval. I tried enabling comments, and did enter a few test comments. Still the node_comment_statistics is empty, and hence the replies column still shows 0 replies. So, my question is: - Did anyone else see a similar issue (node_comment_statistics table is empty and tracker gives no results)? - Is it normal to have an empty table, and not having anything inserted in it even after enabling comments? As far as I can tell, the inserts are done via the nodeapi of the comment.module, and are in real time (not via cron for example)? - Is this an exception case that we did not program for (someone has comments disabled on their web site)? Based on your replies, I will create a patch for the issue of having correct tracker output. I am still puzzled as to why no inserts are happening for node_comment_statistics.

1 2

[drupal-devel] [feature] Order taxonomy terms by vocabulary weight, then term weight
by grohk 18 May '05

18 May '05

Issue status update for http://drupal.org/node/7684 Project: Drupal Version: cvs Component: taxonomy.module Category: feature requests Priority: normal Assigned to: Anonymous Reported by: MrRoot Updated by: grohk Status: patch Attachment: http://drupal.org/files/issues/taxonomy_vocab_weight_2.patch (901 bytes) As per a suggestion Moshe made in an email, I have updated this patch to order by vocabulary weight then term weight. grohk Previous comments: ------------------------------------------------------------------------ May 10, 2004 - 21:33 : MrRoot Attachment: http://drupal.org/files/issues/taxonomy.module_2.patch (866 bytes) This is a trivial patch to the taxonomy_node_get_terms() function. Currently, it was only sorting the results by term weight; the patch joins in the vocabulary table and adds the vocabulary weight as a second preference ordering. I wrote this because I wanted to force ordering of vocabularies when listing the taxonomies of a node using the taxonomy_link() function. Basically, what I was doing was this: I created a "Story Type" vocab which described the overall *type* of post ( News, Rant, Review, ... ) and a "Topic" vocab which described the *topic* of the post ( Programming, Math, Political, Family, ... ). Now, when you added a new story, you picked a Story Type and a Topic. When the story is displayed, it shows the taxonomy assignments as a list of links. The ordering of that list was by term weight, term name. That meant that if I wanted to control the left to right layout of that information, I'd have to set the weight on every term in each vocabulary. That seemed tedious, especially since the vocabularies themselves already had a weight associated with them. Hence, I dug around for about 15 minutes and wrote this patch. It's been tested and seems to work quite well. I can now *force* which taxonomy vocabulary is listed when, and thereby always make the posts appear as "Story Type | Topic". Hope it's useful.. :) ------------------------------------------------------------------------ May 10, 2004 - 21:40 : MrRoot Ack - that patchfile was generated against the current CVS tree, so I suppose the Version should have been 'cvs'? Sorry about that if it was misplaced. ------------------------------------------------------------------------ May 10, 2004 - 22:48 : moshe weitzman this patch makes a lot of sense ... however, your sql is non standard for drupal. we use the x JOIN y ON x.field = y.field syntax. Your SQL doe snot use this JOIN syntax. Please resubmit and then I'll bet that this will be accepted into core. ------------------------------------------------------------------------ May 10, 2004 - 23:47 : MrRoot Attachment: http://drupal.org/files/issues/taxonomy.module_3.patch (872 bytes) Ah.. I was wondering about that.. Looks like most of the rest of taxonomy.module does not make use of JOIN statements. So I was following that. Anyhow, I updated the patch to use JOIN on all of the tables. Cheers ------------------------------------------------------------------------ May 11, 2004 - 16:15 : Dries Is that ANSI SQL? If these are 'left' joins, please use 'LEFT JOIN'. If these are 'inner' joins, please use 'INNER JOIN'. Also, I'd add a small comment to code to explain the rationale behind that query. ------------------------------------------------------------------------ August 12, 2004 - 11:28 : killes(a)www.drop.org Patch doesn't apply. ------------------------------------------------------------------------ May 8, 2005 - 03:16 : grohk Attachment: http://drupal.org/files/issues/taxonomy_vocab_weight.patch (901 bytes) I have been looking for this funtionality for a long time, so I have attempted to bring this patch up-to-date and clean it up as per the suggestions.

1 0

[drupal-devel] [bug] file_create_path() is faulty in 4.6 and HEAD
by drumm 18 May '05

18 May '05

Issue status update for http://drupal.org/node/23100 Project: Drupal Version: 4.6.0 Component: file system Category: bug reports Priority: critical Assigned to: drumm Reported by: drumm Updated by: drumm Status: patch Attachment: http://drupal.org/files/issues/file.inc_4.diff (1.04 KB) Conditions to reproduce: - 'Temporary directory' on the admin/settings page is configured to something not starting with the configuration of 'File system path'. For example, the default '/tmp' does not start with the default file system path 'files'. - There are not directories named the same as the temporary directory in the file system path. In the above example, path/to/drupal/files/tmp should not exist. What happens: 1. file_create_path('/tmp/something') is called. 2. file_check_location('/tmp/something', 'files') returns false. 3. Fall back to file_check_location('files//tmp/something', 'files'), which does one of two things: - if path/to/drupal/files/tmp exists that is happily used, ignoring the admin's configuration, and things work. - otherwise the whole thing returns FALSE and a bunch of stuff up the stack gets horribly confused. Solution: Lets add in another check to see if the file is in the temporary directory between steps 2 and 3. drumm

1 0

[drupal-devel] [bug] Revert the theme.inc patch
by mathias 17 May '05

17 May '05

Issue status update for http://drupal.org/node/23083 Project: Drupal Version: 4.6.0 Component: theme system Category: bug reports Priority: normal Assigned to: mathias Reported by: mathias Updated by: mathias Status: patch Attachment: http://drupal.org/files/issues/revert_theme_inc.patch (1.41 KB) The last patch [1] to theme inc should probably be reverted as it changes the behavior of the theme_image function and also requires core (system.module) and contrib modules (image.module) to also update their 4.6 releases. Just to be clear, this patch should stay in HEAD. [1] http://cvs.drupal.org/viewcvs/drupal/drupal/includes/theme.inc?only_with_ta… mathias

1 0

[drupal-devel] Question on valid_input_data()
by K B 17 May '05

17 May '05

In 4.6 includes/common.inc, in the function valid_input_data(), there is a check for various entities. Among these entities, there is a check for "style". http://drupaldocs.org/api/4.6/function/valid_input_data I use the banner module with text ads, and I use things like: <div style="some-style-definitions">some text</div> This check causes the above to be flagged as a security breach attempt and is logged to the watchdog as such. http://drupal.org/node/20608#comment-29106 My question is: Can the "style" element be used in malicious attacks? If yes, then how? Thanks in advance.

5 8

[drupal-devel] Admin Help writing instructions - 60 patches coming soon
by Kieran Lal 17 May '05

17 May '05

Hi, last week I ran an admin help documentation sprint for 60 modules. Through lots of discussion and various different attempts we have arrived at some writing instructions for what should be in admin help text. We probably still have a draft or two to do. I want to make sure that the development community is going to be behind this effort when the patches come. This would be a good time to include your feedback into the writing instructions or the admin help drafts themselves. Everything is in a wiki so edit away! Here are the writing instructions: http://dev.bryght.com/t/wiki/ AdminHelpWritingInstructions Here are the drafts: http://dev.bryght.com/t/wiki/ DrupalAdminHelpDocumentation, http://dev.bryght.com/t/wiki/ DrupalContribsAdminHelpDocumentation We are looking for experts to review to the admin help when we think we have done enough drafts. Please let me know if you would be willing to review documentation to ensure it is accurate. Cheers, Kieran

8 12