pass matrix is now a database table

barbie · Apr 16, 2015 · c522171 · c522171
1 parent fe1c120
commit c522171
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,9 @@
 Revision history for CPAN-Testers-WWW-Statistics
 ================================================
 
+        - pass matrix is now a database table. Changed due to problems storing
+          as a JSON file.
+
 1.19    2015-02-08
         - removed Perl promotions links.
         - added Admin site links.

diff --git a/examples/cpanstats.sql b/examples/cpanstats.sql
@@ -110,3 +110,17 @@ CREATE TABLE noreports (
      KEY NRIX (dist,version,osname),
      KEY OSIX (osname)
 );
+
+
+DROP TABLE IF EXISTS passreports;
+CREATE TABLE passreports (
+     platform   varchar(255),
+     osname     varchar(255),
+     perl       varchar(255),
+     postdate   varchar(8),
+     dist       varchar(255),
+     KEY PLATFORMIX (platform),
+     KEY OSNAMEIX (osname),
+     KEY PERLIX (perl),
+     KEY DATEIX (postdate)
+);
diff --git a/lib/CPAN/Testers/WWW/Statistics/Pages.pm b/lib/CPAN/Testers/WWW/Statistics/Pages.pm
@@ -457,6 +457,17 @@ sub build_data {
     }
 #$self->{parent}->_log("build:2.".Dumper($self->{build}));
 
+
+    # load pass matrices
+    $self->{parent}->_log("building pass reports matrices from database");
+    my $count = 0;
+    my $iterator = $dbx->iterator('hash','SELECT * FROM passreports');
+    while(my $row = $iterator->()) {
+        $self->{pass}    {$row->{platform}}{$row->{perl}}{all}{$row->{dist}} = 1;
+        $self->{pass}    {$row->{platform}}{$row->{perl}}{month}{$row->{postdate}}{$row->{dist}} = 1;
+    }
+
+
     # 0,  1,    2,     3,        4,      5     6,       7,        8,    9,      10      11        12
     # id, guid, state, postdate, tester, dist, version, platform, perl, osname, osvers, fulldate, type
 
@@ -494,13 +505,13 @@ sub build_data {
             $perl =~ s/\s.*//;  # only need to know the main release
             $self->{perls}{$perl} = 1;
 
-            $self->{pass}    {$row->{platform}}{$perl}{all}{$row->{dist}} = 1;
+#            $self->{pass}    {$row->{platform}}{$perl}{all}{$row->{dist}} = 1;
             $self->{platform}{$row->{platform}}{$perl}{all}++;
             $self->{osys}    {$osname}  {$perl}{all}{$row->{dist}} = 1;
             $self->{osname}  {$osname}  {$perl}{all}++;
 
             if($row->{postdate} > $self->{dates}{THATMONTH}) {
-                $self->{pass}    {$row->{platform}}{$perl}{month}{$row->{postdate}}{$row->{dist}} = 1;
+#                $self->{pass}    {$row->{platform}}{$perl}{month}{$row->{postdate}}{$row->{dist}} = 1;
                 $self->{platform}{$row->{platform}}{$perl}{month}{$row->{postdate}}++;
                 $self->{osys}    {$osname}  {$perl}{month}{$row->{postdate}}{$row->{dist}} = 1;
                 $self->{osname}  {$osname}  {$perl}{month}{$row->{postdate}}++;
@@ -568,7 +579,8 @@ sub storage_read {
         return $store->{$type};
     }
 
-    for $type (qw(stats dists fails perls pass platform osys osname build counts count xrefs xlast)) {
+#    for $type (qw(stats dists fails perls pass platform osys osname build counts count xrefs xlast)) {
+    for $type (qw(stats dists fails perls platform osys osname build counts count xrefs xlast)) {
         my $storage = sprintf $self->{parent}->mainstore(), $type;
         next    unless(-f $storage);
         my $data = read_file($storage);
@@ -591,7 +603,8 @@ sub storage_write {
         return;
     }
 
-    for $type (qw(stats dists fails perls pass platform osys osname build counts count xrefs xlast)) {
+#    for $type (qw(stats dists fails perls pass platform osys osname build counts count xrefs xlast)) {
+    for $type (qw(stats dists fails perls platform osys osname build counts count xrefs xlast)) {
         next    unless($self->{$type});
         my $data = encode_json({$type => $self->{$type}});