* More correct fix for overview query. Use LEFT JOIN to explicitly specify order of tables to help MySQL to generate correct exec plan.

* Speed-up history query by using TESTRESULTS as main table and TR_ID field for ordering.
* Test file or run id must be provided for history query. Print an error if not provided.
* Limit query results to 1000 records to prevent unnecessary server load.

git-svn-id: trunk@23579 -

tests/utils/testsuite/utests.pp

@@ -128,6 +128,7 @@ Const
   OldTestResultsTableName = 'OLDTESTRESULTS';
   NewTestResultsTableName = 'TESTRESULTS';
   LastOldTestRun = 91178;
+  MaxLimit = 1000;
 
   Function TestResultsTableName(const RunId : String) : string;
   var
@@ -303,6 +304,8 @@ begin
   if Length(S) = 0 then
     S:=RequestVariables['TESTLIMIT'];
   FLimit:=StrToIntDef(S,50);
+  if FLimit > MaxLimit then
+    FLimit:=MaxLimit;
   FVersion:=RequestVariables['version'];
   if Length(FVersion) = 0 then
     FVersion:=RequestVariables['TESTVERSION'];
@@ -793,7 +796,7 @@ end;
 Procedure TTestSuite.ShowRunOverview;
 Const
   SOverview = 'SELECT TU_ID as ID,TU_DATE as Date,TC_NAME as CPU,TO_NAME as OS,'+
-               'TV_VERSION as Version,(select count(*) from TESTRESULTS where TR_TESTRUN_FK=TU_ID) as Count,'+
+               'TV_VERSION as Version,count(*) as Count,'+
                'TU_SVNCOMPILERREVISION as SvnCompRev,'+
                'TU_SVNRTLREVISION as SvnRTLRev,'+
                'TU_SVNPACKAGESREVISION as SvnPackRev,TU_SVNTESTSREVISION as SvnTestsRev,'+
@@ -802,13 +805,10 @@ Const
                '(TU_SUCCESSFULLYFAILED+TU_SUCCESFULLYCOMPILED+TU_SUCCESSFULLYRUN+'+
                 'TU_FAILEDTOCOMPILE+TU_FAILEDTORUN+TU_FAILEDTOFAIL) as Total,'+
                'TU_SUBMITTER as Submitter, TU_MACHINE as Machine, TU_COMMENT as Comment %s '+
-              'FROM TESTRUN force index (primary),TESTCPU,TESTOS,TESTVERSION,TESTCATEGORY '+
-              'WHERE '+
-               '(TC_ID=TU_CPU_FK) AND '+
-               '(TO_ID=TU_OS_FK) AND '+
-               '(TV_ID=TU_VERSION_FK) AND '+
-               '(TCAT_ID=TU_CATEGORY_FK) '+
-               '%s '+
+              'FROM TESTRUN left join TESTCPU on (TC_ID=TU_CPU_FK) left join TESTOS on (TO_ID=TU_OS_FK) '+
+              'left join TESTVERSION on (TV_ID=TU_VERSION_FK) left join TESTCATEGORY on (TCAT_ID=TU_CATEGORY_FK) '+
+              'left join TESTRESULTS on (TR_TESTRUN_FK=TU_ID) '+
+              '%s'+
               'GROUP BY TU_ID '+
               'ORDER BY TU_ID DESC LIMIT %d';
 
@@ -852,6 +852,12 @@ begin
      A:=A+'&failedonly=1';
    If FNoSkipped then
      A:=A+'&noskipped=1';
+     
+  if S <> '' then
+  begin
+    Delete(S, 1, 4);
+    S:='WHERE '+ S + ' ';
+  end;
   Qry:=Format(SOverview,[SC,S,FLimit]);
   If FDebug then
     Writeln('Query : '+Qry);
@@ -1554,6 +1560,7 @@ Var
   Res : Boolean;
   ver : known_versions;
 begin
+  Res:=False;
   os_count:=nil;
   cpu_count:=nil;
   version_count:=nil;
@@ -1564,14 +1571,6 @@ begin
   begin
     FTestFileID:=GetSingleton('SELECT T_ID FROM TESTS WHERE T_NAME LIKE ''%'+
      FTestFileName+'%''');
-    if FTestFileID = '' then
-      with FHTMLWriter do begin
-        EmitHistoryForm;
-        HeaderStart(2);
-        Write(Format('No test files matching "%s" found.', [FTestFileName]));
-        HeaderEnd(2);
-        exit;
-      end;
   end;
   if FTestFileID<>'' then
     FTestFileName:=GetTestFileName(FTestFileID);
@@ -1605,6 +1604,16 @@ begin
         //EmitCheckBox('noskipped','1',FNoSkipped);
         Res:=true;
         EmitHistoryForm;
+        if FTestFileID = '' then
+          with FHTMLWriter do begin
+            HeaderStart(2);
+            if Trim(FTestFileName) <> '' then
+              Write(Format('Error: No test files matching "%s" found.', [FTestFileName]))
+            else
+              Write('Error: Please specify a test file.');
+            HeaderEnd(2);
+            Res:=False;
+          end;
       end;
     If Res then
       begin
@@ -1664,14 +1673,16 @@ begin
         +',TU_SVNCOMPILERREVISION AS Compiler_rev'
         +',TU_SVNPACKAGESREVISION AS Packages_rev'
         +',TO_ID,TC_ID,TV_ID'
-        +' FROM TESTRUN '
-        +' LEFT JOIN TESTRESULTS ON  (TR_TESTRUN_FK=TU_ID)'
+        +' FROM TESTRESULTS '
+        +' LEFT JOIN TESTRUN ON  (TR_TESTRUN_FK=TU_ID)'
         +' LEFT JOIN TESTOS ON  (TU_OS_FK=TO_ID)'
         +' LEFT JOIN TESTCPU ON  (TU_CPU_FK=TC_ID)'
         +' LEFT JOIN TESTVERSION ON  (TU_VERSION_FK=TV_ID)';
       S:='';
       if FTestFileID<>'' then
         S:=S+' AND (TR_TEST_FK='+FTestFileID+')';
+      if FRunID<>'' then
+        S:=S+' AND (TR_TESTRUN_FK='+FRunID+')';
       If FOnlyFailed then
         S:=S+' AND (TR_OK="-")';
       If FNoSkipped then
@@ -1753,16 +1764,17 @@ begin
 
       if S <> '' then
       begin
-        if LowerCase(Copy(S, 1, 4)) = ' and' then
-          Delete(S, 1, 4);
+        Delete(S, 1, 4);
         S:=SS + ' WHERE '+ S;
       end
       else
         S:=SS;
 
-      S:=S+' ORDER BY TU_ID DESC';
+      S:=S+' ORDER BY TR_ID DESC';
       if FDATE=0 then
-        S:=S+' LIMIT '+IntToStr(FLimit);
+        S:=S+' LIMIT '+IntToStr(FLimit)
+      else
+        S:=S+' LIMIT '+IntToStr(MaxLimit);
       Qry:=S;
       If FDebug then
       begin
@@ -2217,9 +2229,7 @@ begin
             end;
              if FDebug then
               Write('After Source.');
-    end
-    else
-      Write(Format('No data for test file with ID: %s',[FTestFileID]));
+    end;
 
     end;
   if assigned(os_count) then