DbiValidate.cc

Go to the documentation of this file.

// $Id: DbiValidate.cc,v 1.102 2008/11/17 07:52:33 nwest Exp $

#include <fstream>
#include <iomanip>
#include <list>
#include <map>
#include <memory>
using std::auto_ptr;
#include <sstream>
#include <string>

#include <math.h>
#include <vector>

#include "TObjectTable.h"
#include "TStopwatch.h"
#include "TSystem.h"
#include "TSQLServer.h"
#include "TSQLStatement.h"

#include "Conventions/Detector.h"
#include "Conventions/SimFlag.h"
#include "DatabaseInterface/Dbi.h"
#include "DatabaseInterface/DbiResultAgg.h"
#include "DatabaseInterface/DbiCascader.h"
#include "DatabaseInterface/DbiConfigSet.h"
#include "DatabaseInterface/DbiConfigStream.h"
#include "DatabaseInterface/test/DbiDemoData1.h"
#include "DatabaseInterface/test/DbiDemoData2.h"
#include "DatabaseInterface/test/DbiDemoData3.h"
#include "DatabaseInterface/test/DbiDemoData4.h"
#include "DatabaseInterface/DbiBinaryFile.h"
#include "DatabaseInterface/DbiLogEntry.h"
#include "DatabaseInterface/DbiRecord.h"
#include "DatabaseInterface/DbiResultKey.h"
#include "DatabaseInterface/DbiResultNonAgg.h"
#include "DatabaseInterface/DbiResultPtr.h"
#include "DatabaseInterface/DbiResultSet.h"
#include "DatabaseInterface/DbiServices.h"
#include "DatabaseInterface/DbiSimFlagAssociation.h"
#include "DatabaseInterface/DbiSqlContext.h"
#include "DatabaseInterface/DbiSqlValPacket.h"
#include "DatabaseInterface/DbiStatement.h"
#include "DatabaseInterface/DbiTableProxy.h"
#include "DatabaseInterface/DbiValRecSet.h"
#include "DatabaseInterface/test/DbiValidate.hh"
#include "LeakChecker/Lea.h"
#include "LeakChecker/LeaLeakChecker.h"
#include "MessageService/MsgService.h"
#include "Registry/Registry.h"


#include "Util/UtilString.h"
#include "Validity/VldTimeStamp.h"

//ClassImp(DbiValidate)

//   Definition of static data members
//   *********************************
#include "DatabaseInterface/DbiCache.h"

CVSID("$Id: DbiValidate.cc,v 1.102 2008/11/17 07:52:33 nwest Exp $");

// Definition of member functions (alphabetical order)
// ***************************************************


//.....................................................................

DbiValidate::DbiValidate() :
  fNumFail(0),
  fNumPass(0),
  fGoodCascade(false),
  fSkipAsciiDbTest(false)
{
//
//  Purpose:   Default constructor.
//  Arguments: None.
//  Return:    None.
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o  Create default object and prepares the database.


  MSG("Dbi",Msg::kVerbose) << "DbiValidate ctor 1 at " << this 
                             << "\n";
  MSG("Dbi",Msg::kInfo) << "DbiValidation: $Revision: 1.102 $" << endl;

  // Initiate leak checking before preparing the database as this creates DBI objects.
  LeaLeakChecker* lea = LeaLeakChecker::Instance();
  //Not really necessary, but keeps compiler from fretting about unused variables.
  lea->Reset();
  fSkipAsciiDbTest = gSystem->Getenv("ENV_SKIP_ASCII_DB_TEST") != 0;
  this->PrepareDatabases();

}

//.....................................................................

DbiValidate::~DbiValidate() {
//
//
//  Purpose:   Destructor.
//  Arguments: None.
//  Return:    None.
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o  Destroy object.

  MSG("Dbi",Msg::kVerbose) << "DbiValidate dtor at " << this << "\n";
  if ( gSystem->Getenv("ENV_NO_CLEAN_DB_TEST") ) {
    MSG("Dbi",Msg::kInfo) << "ENV_NO_CLEAN_DB_TEST set; not cleaning database" <<endl;
  }
  else this->CleanDatabases();

}

//.....................................................................

void DbiValidate::CleanDatabases(Bool_t printWarnings) {
//
//
//  Purpose:   Cleanup Databases, removing unwanted test data.

// Operate only if safe to do so!
  if ( ! fGoodCascade ) return;

  MSG("Dbi",Msg::kInfo)  << "Removing test tables from databases...\n" << endl;

  DbiCascader* cascader = DbiTableProxyRegistry::Instance().fCascader;
  for (int cascadeEntry = 0; cascadeEntry <= 1; ++cascadeEntry) {
    auto_ptr<DbiStatement> stmtDbn(cascader->CreateStatement(cascadeEntry));
    if ( ! stmtDbn.get() ) {
      MSG("Dbi",Msg::kError) << "Cannot get a statement for cascade entry " << cascadeEntry 
                             << "\n    Please check the ENV_TSQL_* environment.  Quitting ... " << endl;
      exit(1);
    }

    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA1");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA1VLD");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA2");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA2VLD");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA3");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA3VLD");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA3A");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA3AVLD");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA4");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBIDEMODATA4VLD");
    if (printWarnings) stmtDbn->PrintExceptions();
    stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS LOCALSEQNO");
    if (printWarnings) stmtDbn->PrintExceptions();

    if ( cascadeEntry == 0 ) {
      stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBILOGENTRY");
      if (printWarnings) stmtDbn->PrintExceptions();
      stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS DBILOGENTRYVLD");
      if (printWarnings) stmtDbn->PrintExceptions();
      stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS GLOBALSEQNO");
      if (printWarnings) stmtDbn->PrintExceptions();
      stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS ALL_DATA_TYPES");
      if (printWarnings) stmtDbn->PrintExceptions();
      stmtDbn->ExecuteUpdate("DROP TABLE IF EXISTS ALL_DATA_TYPESVLD");
      if (printWarnings) stmtDbn->PrintExceptions();
   }
  }
}
//.....................................................................

