Index: trunk/Mars/msql/MBasketSQL.cc =================================================================== --- trunk/Mars/msql/MBasketSQL.cc (revision 15419) +++ trunk/Mars/msql/MBasketSQL.cc (revision 15439) @@ -1,13 +1,2 @@ -// @(#)root/tree:$Id: MBasketSQL.cxx 43518 2012-03-28 01:04:07Z pcanal $ -// Author: Philippe Canal and al. 08/2004 - -/************************************************************************* - * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * - * All rights reserved. * - * * - * For the licensing terms see $ROOTSYS/LICENSE. * - * For the list of contributors see $ROOTSYS/README/CREDITS. * - *************************************************************************/ - ////////////////////////////////////////////////////////////////////////// // // @@ -18,16 +7,12 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef TBASKETSQL_CXX -#define TBASKETSQL_CXX +#ifndef MARS_MBasketSQL +#define MARS_MBasketSQL + +#include "MBasketSQL.h" #include "TBasket.h" #include "TTree.h" #include "TBranch.h" -#include "TFile.h" -#include "TMath.h" -#include "MBasketSQL.h" -#include -#include -#include "MTreeSQL.h" #include "MBufferSQL.h" @@ -37,81 +22,35 @@ //_________________________________________________________________________ -MBasketSQL::MBasketSQL() : TBasket(), fResultPtr(0), fRowPtr(0), fInsertQuery(0) +MBasketSQL::MBasketSQL() : TBasket(), fRowPtr(0) { // Default constructor. - } //_________________________________________________________________________ -MBasketSQL::MBasketSQL(const char *name, const char *title, TBranch *branch, - TSQLResult ** rs, TString *insert_query, - vector *vc, TSQLRow **r) : - fResultPtr(rs),fRowPtr(r) -{ - // Regular constructor. +MBasketSQL::MBasketSQL(TBranch *branch, TSQLRow **sqlrow, Int_t index, TString type) +{ + // Create a TSQLBuffer for this basket. + SetName(branch->GetName()); + SetTitle(branch->GetName()); - SetName(name); - SetTitle(title); - fClassName = "MBasketSQL"; - fBufferSize = branch->GetBasketSize(); - fNevBufSize = branch->GetEntryOffsetLen(); - fNevBuf = 0; - fEntryOffset = 0; //Must be set to 0 before calling Sizeof - fDisplacement= 0; //Must be set to 0 before calling Sizeof - fBuffer = 0; //Must be set to 0 before calling Sizeof - fInsertQuery = insert_query; + fClassName = "MBasketSQL"; - if (vc==0) { - fBufferRef = 0; - } else { - fBufferRef = new MBufferSQL(TBuffer::kWrite, fBufferSize, vc, fInsertQuery, fRowPtr); - } - fHeaderOnly = kTRUE; - fLast = 0; // Must initialize before calling Streamer() - //Streamer(*fBufferRef); - fBuffer = 0; - fBranch = branch; - fHeaderOnly = kFALSE; - branch->GetTree()->IncrementTotalBuffers(fBufferSize); + fBufferSize = branch->GetBasketSize(); + fNevBufSize = branch->GetEntryOffsetLen(); + fNevBuf = 0; + fEntryOffset = 0; //Must be set to 0 before calling Sizeof + fDisplacement= 0; //Must be set to 0 before calling Sizeof + fBuffer = 0; //Must be set to 0 before calling Sizeof + fBufferRef = 0; -} + fBufferRef = new MBufferSQL(sqlrow, index, type); -//_________________________________________________________________________ -MBasketSQL::~MBasketSQL() -{ - // Destructor -} - -//_________________________________________________________________________ -void MBasketSQL::CreateBuffer(const char *name, TString title, - vector *vc, - TBranch *branch, TSQLResult ** rs) -{ - // Create a TSQLBuffer for this basket. - - fResultPtr = rs; - SetName(name); - SetTitle(title); - fClassName = "MBasketSQL"; - fBufferSize = branch->GetBasketSize(); - fNevBufSize = branch->GetEntryOffsetLen(); - fNevBuf = 0; - fEntryOffset = 0; //Must be set to 0 before calling Sizeof - fDisplacement= 0; //Must be set to 0 before calling Sizeof - fBuffer = 0; //Must be set to 0 before calling Sizeof - - if(vc==0) { - fBufferRef = 0; - Error("CreateBuffer","Need a vector of columns\n"); - } else { - fBufferRef = new MBufferSQL(TBuffer::kWrite, fBufferSize, vc, fInsertQuery, fRowPtr); - } - fHeaderOnly = kTRUE; - fLast = 0; - //Streamer(*fBufferRef); - fBuffer = 0; - fBranch = branch; - fHeaderOnly = kFALSE; - branch->GetTree()->IncrementTotalBuffers(fBufferSize); + fHeaderOnly = kTRUE; + fLast = 0; + //Streamer(*fBufferRef); + fBuffer = 0; + fBranch = branch; + fHeaderOnly = kFALSE; + branch->GetTree()->IncrementTotalBuffers(fBufferSize); } @@ -119,9 +58,6 @@ void MBasketSQL::PrepareBasket(Long64_t entry) { - // Prepare the basket for the next entry. - - ((MBufferSQL*)fBufferRef)->ResetOffset(); - ((MTreeSQL*)fBranch->GetTree())->PrepEntry(entry); - fBufferRef->Reset(); + // Prepare the basket for the next entry. + fBranch->GetTree()->LoadTree(entry); } @@ -129,37 +65,21 @@ Int_t MBasketSQL::ReadBasketBytes(Long64_t , TFile *) { - // See TBasket::ReadBasketBytes. This is not implemented in MBasketSQL. - - Error("ReadBasketBytes","This member function should not be called!"); - return 0; + Error("ReadBasketBytes","This member function should not be called!"); + return 0; } //_________________________________________________________________________ Int_t MBasketSQL::ReadBasketBuffers(Long64_t , Int_t, TFile *) -{ - // See TBasket::ReadBasketBuffers. This is not implemented in MBasketSQL. - - Error("ReadBasketBuffers","This member function should not be called!"); - return 0; +{ + Error("ReadBasketBuffers","This member function should not be called!"); + return 0; } - -//_________________________________________________________________________ -void MBasketSQL::Reset() -{ - // See TBasket::Reset - - TBasket::Reset(); -} - //_________________________________________________________________________ void MBasketSQL::Update(Int_t, Int_t) { - // See TBasket::Update. - - ((MBufferSQL*)fBufferRef)->ResetOffset(); - fNevBuf++; + // See TBasket::Update. + fNevBuf++; } - #endif Index: trunk/Mars/msql/MBasketSQL.h =================================================================== --- trunk/Mars/msql/MBasketSQL.h (revision 15419) +++ trunk/Mars/msql/MBasketSQL.h (revision 15439) @@ -1,13 +1,2 @@ -// @(#)root/tree:$Id: MBasketSQL.h 35231 2010-09-10 17:59:10Z pcanal $ -// Author: Philippe Canal 2005 - -/************************************************************************* - * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * - * All rights reserved. * - * * - * For the licensing terms see $ROOTSYS/LICENSE. * - * For the list of contributors see $ROOTSYS/README/CREDITS. * - *************************************************************************/ - #ifndef ROOT_MBasketSQL #define ROOT_MBasketSQL @@ -21,14 +10,10 @@ ////////////////////////////////////////////////////////////////////////// -#include #include "TBasket.h" -class TSQLResult; class TSQLRow; -class MBufferSQL; class MBasketSQL : public TBasket { - private: MBasketSQL(const MBasketSQL&); // MBasketSQL objects are not copiable. @@ -36,20 +21,14 @@ protected: - TSQLResult **fResultPtr; //! - TSQLRow **fRowPtr; //! - TString *fInsertQuery; //! + TSQLRow **fRowPtr; //! public: MBasketSQL(); - MBasketSQL(const char *name, const char *title, - TBranch *branch, TSQLResult **rs, - TString *insert_query, std::vector *vc, TSQLRow **row); - ~MBasketSQL(); - void PrepareBasket(Long64_t entry); - virtual Int_t ReadBasketBuffers(Long64_t pos, Int_t len, TFile *file); - virtual Int_t ReadBasketBytes(Long64_t pos, TFile *file); - virtual void Reset(); - TSQLResult * GetResultSet() { return *fResultPtr;} - void CreateBuffer(const char *name, TString title, std::vector * vc, TBranch *branch, TSQLResult ** rs); + MBasketSQL(TBranch *b, TSQLRow **r, Int_t index, TString type); + + void PrepareBasket(Long64_t entry); + + virtual Int_t ReadBasketBuffers(Long64_t pos, Int_t len, TFile *file); + virtual Int_t ReadBasketBytes(Long64_t pos, TFile *file); void Update(Int_t offset, Int_t skipped); Index: trunk/Mars/msql/MBufferSQL.cc =================================================================== --- trunk/Mars/msql/MBufferSQL.cc (revision 15419) +++ trunk/Mars/msql/MBufferSQL.cc (revision 15439) @@ -17,13 +17,15 @@ // // ////////////////////////////////////////////////////////////////////////// +#include "MBufferSQL.h" -#include #include +#include + #include "TError.h" -#include "MBufferSQL.h" #include "TSQLResult.h" #include "TSQLRow.h" -#include + +#include "MTime.h" using namespace std; @@ -32,128 +34,17 @@ //________________________________________________________________________ -MBufferSQL::MBufferSQL(TBuffer::EMode mode, vector *vc, - TString *insert_query, TSQLRow ** r) : - TBufferFile(mode), - fColumnVec(vc), fInsertQuery(insert_query), fRowPtr(r) +MBufferSQL::MBufferSQL() : TBufferFile(), fRowPtr(0) { // Constructor. - - fIter = fColumnVec->begin(); } //________________________________________________________________________ -MBufferSQL::MBufferSQL(TBuffer::EMode mode, Int_t bufsiz, vector *vc, - TString *insert_query, TSQLRow ** r) : - TBufferFile(mode,bufsiz), - fColumnVec(vc), fInsertQuery(insert_query), fRowPtr(r) +MBufferSQL::MBufferSQL(TSQLRow **r, Int_t index, TString type) : +TBufferFile(TBufferFile::kRead), fRowPtr(r), fIndex(index), fIsDate(kFALSE) { - // Constructor. - - fIter = fColumnVec->begin(); -} - -//________________________________________________________________________ -MBufferSQL::MBufferSQL(TBuffer::EMode mode, Int_t bufsiz, vector *vc, - TString *insert_query, TSQLRow ** r, - void *buf, Bool_t adopt) : - TBufferFile(mode,bufsiz,buf,adopt), - fColumnVec(vc), fInsertQuery(insert_query), fRowPtr(r) -{ - // Constructor. - - fIter = fColumnVec->begin(); -} - -//________________________________________________________________________ -MBufferSQL::MBufferSQL() : TBufferFile(), fColumnVec(0),fInsertQuery(0),fRowPtr(0) -{ - // Constructor. - -} - -//________________________________________________________________________ -MBufferSQL::~MBufferSQL() -{ - // Destructo. - - delete fColumnVec; -} - -//________________________________________________________________________ -void MBufferSQL::ReadBool(Bool_t &b) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - b = (Bool_t)atoi(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(Bool_t&)","Error reading Bool_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadChar(Char_t &c) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - c = (Char_t)atoi(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(Char_t&)","Error reading Char_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadShort(Short_t &h) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - h = (Short_t)atoi(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(Short_t&)","Error reading Short_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadInt(Int_t &i) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - i = atoi(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(Int_t&)","Error reading Int_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadFloat(Float_t &f) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - f = atof(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(Float_t&)","Error reading Float_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadLong(Long_t &l) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - l = atol(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(Long_t&)","Error reading Long_t"); + // Constructor. + if (type.BeginsWith("date", TString::kIgnoreCase) || + type.BeginsWith("time", TString::kIgnoreCase)) + fIsDate = kTRUE; } @@ -162,649 +53,19 @@ { // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); + const char *ptr = (*fRowPtr)->GetField(fIndex); - d = atof(ptr?ptr:""); + if (ptr==0) + { + d = 0; + Error("operator>>(Double_t&)","NULL value found in cell"); + return; + } - if (fIter != fColumnVec->end()) ++fIter; + if (!fIsDate) + { + d = atof(ptr); + return; + } - if(ptr==0) Error("operator>>(Double_t&)","Error reading Double_t"); + d = MTime(ptr).GetAxisTime(); } - - -//________________________________________________________________________ -void MBufferSQL::WriteBool(Bool_t b) -{ - // Operator<< - - (*fInsertQuery) += b; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteChar(Char_t c) -{ - // Operator<< - - (*fInsertQuery) += c; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteShort(Short_t h) -{ - // Operator<< - - (*fInsertQuery) += h; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteInt(Int_t i) -{ - // Operator<< - - (*fInsertQuery) += i; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteLong(Long_t l) -{ - // Operator<< - - (*fInsertQuery) += l; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteFloat(Float_t f) -{ - // Operator<< - - (*fInsertQuery) += f; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteDouble(Double_t d) -{ - // Operator<< - - (*fInsertQuery) += d; - (*fInsertQuery) += ","; - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadUChar(UChar_t& uc) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - uc = (UChar_t)atoi(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(UChar_t&)","Error reading UChar_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadUShort(UShort_t& us) -{ - // Operator>> - const char *ptr = (*fRowPtr)->GetField(*fIter); - - us = (UShort_t)atoi(ptr?ptr:""); - - if (fIter != fColumnVec->end()) ++fIter; - - if(ptr==0) Error("operator>>(UShort_t&)","Error reading UShort_t"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadUInt(UInt_t& ui) -{ - // Operator>> - - TString val = (*fRowPtr)->GetField(*fIter); - Int_t code = sscanf(val.Data(), "%u",&ui); - if(code == 0) Error("operator>>(UInt_t&)","Error reading UInt_t"); - - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadULong(ULong_t& ul) -{ - // Operator>> - - TString val = (*fRowPtr)->GetField(*fIter); - Int_t code = sscanf(val.Data(), "%lu",&ul); - if(code == 0) Error("operator>>(ULong_t&)","Error reading ULong_t"); - - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadLong64(Long64_t &ll) -{ - // Operator>> - - TString val = (*fRowPtr)->GetField(*fIter); - Int_t code = sscanf(val.Data(), "%lld",&ll); - if(code == 0) Error("operator>>(ULong_t&)","Error reading Long64_t"); - - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadULong64(ULong64_t &ull) -{ - // Operator>> - - TString val = (*fRowPtr)->GetField(*fIter); - Int_t code = sscanf(val.Data(), "%llu",&ull); - if(code == 0) Error("operator>>(ULong_t&)","Error reading ULong64_t"); - - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadCharP(Char_t *str) -{ - // Operator>> - - strcpy(str,(*fRowPtr)->GetField(*fIter)); // Legacy interface, we have no way to know the user's buffer size .... - if (fIter != fColumnVec->end()) ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadTString(TString &) -{ - // Operator>> - - //strcpy(str,(*fRowPtr)->GetField(*fIter)); - //if (fIter != fColumnVec->end()) ++fIter; - printf("ERROR NOT IMPLEMENTED\n"); -} - -//________________________________________________________________________ -void MBufferSQL::WriteTString(const TString &) -{ - // Operator>> - - //strcpy(str,(*fRowPtr)->GetField(*fIter)); - //if (fIter != fColumnVec->end()) ++fIter; - printf("ERROR NOT IMPLEMENTED\n"); -} - -// Method to send to database. - -//________________________________________________________________________ -void MBufferSQL::WriteUChar(UChar_t uc) -{ - // Operator<< - - (*fInsertQuery) += uc; - (*fInsertQuery) += ","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteUShort(UShort_t us) -{ - // Operator<< - - (*fInsertQuery) += us; - (*fInsertQuery) += ","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteUInt(UInt_t ui) -{ - // Operator<< - - (*fInsertQuery) += ui; - (*fInsertQuery) += ","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteULong(ULong_t ul) -{ - // Operator<< - - (*fInsertQuery) += ul; - (*fInsertQuery) += ","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteLong64(Long64_t ll) -{ - // Operator<< - - (*fInsertQuery) += ll; - (*fInsertQuery) += ","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteULong64(ULong64_t ull) -{ - // Operator<< - - (*fInsertQuery) += ull; - (*fInsertQuery) += ","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteCharP(const Char_t *str) -{ - // Operator<< - - (*fInsertQuery) += "\""; - (*fInsertQuery) += str; - (*fInsertQuery) += "\","; - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::WriteFastArray(const Bool_t *b, Int_t n) -{ - // WriteFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Char_t *c, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArrayString(Char_t *c, Int_t /* n */) -{ - // ReadFastArray SQL implementation. - strcpy(c,((*fRowPtr)->GetField(*fIter))); - ++fIter; -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(UChar_t *uc, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Short_t *s, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(UShort_t *us, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Int_t *in, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(UInt_t *ui, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Long_t *l, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(ULong_t *ul, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; i> ul[i]; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Long64_t *ll, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; i> ll[i]; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(ULong64_t *ull, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; i> ull[i]; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Float_t *f, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(Double_t *d, Int_t n) -{ - // ReadFastArray SQL implementation. - for(int i=0; iGetField(*fIter)); - ++fIter; - } -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArrayFloat16(Float_t *, Int_t , TStreamerElement *) -{ - // ReadFastArray SQL implementation. - Fatal("ReadFastArrayFloat16(Float_t *, Int_t , TStreamerElement *)","Not implemented yet"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArrayDouble32(Double_t *, Int_t , TStreamerElement *) -{ - // ReadFastArray SQL implementation. - Fatal("ReadFastArrayDouble32(Double_t *, Int_t , TStreamerElement *)","Not implemented yet"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(void *, const TClass *, Int_t, TMemberStreamer *, const TClass *) -{ - // ReadFastArray SQL implementation. - Fatal("ReadFastArray(void *, const TClass *, Int_t, TMemberStreamer *, const TClass *)","Not implemented yet"); -} - -//________________________________________________________________________ -void MBufferSQL::ReadFastArray(void **, const TClass *, Int_t, Bool_t, TMemberStreamer *, const TClass *) -{ - // ReadFastArray SQL implementation. - Fatal("ReadFastArray(void **, const TClass *, Int_t, Bool_t, TMemberStreamer *, const TClass *)","Not implemented yet"); -} - -//________________________________________________________________________ -void MBufferSQL::ResetOffset() -{ - // Reset Offset. - fIter = fColumnVec->begin(); -} - -#if 0 -//________________________________________________________________________ -void MBufferSQL::insert_test(const char* dsn, const char* usr, - const char* pwd, const TString& tblname) -{ - TString str; - TString select = "select * from "; - TString sql; - TSQLStatement* stmt; - sql = select + "ins"; - - con = gSQLDriverManager->GetConnection(dsn,usr,pwd); - - if(!con) - printf("\n\n\nConnection NOT Successful\n\n\n"); - else - printf("\n\n\nConnection Sucessful\n\n\n"); - - - - stmt = con->CreateStatement(0, odbc::ResultSet::CONCUR_READ_ONLY); - - ptr = stmt->ExecuteQuery(sql.Data()); - if(!ptr) printf("No recorSet found!"); - - ptr->Next(); - ptr->MoveToInsertRow(); - cerr << "IsAfterLast(): " << ptr->IsAfterLast() << endl; - ptr->UpdateInt(1, 5555); - ptr->InsertRow(); - con->Commit(); - - ptr1 = stmt->ExecuteQuery(sql.Data()); - -} -#endif Index: trunk/Mars/msql/MBufferSQL.h =================================================================== --- trunk/Mars/msql/MBufferSQL.h (revision 15419) +++ trunk/Mars/msql/MBufferSQL.h (revision 15439) @@ -32,97 +32,22 @@ class TSQLRow; -class MBufferSQL : public TBufferFile { - +class MBufferSQL : public TBufferFile +{ private: - std::vector::const_iterator fIter; - - std::vector *fColumnVec; //! - TString *fInsertQuery; //! - TSQLRow **fRowPtr; //! + TSQLRow **fRowPtr; //! + Int_t fIndex; + Bool_t fIsDate; // TBuffer objects cannot be copied or assigned - MBufferSQL(const MBufferSQL &); // not implemented - void operator=(const MBufferSQL &); // not implemented + MBufferSQL(const MBufferSQL &); // not implemented + void operator=(const MBufferSQL &); // not implemented public: - MBufferSQL(); - MBufferSQL(TBuffer::EMode mode, std::vector *vc, TString *insert_query, TSQLRow **rowPtr); - MBufferSQL(TBuffer::EMode mode, Int_t bufsiz, std::vector *vc, TString *insert_query, TSQLRow **rowPtr); - MBufferSQL(TBuffer::EMode mode, Int_t bufsiz, std::vector *vc, TString *insert_query, TSQLRow **rowPtr,void *buf, Bool_t adopt = kTRUE); - ~MBufferSQL(); + MBufferSQL(); + MBufferSQL(TSQLRow **row, Int_t index, TString type); - void ResetOffset(); + void ReadDouble(Double_t &d); - virtual void ReadBool(Bool_t &b); - virtual void ReadChar(Char_t &c); - virtual void ReadUChar(UChar_t &c); - virtual void ReadShort(Short_t &s); - virtual void ReadUShort(UShort_t &s); - virtual void ReadInt(Int_t &i); - virtual void ReadUInt(UInt_t &i); - virtual void ReadLong(Long_t &l); - virtual void ReadULong(ULong_t &l); - virtual void ReadLong64(Long64_t &l); - virtual void ReadULong64(ULong64_t &l); - virtual void ReadFloat(Float_t &f); - virtual void ReadDouble(Double_t &d); - virtual void ReadCharP(Char_t *c); - virtual void ReadTString(TString &s); - - virtual void WriteBool(Bool_t b); - virtual void WriteChar(Char_t c); - virtual void WriteUChar(UChar_t c); - virtual void WriteShort(Short_t s); - virtual void WriteUShort(UShort_t s); - virtual void WriteInt(Int_t i); - virtual void WriteUInt(UInt_t i); - virtual void WriteLong(Long_t l); - virtual void WriteULong(ULong_t l); - virtual void WriteLong64(Long64_t l); - virtual void WriteULong64(ULong64_t l); - virtual void WriteFloat(Float_t f); - virtual void WriteDouble(Double_t d); - virtual void WriteCharP(const Char_t *c); - virtual void WriteTString(const TString &s); - - - virtual void WriteFastArray(const Bool_t *b, Int_t n); - virtual void WriteFastArray(const Char_t *c, Int_t n); - virtual void WriteFastArrayString(const Char_t *c, Int_t n); - virtual void WriteFastArray(const UChar_t *c, Int_t n); - virtual void WriteFastArray(const Short_t *h, Int_t n); - virtual void WriteFastArray(const UShort_t *h, Int_t n); - virtual void WriteFastArray(const Int_t *i, Int_t n); - virtual void WriteFastArray(const UInt_t *i, Int_t n); - virtual void WriteFastArray(const Long_t *l, Int_t n); - virtual void WriteFastArray(const ULong_t *l, Int_t n); - virtual void WriteFastArray(const Long64_t *l, Int_t n); - virtual void WriteFastArray(const ULong64_t *l, Int_t n); - virtual void WriteFastArray(const Float_t *f, Int_t n); - virtual void WriteFastArray(const Double_t *d, Int_t n); - virtual void WriteFastArray(void *start, const TClass *cl, Int_t n=1, TMemberStreamer *s=0); - virtual Int_t WriteFastArray(void **startp, const TClass *cl, Int_t n=1, Bool_t isPreAlloc=kFALSE, TMemberStreamer *s=0); - - virtual void ReadFastArray(Bool_t *, Int_t ); - virtual void ReadFastArray(Char_t *, Int_t ); - virtual void ReadFastArrayString(Char_t *, Int_t ); - virtual void ReadFastArray(UChar_t *, Int_t ); - virtual void ReadFastArray(Short_t *, Int_t ); - virtual void ReadFastArray(UShort_t *, Int_t ); - virtual void ReadFastArray(Int_t *, Int_t ); - virtual void ReadFastArray(UInt_t *, Int_t ); - virtual void ReadFastArray(Long_t *, Int_t ); - virtual void ReadFastArray(ULong_t *, Int_t ); - virtual void ReadFastArray(Long64_t *, Int_t ); - virtual void ReadFastArray(ULong64_t *, Int_t ); - virtual void ReadFastArray(Float_t *, Int_t ); - virtual void ReadFastArray(Double_t *, Int_t ); - virtual void ReadFastArrayFloat16(Float_t *f, Int_t n, TStreamerElement *ele=0); - virtual void ReadFastArrayDouble32(Double_t *d, Int_t n, TStreamerElement *ele=0); - virtual void ReadFastArray(void *, const TClass *, Int_t n=1, TMemberStreamer *s=0, const TClass *onFileClass=0); - virtual void ReadFastArray(void **, const TClass *, Int_t n=1, Bool_t isPreAlloc=kFALSE, TMemberStreamer *s=0, const TClass *onFileClass=0); - - ClassDef(MBufferSQL, 1); // Implementation of TBuffer to load and write to a SQL database - + ClassDef(MBufferSQL, 1); // Implementation of TBuffer to load and write to a SQL database }; Index: trunk/Mars/msql/MSQLServer.cc =================================================================== --- trunk/Mars/msql/MSQLServer.cc (revision 15419) +++ trunk/Mars/msql/MSQLServer.cc (revision 15439) @@ -59,4 +59,6 @@ #include +#include "MTreeSQL.h" + ClassImp(MSQLServer); @@ -445,4 +447,7 @@ if (TestBit(kIsOwner)) { + if (fTree) + delete fTree; + delete fServ; fServ=0; @@ -621,4 +626,5 @@ fType = kIsZombie; + fTree = 0; fList.SetOwner(); } @@ -714,4 +720,5 @@ { fServ = serv.fServ; + fTree = 0; fDataBase = serv.fDataBase; @@ -726,4 +733,5 @@ if (gDebug>0) cout << "Delete: " << GetName() << endl; + Close(); } @@ -873,4 +881,15 @@ } +MTreeSQL *MSQLServer::GetTree(const char *table, const char *addon) +{ + if (fType!=kIsServer || !fServ || !TestBit(kIsOwner)) + return 0; + + if (!fTree) + fTree = new MTreeSQL(this, table, addon); + + return fTree; +} + void MSQLServer::RecursiveRemove(TObject *obj) { Index: trunk/Mars/msql/MSQLServer.h =================================================================== --- trunk/Mars/msql/MSQLServer.h (revision 15419) +++ trunk/Mars/msql/MSQLServer.h (revision 15439) @@ -12,8 +12,11 @@ class TSQLResult; +class MTreeSQL; + class MSQLServer : public TObject { private: TSQLServer *fServ; + MTreeSQL *fTree; TString fDataBase; @@ -66,5 +69,5 @@ public: MSQLServer(TSQLServer *serv, const char *dbname=0, const char *tname=0, const char *col=0) - : fServ(serv), fDataBase(dbname), fTable(tname), fColumn(col), fType(kIsZombie) + : fServ(serv), fTree(0), fDataBase(dbname), fTable(tname), fColumn(col), fType(kIsZombie) { fList.SetOwner(); @@ -128,4 +131,6 @@ void RecursiveRemove(TObject *obj); + MTreeSQL *GetTree(const char *table, const char *addon=0); + ClassDef(MSQLServer, 0) // An enhancement of TSQLServer }; Index: trunk/Mars/msql/MTreeSQL.cc =================================================================== --- trunk/Mars/msql/MTreeSQL.cc (revision 15419) +++ trunk/Mars/msql/MTreeSQL.cc (revision 15439) @@ -34,5 +34,6 @@ #include "TSQLRow.h" #include "TSQLResult.h" -#include "TSQLServer.h" + +#include "MSQLServer.h" #include "MTreeSQL.h" @@ -44,8 +45,7 @@ //______________________________________________________________________________ -MTreeSQL::MTreeSQL(TSQLServer *server, TString DB, const TString& table, const TString &addon) : +MTreeSQL::MTreeSQL(MSQLServer *server, const TString& table, const TString &addon) : TTree(table.Data(), "Database read from table: " + table, 0), - fCurrentEntry(-1), fDB(DB), fQuery(table+" "+addon),fResult(0), fRow(0), - fServer(server) + fServer(server), fQuery(table+" "+addon), fResult(0), fRow(0) { fEntries = 0; @@ -60,5 +60,5 @@ // Constructor with an explicit TSQLServer - TPRegexp reg("LEFT +JOIN +([a-zA-Z0-9_.]+)"); + TPRegexp reg(" +JOIN +([a-zA-Z0-9_.]+)"); Int_t p = -1; @@ -79,9 +79,193 @@ for (auto it=fTables.begin(); it!=fTables.end(); it++) - { - cout << *it << endl; if (!CheckTable(*it)) return; + + Init(); +} + +MTreeSQL::~MTreeSQL() +{ + for (auto it=fRows.begin(); it!=fRows.end(); it++) + delete *it; + + delete fResult; +} + +//______________________________________________________________________________ +Bool_t MTreeSQL::CheckTable(const TString &table) const +{ + // Check the table exist in the database + if (fServer==0) + return kFALSE; + + TSQLResult *tables = fServer->GetTables(table); + if (!tables) + return kFALSE; + + TSQLRow * row = 0; + while ((row = tables->Next())) + { + if (table.CompareTo(row->GetField(0),TString::kIgnoreCase)==0) + return kTRUE; + + delete row; } + delete tables; + + // The table is a not a permanent table, let's see if it is a 'temporary' table + const Int_t before = gErrorIgnoreLevel; + gErrorIgnoreLevel = kFatal; + + TSQLResult *res = fServer->GetColumns(table); + if (res) + delete res; + + gErrorIgnoreLevel = before; + + return res ? kTRUE : kFALSE; +} + +//______________________________________________________________________________ +void MTreeSQL::Init() +{ + // Initializeation routine + // Number of entries needed to create the branches + //GetEntries(); + + vector> cols; + + for (auto it=fTables.begin(); it!=fTables.end(); it++) + { + TSQLResult *res = fServer->GetColumns(*it); + + TSQLRow *row = 0; + while ((row=res->Next())) + { + TString f1 = row->GetField(1); + + Int_t p0 = f1.First('('); + if (p0<0) + p0 = f1.First(' '); + if (p0<0) + p0 = f1.Length(); + + const TString type = f1(0, p0); + + if (type.CompareTo("int", TString::kIgnoreCase) && + type.CompareTo("date", TString::kIgnoreCase) && + type.CompareTo("time", TString::kIgnoreCase) && + type.CompareTo("datetime", TString::kIgnoreCase) && + type.CompareTo("year", TString::kIgnoreCase) && + type.CompareTo("timestamp", TString::kIgnoreCase) && + type.CompareTo("bit", TString::kIgnoreCase) && + type.CompareTo("tinyint", TString::kIgnoreCase) && + type.CompareTo("smallint", TString::kIgnoreCase) && + type.CompareTo("mediumint", TString::kIgnoreCase) && + type.CompareTo("integer", TString::kIgnoreCase) && + type.CompareTo("bigint", TString::kIgnoreCase) && + type.CompareTo("decimal", TString::kIgnoreCase) && + type.CompareTo("int", TString::kIgnoreCase) && + type.CompareTo("real", TString::kIgnoreCase) && + type.CompareTo("float", TString::kIgnoreCase) && + type.CompareTo("double", TString::kIgnoreCase)) + { + //cout << "Skip: " << type << endl; + continue; + } + + const TString name = *it+"."+row->GetField(0); + cols.push_back(make_pair(name, type)); + + delete row; + } + delete res; + } + + TString list; + for (auto it=cols.begin(); it!=cols.end(); it++) + list += ","+it->first; + + list.Remove(0, 1); + + fResult = fServer->Query(("SELECT "+list+" FROM "+fQuery).Data()); + if (!fResult) + return; + + TSQLRow *row = 0; + while ((row=(TSQLRow*)fResult->Next())) + fRows.push_back(row); + + fEntries = fRows.size(); + + // ============================================================== + + // determine leaf description string + Int_t idx = 0; + for (auto it=cols.begin(); it!=cols.end(); it++, idx++) + { + const TString name = it->first; + + TBranch *br = TTree::Branch(name, 0, name+"/D"); + + br->ResetAddress(); + br->SetEntries(fEntries); + + auto entry = br->GetBasketEntry(); + entry[0] = 0; + entry[1] = fEntries; + + TBasket *bsk = new MBasketSQL(br, &fRow, idx, it->second); + + br->GetListOfBaskets()->AddAtAndExpand(bsk, 0); + } +} + +//______________________________________________________________________________ +Long64_t MTreeSQL::GetEntries() const +{ + // Get the number of rows in the database + return GetEntriesFast(); +} + +//______________________________________________________________________________ +Long64_t MTreeSQL::GetEntriesFast() const +{ + // Return the number of entries as of the last check. + // Use GetEntries for a more accurate count. + + return fEntries; +} + +//______________________________________________________________________________ +Long64_t MTreeSQL::LoadTree(Long64_t entry) +{ + // Setup the tree to the load the specified entry. + // Make sure the server and result set are setup for the requested entry + if (entry<0 || entry>=fEntries) + return -1; + + fReadEntry = entry; + fRow = fRows[entry]; + + return entry; +} + +//______________________________________________________________________________ +void MTreeSQL::Refresh() +{ + if (!fServer) + return; + + // Refresh contents of this Tree and his branches from the current + // Tree status in the database + // One can call this function in case the Tree on its file is being + // updated by another process + for (auto it=fRows.begin(); it!=fRows.end(); it++) + delete *it; + + fRows.clear(); + + delete fResult; Init(); @@ -169,204 +353,4 @@ //______________________________________________________________________________ -TBranch * MTreeSQL::Branch(const char *name, void *address, - const char *leaflist, Int_t bufsize) -{ - // Create a branch - - Int_t nb = fBranches.GetEntriesFast(); - TBranch *branch; - TString brName; - - for (int i=0;iGetName(); - if (brName.Index(name) == 0) { - // Now if the branch exists in db, root gives a warning and exit - // Dealing with duplicate branch has been done, but not tested yet. - // So if you want to allow duplicate branch, just comment Fatal() line and uncomment commented - // below Fatal() line - - Fatal("Branch()", "Duplicate branch!!!"); - } - } - return TTree::Branch(name, address, leaflist, bufsize); -} - -//______________________________________________________________________________ -Bool_t MTreeSQL::CheckTable(const TString &table) const -{ - // Check the table exist in the database - - if (fServer==0) return kFALSE; - TSQLResult * tables = fServer->GetTables(fDB.Data(),table); - if (!tables) return kFALSE; - TSQLRow * row = 0; - while( (row = tables->Next()) ) { - if(table.CompareTo(row->GetField(0),TString::kIgnoreCase)==0){ - return kTRUE; - } - } - // The table is a not a permanent table, let's see if it is a 'temporary' table - Int_t before = gErrorIgnoreLevel; - gErrorIgnoreLevel = kFatal; - TSQLResult *res = fServer->GetColumns(fDB.Data(),table); - if (res) { - delete res; - return kTRUE; - } - gErrorIgnoreLevel = before; - - return kFALSE; -} - -//______________________________________________________________________________ -TBasket * MTreeSQL::CreateBasket(TBranch * tb) -{ - // Create a TBasketSQL - - if (fServer==0) { - Error("CreateBasket","No TSQLServer specified"); - return 0; - } - - static TString dummy; - - vector *columnVec = GetColumnIndice(tb); - if (columnVec) { - return new MBasketSQL(tb->GetName(), tb->GetName(), tb, - &fResult, &dummy, columnVec, &fRow); - } else { - return 0; - } -} - -//_________________________________________________________________________ -TString MTreeSQL::CreateBranches(TSQLResult * rs, const TString &table) -{ - // determine leaf description string - - if(!rs) return ""; - - Int_t rows; - TString type; - TString res; - TString branchName; - TString leafName; - Int_t prec=0; - TBranch * br = 0; - rows = rs->GetRowCount(); - TString decl; - TString prevBranch; - - for( int i=0; i < rows; ++i ) { - TSQLRow * row = rs->Next(); - if (!row) continue; - type = row->GetField(1); - Int_t index = type.First('('); - if(index>0){ - prec = atoi(type(index+1,type.First(')')-1).Data()); - type = type(0,index); - } - branchName = table+"."+row->GetField(0); - //cout << table << "." << branchName << endl; - Int_t pos; - if ((pos=branchName.Index("__"))!=kNPOS) { - leafName = branchName(pos+2,branchName.Length()); - branchName.Remove(pos); - } else { - leafName = branchName; - } - if (prevBranch.Length()) { - if (prevBranch != branchName) { - // new branch let's flush. - if (decl.Length()) decl.Remove(decl.Length()-1); - br = TTree::Branch(prevBranch,0,decl); - br->ResetAddress(); - - (br->GetBasketEntry())[0] = 0; - (br->GetBasketEntry())[1] = fEntries; - - br->SetEntries(fEntries); - - //++(br->fNBaskets); - br->GetListOfBaskets()->AddAtAndExpand(CreateBasket(br),0); - - prevBranch = branchName; - decl = ""; - } - } else { - prevBranch = branchName; - } - - if(type.CompareTo("varchar",TString::kIgnoreCase)==0 || type.CompareTo("varchar2",TString::kIgnoreCase)==0 || type.CompareTo("char",TString::kIgnoreCase)==0 ) { - char siz[6]; - snprintf(siz,6,"[%d]",prec); - decl.Append( leafName+siz+"/C:" ); - } - else if(type.CompareTo("int",TString::kIgnoreCase)==0){ - decl.Append( leafName+"/I:" ); - } - else if( type.CompareTo("date",TString::kIgnoreCase)==0 || - type.CompareTo("time",TString::kIgnoreCase)==0 || - type.CompareTo("timestamp",TString::kIgnoreCase)==0 ) { - decl.Append( leafName+"/I:" ); - } - else if(type.CompareTo("bit",TString::kIgnoreCase)==0 || - type.CompareTo("tinyint",TString::kIgnoreCase)==0 || - type.CompareTo("smallint",TString::kIgnoreCase)==0 ) { - decl.Append( leafName+"/i:" ); - } - else if(type.CompareTo("real",TString::kIgnoreCase)==0 || type.CompareTo("longvarchar",TString::kIgnoreCase)==0 || type.CompareTo("longvarbinary",TString::kIgnoreCase)==0 || type.CompareTo("varbinary",TString::kIgnoreCase)==0 ){ - decl.Append( leafName+"/S:" ); - } - - // case kLONGVARCHAR: // not resolved yet how to handle - // case kLONGVARBINARY: - //case kVARBINARY: - // break; - else - //if(type.CompareTo("bigint",TString::kIgnoreCase)==0 || type.CompareTo("decimal",TString::kIgnoreCase)==0 || type.CompareTo("numeric",TString::kIgnoreCase)==0 || type.CompareTo("double",TString::kIgnoreCase)==0 || - //type.CompareTo("float",TString::kIgnoreCase)==0 ) - { - - decl.Append( leafName+"/F:" ); - } - - } - - // new branch let's flush. - if (decl.Length()) decl.Remove(decl.Length()-1); - if (prevBranch.Length()) { - br = TTree::Branch(prevBranch,0,decl); - br->ResetAddress(); - - (br->GetBasketEntry())[0] = 0; - (br->GetBasketEntry())[1] = fEntries; - br->SetEntries(fEntries); - br->GetListOfBaskets()->AddAtAndExpand(CreateBasket(br),0); - } - - if(!res.IsNull()) res.Resize(res.Length()-1); // cut off last ":" - return res; -} - -//______________________________________________________________________________ -void MTreeSQL::Init() -{ - // Initializeation routine - - fCurrentEntry = -1; - - GetEntries(); - - delete fResult; - fResult = fServer->Query(("SELECT * FROM "+fQuery).Data()); - if(!fResult) return; - - for (auto it=fTables.begin(); it!=fTables.end(); it++) - CreateBranches(fServer->GetColumns(fDB, *it), *it); -} - -//______________________________________________________________________________ Int_t MTreeSQL::Fill() { @@ -374,189 +358,2 @@ return -1; } - -//______________________________________________________________________________ -vector *MTreeSQL::GetColumnIndice(TBranch *branch) -{ - // Return a vector of columns index corresponding to the - // current SQL table and the branch given as argument - // Returns 0 if no columns indices is found - // Otherwise returns a pointer to a vector to be deleted by the caller - - //if (!CheckTable(fTable)) return 0; - - vector *columns = new vector; - - Int_t nl = branch->GetNleaves(); - - vector names; - pair value; - - for (auto it=fTables.begin(); it!=fTables.end(); it++) - { - TSQLResult *rs = fServer->GetColumns(fDB, *it); - if (rs==0) { delete columns; return 0; } - Int_t rows = rs->GetRowCount(); - - for (Int_t i=0;iNext(); - names.push_back( *it+"."+row->GetField(0) ); - delete row; - } - delete rs; - } - - for(int j=0;jGetListOfLeaves()->UncheckedAt(j); - TString leafName = leaf->GetName(); - TString str; - - str = ""; - str = branch->GetName(); - str += "__"; - str += leafName; - for (UInt_t i=0;i=0){ - columns->push_back(col); - } else Error("GetColumnIndice","Error finding column %d %s",j,str.Data()); - } - if (columns->empty()) { - delete columns; return 0; - } else - return columns; -} - -//______________________________________________________________________________ -Long64_t MTreeSQL::GetEntries() const -{ - // Get the number of rows in the database - - if (fServer==0) return GetEntriesFast(); - //if (!CheckTable(fTable.Data())) return 0; - - MTreeSQL* thisvar = const_cast(this); - - // What if the user already started to call GetEntry - // What about the initial value of fEntries is it really 0? - - const TString counting = "SELECT COUNT(*) FROM " + fQuery; - TSQLResult *count = fServer->Query(counting); - - if (count==0) { - thisvar->fEntries = 0; - } else { - TSQLRow * row = count->Next(); - if (row) { - TString val = row->GetField(0); - Long_t ret; - sscanf(val.Data(), "%ld",&(ret) ); - thisvar->fEntries = ret; - } else { - thisvar->fEntries = 0; - } - } - return fEntries; -} - -//______________________________________________________________________________ -Long64_t MTreeSQL::GetEntriesFast() const -{ - // Return the number of entries as of the last check. - // Use GetEntries for a more accurate count. - - return fEntries; -} - -//______________________________________________________________________________ -Int_t MTreeSQL::GetEntry(Long64_t entry, Int_t getall) -{ - // Load the data for the entry from the database. - - if (PrepEntry(entry)>=0) return TTree::GetEntry(entry,getall); - else return -1; -} - -//______________________________________________________________________________ -Long64_t MTreeSQL::LoadTree(Long64_t entry) -{ - // Setup the tree to the load the specified entry. - - fReadEntry = entry; - return PrepEntry(entry); -} - -//______________________________________________________________________________ -Long64_t MTreeSQL::PrepEntry(Long64_t entry) -{ - // Make sure the server and result set are setup for the requested entry - - if (entry < 0 || entry >= fEntries || fServer==0) return 0; - fReadEntry = entry; - - if(entry == fCurrentEntry) return entry; - - if(entry < fCurrentEntry || fResult==0){ - delete fResult; - fResult = fServer->Query(("SELECT * FROM "+fQuery).Data()); - fCurrentEntry = -1; - } - - Bool_t reset = false; - while ( fResult && fCurrentEntry < entry ) { - ++fCurrentEntry; - delete fRow; - fRow = fResult->Next(); - if (fRow==0 && !reset) { - delete fResult; - fResult = fServer->Query(("SELECT * FROM "+fQuery).Data()); - fCurrentEntry = -1; - reset = true; - } - } - if (fRow==0) return -1; - return entry; -} -/* -//______________________________________________________________________________ -// void MTreeSQL::LoadNumberEntries() -// { -// R__ASSERT(0); - -// fResult = fServer->Query(fQuery.Data()); -// fEntries=0; - -// while(fResult->Next()){ -// fEntries++; -// } -// fResult = fServer->Query(fQuery.Data()); -// } -*/ -//______________________________________________________________________________ -void MTreeSQL::Refresh() -{ - // Refresh contents of this Tree and his branches from the current - // Tree status in the database - // One can call this function in case the Tree on its file is being - // updated by another process - - // Note : something to be done? - GetEntries(); // Re-load the number of entries - fCurrentEntry = -1; - delete fResult; fResult = 0; - delete fRow; fRow = 0; -} Index: trunk/Mars/msql/MTreeSQL.h =================================================================== --- trunk/Mars/msql/MTreeSQL.h (revision 15419) +++ trunk/Mars/msql/MTreeSQL.h (revision 15439) @@ -37,23 +37,22 @@ #include -class TSQLServer; +class MSQLServer; class TSQLRow; -class MTreeSQL : public TTree { +class MTreeSQL : public TTree +{ +protected: + MSQLServer *fServer; -protected: - Int_t fCurrentEntry; - TString fDB; - TString fQuery; - TSQLResult *fResult; - TSQLRow *fRow; - TSQLServer *fServer; - std::vector fTables; + TString fQuery; - Bool_t CheckTable(const TString &table) const; - TString CreateBranches(TSQLResult * rs, const TString &table); - std::vector *GetColumnIndice(TBranch *branch); - void Init(); - virtual TBasket *CreateBasket(TBranch * br); + TSQLResult *fResult; + TSQLRow *fRow; + + std::vector fTables; + std::vector fRows; + + Bool_t CheckTable(const TString &table) const; + void Init(); virtual TBranch *BranchImp(const char *branchname, const char *classname, TClass *ptrClass, void *addobj, Int_t bufsize, Int_t splitlevel); @@ -61,25 +60,24 @@ public: - MTreeSQL(TSQLServer * server, TString DB, const TString& table, const TString &addon=""); + MTreeSQL(MSQLServer *server, const TString& table, const TString &addon=""); + ~MTreeSQL(); - virtual Int_t Branch(TCollection *list, Int_t bufsize=32000, Int_t splitlevel=99, const char *name=""); - virtual Int_t Branch(TList *list, Int_t bufsize=32000, Int_t splitlevel=99); - virtual Int_t Branch(const char *folder, Int_t bufsize=32000, Int_t splitlevel=99); - virtual TBranch *Bronch(const char *name, const char *classname, void *addobj, Int_t bufsize=32000, Int_t splitlevel=99); - virtual TBranch *BranchOld(const char *name, const char *classname, void *addobj, Int_t bufsize=32000, Int_t splitlevel=1); + Int_t Branch(TCollection *list, Int_t bufsize=32000, Int_t splitlevel=99, const char *name=""); + Int_t Branch(TList *list, Int_t bufsize=32000, Int_t splitlevel=99); + Int_t Branch(const char *folder, Int_t bufsize=32000, Int_t splitlevel=99); + TBranch *Bronch(const char *name, const char *classname, void *addobj, Int_t bufsize=32000, Int_t splitlevel=99); + TBranch *BranchOld(const char *name, const char *classname, void *addobj, Int_t bufsize=32000, Int_t splitlevel=1); + TBranch *Branch(const char *name, void *address, const char *leaflist, Int_t bufsize) { return TTree::Branch(name, address, leaflist, bufsize); } #if !defined(__CINT__) - virtual TBranch *Branch(const char *name, const char *classname, void *addobj, Int_t bufsize=32000, Int_t splitlevel=99); + TBranch *Branch(const char *name, const char *classname, void *addobj, Int_t bufsize=32000, Int_t splitlevel=99); #endif - virtual TBranch *Branch(const char *name, void *address, const char *leaflist, Int_t bufsize); + Int_t Fill(); + Long64_t GetEntries() const; + Long64_t GetEntries(const char *sel) { return TTree::GetEntries(sel); } + Long64_t GetEntriesFast()const; + Long64_t LoadTree(Long64_t entry); - virtual Int_t Fill(); - virtual Int_t GetEntry(Long64_t entry=0, Int_t getall=0); - virtual Long64_t GetEntries() const; - virtual Long64_t GetEntries(const char *sel) { return TTree::GetEntries(sel); } - virtual Long64_t GetEntriesFast()const; - virtual Long64_t LoadTree(Long64_t entry); - virtual Long64_t PrepEntry(Long64_t entry); - void Refresh(); + void Refresh(); ClassDef(MTreeSQL,1); // TTree Implementation read and write to a SQL database.