oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fixes and caching improvements

Browse source
This commit is contained in:
JT Smith 2005-02-26 17:28:42 +00:00
parent 48a8934b3b
commit 91d950e5f7
6 changed files with 95 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/changelog/6.x.x.txt
View file

@ -1,3 +1,10 @@
6.3.1
- Added some indicies to increase performance.
- Added all sorts of caching to increase performance.
- Fixed resetting votes on Poll would crash it.
- Fixed not being able to set display title and other yes no questions to no.
6.3.0
- Migrated all wobjects to assets.
- Migrated pages to the layout and redirect assets.

1
docs/upgrades/upgrade_6.2.11-6.3.0.pl
View file

@ -1729,6 +1729,7 @@ WebGUI::Session::close();
sub replaceMacros {
my $content = shift;
return $content if ($content =~ /\^\^/); # double carets bad
my $parenthesis;
$parenthesis = qr /\( # Start with '(',
(?: # Followed by

4
docs/upgrades/upgrade_6.3.0-6.3.1.sql Normal file
View file

@ -0,0 +1,4 @@
insert into webguiVersion values ('6.3.1','upgrade',unix_timestamp());
alter table asset add index state_parentId_lineage (state,parentId,lineage);

115
lib/WebGUI/Asset.pm
View file

@ -18,6 +18,7 @@ use strict;
use Tie::IxHash;
use WebGUI::Asset::Template;
use WebGUI::AdminConsole;
use WebGUI::Cache;
use WebGUI::DateTime;
use WebGUI::ErrorHandler;
use WebGUI::Form;
@ -256,6 +257,8 @@ sub cascadeLineage {
my $self = shift;
my $newLineage = shift;
my $oldLineage = shift || $self->get("lineage");
WebGUI::Cache->new($self->getId)->deleteByRegex(/^asset_/);
WebGUI::Cache->new($self->getId)->deleteByRegex(/^lineage_$oldLineage/);
WebGUI::SQL->write("update asset set lineage=concat(".quote($newLineage).", substring(lineage from ".(length($oldLineage)+1)."))
where lineage like ".quote($oldLineage.'%'));
}
@ -1033,7 +1036,11 @@ Returns the highest rank, top of the highest rank Asset under current Asset.
sub getFirstChild {
my $self = shift;
unless (exists $self->{_firstChild}) {
my ($lineage) = WebGUI::SQL->quickArray("select min(lineage) from asset where parentId=".quote($self->getId));
my $lineage = WebGUI::Cache->new("firstchild_".$self->getId)->get;
unless ($lineage) {
($lineage) = WebGUI::SQL->quickArray("select min(lineage) from asset where parentId=".quote($self->getId));
WebGUI::Cache->new("firstchild_".$self->getId)->set($lineage);
}
$self->{_firstChild} = WebGUI::Asset->newByLineage($lineage);
}
return $self->{_firstChild};
@ -1108,7 +1115,11 @@ Returns the lowest rank, bottom of the lowest rank Asset under current Asset.
sub getLastChild {
my $self = shift;
unless (exists $self->{_lastChild}) {
my ($lineage) = WebGUI::SQL->quickArray("select max(lineage) from asset where parentId=".quote($self->getId));
my $lineage = WebGUI::Cache->new("lastchild_".$self->getId)->get;
unless ($lineage) {
($lineage) = WebGUI::SQL->quickArray("select max(lineage) from asset where parentId=".quote($self->getId));
WebGUI::Cache->new("lastchild_".$self->getId)->set($lineage);
}
$self->{_lastChild} = WebGUI::Asset->newByLineage($lineage);
}
return $self->{_lastChild};
@ -1215,7 +1226,7 @@ sub getLineage {
my $columns = "asset.assetId, asset.className, asset.parentId";
my $slavedb;
if ($rules->{returnQuickReadObjects}) {
$columns = "asset.*";
$columns = "*";
$slavedb = WebGUI::SQL->getSlave;
}
my $sortOrder = ($rules->{invertTree}) ? "desc" : "asc";
@ -1534,7 +1545,11 @@ sub hasChildren {
} elsif (exists $self->{_lastChild}) {
$self->{_hasChildren} = 1;
} else {
my ($hasChildren) = WebGUI::SQL->quickArray("select count(*) from asset where parentId=".quote($self->getId));
my $hasChildren = WebGUI::Cache->new("childCount_".$self->getId)->get;
unless (defined $hasChildren) {
($hasChildren) = WebGUI::SQL->quickArray("select count(*) from asset where parentId=".quote($self->getId));
WebGUI::Cache->new("childCount_".$self->getId)->set($hasChildren);
}
$self->{_hasChildren} = $hasChildren;
}
}
@ -1563,11 +1578,13 @@ sub new {
my $class = shift;
my $assetId = shift;
my $overrideProperties = shift;
my $properties;
my $properties = WebGUI::Cache->new("asset_".$assetId)->get;
if ($assetId eq "new") {
$properties = $overrideProperties;
$properties->{assetId} = "new";
$properties->{className} = $class;
} elsif (exists $properties->{assetId}) {
# got properties from cache
} else {
my $definitions = $class->definition;
my @definitionsReversed = reverse(@{$definitions});
@ -1579,6 +1596,7 @@ sub new {
$sql .= " where asset.assetId=".quote($assetId);
$properties = WebGUI::SQL->quickHashRef($sql);
return undef unless (exists $properties->{assetId});
WebGUI::Cache->new("asset_".$assetId)->set($properties,$properties->{cacheTimeout});
}
if (defined $overrideProperties) {
foreach my $definition (@{$class->definition}) {
@ -1624,7 +1642,12 @@ sub newByDynamicClass {
my $className = shift;
my $overrideProperties = shift;
unless (defined $className) {
($className) = WebGUI::SQL->quickArray("select className from asset where assetId=".quote($assetId));
my $asset = WebGUI::Cache->new("asset_".$assetId)->get;
if (exists $asset->{className}) {
$className = $asset->{className};
} else {
($className) = WebGUI::SQL->quickArray("select className from asset where assetId=".quote($assetId));
}
}
if ($className eq "") {
WebGUI::HTTP::setStatus('404',"Page Not Found");
@ -1655,7 +1678,11 @@ Lineage string.
sub newByLineage {
my $class = shift;
my $lineage = shift;
my $asset = WebGUI::SQL->quickHashRef("select assetId, className from asset where lineage=".quote($lineage));
my $asset = WebGUI::Cache->new("lineage_".$lineage)->get;
unless (exists $asset->{assetId}) {
$asset = WebGUI::SQL->quickHashRef("select assetId, className from asset where lineage=".quote($lineage));
WebGUI::Cache->new("lineage_".$lineage)->set($asset);
}
return WebGUI::Asset->newByDynamicClass($asset->{assetId}, $asset->{className});
}
@ -1705,7 +1732,11 @@ sub newByUrl {
$url =~ s/\"//;
my $asset;
if ($url ne "") {
$asset = WebGUI::SQL->quickHashRef("select assetId, className from asset where url=".quote($url));
my $asset = WebGUI::Cache->new("asseturl_".$url)->get;
unless (exists $asset->{assetId}) {
$asset = WebGUI::SQL->quickHashRef("select assetId, className from asset where url=".quote($url));
WebGUI::Cache->new("asseturl_".$url)->set($asset,3600);
}
if ($asset->{assetId} ne "" || $asset->{className} ne "") {
return WebGUI::Asset->newByDynamicClass($asset->{assetId}, $asset->{className});
}
@ -1819,7 +1850,7 @@ sub processTemplate {
my $self = shift;
my $var = shift;
my $templateId = shift;
my $meta = $self->getMetaDataFields();
my $meta = $self->getMetaDataFields() if ($session{setting}{metaDataEnabled});
foreach my $field (keys %$meta) {
$var->{$meta->{$field}{fieldName}} = $meta->{$field}{value};
}
@ -1868,6 +1899,7 @@ Returns 1. Deletes an asset from tables and removes anything bound to that asset
sub purge {
my $self = shift;
WebGUI::Cache->new("asset_".$self->getId)->delete;
$self->updateHistory("purged");
WebGUI::SQL->beginTransaction;
foreach my $definition (@{$self->definition}) {
@ -2064,33 +2096,32 @@ Hash reference of properties and values to set.
=cut
sub update {
my $self = shift;
my $properties = shift;
WebGUI::SQL->beginTransaction;
foreach my $definition (@{$self->definition}) {
my @setPairs;
if ($definition->{tableName} eq "asset") {
push(@setPairs,"lastUpdated=".time());
}
foreach my $property (keys %{$definition->{properties}}) {
next unless (exists $properties->{$property});
my $value = $properties->{$property} || $definition->{properties}{$property}{defaultValue};
if (defined $value) {
if (exists $definition->{properties}{$property}{filter}) {
my $filter = $definition->{properties}{$property}{filter};
$value = $self->$filter($value);
}
$self->{_properties}{$property} = $value;
push(@setPairs, $property."=".quote($value));
}
}
if (scalar(@setPairs) > 0) {
WebGUI::SQL->write("update ".$definition->{tableName}." set ".join(",",@setPairs)." where assetId=".quote($self->getId));
}
}
$self->setSize;
WebGUI::SQL->commit;
return 1;
my $self = shift;
my $properties = shift;
WebGUI::Cache->new($self->getId)->delete;
WebGUI::SQL->beginTransaction;
foreach my $definition (@{$self->definition}) {
my @setPairs;
if ($definition->{tableName} eq "asset") {
push(@setPairs,"lastUpdated=".time());
}
foreach my $property (keys %{$definition->{properties}}) {
next unless (exists $properties->{$property});
my $value = $properties->{$property};
if (exists $definition->{properties}{$property}{filter}) {
my $filter = $definition->{properties}{$property}{filter};
$value = $self->$filter($value);
}
$self->{_properties}{$property} = $value;
push(@setPairs, $property."=".quote($value));
}
if (scalar(@setPairs) > 0) {
WebGUI::SQL->write("update ".$definition->{tableName}." set ".join(",",@setPairs)." where assetId=".quote($self->getId));
}
}
$self->setSize;
WebGUI::SQL->commit;
return 1;
}
#-------------------------------------------------------------------
@ -2377,14 +2408,14 @@ Saves and updates history. If canEdit, returns www_manageAssets() if a new Asset
sub www_editSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
my $object;
if ($session{form}{assetId} eq "new") {
$object = $self->addChild({className=>$session{form}{class}});
$object->{_parent} = $self;
} else {
$object = $self;
}
$object = $self->addChild({className=>$session{form}{class}});
$object->{_parent} = $self;
} else {
$object = $self;
}
$object->processPropertiesFromFormPost;
$object->updateHistory("edited");
return $self->www_manageAssets if ($session{form}{proceed} eq "manageAssets" && $session{form}{assetId} eq "new");

6
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -284,14 +284,14 @@ sub processPropertiesFromFormPost {
$property->{'a'.$i} = $answer[($i-1)];
}
$self->update($property);
WebGUI::SQL->write("delete from Poll_answers where assetId=".quote($self->getId)) if ($session{form}{resetVotes});
WebGUI::SQL->write("delete from Poll_answer where assetId=".quote($self->getId)) if ($session{form}{resetVotes});
}
#-------------------------------------------------------------------
sub purge {
my $self = shift;
WebGUI::SQL->write("delete from Poll_answers where assetId=".quote($self->getId));
WebGUI::SQL->write("delete from Poll_answer where assetId=".quote($self->getId));
$self->SUPER::purge();
}
@ -369,7 +369,7 @@ sub www_vote {
$u->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
}
}
return "";
return $self->getContainer->www_view;
}

9
lib/WebGUI/Grouping.pm
View file

@ -15,10 +15,11 @@ package WebGUI::Grouping;
=cut
use strict;
use WebGUI::Cache;
use WebGUI::DateTime;
use WebGUI::ErrorHandler;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::ErrorHandler;
use WebGUI::Utility;
=head1 NAME
@ -252,7 +253,11 @@ sub getGroupsInGroup {
} elsif (exists $session{gotGroupsInGroup}{recursive}{$groupId}) {
return $session{gotGroupsInGroup}{direct}{$groupId};
}
my $groups = WebGUI::SQL->buildArrayRef("select groupId from groupGroupings where inGroup=".quote($groupId));
my $groups = WebGUI::Cache->new("groups_in_group_".$groupId)->get;
unless (defined $groups) {
$groups = WebGUI::SQL->buildArrayRef("select groupId from groupGroupings where inGroup=".quote($groupId));
WebGUI::Cache->new("groups_in_group_".$groupId)->set($groups);
}
if ($isRecursive) {
$loopCount++;
if ($loopCount > 99) {