Changeset 1907

Timestamp:

01/03/17 23:34:54 (8 years ago)

Author:

nanardon

Message:

Add cache for object alias, then allow search trought them

Location:

trunk/LATMOS-Accounts

Files:

• bin/la-sql-upgrade.in (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (6 diffs)

trunk/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -1136 +1136 @@
             COST 100;
             },
+        ],
+    },
+    {
+        ver => 25,
+        sql => [
+            'ALTER TABLE objects ADD COLUMN oaliascache text',
         ],
     },

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -203 +203 @@
             return;
         };
+        $refotype eq $otype or do {
+            $self->log(LA_DEBUG, "Oalias %s (%s): Attribute does not reference same object type",
+                $otype, $oalias, $refotype);
+            return;
+        };
         my $robj = $self->get_object($aliasotype, $aliasoname) or do {
             $self->log(LA_DEBUG, "Oalias %s (%s): can fetch object %s/%s",

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -1425 +1425 @@
 
     my $stAddAlias = $base->db->prepare_cached(
-        q{INSERT INTO "user" (name, uidnumber,            gidnumber, oalias) values
-                             (?,    -nextval('ikey_seq'), ?,         ?)}
+        q{INSERT INTO "user" (name, uidnumber,            gidnumber, oalias, oaliascache) values
+                             (?,    -nextval('ikey_seq'), ?,         ?,      ?)}
     );
 
-    my $res = $stAddAlias->execute($name, -1, $for);
+    my $res = $stAddAlias->execute($name, -1, $for, $base->_derefObject($for));
     return $res ? 1 : 0;
 }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -164 +164 @@
                 my ($self, $value) = @_;
                 $self->object->_update_aliases_ptr();
+                $self->object->_update_aliases_cache();
             },
             checkinput => sub {
@@ -192 +193 @@
                 return 1;
             },
+        },
+        oaliascache => {
+            inline  => 1,
+            reference => $class->type,
+            label => 'Cache for oalias data',
+            hide => 1,
         },
         internobject => {
@@ -716 +723 @@
     }
 
+    delete($self->base->{__cache}{"_" . $self->type}{$self->id});
 
     foreach my $attr (@updated_attributes) {
         my $oattr = $self->attribute($attr);
         my $ref = $oattr->reference or next;
-        my $attrref = sprintf('oalias=%s.%s.%s', $self->type, $self->id, $attr);
+        my $refname = sprintf('%s.%s.%s', $self->type, $self->id, $attr);
+        my $attrref = "oalias=$refname";
+        warn "$ref, $refname";
         foreach my $alias ($self->base->search_objects($ref, $attrref)) {
-            my $olias = $self->base->GetAlias($ref, $alias) or next;
-            $olias->_update_aliases_ptr;
-        }
-    }
-
-    delete($self->base->{__cache}{"_" . $self->type}{$self->id});
+            my $oalias = $self->base->GetAlias($ref, $alias) or next;
+            warn $oalias;
+            $oalias->_update_aliases_cache;
+            $oalias->_update_aliases_ptr;
+        }
+    }
+
     scalar(@updated_attributes);
 }
+
 
 =head2 SetNoDelete($value)
@@ -1031 +1043 @@
         my @oaliases = ();
         if ($attr ne 'oalias' && $attribute->reference) {
-            @oaliases = $base->search_objects($attribute->reference, "oalias=$value");
+            @oaliases = $base->search_objects($attribute->reference, "oaliascache=$value");
             $base->log(LA_DEBUG, "Uniq search will match oaliases: %s", join(' ', @oaliases) || '(none)');
         }
@@ -1110 +1122 @@
                 my @oaliases = ();
                 if ($attr ne 'oalias' && $attribute->reference) {
-                    @oaliases = $base->search_objects($attribute->reference, "oalias=$val");
+                    @oaliases = $base->search_objects($attribute->reference, "oaliascache=$val");
                     $base->log(LA_DEBUG, "Uniq search will match oaliases for %s: %s", $val, join(' ', @oaliases) || '(none)');
                 }
@@ -1295 +1307 @@
 }
 
+sub _update_aliases_cache {
+    my ($self) = @_;
+
+    my $getoalias = $self->base->db->prepare(
+        sprintf(
+            q{ select * from %s where %s = ? },
+            $self->base->db->quote_identifier($self->_object_table),
+            $self->base->db->quote_identifier($self->_key_field),
+        )
+    );
+    $getoalias->execute($self->id);
+    my $res = $getoalias->fetchrow_hashref or do {
+        $self->base->log(LA_ERR, "Cannot find alias %s / %s", $self->type, $self->id);
+        return;
+    };
+    $getoalias->finish;
+
+    my $ref = $self->base->_derefObject($self->type, $res->{oalias});
+
+    if (($ref->id || '') ne ($res->{oaliascache} || '')) {
+        my $upd = $self->base->db->prepare(
+            sprintf(
+                q{update %s set oaliascache = ? where %s = ?},
+                $self->base->db->quote_identifier($self->_object_table),
+                $self->base->db->quote_identifier($self->_key_field),
+            )
+        );
+        $self->base->log(LA_DEBUG, "Updating Cache for alias %s => %s", $self->id, $ref->id);
+        return $upd->execute($ref->id, $self->id);
+    }
+}
+
 1;