void DbiValidate::PrepareDatabases() {
//
//
//  Purpose:   Prepare Databases, by creating required test data.

  bool fail = false;
  MSG("Dbi",Msg::kInfo) << "Preparing databases for DBI testing ..." << endl;

  string privateContext(gSystem->Getenv("SRT_PRIVATE_CONTEXT"));
  string  publicContext(gSystem->Getenv("SRT_PUBLIC_CONTEXT"));

// Before opening the database append an ASCII DB to the cascade if there are
// only 2 entries and not skipping test.
  string cascade(gSystem->Getenv("ENV_TSQL_URL"));
  vector<string>cascadeElements;
  UtilString::StringTok(cascadeElements,cascade,";");
  if ( cascadeElements.size() == 2 && ! fSkipAsciiDbTest ) {
    string asciiDb = cascadeElements[1] + "#";
    asciiDb  += ( privateContext.size() > 2 ) ? privateContext : publicContext;
    asciiDb  += "/DatabaseInterface/test/DemoASCIICatalogue.db";
    MSG("Dbi",Msg::kInfo) << "Appending ASCII DB: " << asciiDb << endl;
    cascade += ";" + asciiDb;
    gSystem->Setenv("ENV_TSQL_URL",cascade.c_str());
  }


// Before proceeding make sure that the cascade looks O.K. and that we
// are not going to do damage by recreating the GLOBALSEQNO table on cascade entry 0
// or wiping DBILOGENTRY.

  DbiCascader* cascader = DbiTableProxyRegistry::Instance().fCascader;

  auto_ptr<DbiStatement> stmtDb(cascader->CreateStatement(0));
  if ( ! stmtDb.get() ) {
    MSG("Dbi",Msg::kError) << "Cannot get a statement for cascade entry 0.  \n"
                           << "Please check the ENV_TSQL_* environment.  Quitting ... " << endl;
    exit(1);
  }
  TSQLStatement* stmtTSQL = stmtDb->ExecuteQuery("select * from GLOBALSEQNO;");

  if ( stmtTSQL ) {
    while ( stmtTSQL->NextResultRow() ) {
      TString tableName = stmtTSQL->GetString(0);
      int lastUsedSeqNo = stmtTSQL->GetInt(1);
      if ( tableName == "*" && lastUsedSeqNo != 900000000 )  {
        MSG("Dbi",Msg::kError) << "GLOBALSEQNO table error. Entry * = " <<   lastUsedSeqNo
                               << " but should be 900000000" << endl;
        fail = true;
      }
      else if  ( tableName != "*" ) {
        string tn3(tableName.Data(),3);
        if ( tn3 != "DBI"  || lastUsedSeqNo < 900000000 || lastUsedSeqNo > 999999999 ) {
          MSG("Dbi",Msg::kError) << "GLOBALSEQNO table error. Entry " <<  tableName 
                                 << " but should start DBI \n"
                                 << "     and last used SEQNO: " << lastUsedSeqNo
                                 << " should be in range 900000000..999999999" << endl;
          fail = true;
        }
      }
    }
  }

  if ( fail ) {
    MSG("Dbi",Msg::kError) << "The GLOBALSEQNO table at entry 0 of the cascade doesn't look\n"
                           << "     like a dummy and as the test suite erases it the job will"
                                << " quit rather than risk damage to this table\n" << endl;
    exit(1);
  }

  // See that DBILOGENTRY has not got too many entries.

  stmtTSQL = stmtDb->ExecuteQuery("select count(*) from DBILOGENTRY;");
  if ( stmtTSQL ) {
    stmtTSQL->NextResultRow();
    int numEntries = stmtTSQL->GetInt(0);
    if ( numEntries > 8)  {
    MSG("Dbi",Msg::kError) << "DBILOGENTRY at entry 0 has " <<  numEntries 
                           << " entries but should have no more than 8 \n"
                           << "    will quit rather than risk damage to this table\n" << endl;
    exit(1);
   }
  }

  // O.K. the cascade looks good.
  fGoodCascade = true;

  // Just in case the previous job didn't end cleanly.
  // Suppress errors at this stage - the database should be clean!
  this->CleanDatabases(false);

  // Now prime the first two cascade entries.

  MSG("Dbi",Msg::kInfo) << "Adding test tables to databases ..." << endl;

  for (int cascadeEntry = 0; cascadeEntry <= 1; ++cascadeEntry) {

  // Locate the commands to recreate the databases.
    ostringstream os;
    os << "/DatabaseInterface/test/prepare_db_" << cascadeEntry << ".sql";
    string fileName = privateContext + os.str();
    // AccessPathName returns true if cannot access!
    if ( gSystem->AccessPathName(fileName.c_str()) ) 
       fileName = publicContext + os.str();

    ifstream inp(fileName.c_str());
    if ( ! inp.is_open() ) {
      MSG("Dbi",Msg::kError) << "Cannot read DB priming file " << fileName << endl;
      exit(1);
    }

    // Get a statement through which to pass the commands.
    auto_ptr<DbiStatement> stmtDbn(cascader->CreateStatement(cascadeEntry));
    if ( ! stmtDbn.get() ) {
      MSG("Dbi",Msg::kError) << "Cannot get a statement for cascade entry " << cascadeEntry 
                             << "\n    Please check the ENV_TSQL_* environment.  Quitting ... " << endl;
      exit(1);
    }

    std::vector<std::string> sql_cmds;

    // The definition of DBIDEMODATA3 is centralised in the DbiDemoData3 class.
    sql_cmds.push_back(Dbi::GetVldDescr("DBIDEMODATA3"));
    sql_cmds.push_back(DbiDemoData3::GetTableDescr());
    if ( cascadeEntry == 0 ) {
      sql_cmds.push_back(Dbi::GetVldDescr("DBIDEMODATA3A"));
      sql_cmds.push_back(DbiDemoData3::GetTableDescr("DBIDEMODATA3A"));
    }

   // Loop over lines assembling SQL commands terminated by ;
    
    string sql; 
    while ( ! inp.eof() ) {
      string line;
      getline(inp,line);

      // Remove trailing spaces.
      while ( line.size() > 0 && *(line.rbegin()) == ' ' ) line.erase(line.size()-1);

      // Ignore empty lines and comments
      if ( line.size() == 0 || line[0] == '#' ) continue;

      sql += line;

      // If terminating semicolon found execute command.
      if ( *(line.rbegin()) == ';' ) {
        sql_cmds.push_back(sql);
        sql = "";
      }
    }
    
    // Now execute the assemble list of SQL commands.

    std::vector<std::string>::iterator itr(sql_cmds.begin()), itrEnd(sql_cmds.end());
    while( itr != itrEnd ) {
      std::string& sql_cmd(*itr++);
      // For DbiDemoData3 data, ignore SQL command and instead generate the data from
      // a reference object.  Do this for 2 reasons:-
      // a)  For self consistency: checks are always w.r.t. to the reference object
      // b)  For ORACLE metadata is always signed (unsigned not supported) but 
      //     for MySQL want to test support for unsigned so require either
      //     signed or unsigned data and by using DbiWriter to write the data
      //     ensures that it gets written in the right form.
      if ( sql_cmd.find("insert into DBIDEMODATA3 values") != std::string::npos) {
        MSG("Dbi",Msg::kDebug) << "Priming DB " << cascadeEntry << " using DbiDemoData3 to create data" << endl;
        DbiDemoData3 refDd3;
        DbiWriter<DbiDemoData3> w_Dd3(DbiDemoData3::GetRangeDTF(),refDd3.GetAggregateNo());
        w_Dd3.SetDbNo(cascadeEntry);
        w_Dd3.SetLogComment("test data");
        w_Dd3 << refDd3;
        if ( ! w_Dd3.Close() ) fail = true;
      }
      else {
        MSG("Dbi",Msg::kDebug) << "Priming DB " << cascadeEntry << "  SQL:" << sql_cmd << endl;
        stmtDbn->ExecuteUpdate(sql_cmd.c_str());
        if ( stmtDbn->PrintExceptions() ) fail = true;
      }
    }

    // Refresh list of tables in connected database
    cascader->GetConnection(cascadeEntry)->SetTableExists();
  }
  if ( fail ) {
    MSG("Dbi",Msg::kError) << "Quiting due to errors preparing database\n" << endl;
    if ( gSystem->Getenv("ENV_NO_CLEAN_DB_TEST") ) {
      MSG("Dbi",Msg::kInfo) << "ENV_NO_CLEAN_DB_TEST set; not cleaning database" <<endl;
    }
    else this->CleanDatabases();
    exit(1);
  }

  // Force cascader to use entry 0 as the authorising DB - it probably came
  // up without one.
  cascader->SetAuthorisingEntry(0);

  MSG("Dbi",Msg::kInfo) << "Database preparation complete." << endl;

  MSG("Dbi",Msg::kDebug) << "Load ALL_DATA_TYPES table to check meta-data" << endl;
  DbiTableProxyRegistry& tbp = DbiTableProxyRegistry::Instance();
  DbiConfigSet cfs;
  tbp.GetTableProxy("ALL_DATA_TYPES",&cfs);
}


//.....................................................................

Bool_t DbiValidate::RunAllTests() {
//
//
//  Purpose:   Run all tests.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.
//
//  Contact:   N. West
//
//
//  Specification:-
//  =============
//
//  o  Run all tests
//
//  o  Check for leaks.


  LeaLeakChecker* lea = LeaLeakChecker::Instance();

//  Run all tests.

  Bool_t ok = kTRUE;

  Int_t numOK = 0;
  for ( Int_t testNum = 1; testNum <= kNUMTESTS; testNum++  ) {
    if ( ! RunTest(testNum) ) ok = kFALSE;
    else ++numOK;
  }

// Delete any residual objects and check for leaks.

  DbiTableProxyRegistry::Instance().Set("Shutdown = 1");
  DbiTableProxyRegistry::Instance().ShowStatistics();
  delete &(DbiTableProxyRegistry::Instance());
  DbiTableProxyRegistry::fgInstance = 0;

//   extern TObjectTable* gObjectTable;
//   if (gObjectTable) gObjectTable->Print();

  if ( lea->GetNumCreated() == 0 ) {
    MSG("Dbi",Msg::kInfo) << "Warning: Leak checking disabled!!"
                          << endl;
  }
  else if ( lea->GetNumActive() ) {
    MSG("Dbi",Msg::kInfo) << "Error, leaks detected! " << endl <<lea;
    ok = kFALSE;
  }
  else {
    MSG("Dbi",Msg::kInfo) << "O.K., no leaks detected " << endl << lea;
  }

  MSG("Dbi",Msg::kInfo) << "\nOverall test status for " << (int) kNUMTESTS << " tests : "
                        << ( ok ? "O.K." : "failed!") 
                        << "  (" << numOK << " passed) " << endl;
  if ( fSkipAsciiDbTest ) MSG("Dbi",Msg::kInfo) 
      << "Warning: ASCII DB tests skipped due to "
      << "setting of environmental variable ENV_SKIP_ASCII_DB_TEST !! \n" << endl;
  return ok;
}

//.....................................................................

Bool_t DbiValidate::RunTest(Int_t testNum) {
//
//
//  Purpose:   Run a specific test.
//  Arguments: 
//    testNum      in  Test to be run.
//
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============

//  Program Notes
//  =============

//  Banner printing not yet implemented.

//  Dispatch to appropriate test.

  switch ( testNum ) {
  case  0: return Test_0();
  case  1: return Test_1();
  case  2: return Test_2();
  case  3: return Test_3();
  case  4: return Test_4();
  case  5: return Test_5();
  case  6: return Test_6();
  case  7: return Test_7();
  case  8: return Test_8();
  case  9: return Test_9();
  case 10: return Test_10();
  case 11: return Test_11();
  case 12: return Test_12();
  case 13: return Test_13();
    }
  MSG("Dbi",Msg::kError) << "Undefined test: " << testNum << "\n";
  return kFALSE;

}

//.....................................................................

void DbiValidate::RunTimeTest() {
//
//
//  Purpose:   Run time test.
//  Arguments: None.
//
//  Return:    n/a
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o  Run time test loading UgliDbiStrip.

//  Program Notes
//  =============
  TStopwatch tim;

  cout << "RunTimeTest has been dummied out.  It's no longer needed and using \n"
       << "UGLI pulls in most of loon and makes testing of API changes tedious\n"
       << "as many libraries have to be rebuilt"  << endl;

}

//.....................................................................

Bool_t DbiValidate::Test_0() {
//
//
//  Purpose:   Dummy test.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o 
//
 
  Bool_t ok = kTRUE;

  MSG("Dbi",Msg::kInfo) 
       << "Test 0: Dummy                                   ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_1() {
//
//
//  Purpose:  DateTime conversion utilities.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Test conversion between VldTimeStamp and SQL DATETIME string.
//
 
  Bool_t ok = kTRUE;

  string ref("2001-09-27 01:02:03");
  VldTimeStamp dt1(2001,9,27,1,2,3);

  string s1 = Dbi::MakeDateTimeString(dt1);
  VldTimeStamp dt2(Dbi::MakeTimeStamp(s1));
  string s2 = Dbi::MakeDateTimeString(dt2);

  if ( ref.compare(s1) || ref.compare(s2) ) {
  
    MSG("Dbi",Msg::kError) << "Conversion test failed: strings: ("
                           << s1 << "," << s2 << ") do not match:" 
                           << ref << endl;
    ok = kFALSE;
  }

  // Check for incomplete and illegal dates.

  Bool_t convertOK;
  dt1 = Dbi::MakeTimeStamp("2000-1-",&convertOK);
  if ( ! convertOK )  {
    MSG("Dbi",Msg::kError) 
      << "Conversion: \"2000-1-\" failed but should not have." << endl;
    ok = kFALSE;
  }

  dt2 = Dbi::MakeTimeStamp("1960-1",&convertOK);
  if ( convertOK )  {
    MSG("Dbi",Msg::kError) 
      << "Conversion: \"1960-1\" should have failed but did not."<< endl;
    ok = kFALSE;
  }

  MSG("Dbi",Msg::kInfo) 
       << "Test 1: DateTime conversion utilities          ...... "
       << ( ok ? "O.K." : "Failed") << endl;

  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}
