[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm, 1.23, 1.24 DB.pm, 1.14, 1.15 Postgres.pm, 1.23, 1.24
Brought to you by:
ajlittoz
From: AdrianIssott <adr...@us...> - 2009-04-19 16:52:53
|
Update of /cvsroot/lxr/lxr/lib/LXR/Index In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22353/lib/LXR/Index Modified Files: Mysql.pm DB.pm Postgres.pm Oracle.pm DBI.pm Log Message: Feature 1691378 (Rearchitect the DB backends) Part II * Standardising the LXR::Index interface Index: Mysql.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Mysql.pm 19 Apr 2009 09:51:18 -0000 1.23 +++ Mysql.pm 19 Apr 2009 16:52:40 -0000 1.24 @@ -251,7 +251,7 @@ } sub issymbol { - my ($self, $symname) = @_; + my ($self, $symname, $release) = @_; # TODO make use of $release my ($symid); $symid = $symcache{$symname}; Index: DB.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/DB.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- DB.pm 19 Apr 2009 16:12:28 -0000 1.14 +++ DB.pm 19 Apr 2009 16:52:40 -0000 1.15 @@ -43,12 +43,12 @@ } sub index { - my ($self, $symname, $fileid, $line, $type, $rel) = @_; + my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_; my $symid = $self->symid($symname); - $self->{'indexes'}{$symid} .= join("\t", $fileid, $line, $type, $rel) . "\0"; + $self->{'indexes'}{$symid} .= join("\t", $fileid, $line, $type, $relsym) . "\0"; - # $$self{'index'}{$self->symid($symname, $release)} = + # $$self{'index'}{$self->symid($symname)} = # join("\t", $filename, $line, $type, ''); } @@ -57,7 +57,7 @@ my ($self, $symname, $release) = @_; my (@d, $f); - foreach $f (split(/\0/, $$self{'indexes'}{ $self->symid($symname, $release) })) { + foreach $f (split(/\0/, $$self{'indexes'}{ $self->symid($symname) })) { my ($fi, $l, $t, $s) = split(/\t/, $f); my %r = map { ($_ => 1) } split(/;/, $self->{'releases'}{$fi}); @@ -69,13 +69,14 @@ } sub getreference { + my ($self, $symname, $release) = @_; return (); } sub fileid { - my ($self, $filename, $release) = @_; + my ($self, $filename, $revision) = @_; - return $filename . ';' . $release; + return $filename . ';' . $revision; } # Convert from fileid to filename @@ -105,7 +106,7 @@ } sub symid { - my ($self, $symname, $release) = @_; + my ($self, $symname) = @_; my ($symid); return $symname; @@ -114,7 +115,7 @@ sub issymbol { my ($self, $symname, $release) = @_; - return $$self{'indexes'}{ $self->symid($symname, $release) }; + return $$self{'indexes'}{ $self->symid($symname) }; } sub empty_cache { Index: Postgres.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Postgres.pm 19 Apr 2009 16:12:29 -0000 1.23 +++ Postgres.pm 19 Apr 2009 16:52:40 -0000 1.24 @@ -258,7 +258,7 @@ } sub issymbol { - my ($self, $symname) = @_; + my ($self, $symname, $release) = @_; # TODO make use of $release unless (exists($symcache{$symname})) { $symbols_byname->execute($symname); Index: Oracle.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Oracle.pm 19 Apr 2009 09:51:18 -0000 1.12 +++ Oracle.pm 19 Apr 2009 16:52:40 -0000 1.13 @@ -252,15 +252,15 @@ } sub issymbol { - my ($self, $symname, $release, $lang) = @_; + my ($self, $symname, $release) = @_; # TODO make use of $release my ($symid); - $symid = $symcache{$release}{$lang}{$symname}; + $symid = $symcache{$release}{$symname}; unless (defined($symid)) { $self->{symbols_byname}->execute($symname); ($symid) = $self->{symbols_byname}->fetchrow_array(); $self->{symbols_byname}->finish(); - $symcache{$release}{$lang}{$symname} = $symid; + $symcache{$release}{$symname} = $symid; } return $symid; Index: DBI.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/DBI.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- DBI.pm 21 Jul 2004 20:44:31 -0000 1.21 +++ DBI.pm 19 Apr 2009 16:52:40 -0000 1.22 @@ -39,4 +39,92 @@ return $index; } +sub getindex { + my ($self, $symname, $release) = @_; + my @indexes; + return @indexes; +} + +sub index { + my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_; + return; +} + +sub toindex { + my ($self, $fileid) = @_; + my $filefoundboolean; + return $filefoundboolean; +} + +sub setindexed { + my ($self, $fileid) = @_; + return; +} + +sub fileid { + my ($self, $filename, $revision) = @_; + my $fileid; + return $fileid; +} + +sub getreference { + my ($self, $symname, $release) = @_; + my @references; + return @references; +} + +sub reference { + my ($self, $symname, $fileid, $line) = @_; + return; +} + +sub toreference { + my ($self, $fileid) = @_; + my $referencefoundboolean; + return $referencefoundboolean; +} + +sub setreferenced { + my ($self, $fileid) = @_; + return; +} + +sub release { + my ($self, $fileid, $release) = @_; + return; +} + +sub symid { + my ($self, $symname) = @_; + my $symid; + return $symid; +} + +sub symname { + my ($self, $symid) = @_; + my $symname; + return $symname; +} + +sub issymbol { + my ($self, $symname, $release) = @_; + my $symbolfoundboolean; + return $symbolfoundboolean; +} + +sub getdecid { + my ($self, $lang, $string) = @_; + my $decid; + return $decid; +} + +sub empty_cache { + return; +} + +sub purge { + my ($self, $version) = @_; + return; +} + 1; |