GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-20 10:59:29 +01:00
Code Issues Projects Releases Wiki Activity

DualIndexSQLiteObject: minor improvements

Browse Source
This commit is contained in:
Pragmatic Software 2020-02-26 17:49:59 -08:00
parent c489b6eac7
commit b7fcb909dc
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PBot/DualIndexSQLiteObject.pm
View File

@ -73,9 +73,6 @@ sub begin {
}; };
if ($@) { $self->{pbot}->{logger}->log("Error initializing $self->{name} database: $@\n"); } if ($@) { $self->{pbot}->{logger}->log("Error initializing $self->{name} database: $@\n"); }
$self->create_database;
$self->create_cache;
} }
sub end { sub end {
@ -149,7 +146,6 @@ sub trim_cache {
foreach my $index1 (keys %{$self->{cache_timeouts}}) { foreach my $index1 (keys %{$self->{cache_timeouts}}) {
foreach my $index2 (keys %{$self->{cache_timeouts}->{$index1}}) { foreach my $index2 (keys %{$self->{cache_timeouts}->{$index1}}) {
if ($now >= $self->{cache_timeouts}->{$index1}->{$index2}) { if ($now >= $self->{cache_timeouts}->{$index1}->{$index2}) {
$self->{pbot}->{logger}->log("Trimming $self->{name} [$index1] $index2 cache\n");
my $name = $self->{cache}->{$index1}->{$index2}->{_name}; my $name = $self->{cache}->{$index1}->{$index2}->{_name};
$self->{cache}->{$index1}->{$index2} = {}; $self->{cache}->{$index1}->{$index2} = {};
$self->{cache}->{$index1}->{$index2}->{_name} = $name if defined $name; $self->{cache}->{$index1}->{$index2}->{_name} = $name if defined $name;
@ -338,23 +334,6 @@ sub get_keys {
return @keys; return @keys;
} }
sub get_all_index2 {
my ($self, $index2) = @_;
my $data = eval {
my $sth = $self->{dbh}->prepare('SELECT index1, index2, action FROM Stuff WHERE index2 = ?');
$sth->execute($index2);
return $sth->fetchall_arrayref({});
};
if ($@) {
$self->{pbot}->{logger}->log("Error in get_all_index2: $@\n");
return [];
}
return $data;
}
sub get { sub get {
my ($self, %opts) = @_; my ($self, %opts) = @_;
@ -411,7 +390,7 @@ sub get_data {
return undef if not exists $self->{cache}->{$lc_index1}->{$lc_index2} and $lc_index2 ne '_name'; return undef if not exists $self->{cache}->{$lc_index1}->{$lc_index2} and $lc_index2 ne '_name';
if (not defined $data_index) { if (not defined $data_index) {
# special case for compatability with DualIndexHashObject # special case for compatibility with DualIndexHashObject
if ($lc_index2 eq '_name') { if ($lc_index2 eq '_name') {
if (exists $self->{cache}->{$lc_index1}->{_name}) { if (exists $self->{cache}->{$lc_index1}->{_name}) {
return $self->{cache}->{$lc_index1}->{_name}; return $self->{cache}->{$lc_index1}->{_name};
@ -456,7 +435,7 @@ sub get_data {
return $data; return $data;
} }
# special case for compatability with DualIndexHashObject # special case for compatibility with DualIndexHashObject
if ($data_index eq '_name') { if ($data_index eq '_name') {
if (exists $self->{cache}->{$lc_index1}->{$lc_index2}->{_name}) { if (exists $self->{cache}->{$lc_index1}->{$lc_index2}->{_name}) {
return $self->{cache}->{$lc_index1}->{$lc_index2}->{_name}; return $self->{cache}->{$lc_index1}->{$lc_index2}->{_name};
@ -654,7 +633,7 @@ sub set {
return $result; return $result;
} }
my $name1 = $self->get_data($index1, $index2, '_name'); my $name1 = $self->get_data($index1, '_name');
my $name2 = $self->get_data($index1, $index2, '_name'); my $name2 = $self->get_data($index1, $index2, '_name');
$name1 = 'global' if $name1 eq '.*'; $name1 = 'global' if $name1 eq '.*';
@ -744,9 +723,14 @@ sub unset {
return "[$name1] $name2.$key unset."; return "[$name1] $name2.$key unset.";
} }
sub load {
my ($self) = @_;
$self->create_database;
$self->create_cache;
}
# nothing to do here for SQLite # nothing to do here for SQLite
# kept for compatability with DualIndexHashObject # kept for compatibility with DualIndexHashObject
sub load { }
sub save { } sub save { }
sub clear { } sub clear { }