//.....................................................................

Bool_t DbiValidate::Test_2() {
//
//
//  Purpose:   Retrieval of non-aggregated data from database table.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Get data from DbiDataDemo1 and DbiDemoData3 tables.
//
 
  Bool_t ok = kTRUE;

  struct Test_t {
    Int_t    dateCntx;
    Int_t    timeCntx;
    Int_t    dateResStart;
    Int_t    timeResStart;
    Int_t    dateResEnd;
    Int_t    timeResEnd;
    UInt_t   numRows;
    Float_t  firstGain1;
    Float_t  lastGain1;
  };

  Test_t tests[] = {
    {20001230,120000, 20000106,110000, 20010101,  10203,  0,  0.,  0.},
    {20010130,110000, 20010120, 40506, 20380119,  31407,  0,  0.,  0.},
    {20010113,100000, 20010110, 40506, 20010116,  10203,  0,  0.,  0.},
    {20010103, 90000, 20010103, 10203, 20010104,  10203,  4, 30., 33.},
    {20010105,120000, 20010105,110000, 20010105, 130000,  4, 1.0, 1.3},
  };

  for (int itest=0; itest<5; ++itest ) {
    Test_t& test = tests[itest];
    Int_t date = test.dateCntx;
    Int_t time = test.timeCntx;
    VldTimeStamp tstamp(date/10000, date/100%100, date%100,
                        time/10000, time/100%100, time%100);
    VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);

    DbiResultPtr<DbiDemoData1> pr(vc,0);

// Check validity range of result set.
    VldTimeStamp tsstart = pr.GetValidityRec()
                                         ->GetVldRange().GetTimeStart();
    VldTimeStamp tsend   = pr.GetValidityRec()
                                           ->GetVldRange().GetTimeEnd();
    if (    tsstart.GetDate() != test.dateResStart
         || tsstart.GetTime() != test.timeResStart
         || tsend.GetDate()   != test.dateResEnd
         || tsend.GetTime()   != test.timeResEnd ) {

      MSG("Dbi",Msg::kError) 
        << "Query date: " << tstamp.AsString() << endl
        << " has validity " << pr.GetValidityRec()
                                 ->GetVldRange().AsString() << endl
        << " but should have "
        << test.dateResStart << " " << test.timeResStart << " - "
        << test.dateResEnd   << " " << test.timeResEnd << endl;

      ok = kFALSE;
    }

// Check number of entries in result set.
    unsigned int numRows = pr.GetNumRows();
    if ( numRows != test.numRows ) {
      MSG("Dbi",Msg::kError) 
        << "Query date: " << tstamp.AsString() << endl
        << " gave num rows  " << numRows
        << " but should have given " << test.numRows << endl;
      ok = kFALSE;
    }

    if ( numRows > 0 ) {
      Float_t  firstGain1 = pr.GetRow(0)->GetGain1();
      Float_t  lastGain1  = pr.GetRow(numRows-1)->GetGain1();
      if (     firstGain1 != test.firstGain1 
           ||  lastGain1  != test.lastGain1  ) {
        MSG("Dbi",Msg::kError) 
          << "Query date: " << tstamp.AsString() << endl
          << " gave first,last gains  " << firstGain1
          << "," << lastGain1
          << " but should have given " << test.firstGain1
          << "," << test.lastGain1 << endl;
        ok = kFALSE;

     }
 
      const DbiDemoData1* ddd3 = pr.GetRowByIndex(3000000003U);
      if ( ! ddd3 ) {
        MSG("Dbi",Msg::kError) 
          << "Query date: " << tstamp.AsString() << endl
          << " found no entry at index 3 " << endl;
        ok = kFALSE;
      }
      else if (  ddd3->GetGain1() != test.lastGain1 ) {
        MSG("Dbi",Msg::kError) 
          << "Query date: " << tstamp.AsString() << endl
          << " index 3 gain  " <<  lastGain1
          << " but should have given " << test.lastGain1 << endl;
        ok = kFALSE;
      }

      // On first non-empty test try out SEQNO query.
      if ( itest == 3 ) {
        const DbiValidityRec* vrec = pr.GetValidityRec();
        UInt_t dbNo  = vrec->GetDbNo();
        UInt_t seqNo = vrec->GetSeqNo();
        DbiResultPtr<DbiDemoData1> prSeqno("DbiDemoData1",seqNo,dbNo);
        numRows = prSeqno.GetNumRows();
        if ( numRows != test.numRows ) {
          MSG("Dbi",Msg::kError) 
            << "Query SEQNO " << seqNo << " on database " << dbNo << endl
            << " gave num rows  " << numRows
            << " but should have given " << test.numRows << endl;
          ok = kFALSE;
        }
      }
    }

  }

  // Test moving to adjacent validity range.
  Test_t& test = tests[0];
  Int_t date = test.dateCntx;
  Int_t time = test.timeCntx;
  VldTimeStamp tstamp2(date/10000, date/100%100, date%100,
                      time/10000, time/100%100, time%100);
  VldContext vc2(Detector::kCalib,SimFlag::kData,tstamp2);
  DbiResultPtr<DbiDemoData1> pr(vc2,0);
  for (int step = 0; step < 5; ++step) {
    pr.NextQuery();
  }

  Int_t nextDateGot = pr.GetValidityRec()->GetVldRange()
                        .GetTimeStart().GetDate();
  Int_t nextDateReq = 20010105;
  if ( nextDateGot != nextDateReq ) {
    MSG("Dbi",Msg::kInfo)
      << " Stepping forward expected date: " << nextDateReq
      << " but found " << nextDateGot << endl;
      ok = kFALSE;
    }

  for (int step = 0; step < 5; ++step) {
    pr.NextQuery(kFALSE);
  }

  nextDateGot = pr.GetValidityRec()->GetVldRange()
                  .GetTimeStart().GetDate();
  nextDateReq = 20000106;
  if ( nextDateGot != nextDateReq ) {
    MSG("Dbi",Msg::kInfo)
      << " Stepping backward expected date: " << nextDateReq
      << " but found " << nextDateGot << endl;
      ok = kFALSE;
  }


// Test of DbiDemoData3 data.

  DbiDemoData3 refdd3;
  VldContext vc(refdd3.GetContextDTF());
  DbiResultPtr<DbiDemoData3> pr3(vc,0);
  DbiResultPtr<DbiDemoData3> pr3_copy(pr3);
  const DbiDemoData3* pdd3 = pr3_copy.GetRow(0);
  if ( ! pdd3 ) {
    MSG("Dbi",Msg::kInfo)
      << " Cannot find  DbiDemoData3:-" << endl;
      ok = kFALSE;
    }
  else if ( ! refdd3.Compare(pdd3) ) {
    MSG("Dbi",Msg::kInfo)
      << " Comparison failed comparing reference v. database (initial primed value)." << endl;
    ok = kFALSE;
  }

// Test DbiResultKey coping.

  const DbiResultKey* original_key(pr3.GetKey());
  DbiResultKey copied_key(original_key);
  if ( not copied_key.IsEqualTo(original_key) ) {
  MSG("Dbi",Msg::kInfo)
      << " Copied DbiResultKey of DbiDemoData3 doesn't match:-\n" 
      <<  "Original:   " << *original_key << endl
      <<  "Copy:       " << copied_key << endl;
      ok = kFALSE;
    }

  MSG("Dbi",Msg::kInfo) 
       << "Test 2: Retrieval of non-aggregated data       ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}
//.....................................................................

Bool_t DbiValidate::Test_3() {
//
//
//  Purpose:   Test cache
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Check caching of DemoData1.
//
 
  Bool_t ok = kTRUE;

  struct Test_t {
    Int_t    dateCntx;
    Int_t    timeCntx;
  };

  Test_t tests[] = {
    {20001230,120000},
    {20010130,110000},
    {20010113,100000},
    {20010103, 90000},
  };

// Initially the cache should have not have any DbiResults with clients
// so we can force a purge that will empty it.

  DbiCache* cache = const_cast<DbiTableProxy&>
                        ( DbiResultPtr<DbiDemoData1>::GetTableProxy() )
                        .GetCache();
  cache->Purge();

   if ( cache->GetCurSize() != 0 ) {
     MSG("Dbi",Msg::kError) 
       << "Initial cache size is  " <<  cache->GetCurSize()
       << " but should be 0 " << endl;
     ok = kFALSE;
   }
   unsigned int numResused = cache->GetNumReused();

// Force cache to be overfull by requesting multiple different
// validities simultaneously.
  list<DbiResultPtr<DbiDemoData1>*> pResPtrs;
  for (int itest=0; itest<4; ++itest ) {
    Test_t& test = tests[itest];
    Int_t date = test.dateCntx;
    Int_t time = test.timeCntx;
    VldTimeStamp tstamp(date/10000, date/100%100, date%100,
                        time/10000, time/100%100, time%100);
    VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);

// Create multiple requests to test cache sharing
    pResPtrs.push_back( new DbiResultPtr<DbiDemoData1>(vc,0) );
    pResPtrs.push_back( new DbiResultPtr<DbiDemoData1>(vc,0) );
    pResPtrs.push_back( new DbiResultPtr<DbiDemoData1>(vc,0) );
  }

// There should now be 4 in the cache, each reused twice.
   
  numResused = cache->GetNumReused() - numResused;
  if (    cache->GetCurSize() != 4  
       || numResused != 8 ) {
     MSG("Dbi",Msg::kError) 
       << "Final cache size is  " <<  cache->GetCurSize()
       << " but should be 4 " 
       << ", resuse count is "<< numResused
       << " but should be 8 " << endl;
     ok = kFALSE;
  }


  const DbiRecord* rec = DbiServices::GetRecord();
  if ( rec ) cout << *rec << endl;

// Now delete all the DbiResultPtrs, purge  and the cache should drop
// back to zero.

  for ( list<DbiResultPtr<DbiDemoData1>*>::iterator itr
             = pResPtrs.begin();
        itr != pResPtrs.end();
        ++itr ) delete *itr;

  cache->Purge();

   if ( cache->GetCurSize() != 0 ) {
     MSG("Dbi",Msg::kError) 
       << "Emptied cache size is  " <<  cache->GetCurSize()
       << " but should be 0 " << endl;
     ok = kFALSE;
   }
   
// Test marking of cache as stale to force reloading.
   for (Int_t itry =1; itry <= 10; ++itry ) {
     Test_t& test = tests[0];
     Int_t date = test.dateCntx;
     Int_t time = test.timeCntx;
     VldTimeStamp tstamp(date/10000, date/100%100, date%100,
                         time/10000, time/100%100, time%100);
     VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);
     cache->SetStale();
     DbiResultPtr<DbiDemoData1> pr1(vc,0);
   }

  numResused = cache->GetNumReused() - numResused;
  if (    cache->GetCurSize() != 1  
       || numResused != 0 ) {
     MSG("Dbi",Msg::kError) 
       << " SetStale test: Final cache size is  " <<  cache->GetCurSize()
       << " but should be 1 " 
       << ", resuse count is "<< numResused
       << " but should be 0 " << endl;
     ok = kFALSE;
  }

  MSG("Dbi",Msg::kInfo) 
       << "Test 3: Caching of DbiResults                  ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_4() {
//
//
//  Purpose:  Cache Save to/Restore from disk
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Perform binary I/O on all the basic types.
//
//  o Test caching of unaggregated and aggregated queries.

  Bool_t ok = kTRUE;

  CfgConfigurable& dbiCfg = DbiTableProxyRegistry::Instance();
  dbiCfg.Set("Level2Cache = './'");
  dbiCfg.Update();
   
//  Test I/O for builtin, string, simple and compound objects.

  int    i = 999;
  double f = 3.1415;
  string s1("A non-empty string");
  string s2;
  VldTimeStamp ts;
  VldTimeStamp ts2(2001,4,07,12,00,00);
  VldRange     vr(7,3,ts,ts2,"Test11");
  DbiValidityRec vrec(vr,123,456,789);
  DbiBinaryFile out("dbicache.dat",kFALSE);
  out << i << f << s1  << s2 << ts << vr;
  vrec.Streamer(out);
  out.Close();

  i = 0;
  f = 0.;
  s1 = "dummy";
  s2 = "dummy";
  string tsAsString = ts.AsString();
  string vrAsString = vr.AsString();

  // Destroy ts, vr
  memcpy(&ts," ",sizeof(ts));
  vr = VldRange();

  DbiValidityRec vrec2;
  DbiBinaryFile in("dbicache.dat");
  in >> i >> f >> s1  >> s2 >> ts >> vr;
  vrec2.Streamer(in);
  in.Close();
  if (     vrec.GetAggregateNo()  !=  vrec2.GetAggregateNo() 
       ||  vrec.GetDbNo()         !=  vrec2.GetDbNo()
       ||  vrec.GetTask()         !=  vrec2.GetTask()
       ||  vrec.GetSeqNo()        !=  vrec2.GetSeqNo()
       ||  vrec.GetInsertDate()   !=  vrec2.GetInsertDate()
       ||  vrec.GetCreationDate() !=  vrec2.GetCreationDate()
       ||  vrec.IsGap()           !=  vrec2.IsGap()
     ) {
    MSG("Dbi",Msg::kError) 
        << "Binary I/O has failed:-\n"
        <<   "  DbiValidityRec was " << vrec 
        << "\n          but now is " << vrec << endl;
    ok = kFALSE;
  }
  if (    i  != 999 
       || f  != 3.1415 
       || s1 != "A non-empty string" 
       || s2 != "" 
       || tsAsString != ts.AsString() 
       || vrAsString != vr.AsString() ) {
    MSG("Dbi",Msg::kError) 
        << "Binary I/O has failed:-\n"
        << "    int   = " << i << " but should be 999\n"
        << "    float = " << f << " but should be 3.1415\n"
        << "    str1  = \"" << s1 << "\" but should be \"A non-empty string\"\n"
        << "    str2  = \"" << s2 << "\" but should be \"\"\n"
        << "    ts    = \"" << ts.AsString() << "\n          but should be \"" 
        << tsAsString << "\"\n"
        << "    vr    = \"" << vr.AsString() << "\n          but should be \"" 
        << vrAsString << "\"\n"
        << endl;
    ok = kFALSE;
  }


//  Test I/O for vector<DbiTableRow*>.

  DbiDemoData4 pet;
  void* vt;
  memcpy(&vt,&pet,4);
  MSG("Dbi",Msg::kVerbose) << "VT for DbiDemoData4 " << hex << vt << dec << endl;

  unsigned int  numRows  = 20;
  unsigned int  numTries = 5;

  for (unsigned int itry = 1; itry <= numTries; ++itry ) {
    vector<DbiTableRow*> arr;

    MSG("Dbi",Msg::kVerbose) << "Creating data ..." << endl;
    for (unsigned int row =0; row < numRows; ++row ) 
        arr.push_back(new DbiDemoData4(row));

    MSG("Dbi",Msg::kVerbose) << "Checking data ..." << endl;
    for (unsigned int row =0; row < numRows; ++row ) {
      if ( ! dynamic_cast<DbiDemoData4*>(arr[row])->IsValid() 
         ) {
         MSG("Dbi",Msg::kError) << row << " is not valid " << endl;
         ok = kFALSE;
      }
    }

    MSG("Dbi",Msg::kVerbose) << "Writing data ..." << endl;
    DbiBinaryFile out2("dbicache2.dat",kFALSE);
    out2 << arr;
    out2.Close();

    MSG("Dbi",Msg::kVerbose) << "Destroying data ..." << endl;
    for (unsigned int row =0; row < numRows; ++row ) delete arr[row];
    arr.clear();
  
    MSG("Dbi",Msg::kVerbose) << "Reading data ..." << endl;
    DbiBinaryFile in2("dbicache2.dat");
    in2 >> arr;
    in2.Close();
    char* buffer = in2.ReleaseArrayBuffer();
  
    MSG("Dbi",Msg::kVerbose) << "Checking data ..." << endl;
    for (unsigned int row =0; row < numRows; ++row ) {
      if ( ! dynamic_cast<DbiDemoData4*>(arr[row])->IsValid() 
         ) {
         MSG("Dbi",Msg::kError) << row << " is not valid " << endl;
         ok = kFALSE;
      }

    }
    delete[] buffer;
    buffer = 0;
  }

// Test saving to Level 2 when caching enabled.


  DbiCache* cache1 = const_cast<DbiTableProxy&>
                        ( DbiResultPtr<DbiDemoData1>::GetTableProxy() )
                        .GetCache();
  DbiCache* cache2 = const_cast<DbiTableProxy&>
                        ( DbiResultPtr<DbiDemoData2>::GetTableProxy() )
                        .GetCache();

  VldTimeStamp ts3(2001,1,10,0,0,0);
  VldContext vc3(Detector::kCalib,SimFlag::kData,ts3);

  cache1->Purge();
  cache2->Purge();

// First make L2 cache write-only, to refresh it.
  DbiBinaryFile::SetReadAccess(kFALSE);

  IndexToRow_t dd1Table;
  IndexToRow_t dd2Table;

// Perform query within a scope to release resultset automatically
// but take a copy of the results.
  {
    DbiResultPtr<DbiDemoData1> dd1pr3(vc3,0);
    DbiResultPtr<DbiDemoData2> dd2pr3(vc3,0);

    if ( ! dd1pr3.ResultsFromDb() || ! dd2pr3.ResultsFromDb() ) {
      MSG("Dbi",Msg::kError) << "First query isn't from database but should be " << endl;
      ok = kFALSE;
    }

    for (unsigned row=0; row < dd1pr3.GetNumRows(); ++row) {
      const DbiDemoData1* dd1 = dd1pr3.GetRow(row);
      const DbiTableRow* dd1Copy = new DbiDemoData1(*dd1);
      dd1Table[dd1->GetIndex(row)] = dd1Copy;
    }
    for (unsigned row=0; row < dd2pr3.GetNumRows(); ++row) {
      const DbiDemoData2* dd2 = dd2pr3.GetRow(row);
      const DbiTableRow* dd2Copy = new DbiDemoData2(*dd2);
      dd2Table[dd2->GetIndex(row)] = dd2Copy;
    }

  }

  cache1->Purge();
  cache2->Purge();

// Now enable read access, read again, and compare.

  DbiBinaryFile::SetReadAccess();
  DbiResultPtr<DbiDemoData1> dd1pr3(vc3,0);
  DbiResultPtr<DbiDemoData2> dd2pr3(vc3,0);
  if ( dd1pr3.ResultsFromDb() || dd2pr3.ResultsFromDb() ) {
    MSG("Dbi",Msg::kError) << "Second query is from database but should not be " << endl;
    ok = kFALSE;
  }
  for (unsigned row=0; row < dd1pr3.GetNumRows(); ++row) {
    const DbiDemoData1* dd1 = dd1pr3.GetRow(row);
    const DbiDemoData1* dd1Copy = dynamic_cast<const DbiDemoData1*>(dd1Table[dd1->GetIndex(row)]);
    if ( ! dd1Copy || ! dd1Copy->Compare(*dd1) ) {
      MSG("Dbi",Msg::kError) << "Results for DbiDemoData1 from L2 cache differs on row  " 
                             << row << endl;
    ok = kFALSE;
    }
  }
  for (unsigned row=0; row < dd2pr3.GetNumRows(); ++row) {
    const DbiDemoData2* dd2 = dd2pr3.GetRow(row);
    const DbiDemoData2* dd2Copy = dynamic_cast<const DbiDemoData2*>(dd2Table[dd2->GetIndex(row)]);
    if ( ! dd2Copy || ! dd2Copy->Compare(*dd2) ) {
      MSG("Dbi",Msg::kError) << "Results for DbiDemoData2 from L2 cache differs on row  " 
                             << row << endl;
    ok = kFALSE;
    }
  }

// Destroy copy so it doesn't show up as a leak.
  IndexToRow_t::iterator itr    =  dd1Table.begin();
  IndexToRow_t::iterator itrEnd =  dd1Table.end();
  for (; itr != itrEnd; ++itr) delete itr->second;
  itr    =  dd2Table.begin();
  itrEnd =  dd2Table.end();
  for (; itr != itrEnd; ++itr) delete itr->second;

  dbiCfg.Set("Level2Cache = ''");
  dbiCfg.Update();


  MSG("Dbi",Msg::kInfo) 
       << "Test 4: Level 2 Caching of DbiResults          ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}
//.....................................................................

Bool_t DbiValidate::Test_5() {
//
//
//  Purpose:   Test of aggregated data.  Further cache tests
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Step through a set of validity range boundaries and ensure
//    that the correct aggregates get refreshed and that all data 
//    is valid.
// 
// o  Check on task selection and show that each task remains in
//    cache
// 
// 
  Bool_t ok = kTRUE;
  struct Test_t {
    Int_t    dateCntx;
    Int_t    timeCntx;
    Int_t    dateResStart;
    Int_t    timeResStart;
    Int_t    dateResEnd;
    Int_t    timeResEnd;
    UInt_t   numRows;
    Float_t  datai[4];
    Float_t  datar[4];
  };

  enum { NUM_TESTS = 5 }; // Number of tests. 
  Test_t tests[] = {
    {20010101,120000, 20010101, 000000, 20010103, 000000, 15,
                              { 100.,  104.,  109.,  114.},
                              { 102.,  108.,  100.,  107.} },
    {20010102,120000, 20010101, 000000, 20010103, 000000, 15,
                              { 100.,  104.,  109.,  114.},
                              { 102.,  108.,  100.,  107.} },
    {20010103,120000, 20010103, 000000, 20010104, 000000, 15,
                              { 100.,  204.,  209.,  114. },
                              { 202.,  108.,  100.,  207. } },
    {20010104,120000, 20010104, 101112, 20010105, 000000, 12,
                              { 300., -999.,  309.,  314. },
                              { 202.,  308.,  300., -999. } },
    {20010105,120000, 20010105, 000000, 20010131, 000000, 15,
                              { 400.,  404.,  409.,  414. },
                              { 402.,  408.,  400.,  407. } },
  };


// Sweep over all validity range boundaries.

  for (int itest=0; itest<NUM_TESTS; ++itest ) {
    Test_t& test = tests[itest];
    Int_t date = test.dateCntx;
    Int_t time = test.timeCntx;
    VldTimeStamp tstamp(date/10000, date/100%100, date%100,
                        time/10000, time/100%100, time%100);
    VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);

    DbiResultPtr<DbiDemoData2> rp(vc,0);

// Check validity range of result set.
    VldTimeStamp tsstart = rp.GetValidityRec()
                                         ->GetVldRange().GetTimeStart();
    VldTimeStamp tsend   = rp.GetValidityRec()
                                           ->GetVldRange().GetTimeEnd();
    if (    tsstart.GetDate() != test.dateResStart
         || tsstart.GetTime() != test.timeResStart
         || tsend.GetDate()   != test.dateResEnd
         || tsend.GetTime()   != test.timeResEnd ) {

      MSG("Dbi",Msg::kError) 
        << "Query date: " << tstamp.AsString() << endl
        << " has validity " << rp.GetValidityRec()
                                 ->GetVldRange().AsString() << endl
        << " but should have "
        << test.dateResStart << " " << test.timeResStart << " - "
        << test.dateResEnd   << " " << test.timeResEnd << endl;

      ok = kFALSE;
    }

// Check number of entries in result set.
    unsigned int numRows = rp.GetNumRows();
    if ( numRows != test.numRows ) {
      MSG("Dbi",Msg::kError) 
        << "Query date: " << tstamp.AsString() << endl
        << " gave num rows  " << numRows
        << " but should have given " << test.numRows << endl;
      ok = kFALSE;
    }

// Check the data from subsystems with indeces 0, 4, 9, 14.
    UInt_t indeces[] = { 0, 4, 9, 14};
    for (UInt_t idata = 0; idata<4; ++idata) {
      UInt_t index = indeces[idata];
      const DbiDemoData2* pdd2i = rp.GetRowByIndex(index);
      if ( pdd2i  == 0 ) {
        if ( test.datai[idata] != -999. ) {
          MSG("Dbi",Msg::kError) 
            << "Query date: " << tstamp.AsString() << endl
            << " gave data for index " << index
            << " but should have been missing " 
            << endl;
          ok = kFALSE;
        }
      }
      else {
        if ( pdd2i->GetData() != test.datai[idata] ) {
          MSG("Dbi",Msg::kError) 
            << "Query date: " << tstamp.AsString() << endl
            << " gave gave data  " <<  pdd2i->GetData()
            << " for index " << index
            << " but should have given " << test.datai[idata] << endl;
        ok = kFALSE;
        }
      }
    }

  }
  
//  Repeat last validity context multiple times for multiple tasks

  DbiCache* cache = const_cast<DbiTableProxy&>
                    ( DbiResultPtr<DbiDemoData2>::GetTableProxy() )
                    .GetCache();
  int itest= NUM_TESTS-1;
  Test_t& test = tests[itest];
  Int_t date = test.dateCntx;
  Int_t time = test.timeCntx;
  VldTimeStamp tstamp(date/10000, date/100%100, date%100,
                      time/10000, time/100%100, time%100);
  VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);

  UInt_t numAdopted = cache->GetNumAdopted();
  UInt_t setSize = 0;
  for ( int trial=0; trial<3; ++trial) {
    for (Dbi::Task task=1; task < 4; ++task ) { 
      DbiResultPtr<DbiDemoData2> rp(vc,task);
      setSize = rp.GetNumRows();
    }
  }
  numAdopted = cache->GetNumAdopted() - numAdopted;

  if (    setSize != 5 ||  numAdopted != 9 ) {
     MSG("Dbi",Msg::kError) 
       << "Non-zero task test:" << endl
       << "      Set size is  " << setSize
       << " but should be 5 " 
       << ", number adopted is "<< numAdopted
       << " but should be 9 " << endl;
     ok = kFALSE;
  }

// Test getting a DbiValidityRec for a row.

  VldTimeStamp tstamp2(2001, 01, 03, 12, 0, 0);
  VldContext vc2(Detector::kCalib,SimFlag::kData,tstamp2);
  Int_t startDateReq = 20010103;
  Int_t endDateReq   = 20010104;

  DbiResultPtr<DbiDemoData2> rp(vc2);
  const VldRange& rng = rp.GetValidityRec()->GetVldRange(); 
  Int_t startDateGot = rng.GetTimeStart().GetDate();
  Int_t endDateGot   = rng.GetTimeEnd().GetDate();

  if ( startDateGot != startDateReq || endDateGot != endDateReq ) {
     MSG("Dbi",Msg::kError) 
       << "Failed row validity test" << endl
       << "           got  " << startDateGot << "-" << endDateGot <<endl
       << " but should be  "  << startDateReq << "-" << endDateReq <<endl;
     ok = kFALSE;
  }


  MSG("Dbi",Msg::kInfo) 
       << "Test 5: Retrieval of aggregated data           ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_6() {
//
//
//  Purpose:   Test of configuration data..
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Build DbiConfigStream and use it to fill a Registry.
 
  Bool_t ok = kTRUE;



// Test of DbiConfigSet/Stream  reading of DbiDemoData4 
// and DEMOASCIICONFIG data.
// This tests configuration loading from a configuration table i.e.
// one in which there is a single column holding a string with
// attribute name=value pairs.

  for (int tryNum = 0; tryNum < 2; ++tryNum) {

    string tableName = tryNum == 0 ? "DbiDemoData4" : "DEMOASCIICONFIG";

    if ( tableName == "DEMOASCIICONFIG" && fSkipAsciiDbTest ) {
      MSG("Dbi",Msg::kInfo) << "Skipping test on ASCII DB" << endl;
      continue;
    }
    DbiConfigStream cfStream2(tableName,"default",DbiConfigStream::fgDefaultContext,0,tableName);
  
    if ( cfStream2.GetConfigSet() == 0 ) {
      MSG("Dbi",Msg::kError)
        << "Error: ConfigStream2 is empty for table  " << tableName << endl;
        ok = kFALSE;
    }
    else {
  
      Registry reg(kFALSE);
      cfStream2 >> &reg;

      bool  testBool      = 1;
      Double_t testDouble = 1.23456789012345678e+100;
      string testString   = "This is a string";
      int    testInt      = 12345;
  
      if (    testBool != reg.GetInt("mybool") 
           || fabs( testDouble - reg.GetDouble("mydouble") ) > 1.0e86
           || testString != reg.GetCharString("mystring") 
           || testInt  != reg.GetInt("myint") ) {
        MSG("Dbi",Msg::kInfo)
          << "Mismatch reading contents of " << tableName << ":-" << endl
          <<  "  Bool   " << reg.GetInt("mybool") 
          << " should be: " << testBool   << endl
          <<  "  Double " << reg.GetDouble("mydouble") 
          << " should be: " << testDouble 
          << " - diff = " << testDouble - reg.GetDouble("mydouble") << endl
          <<  "  String \"" << reg.GetCharString("mystring") 
          << "\" should be: \"" << testString << "\"" << endl
          <<  " testInt  " << reg.GetInt("myint") 
          << " should be: " << testInt<< endl;
          ok = kFALSE;
      }
  
    }
  }

  MSG("Dbi",Msg::kInfo) 
       << "Test 6: Retrieval of configuration data        ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}


//.....................................................................

Bool_t DbiValidate::Test_7() {
//
//
//  Purpose:   Test of DbiWriter and DbiLogEntry.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Duplicate and write an aggregated set, then read back and compare.
//

  typedef vector<DbiWriter<DbiDemoData2>*> vector_writer_t;
  typedef vector_writer_t::iterator        vector_writer_itr_t;
 
  Bool_t ok = kTRUE;
  
// Remove any existing data from the database.

  DbiCascader* cascader = DbiTableProxyRegistry::Instance().fCascader;
  auto_ptr<DbiStatement> stmtDb(cascader->CreateStatement(0));
// To avoid those "Unable to close ...still active statements.
  cascader->SetPermanent(0);

// Check out local and global SeqNo allocation.

  Int_t lsqn1 = cascader->AllocateSeqNo("DBIDEMODATA1",-1,0);
  Int_t lsqn2 = cascader->AllocateSeqNo("DBIDEMODATA1",-1,0);
  Int_t gsqn1 = cascader->AllocateSeqNo("DBIDEMODATA1",1,0);
  Int_t gsqn2 = cascader->AllocateSeqNo("DBIDEMODATA1",1,0);
  if ( lsqn1 != 4 || lsqn2 != 5 ) {
    MSG("Dbi",Msg::kError) 
     << "Bad local sequence numbers. Got " << lsqn1
     << "," << lsqn2 << " but should be 4,5" << endl;
     ok = kFALSE;
  }
  if ( gsqn1 != 900000001 || gsqn2 != 900000002 ) {
    MSG("Dbi",Msg::kError) 
     << "Bad global sequence numbers. Got " << gsqn1
     << "," << gsqn2 << " but should be 900000001,900000002" << endl;
     ok = kFALSE;
  }

  
  
//  Unagregated data test
//  *********************


// Read in reference set,

  DbiDemoData3 refdd3;
  VldContext vc_dd3(refdd3.GetContextDTF());
  DbiResultPtr<DbiDemoData3> refRP3(vc_dd3,0);
  const DbiDemoData3* row3 = refRP3.GetRow(0);

// Define a validity range for the output set.

  VldTimeStamp  start(2001,4,07,12,00,00);
// Add 173 days to get end date.
  time_t vcSec = start.GetSec() + 173*24*60*60;
  VldTimeStamp    end(vcSec,0);
  VldTimeStamp create(2001,5,7,12,00,00);
  VldRange      range(7,3,start,end,"Test6");
  
// Create a writer and store the data and close writer.

  DbiWriter<DbiDemoData3> writer3(range,-1,0,create,0);  
  DbiValidityRec vrec3(range,0,-1,0);
  string ovlayTsGot1 = writer3.TableProxy()
                       .QueryOverlayCreationDate(vrec3,0).AsString("s");
  string ovlayTsReq1 = "2001-04-07 12:00:00";
  writer3 << *row3;

// Give it a log comment from a file.
  ofstream log_comment("dbi_test_7.tmp");
  log_comment << "First comment" << endl;
  log_comment << "FIXUP-FILE:  (should be ignored)" << endl;
  log_comment << "Second comment" << endl;
  log_comment << "BROADCAST:  (should be ignored)" << endl;
  log_comment << "Last comment" << endl;
  log_comment.close();
  writer3.SetLogComment("@dbi_test_7.tmp");

  if ( ! writer3.Close() ) {
    MSG("Dbi",Msg::kError) 
         << "Output error writing data" << endl;
     ok = kFALSE;
  }
  string ovlayTsGot2 = writer3.TableProxy()
                       .QueryOverlayCreationDate(vrec3,0).AsString("s");
  string ovlayTsReq2 = "2001-05-07 12:01:00";

  if ( ovlayTsGot1 != ovlayTsReq1 || ovlayTsGot2 != ovlayTsReq2 ) {
    MSG("Dbi",Msg::kError) 
         << "Bad overlay creation dates:-" 
         << "\n  No overlay: got " << ovlayTsGot1 << " but expected " << ovlayTsReq1 
         << "\n  Overlay:    got " << ovlayTsGot2 << " but expected " << ovlayTsReq2
         << endl;
     ok = kFALSE;
  }

//  Read back the data just written and compare to the orginal.

  VldContext copyVC(Detector::kCalib,SimFlag::kData,create);
  DbiResultPtr<DbiDemoData3> copyRP3(copyVC,0);

  UInt_t copyNumRows = copyRP3.GetNumRows();
  if ( copyNumRows != 1 ) {
    MSG("Dbi",Msg::kError) 
     << "Reference size " << 1
     << "  does not match copy size  " << copyNumRows << endl;
     ok = kFALSE;
  }

  else {
    const DbiDemoData3* copyRow3 = copyRP3.GetRow(0);
    if ( ! refdd3.Compare(copyRow3) ) {
    MSG("Dbi",Msg::kError) 
     << "Comparison failed reference v. Database (written & read back)" << endl;
     ok = kFALSE;
    }
  }

//  Try writing to an alternative table.

  DbiWriter<DbiDemoData3> writer3A(range,-1,0,create,0,"@dbi_test_7.tmp","DBIDEMODATA3A");  
  writer3A << *row3;
  if ( ! writer3A.Close() ) {
    MSG("Dbi",Msg::kError) 
         << "Output error writing data to DBIDEMODATA3A" << endl;
     ok = kFALSE;
  }

  DbiResultPtr<DbiDemoData3> copyRP3A("DBIDEMODATA3A",copyVC,0);
  UInt_t copyNumRowsA = copyRP3A.GetNumRows();
  if ( copyNumRowsA != 1 ) {
    MSG("Dbi",Msg::kError) 
     << "Reference size " << 1
     << "  does not match copy size  " << copyNumRowsA << endl;
     ok = kFALSE;
  }

 

//  Use extended context query to check the update record.
  time_t insSec = copyRP3A.GetValidityRec()->GetInsertDate().GetSec();
  VldTimeStamp lo(insSec-10,0);
  VldTimeStamp hi(insSec+10,0);
  DbiSqlContext sc(DbiSqlContext::kWithin,lo,hi,Detector::kCalib,SimFlag::kData);
  DbiResultPtr<DbiLogEntry>  logEntryPtr("DbiLogEntry",sc);
  if ( logEntryPtr.GetNumRows() != 2 ) {
    MSG("Dbi",Msg::kError) 
     << "Expected to find two update record but found " 
     << logEntryPtr.GetNumRows() << endl;
     ok = kFALSE;
  }
  else {
    const DbiLogEntry* logEntry = logEntryPtr.GetRow(0);
    string logMsgReq = "First comment\nSecond comment\nLast comment\n";
    string logMsgGot = logEntry->GetReason();
    if ( logMsgReq != logMsgGot ) {
      MSG("Dbi",Msg::kError) 
        << "Expected update record reason:-\n" << logMsgReq
        << "\n but got:- \n" << logMsgGot << endl;
     ok = kFALSE;
    }
    
  }

//  Agregated data test
//  *******************


// Read in reference set,

  VldTimeStamp tstamp(2001,1,1,12,0,0);
  VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);
  DbiResultPtr<DbiDemoData2> refRP(vc,0);

// Loop over all data creating DbiWriters for each aggregate and 
// storing the data.

  vector_writer_t writers;
  UInt_t numRows = refRP.GetNumRows();  
  for (UInt_t irow = 0; irow < numRows; ++irow) {
    const DbiDemoData2* row = refRP.GetRow(irow);
    if ( ! row ) continue;
    UInt_t aggNo = row->GetAggregateNo();
    while ( aggNo >= writers.size() ) writers.push_back(0);
    DbiWriter<DbiDemoData2>* writer = writers[aggNo];
    if ( ! writer ) {
      writer = new DbiWriter<DbiDemoData2>(range,aggNo,0,create,0,"Updating DbiDemoData2");
      writers[aggNo] = writer;
    }
    *writer << *row;
  }
  
// Loop over all writers, closing and deleting them.

  for (vector_writer_itr_t itr = writers.begin(); 
       itr != writers.end();
       ++itr ) {
    DbiWriter<DbiDemoData2>* writer = *itr;
    if ( writer ) {
      if ( ! writer->Close() ) {
        MSG("Dbi",Msg::kError) 
         << "Output error writing data" << endl;
         ok = kFALSE;
      }

      delete writer;
    }
  }
  
//  Read back the data just written and compare to the orginal.

  DbiResultPtr<DbiDemoData2> copyRP(copyVC,0);

  copyNumRows = copyRP.GetNumRows();
  if ( numRows != copyNumRows || numRows == 0 ) {
    MSG("Dbi",Msg::kError) 
     << "Reference size " << numRows
     << "  is zero, or does not match copy size  " << copyNumRows << endl;
     ok = kFALSE;
  }

  else {
    for (UInt_t irow = 0; irow < numRows; ++irow) {
      const DbiDemoData2* refRow  = refRP.GetRow(irow);
      const DbiDemoData2* copyRow = copyRP.GetRowByIndex(refRow->GetIndex(irow));
      Int_t refAggNo   = refRow->GetAggregateNo();
      Int_t copyAggNo  = copyRow->GetAggregateNo();
      Float_t refData  = refRow->GetData();
      Float_t copyData = copyRow->GetData();
      if ( refAggNo != copyAggNo || refData != copyData ) {
        MSG("Dbi",Msg::kError) 
          << "Mismatch between ref. and copy on row " << irow << endl
          << "    Agg. nos: " << refAggNo << "," << copyAggNo 
          << "   Data:" << refData  << "," << copyData << endl;
       ok = kFALSE;
      }
    }
  }

  // Try writing configuration data.

  DbiConfigStream cfs("DbiDemoData4","NewData",DbiConfigStream::fgDefaultContext,0,"DbiDemoData4");
  if ( ! cfs.IsEmpty() ) {
    MSG("Dbi",Msg::kError) << "New configuration data already exists." << endl;
   ok = kFALSE;
  }

  Registry reg(kFALSE);
  reg.Set("MyInt",123);
  reg.Set("MyFloat",456.0);
  reg.Set("MyString","A string");
  cfs << &reg;

  if ( cfs.IsEmpty() ) {
    MSG("Dbi",Msg::kError) << "Config stream still empty after adding config data." << endl;
   ok = kFALSE;
  }
  if ( ! cfs.Write(0,"Test writing config data") ) {
    MSG("Dbi",Msg::kError) << "Failed to write Config stream." << endl;
   ok = kFALSE;
  }

  // Try reading it back again.  Need to set cache as stale to force reloading.
  DbiConfigSet pet;
  DbiTableProxyRegistry::Instance().GetTableProxy("DbiDemoData4",&pet).GetCache()->SetStale();
  DbiConfigStream cfs2("DbiDemoData4","NewData",DbiConfigStream::fgDefaultContext,0,"DbiDemoData4");
  if ( cfs2.IsEmpty() ) {
    MSG("Dbi",Msg::kError) << "Cannot find new configuration data." << endl;
   ok = kFALSE;
  }

  Registry reg2(kFALSE);
  cfs >> &reg2;
  ostringstream os;
  ostringstream os2;
  reg.PrettyPrint(os);
  reg.PrettyPrint(os2);
  if ( os.str() != os2.str() ) {
    MSG("Dbi",Msg::kError) << "Configuration I/O failed."
                           << "\n Wrote:" << os.str() 
                           << "\n Read: " << os2.str() << endl;
   ok = kFALSE;
  }
  MSG("Dbi",Msg::kInfo) 
       << "Test 7: Writing data                           ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_8() {
//
//
//  Purpose:  ASCII catalogue and files.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Load ASCII catalogue that contains two table:-
//     DEMOASCIIDATA and DEMOASCIIDATAVLD
//    That are compatible with DbiDemoData1.
//
//  o Load DbiDemoData1 from this data and check its data.

  Bool_t ok = kTRUE;
  if ( fSkipAsciiDbTest ) {
    MSG("Dbi",Msg::kInfo) << "Skipping test on ASCII DB" << endl;
    return ok;
  }

  const Int_t dbNoCat = 2;  // Hardwired catalog DB as 3rd in cascade.
  DbiCascader* cascader = DbiTableProxyRegistry::Instance().fCascader;
  string url = cascader->GetURL(dbNoCat);
  if ( url == "" || url.find("DemoASCIICatalogue.db") > url.size() ) {
    MSG("Dbi",Msg::kError) 
        << "Database number " << dbNoCat << " does not have \n"
        << " name DemoASCIICatalogue.db; assumed not to be" 
        << " an ASCII catalogue.  Aborting test " << endl;
    ok = kFALSE;
  }

  else {
    string asciiName = "DemoASCIIData";
    if ( ! cascader->TableExists(asciiName) ) asciiName = "DEMOASCIIDATA";
    VldTimeStamp tstamp(2001,1, 3, 12, 0, 0);
    VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);
    DbiResultPtr<DbiDemoData1> pr(asciiName,vc,0);
    const DbiDemoData1* ddd1 = pr.GetRow(0);
    if ( ! ddd1 ) {
      MSG("Dbi",Msg::kError) 
        << "No " << asciiName << " in catalogue " << endl;
      ok = kFALSE;
    }
    else {
      if (     ddd1->GetPedestal() != 1.0
            || ddd1->GetGain1()    != 10.
            || ddd1->GetGain2()    != 100. ){
        MSG("Dbi",Msg::kError) 
          << "Data of first row in catalogue "
          << ddd1->GetPedestal() << "," 
          << ddd1->GetGain1() << "," 
          << ddd1->GetGain2() << "," 
          << " but should have been 1.,10.,100." << endl;
        ok = kFALSE;
      }
    }
  }

  MSG("Dbi",Msg::kInfo) 
       << "Test 8: Flat file (ASCII) access               ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}
//.....................................................................

Bool_t DbiValidate::Test_9() {
//
//
//  Purpose:  Temporary tables
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Create temporary table and then try to access it.
//
 
  Bool_t ok = kTRUE;

// Running this test with ORACLE in position 0 in the cascade fails.  It objects:-
//
//     Error executing " create global temporary table DBIDEMODATA1 ...
//      ...  name is already used by an existing object"
//
// but the whole point of the test is to do just that - overlay existing data.
// Still ORACLE won't be use to host temporary tables so I will skip 
// this test when ORACLE is in position 0 of the cascade. 

  DbiCascader& cascader 
                      = DbiTableProxyRegistry::Instance().GetCascader();
  Dbi::DbTypes dbType = cascader.GetConnection(0)->GetDbType();
  if ( dbType == Dbi::kOracle ) {
    MSG("Dbi",Msg::kInfo) 
      << "Test 9: Temporary table creation & access      ...... Skipped (ORACLE in cascade entry 0)" << endl;
    return ok;
  }

     
// First read DbiDemoData1 from a date found in primary database.

  VldTimeStamp tstamp(2001,01,05,10,30,0);
  VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);
  DbiResultPtr<DbiDemoData1> pr(vc,0);

  unsigned int numRows = pr.GetNumRows();
  if ( numRows != 4 ) {    
    MSG("Dbi",Msg::kError) 
        << "Before writing temp table Query date: " 
        << tstamp.AsString() << endl
        << " gave num rows  " << numRows 
        << " but should have given 4" << endl;
    ok = kFALSE;
  }

// Mark as stale so won't use cache again.

  pr.TableProxy().GetCache()->SetStale();

// Now write new data into temporary table to replace it.


  string tableDescr = "(SEQNO int,"
                      " ROW_COUNTER int,"
                      " SUBSYSTEM  int,"
                      " PEDESTAL float,"
                      " GAIN1 float,"
                      " GAIN2 float )";
  string tableName = "DbiDemoData1";
  if ( ! cascader.TableExists(tableName) ) tableName = "DBIDEMODATA1";
  Int_t dbNo = cascader.CreateTemporaryTable(tableName,tableDescr);

  if ( dbNo < 0 ) {
    MSG("Dbi",Msg::kError) 
     << "Unable to find a database to accept temporary tables. "<< endl;
     ok = kFALSE;
  }

  else if ( dbNo > 0 ) {
    MSG("Dbi",Msg::kError) 
      << "Found database " <<  dbNo 
      << " to accept temporary tables, but should have been 0. "<< endl;
     ok = kFALSE;
  }
 
  else {

    VldTimeStamp  start(2001,1,1,12,00,00);
    VldTimeStamp    end(2001,9,27,12,00,00);
    VldRange      range(7,3,start,end,"Test8");

    DbiWriter<DbiDemoData1> wr(range,-1);
    DbiDemoData1 dd1(7,7.,7.,7.);
    wr << dd1;
    if ( ! wr.Close() ) {
      MSG("Dbi",Msg::kError) 
        << "Output to temporary table failed." << endl;
       ok = kFALSE;
    }
  }

// Read again and confirm we get the new data.

  pr.NewQuery(vc,0);

  numRows = pr.GetNumRows();
  Float_t ped = -999.;
  if ( numRows > 0 ) ped = pr.GetRow(0)->GetPedestal();

  if ( numRows != 1 || ped != 7. ) {    
    MSG("Dbi",Msg::kError) 
        << "After writing temp table Query date: " 
        << tstamp.AsString() << endl
        << " gave num rows  " << numRows 
        << " but should have given 1" << endl
        << " First row pedesal was " << ped
        << " but should have been 7." << endl;
    ok = kFALSE;
  }

  MSG("Dbi",Msg::kInfo) 
       << "Test 9: Temporary table creation & access      ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_10() {
//
//
//  Purpose:  Database maintenance support
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Test out sequence number replacement and loading of all 
//    validity records.
//
//  Program Notes:-
//  ============= 
//
//  Relies on data written by Test 7 (yes I know that's bad and that I 
//  should make them all independent!)

  Bool_t ok = kTRUE;
  
// Get Db proxy for DbiDemoData2 table.
  DbiDemoData1 pet;
  DbiTableProxy& tbProxy  = DbiTableProxyRegistry::Instance()
                           .GetTableProxy("DbiDemoData2",&pet);
  const DbiDBProxy& proxy = tbProxy.GetDBProxy(); 

// Renumber a known SeqNo in Db 0
  ok = proxy.ReplaceSeqNo(900000002,710000002,0);
  if ( ! ok ) MSG("Dbi",Msg::kError) << " Replace SeqNo failed." << endl;
  
// Check create table SQL generation.

  TString sqlMainExp;
  sqlMainExp += "CREATE TABLE DBIDEMODATA2(SEQNO INT NOT NULL, ";
  sqlMainExp += "ROW_COUNTER INT NOT NULL, ";
  sqlMainExp += "AGGREGATENO INT, ";
  sqlMainExp += "SUBSYSTEM INT, ";
  sqlMainExp += "DATA FLOAT, PRIMARY KEY (SEQNO,ROW_COUNTER))";
  TString sqlMainGot = tbProxy.GetMetaData().Sql();
  sqlMainGot.ToUpper();
  if ( sqlMainGot != sqlMainExp ) {
    MSG("Dbi",Msg::kError) 
      << " Creation SQL failed.  Got:-\n" << sqlMainGot
      << "\n but expected:-\n" << sqlMainExp << endl;
    ok = kFALSE;
  }

  TString sqlAuxGot = tbProxy.GetMetaValid().Sql();
  sqlAuxGot.ToUpper();
  TString sqlAuxExp;
  sqlAuxExp += "CREATE TABLE DBIDEMODATA2VLD(";
  sqlAuxExp += "SEQNO INT NOT NULL PRIMARY KEY, ";
  sqlAuxExp += "TIMESTART DATETIME NOT NULL, ";
  sqlAuxExp += "TIMEEND DATETIME NOT NULL, ";
  sqlAuxExp += "DETECTORMASK TINYINT, ";
  sqlAuxExp += "SIMMASK TINYINT, ";
  sqlAuxExp += "TASK INT, ";
  sqlAuxExp += "AGGREGATENO INT, ";
  sqlAuxExp += "CREATIONDATE DATETIME NOT NULL, ";
  sqlAuxExp += "INSERTDATE DATETIME NOT NULL, ";
  sqlAuxExp += "KEY TIMESTART (TIMESTART), KEY TIMEEND (TIMEEND))";
  TString sqlAuxExpOracle =  
               "CREATE TABLE DBIDEMODATA2VLD(SEQNO INTEGER NOT NULL PRIMARY KEY, "
               "TIMESTART DATE NOT NULL, TIMEEND DATE NOT NULL, "
               "DETECTORMASK INTEGER, SIMMASK INTEGER, TASK INTEGER, "
               "AGGREGATENO INTEGER, CREATIONDATE DATE NOT NULL, "
               "INSERTDATE DATE NOT NULL)";
  if ( sqlAuxGot != sqlAuxExp 
       && sqlAuxGot != sqlAuxExpOracle) {
    MSG("Dbi",Msg::kError) 
      << " Creation SQL failed.  Got:-\n" << sqlAuxGot
      << "\n but expected:-\n" << sqlAuxExp
      << "\n or (ORACLE):-\n" << sqlAuxExpOracle << endl;
    ok = kFALSE;
  }
  
// Collect up all validity records.
  DbiValRecSet vrs("DbiDemoData2",0); 
  if ( vrs.GetNumRows() != 5 ) {    
    MSG("Dbi",Msg::kError) 
        << " No. of DbiDemoData2Validity records in cascade entry 0"
        << " was " << vrs.GetNumRows() 
        << " but should have been 5." << endl;
    ok = kFALSE;
  }

// Fill up a DbiConfigSet query for each DbiValidityRec and export it
// checking to see if replaced one is there.
  ofstream export_stream("dbi_test_10.tmp");
  int matchMask = 0;
  for (unsigned int irec = 0; irec < vrs.GetNumRows(); ++irec) {
    const DbiValidityRec* vrec = vrs.GetTableRow(irec);
    DbiResultPtr<DbiConfigSet> cfsPtr("DbiDemoData2",*vrec);
    int numRows = cfsPtr.GetNumRows();
    int seqno = vrec->GetSeqNo();
    if      ( seqno == 710000002 && numRows == 4 )   matchMask |= 1;
    else if ( seqno == 900000001 && numRows == 3 )   matchMask |= 2;
    else if ( seqno == 900000003 && numRows == 2 )   matchMask |= 4;
    else if ( seqno == 900000004 && numRows == 3 )   matchMask |= 8;
    else if ( seqno == 900000005 && numRows == 3 )   matchMask |= 16;
    else  {
      MSG("Dbi",Msg::kError) 
        << "ValidityRec Row " << irec 
        << " SEQNO = " << seqno << " No of members " << numRows
        << " does not match any of:\n "
        << " (710000002,4),(900000001,3),(900000003,2),(900000004,3),(900000005,3)" << endl;
      ok = kFALSE;
    }

    DbiSqlValPacket packet(*vrec);
    packet.Write(export_stream,irec==0);
  }
  if ( matchMask != 31 ) {
    MSG("Dbi",Msg::kError) 
      << "Didn't find all expected rows.  Match mask = " << matchMask
      << " but should have been 31" << endl;
    ok = kFALSE;
  }
  export_stream.close();
  
// Import them again and check total numbers.
  ifstream import("dbi_test_10.tmp");
  DbiSqlValPacket packet(import);

  UInt_t numPackets = 0;
  UInt_t numStmts   = 0;
  while ( packet.CanBeStored() ) {
    ++ numPackets;
    numStmts += packet.GetNumSqlStmts();
    packet.Fill(import);
  }

  if ( numPackets != 5 || numStmts != 20 ) {
    MSG("Dbi",Msg::kError) 
        << "Packet and statements counts were (" << numPackets
        << "," <<  numStmts << ") but should have been (5,20)" << endl;
    ok = kFALSE;
  }

  VldTimeStamp aDate(2001,9,27,1,2,3);
  proxy.ReplaceInsertDate(aDate,900000005,0);

  MSG("Dbi",Msg::kInfo) 
       << "Test 10: Database maintenance support          ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_11() {
//
//
//  Purpose:  Test Rollback
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o Test Rollback
//
 
  Bool_t ok = kTRUE;

  VldTimeStamp tstamp(2001,01,05,0,0,0,0);
  VldContext vc(Detector::kCalib,SimFlag::kData,tstamp);

  DbiResultPtr<DbiDemoData1> pr;
  DbiCache* cache =  pr.TableProxy().GetCache();
  cache->Purge();

  CfgConfigurable& dbiCfg = DbiTableProxyRegistry::Instance();
  dbiCfg.Set("Rollback:* = '2000-01-01'");
  dbiCfg.Set("Rollback:DBI* = '2000-01-01'");
  dbiCfg.Update();

  cache->Purge();
  pr.NewQuery(vc,0);

  float gain = pr.GetRow(0)->GetGain1();
  if ( gain != 9. ) {
    MSG("Dbi",Msg::kError) 
        << "Rollback gain should be 9. but was " << gain << endl;
    ok = kFALSE;
  }

  dbiCfg.Set("Rollback:DBI* = '2001-01-04'");
  dbiCfg.Set("RollbackType:DBI* = 'CREATIONDATE'");
  dbiCfg.Update();

  cache->SetStale();  // Cannot just purge, the client still exists.
  pr.NewQuery(vc,0);

  gain = pr.GetRow(0)->GetGain1();
  if ( gain != 7. ) {
    MSG("Dbi",Msg::kError) 
        << "Rollback gain should be 7. but was " << gain << endl;
    ok = kFALSE;
  }
  DbiTableProxyRegistry::Instance().ClearRollbackDates();

  MSG("Dbi",Msg::kInfo) 
       << "Test 11: Rollback                              ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}
//.....................................................................

Bool_t DbiValidate::Test_12() {
//
//
//  Purpose:   Extended context queries.
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o 
//
 
  Bool_t ok = kTRUE;

  VldTimeStamp start(2002, 1, 1, 0, 0, 0);
  VldTimeStamp   end(2004, 1, 1, 0, 0, 0);
  DbiSqlContext   sc(DbiSqlContext::kStarts,start,end,Detector::kFar,SimFlag::kData);
  DbiResultPtr<DbiDemoData1>  rp("DbiDemoData1",sc,5,"SUBSYSTEM > 1");
  DbiResultPtr<DbiDemoData1> rp2("DbiDemoData1",sc,5,"SUBSYSTEM > 1");

  if ( rp.GetNumRows() != 4 ) {
    MSG("Dbi",Msg::kError) 
        << "First extended context query should give 4 rows but gave " 
        << rp.GetNumRows() << endl;
    ok = kFALSE;
  }
  if ( rp.GetResult() != rp2.GetResult() ) {
    MSG("Dbi",Msg::kError) 
        << "Repeat of first extended context query didn't use cache." << endl;
    ok = kFALSE;
  }

  rp.NewQuery(sc,5,"","Test Fill Options");
  if ( rp.GetNumRows() != 8 ) {
    MSG("Dbi",Msg::kError) 
        << "Second extended context query should give 8 rows but gave " 
        << rp.GetNumRows() << endl;
    ok = kFALSE;
  }

  MSG("Dbi",Msg::kInfo) 
       << "Test 12: Extended context queries              ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

//.....................................................................

Bool_t DbiValidate::Test_13() {
//
//
//  Purpose:  
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o 
//
 
  Bool_t ok = kTRUE;

  Int_t date = 20010103;
  Int_t time = 120000;
  VldTimeStamp tstamp(date/10000, date/100%100, date%100,
                        time/10000, time/100%100, time%100);
  VldContext vc_data(Detector::kCalib,SimFlag::kData,tstamp);
  VldContext vc_mc(Detector::kCalib,SimFlag::kMC,tstamp);

  // There isn't any data for MC but SimFlag association should allow it to
  // find data.  Have 2 tries:-
  //
  //  1)  Data then MC  - to test cache search
  //  2)  MC then data  - to test database query


  DbiTableProxyRegistry& tpr = DbiTableProxyRegistry::Instance();  
  tpr.Set("SimFlagAssociation:MC = 'Reroot,MC,Data'");
  tpr.Update();

  for ( int itry=1; itry <= 2; ++itry ) {

    tpr.PurgeCaches ();

    DbiResultPtr<DbiDemoData2> pr_data;
    DbiResultPtr<DbiDemoData2> pr_mc;

    if ( itry == 1 ) {
      pr_data.NewQuery(vc_data,0);
      pr_mc.NewQuery(vc_mc,0);
    }
    else {
      pr_mc.NewQuery(vc_mc,0);
      pr_data.NewQuery(vc_data,0);
    }
    int numRows_data = pr_data.GetNumRows();
    int numRows_mc   = pr_mc.GetNumRows();

    if ( numRows_data != 15 || numRows_mc != 15) {
      MSG("Dbi",Msg::kError) 
        << "SimFlag association failed on try " << itry
        << ". Both data and MC should give 15 rows but gave " << numRows_data
        << "," << numRows_mc << endl;
      ok = kFALSE;
    }
  }

  tpr.ClearSimFlagAssociation();


  MSG("Dbi",Msg::kInfo) 
       << "Test 13: SimFlag Association:                  ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;

  
}

// Template for further tests
/*

//.....................................................................

Bool_t DbiValidate::Test_?() {
//
//
//  Purpose:  
//  Arguments: None.
//  Return:    = kTRUE if all tests are O.K., kFALSE otherwise.  
//
//  Contact:   N. West
//
//  Specification:-
//  =============
//
//  o 
//
 
  Bool_t ok = kTRUE;

  MSG("Dbi",Msg::kInfo) 
//     << "Test x:                                        ...... ";
       << "Test ?:                                        ...... ";
  MSG("Dbi",Msg::kInfo) << ( ok ? "O.K." : "Failed") ;
  MSG("Dbi",Msg::kInfo) << "\n";


  if ( ok ) fNumPass++; else fNumFail++;

  return ok;
  
}

*/

---